Update demos to RS development branch updates for jogl-2.4

etatara · etatara · commit d03c847beb3d · 2020-09-18T14:05:53.000-05:00
diff --git a/Flock/src/flock/agents/Boid.java b/Flock/src/flock/agents/Boid.java
@@ -1,6 +1,6 @@
 ﻿package flock.agents;
 
-import javax.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector3d;
 
 /**
  * Boid stores a velocity vector that is updated by implementing classes.
diff --git a/Flock/src/flock/agents/Predator.java b/Flock/src/flock/agents/Predator.java
@@ -1,6 +1,6 @@
 ﻿package flock.agents;
 
-import javax.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector3d;
 
 import repast.simphony.context.Context;
 import repast.simphony.engine.environment.RunEnvironment;
diff --git a/Flock/src/flock/agents/Prey.java b/Flock/src/flock/agents/Prey.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector3d;
 
 import repast.simphony.context.Context;
 import repast.simphony.engine.environment.RunEnvironment;
diff --git a/Flock/src/flock/styles/PredatorStyle.java b/Flock/src/flock/styles/PredatorStyle.java
@@ -3,7 +3,7 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Shape3D;
 
 import repast.simphony.visualization.visualization3D.AppearanceFactory;
 import repast.simphony.visualization.visualization3D.ShapeFactory;
diff --git a/Flock/src/flock/styles/PreyStyle.java b/Flock/src/flock/styles/PreyStyle.java
@@ -3,12 +3,11 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.PointArray;
-import javax.media.j3d.PointAttributes;
-import javax.media.j3d.Shape3D;
-import javax.vecmath.Point3f;
-
-import com.sun.j3d.utils.picking.PickTool;
+import org.jogamp.java3d.PointArray;
+import org.jogamp.java3d.PointAttributes;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.utils.picking.PickTool;
+import org.jogamp.vecmath.Point3f;
 
 import repast.simphony.visualization.visualization3D.AppearanceFactory;
 import repast.simphony.visualization.visualization3D.style.Style3D;
diff --git a/PredatorPrey/src/PredatorPrey/styles/GrassNodeStyle.java b/PredatorPrey/src/PredatorPrey/styles/GrassNodeStyle.java
@@ -4,11 +4,11 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Vector3d;
-import javax.vecmath.Vector3f;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Transform3D;
+import org.jogamp.java3d.TransformGroup;
+import org.jogamp.vecmath.Vector3d;
+import org.jogamp.vecmath.Vector3f;
 
 import PredatorPrey.agents.Grass;
 import PredatorPrey.agents.SimpleAgent;
diff --git a/PredatorPrey/src/PredatorPrey/styles/SimpleNodeStyle.java b/PredatorPrey/src/PredatorPrey/styles/SimpleNodeStyle.java
@@ -4,7 +4,7 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Shape3D;
 
 import PredatorPrey.agents.Sheep;
 import PredatorPrey.agents.SimpleAgent;
diff --git a/Schelling/src/Schelling/AgentStyle.java b/Schelling/src/Schelling/AgentStyle.java
@@ -3,7 +3,7 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Shape3D;
 
 import repast.simphony.visualization.visualization3D.AppearanceFactory;
 import repast.simphony.visualization.visualization3D.ShapeFactory;
diff --git a/SimplePhysics/src/SimplePhysics/CubeNodeStyle.java b/SimplePhysics/src/SimplePhysics/CubeNodeStyle.java
@@ -4,7 +4,7 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Shape3D;
 
 import repast.simphony.visualization.visualization3D.AppearanceFactory;
 import repast.simphony.visualization.visualization3D.ShapeFactory;
diff --git a/SimplePhysics/src/SimplePhysics/PhysicsAgent.java b/SimplePhysics/src/SimplePhysics/PhysicsAgent.java
@@ -2,15 +2,15 @@
 
 import java.awt.Color;
 
-import javax.vecmath.AxisAngle4f;
+import org.jogamp.vecmath.AxisAngle4f;
+
+import com.bulletphysics.linearmath.Transform;
 
 import repast.simphony.context.Context;
 import repast.simphony.engine.schedule.ScheduledMethod;
 import repast.simphony.space.physics.PhysicsSpace;
 import repast.simphony.util.ContextUtils;
 
-import com.bulletphysics.linearmath.Transform;
-
 /**
  * 
  * @author Eric Tatara
diff --git a/SimplePhysics/src/SimplePhysics/SphereNodeStyle.java b/SimplePhysics/src/SimplePhysics/SphereNodeStyle.java
@@ -4,7 +4,7 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Shape3D;
 
 import repast.simphony.visualization.visualization3D.AppearanceFactory;
 import repast.simphony.visualization.visualization3D.ShapeFactory;
diff --git a/SolarSystem/src/SolarSystem/GlobeStyle3D.java b/SolarSystem/src/SolarSystem/GlobeStyle3D.java
@@ -4,19 +4,18 @@
 import java.awt.Container;
 import java.awt.Font;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Texture;
-import javax.media.j3d.TextureAttributes;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.TextureAttributes;
+import org.jogamp.java3d.utils.geometry.Primitive;
+import org.jogamp.java3d.utils.geometry.Sphere;
+import org.jogamp.java3d.utils.image.TextureLoader;
 
 import repast.simphony.visualization.visualization3D.style.Style3D;
 import repast.simphony.visualization.visualization3D.style.TaggedAppearance;
 import repast.simphony.visualization.visualization3D.style.TaggedBranchGroup;
 
-import com.sun.j3d.utils.geometry.Primitive;
-import com.sun.j3d.utils.geometry.Sphere;
-import com.sun.j3d.utils.image.TextureLoader;
-
 public class GlobeStyle3D implements Style3D<Planet> {
 
 	Texture texture;
diff --git a/SolarSystem/src/SolarSystem/MoonStyle3D.java b/SolarSystem/src/SolarSystem/MoonStyle3D.java
@@ -4,19 +4,18 @@
 import java.awt.Container;
 import java.awt.Font;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Texture;
-import javax.media.j3d.TextureAttributes;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.TextureAttributes;
+import org.jogamp.java3d.utils.geometry.Primitive;
+import org.jogamp.java3d.utils.geometry.Sphere;
+import org.jogamp.java3d.utils.image.TextureLoader;
 
 import repast.simphony.visualization.visualization3D.style.Style3D;
 import repast.simphony.visualization.visualization3D.style.TaggedAppearance;
 import repast.simphony.visualization.visualization3D.style.TaggedBranchGroup;
 
-import com.sun.j3d.utils.geometry.Primitive;
-import com.sun.j3d.utils.geometry.Sphere;
-import com.sun.j3d.utils.image.TextureLoader;
-
 public class MoonStyle3D implements Style3D<Moon> {
 
 	Texture texture;
diff --git a/SolarSystem/src/SolarSystem/StarFieldStyle3D.java b/SolarSystem/src/SolarSystem/StarFieldStyle3D.java
@@ -4,19 +4,18 @@
 import java.awt.Container;
 import java.awt.Font;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Texture;
-import javax.media.j3d.TextureAttributes;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.TextureAttributes;
+import org.jogamp.java3d.utils.geometry.Primitive;
+import org.jogamp.java3d.utils.geometry.Sphere;
+import org.jogamp.java3d.utils.image.TextureLoader;
 
 import repast.simphony.visualization.visualization3D.style.Style3D;
 import repast.simphony.visualization.visualization3D.style.TaggedAppearance;
 import repast.simphony.visualization.visualization3D.style.TaggedBranchGroup;
 
-import com.sun.j3d.utils.geometry.Primitive;
-import com.sun.j3d.utils.geometry.Sphere;
-import com.sun.j3d.utils.image.TextureLoader;
-
 public class StarFieldStyle3D implements Style3D<Starfield> {
 
 	Texture texture;
diff --git a/SolarSystem/src/SolarSystem/StarStyle3D.java b/SolarSystem/src/SolarSystem/StarStyle3D.java
@@ -4,19 +4,18 @@
 import java.awt.Container;
 import java.awt.Font;
 
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.Texture;
-import javax.media.j3d.TextureAttributes;
+import org.jogamp.java3d.Appearance;
+import org.jogamp.java3d.Shape3D;
+import org.jogamp.java3d.Texture;
+import org.jogamp.java3d.TextureAttributes;
+import org.jogamp.java3d.utils.geometry.Primitive;
+import org.jogamp.java3d.utils.geometry.Sphere;
+import org.jogamp.java3d.utils.image.TextureLoader;
 
 import repast.simphony.visualization.visualization3D.style.Style3D;
 import repast.simphony.visualization.visualization3D.style.TaggedAppearance;
 import repast.simphony.visualization.visualization3D.style.TaggedBranchGroup;
 
-import com.sun.j3d.utils.geometry.Primitive;
-import com.sun.j3d.utils.geometry.Sphere;
-import com.sun.j3d.utils.image.TextureLoader;
-
 public class StarStyle3D implements Style3D<Star> {
 
 	Texture texture;
diff --git a/SugarScape/src/sugarscape/styles/SugarAgentStyle.java b/SugarScape/src/sugarscape/styles/SugarAgentStyle.java
@@ -3,7 +3,7 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.Shape3D;
+import org.jogamp.java3d.Shape3D;
 
 import repast.simphony.visualization.visualization3D.AppearanceFactory;
 import repast.simphony.visualization.visualization3D.ShapeFactory;
