Use By_REFERENCE and Y_UP options for Texture.

6 files changed, 13 insertions, 10 deletions

diff --git a/src/classes/org/jdesktop/j3d/examples/background/BackgroundGeometry.java b/src/classes/org/jdesktop/j3d/examples/background/BackgroundGeometry.java
index bd4f7ca..e05bac3 100644
--- a/src/classes/org/jdesktop/j3d/examples/background/BackgroundGeometry.java
+++ b/src/classes/org/jdesktop/j3d/examples/background/BackgroundGeometry.java
@@ -83,15 +83,18 @@ public class BackgroundGeometry extends javax.swing.JFrame {
         bg.setApplicationBounds(bounds);
 	BranchGroup backGeoBranch = new BranchGroup();
         Sphere sphereObj = new Sphere(1.0f, Sphere.GENERATE_NORMALS |
-			          Sphere.GENERATE_NORMALS_INWARD |
-				  Sphere.GENERATE_TEXTURE_COORDS, 45);
+                Sphere.GENERATE_NORMALS_INWARD |
+                Sphere.GENERATE_TEXTURE_COORDS |
+                Sphere.GENERATE_TEXTURE_COORDS_Y_UP, 45);        
         Appearance backgroundApp = sphereObj.getAppearance();
         backGeoBranch.addChild(sphereObj);
         bg.setGeometry(backGeoBranch);
         objTrans.addChild(bg);
 
         TextureLoader tex = new TextureLoader(bgImage,
-					      new String("RGB"), this);
+                new String("RGB"),
+                TextureLoader.BY_REFERENCE | TextureLoader.Y_UP,
+                this);
         if (tex != null) 
 	    backgroundApp.setTexture(tex.getTexture());
 
diff --git a/src/classes/org/jdesktop/j3d/examples/oriented_shape3d/OrientedPtTest.java b/src/classes/org/jdesktop/j3d/examples/oriented_shape3d/OrientedPtTest.java
index 7a71b1a..4443ad0 100644
--- a/src/classes/org/jdesktop/j3d/examples/oriented_shape3d/OrientedPtTest.java
+++ b/src/classes/org/jdesktop/j3d/examples/oriented_shape3d/OrientedPtTest.java
@@ -159,7 +159,7 @@ public class OrientedPtTest extends Applet {
 	coneMat.set(new Vector3d(0.0, 0.0, 0.0));
 	coneTrans.setTransform(coneMat);
 	coneTrans.addChild(new Cone(.2f, 0.8f,Cone.GENERATE_NORMALS | 
-                Cone.GENERATE_TEXTURE_COORDS | Cone.GENERATE_TEXTURE_COORDS_YUP, apStone));
+                Cone.GENERATE_TEXTURE_COORDS | Cone.GENERATE_TEXTURE_COORDS_Y_UP, apStone));
         objTrans.addChild(coneTrans);
 
         TextureLoader earthTex = new TextureLoader(earthImage, new String("RGB"),
@@ -173,7 +173,7 @@ public class OrientedPtTest extends Applet {
 	cylinderTrans.setTransform(cylinderMat);
 	cylinderTrans.addChild(new Cylinder(.35f, 2.0f,Cylinder.GENERATE_NORMALS |
                 Cylinder.GENERATE_TEXTURE_COORDS |
-                Cylinder.GENERATE_TEXTURE_COORDS_YUP, apEarth));
+                Cylinder.GENERATE_TEXTURE_COORDS_Y_UP, apEarth));
         objTrans.addChild(cylinderTrans);
 
         objTrans.addChild(objScale);
