diff options
Diffstat (limited to 'ardor3d-examples/src/main')
6 files changed, 18 insertions, 17 deletions
diff --git a/ardor3d-examples/src/main/java/com/ardor3d/example/ExampleRunner.java b/ardor3d-examples/src/main/java/com/ardor3d/example/ExampleRunner.java index 5025e1c..ad65b8b 100644 --- a/ardor3d-examples/src/main/java/com/ardor3d/example/ExampleRunner.java +++ b/ardor3d-examples/src/main/java/com/ardor3d/example/ExampleRunner.java @@ -29,6 +29,7 @@ import java.net.URI; import java.net.URL; import java.net.URLConnection; import java.net.URLDecoder; +import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.Enumeration; @@ -84,7 +85,6 @@ import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import com.ardor3d.util.resource.ResourceLocatorTool; -import com.google.common.collect.Lists; /** * starter for Ardor3D examples @@ -449,7 +449,7 @@ public class ExampleRunner extends JFrame { final Class<?> clazz = (Class<?>) selected; final boolean isWindows = System.getProperty("os.name").contains("Windows"); - final List<String> args = Lists.newArrayList(); + final List<String> args = new ArrayList<String>(); args.add(isWindows ? "javaw" : "java"); args.add("-Xmx" + maxHeapMemory + "M"); args.add("-cp"); diff --git a/ardor3d-examples/src/main/java/com/ardor3d/example/effect/ExtrusionExample.java b/ardor3d-examples/src/main/java/com/ardor3d/example/effect/ExtrusionExample.java index deb199f..05ab024 100644 --- a/ardor3d-examples/src/main/java/com/ardor3d/example/effect/ExtrusionExample.java +++ b/ardor3d-examples/src/main/java/com/ardor3d/example/effect/ExtrusionExample.java @@ -10,6 +10,7 @@ package com.ardor3d.example.effect; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -22,7 +23,6 @@ import com.ardor3d.scenegraph.Line; import com.ardor3d.scenegraph.shape.Extrusion; import com.ardor3d.spline.CatmullRomSpline; import com.ardor3d.spline.Curve; -import com.google.common.collect.Lists; /** * A demonstration of the Extrusion class - showing how a set of point can be converted into a 3d shape. @@ -42,7 +42,7 @@ public class ExtrusionExample extends ExampleBase { _canvas.getCanvasRenderer().getCamera().setLocation(new Vector3(0, 0, 80)); _canvas.getCanvasRenderer().getCamera().lookAt(new Vector3(), Vector3.UNIT_Y); - final List<ReadOnlyVector3> path = Lists.newArrayList(); + final List<ReadOnlyVector3> path = new ArrayList<ReadOnlyVector3>(); path.add(new Vector3(0, 0, 0)); path.add(new Vector3(0, 0, 4)); path.add(new Vector3(1, 0, 8)); @@ -97,7 +97,7 @@ public class ExtrusionExample extends ExampleBase { private Line createLineStrip(final boolean loop) { // Create a line with our example "makeLine" method. See method below. - final ReadOnlyVector3[] vectors = { // + final ReadOnlyVector3[] vectors = { // new Vector3(0, 0, 0), // new Vector3(5, 0, 0), // new Vector3(5, 5, 0), // diff --git a/ardor3d-examples/src/main/java/com/ardor3d/example/pipeline/AnimationDemoExample.java b/ardor3d-examples/src/main/java/com/ardor3d/example/pipeline/AnimationDemoExample.java index 73d7d03..0912b12 100644 --- a/ardor3d-examples/src/main/java/com/ardor3d/example/pipeline/AnimationDemoExample.java +++ b/ardor3d-examples/src/main/java/com/ardor3d/example/pipeline/AnimationDemoExample.java @@ -11,6 +11,9 @@ package com.ardor3d.example.pipeline; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.IdentityHashMap; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; @@ -51,8 +54,6 @@ import com.ardor3d.util.geom.MeshCombiner; import com.ardor3d.util.resource.ResourceLocatorTool; import com.ardor3d.util.resource.ResourceSource; import com.ardor3d.util.resource.URLResourceSource; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; /** * Illustrates loading several animations from Collada and arranging them in an animation state machine. @@ -66,9 +67,9 @@ public class AnimationDemoExample extends ExampleBase { static AnimationDemoExample instance; - private final List<AnimationManager> managers = Lists.newArrayList(); - private final List<AnimationInfo> animInfo = Lists.newArrayList(); - private final Map<SkeletonPose, SkinnedMesh> poseToMesh = Maps.newIdentityHashMap(); + private final List<AnimationManager> managers = new ArrayList<AnimationManager>(); + private final List<AnimationInfo> animInfo = new ArrayList<AnimationInfo>(); + private final Map<SkeletonPose, SkinnedMesh> poseToMesh = new IdentityHashMap<SkeletonPose, SkinnedMesh>(); public static void main(final String[] args) { ExampleBase.start(AnimationDemoExample.class); @@ -196,7 +197,7 @@ public class AnimationDemoExample extends ExampleBase { return skeleton; } - private final Map<String, AnimationClip> animationStore = Maps.newHashMap(); + private final Map<String, AnimationClip> animationStore = new HashMap<String, AnimationClip>(); private AnimationManager createAnimationManager(final SkeletonPose pose) { // Make our manager diff --git a/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/Texture3DExample.java b/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/Texture3DExample.java index b9d862f..8a7ce03 100644 --- a/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/Texture3DExample.java +++ b/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/Texture3DExample.java @@ -11,6 +11,7 @@ package com.ardor3d.example.renderer; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.List; import com.ardor3d.example.ExampleBase; @@ -31,7 +32,6 @@ import com.ardor3d.math.ColorRGBA; import com.ardor3d.renderer.state.TextureState; import com.ardor3d.scenegraph.shape.Sphere; import com.ardor3d.util.TextureKey; -import com.google.common.collect.Lists; /** * Very simple example showing use of a Texture3D texture. @@ -78,7 +78,7 @@ public class Texture3DExample extends ExampleBase { img.setHeight(32); img.setDepth(32); - final List<ByteBuffer> data = Lists.newArrayList(); + final List<ByteBuffer> data = new ArrayList<ByteBuffer>(); for (int i = 0; i < 32; i++) { final Image colorImage = GeneratedImageFactory .createSolidColorImage(ColorRGBA.randomColor(null), false, 32); diff --git a/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/utils/atlas/AtlasExample.java b/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/utils/atlas/AtlasExample.java index 1b74add..f18ff48 100644 --- a/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/utils/atlas/AtlasExample.java +++ b/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/utils/atlas/AtlasExample.java @@ -13,6 +13,7 @@ package com.ardor3d.example.renderer.utils.atlas; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import javax.imageio.ImageIO; @@ -48,7 +49,6 @@ import com.ardor3d.ui.text.BasicText; import com.ardor3d.util.ReadOnlyTimer; import com.ardor3d.util.TextureManager; import com.ardor3d.util.geom.MeshCombiner; -import com.google.common.collect.Lists; /** * Example showing how to use the TexturePacker to create a texture atlas. Also shows the benefits of using it together @@ -158,7 +158,7 @@ public class AtlasExample extends ExampleBase { private void packIntoAtlas(final Spatial spatial) { // Gather up all meshes to do the atlas operation on - final List<Mesh> meshes = Lists.newArrayList(); + final List<Mesh> meshes = new ArrayList<Mesh>(); final Visitor visitor = new Visitor() { @Override public void visit(final Spatial spatial) { diff --git a/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/utils/atlas/AtlasExampleMultiTextured.java b/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/utils/atlas/AtlasExampleMultiTextured.java index 356238a..1132d9d 100644 --- a/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/utils/atlas/AtlasExampleMultiTextured.java +++ b/ardor3d-examples/src/main/java/com/ardor3d/example/renderer/utils/atlas/AtlasExampleMultiTextured.java @@ -13,6 +13,7 @@ package com.ardor3d.example.renderer.utils.atlas; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import javax.imageio.ImageIO; @@ -49,7 +50,6 @@ import com.ardor3d.ui.text.BasicText; import com.ardor3d.util.ReadOnlyTimer; import com.ardor3d.util.TextureManager; import com.ardor3d.util.geom.MeshCombiner; -import com.google.common.collect.Lists; /** * Example showing how to use the TexturePacker to create a texture atlas. Also shows the benefits of using it together @@ -159,7 +159,7 @@ public class AtlasExampleMultiTextured extends ExampleBase { private void packIntoAtlas(final Spatial spatial) { // Gather up all meshes to do the atlas operation on - final List<Mesh> meshes = Lists.newArrayList(); + final List<Mesh> meshes = new ArrayList<Mesh>(); final Visitor visitor = new Visitor() { @Override public void visit(final Spatial spatial) { |