diff --git a/src/classes/org/jdesktop/j3d/examples/oriented_shape3d/OrientedTest.java b/src/classes/org/jdesktop/j3d/examples/oriented_shape3d/OrientedTest.java
index eb2a7f2..7402af9 100644
--- a/src/classes/org/jdesktop/j3d/examples/oriented_shape3d/OrientedTest.java
+++ b/src/classes/org/jdesktop/j3d/examples/oriented_shape3d/OrientedTest.java
@@ -143,7 +143,7 @@ public class OrientedTest extends Applet {
 	coneTrans.setTransform(coneMat);
         coneTrans.addChild(new Cone(.2f, 0.8f, Cone.GENERATE_NORMALS |
                 Cone.GENERATE_TEXTURE_COORDS |
-                Cone.GENERATE_TEXTURE_COORDS_YUP, apStone));
+                Cone.GENERATE_TEXTURE_COORDS_Y_UP, apStone));
         objTrans.addChild(coneTrans);
 
         TextureLoader earthTex = new TextureLoader(earthImage, new String("RGB"),
@@ -158,7 +158,7 @@ public class OrientedTest extends Applet {
 	cylinderTrans.setTransform(cylinderMat);
         cylinderTrans.addChild(new Cylinder(.35f, 2.0f, Cylinder.GENERATE_NORMALS |
                 Cylinder.GENERATE_TEXTURE_COORDS |
-                Cylinder.GENERATE_TEXTURE_COORDS_YUP, apEarth));
+                Cylinder.GENERATE_TEXTURE_COORDS_Y_UP, apEarth));
         objTrans.addChild(cylinderTrans);
 
         objTrans.addChild(objScale);
diff --git a/src/classes/org/jdesktop/j3d/examples/texture/MultiTextureTest.java b/src/classes/org/jdesktop/j3d/examples/texture/MultiTextureTest.java
index 17c054d..3ec6e0b 100644
--- a/src/classes/org/jdesktop/j3d/examples/texture/MultiTextureTest.java
+++ b/src/classes/org/jdesktop/j3d/examples/texture/MultiTextureTest.java
@@ -175,7 +175,7 @@ public class MultiTextureTest extends Applet implements ItemListener{
     //Create a Box
     Box BoxObj = new Box(1.5f, 1.5f, 0.8f, Box.GENERATE_NORMALS |
             Box.GENERATE_TEXTURE_COORDS |
-            Box.GENERATE_TEXTURE_COORDS_YUP, ap, 2);
+            Box.GENERATE_TEXTURE_COORDS_Y_UP, ap, 2);
     // add it to the scene graph.
     objTrans.addChild(BoxObj);
 
diff --git a/src/classes/org/jdesktop/j3d/examples/texture/TextureImage.java b/src/classes/org/jdesktop/j3d/examples/texture/TextureImage.java
index 06b5e95..bedb83e 100644
--- a/src/classes/org/jdesktop/j3d/examples/texture/TextureImage.java
+++ b/src/classes/org/jdesktop/j3d/examples/texture/TextureImage.java
@@ -86,7 +86,7 @@ public class TextureImage extends Applet {
 	// Create textured cube and add it to the scene graph.
 	Box textureCube = new Box(0.4f, 0.4f, 0.4f,
                 Box.GENERATE_TEXTURE_COORDS |
-                Box.GENERATE_TEXTURE_COORDS_YUP, app);
+                Box.GENERATE_TEXTURE_COORDS_Y_UP, app);
 	objTrans.addChild(textureCube);
 
 	// Create a new Behavior object that will perform the desired
diff --git a/src/classes/org/jdesktop/j3d/examples/texture/TextureImageNPOT.java b/src/classes/org/jdesktop/j3d/examples/texture/TextureImageNPOT.java
index 781c258..ed7abfa 100644
--- a/src/classes/org/jdesktop/j3d/examples/texture/TextureImageNPOT.java
+++ b/src/classes/org/jdesktop/j3d/examples/texture/TextureImageNPOT.java
@@ -111,7 +111,7 @@ public class TextureImageNPOT extends Applet {
 	// Create textured cube and add it to the scene graph.
         Box textureCube = new Box(0.4f, 0.4f, 0.4f,
                 Box.GENERATE_TEXTURE_COORDS |
-                Box.GENERATE_TEXTURE_COORDS_YUP, app);
+                Box.GENERATE_TEXTURE_COORDS_Y_UP, app);
 	objScale.addChild(textureCube);
 
 	// Create a new Behavior object that will perform the desired