From 72b8355caa4b1ff0241521956a7e680fc5ad6146 Mon Sep 17 00:00:00 2001 From: nobody Date: Mon, 5 Jun 2006 17:39:39 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'exp-1_5_0-build4'. --- README-build.html | 4 +- build.xml | 77 ++++++- manifest.mf | 2 +- nbproject/project.xml | 18 +- .../configured_universe/ConfigObjLoad.java | 9 +- .../j3d/examples/fps_counter/FPSCounterDemo.java | 3 - .../j3d/examples/texture/TextureImage.java | 11 +- .../j3d/examples/texture/TextureImageNPOT.java | 222 +++++++++++++++++++++ 8 files changed, 319 insertions(+), 27 deletions(-) create mode 100644 src/classes/org/jdesktop/j3d/examples/texture/TextureImageNPOT.java diff --git a/README-build.html b/README-build.html index 528df10..ec62fea 100644 --- a/README-build.html +++ b/README-build.html @@ -80,10 +80,10 @@ work.We have built j3d-examples on the following operating environments:

The following software must be installed:

Building j3d-examples - + - - - - - + + + + + + + + + + + - + + @@ -117,9 +124,20 @@ + + + + + + + + + + + @@ -136,6 +154,7 @@ + @@ -143,6 +162,7 @@ + @@ -150,6 +170,7 @@ + @@ -157,6 +178,7 @@ + @@ -164,6 +186,7 @@ + @@ -171,6 +194,7 @@ + @@ -178,6 +202,7 @@ + @@ -185,6 +210,7 @@ + @@ -192,6 +218,7 @@ + @@ -199,6 +226,7 @@ + @@ -206,6 +234,7 @@ + @@ -213,6 +242,7 @@ + @@ -220,6 +250,7 @@ + @@ -227,6 +258,7 @@ + @@ -234,6 +266,7 @@ + @@ -241,6 +274,7 @@ + @@ -248,6 +282,7 @@ + @@ -255,6 +290,7 @@ + @@ -262,6 +298,7 @@ + @@ -269,6 +306,7 @@ + @@ -276,6 +314,7 @@ + @@ -283,6 +322,7 @@ + @@ -291,6 +331,7 @@ + @@ -298,6 +339,7 @@ + @@ -305,6 +347,7 @@ + @@ -312,6 +355,7 @@ + @@ -319,6 +363,7 @@ + @@ -326,6 +371,7 @@ + @@ -333,6 +379,7 @@ + @@ -340,6 +387,7 @@ + @@ -347,6 +395,7 @@ + @@ -354,6 +403,7 @@ + @@ -361,6 +411,7 @@ + @@ -368,6 +419,7 @@ + @@ -375,6 +427,7 @@ + @@ -382,6 +435,7 @@ + @@ -390,6 +444,7 @@ + @@ -397,6 +452,7 @@ + @@ -404,6 +460,7 @@ + @@ -411,6 +468,7 @@ + @@ -418,6 +476,7 @@ + diff --git a/manifest.mf b/manifest.mf index dc0b38e..4ca12ca 100644 --- a/manifest.mf +++ b/manifest.mf @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Implementation-Title: Java 3D Example Programs -Implementation-Version: 1.4.0 +Implementation-Version: 1.5.0 Implementation-Vendor: Sun Microsystems, Inc. Main-Class: org.jdesktop.j3d.examples.hello_universe.HelloUniverse diff --git a/nbproject/project.xml b/nbproject/project.xml index 411d578..6586f04 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -4,7 +4,7 @@ - j3d-examples-1.4.0 + j3d-examples-1.5.0 @@ -21,13 +21,18 @@ clean - run + run.HelloUniverse clean jar + + jar + dist/j3d-examples.jar + jar + @@ -45,12 +50,17 @@ - + + ../j3d-core + ../vecmath + src/classes - 1.4 + ../j3d-core/build/default/debug/lib/ext/j3dcore.jar:../j3d-core/build/default/debug/lib/ext/j3dutils.jar:../vecmath/build/debug/lib/ext/vecmath.jar + dist/j3d-examples.jar + 1.5 diff --git a/src/classes/org/jdesktop/j3d/examples/configured_universe/ConfigObjLoad.java b/src/classes/org/jdesktop/j3d/examples/configured_universe/ConfigObjLoad.java index 16d1060..8cd44bb 100644 --- a/src/classes/org/jdesktop/j3d/examples/configured_universe/ConfigObjLoad.java +++ b/src/classes/org/jdesktop/j3d/examples/configured_universe/ConfigObjLoad.java @@ -189,9 +189,12 @@ public class ConfigObjLoad { // Get the config file URL from the j3d.configURL property or use the // default config file "j3d1x1-window" in the current directory. - //URL configURL = ConfiguredUniverse.getConfigURL("file:j3d1x1-window"); - URL configURL = Resources.getResource("configured_universe/j3d1x1-windows.cfg"); - // Create a simple scene and attach it to the virtual universe + URL configURL = ConfiguredUniverse.getConfigURL(null); + if(configURL == null) { + configURL = Resources.getResource("configured_universe/j3d1x1-window.cfg"); + } + + // Create a simple scene and attach it to the virtual universe BranchGroup scene = createSceneGraph(); u = new ConfiguredUniverse(configURL); diff --git a/src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java b/src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java index d7f8ee9..88ca026 100644 --- a/src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java +++ b/src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java @@ -118,9 +118,6 @@ public class FPSCounterDemo extends javax.swing.JFrame { // objects in the scene can be viewed. univ.getViewingPlatform().setNominalViewingTransform(); - // Ensure at least 5 msec per frame (i.e., < 200Hz) - univ.getViewer().getView().setMinimumFrameCycleTime(5); - return c; } diff --git a/src/classes/org/jdesktop/j3d/examples/texture/TextureImage.java b/src/classes/org/jdesktop/j3d/examples/texture/TextureImage.java index 5ac421e..59cec91 100644 --- a/src/classes/org/jdesktop/j3d/examples/texture/TextureImage.java +++ b/src/classes/org/jdesktop/j3d/examples/texture/TextureImage.java @@ -55,7 +55,8 @@ import javax.vecmath.*; import org.jdesktop.j3d.examples.Resources; public class TextureImage extends Applet { - + + private static final String defaultFileName = "resources/images/stone.jpg"; private java.net.URL texImage = null; private SimpleUniverse u = null; @@ -118,9 +119,9 @@ public class TextureImage extends Applet { public void init() { if (texImage == null) { // the path to the image for an applet - texImage = Resources.getResource("resources/images/stone.jpg"); + texImage = Resources.getResource(defaultFileName); if (texImage == null) { - System.err.println("resources/images/stone.jpg not found"); + System.err.println(defaultFileName + " not found"); System.exit(1); } } @@ -161,9 +162,9 @@ public class TextureImage extends Applet { } } else { // the path to the image for an application - url = Resources.getResource("resources/images/stone.jpg"); + url = Resources.getResource(defaultFileName); if (url == null) { - System.err.println("resources/images/stone.jpg not found"); + System.err.println(defaultFileName + " not found"); System.exit(1); } } diff --git a/src/classes/org/jdesktop/j3d/examples/texture/TextureImageNPOT.java b/src/classes/org/jdesktop/j3d/examples/texture/TextureImageNPOT.java new file mode 100644 index 0000000..3976f0b --- /dev/null +++ b/src/classes/org/jdesktop/j3d/examples/texture/TextureImageNPOT.java @@ -0,0 +1,222 @@ +/* + * $RCSfile$ + * + * Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistribution in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of Sun Microsystems, Inc. or the names of + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * This software is provided "AS IS," without a warranty of any + * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND + * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY + * EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL + * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF + * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS + * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR + * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, + * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND + * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR + * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + * + * You acknowledge that this software is not designed, licensed or + * intended for use in the design, construction, operation or + * maintenance of any nuclear facility. + * + * $Revision$ + * $Date$ + * $State$ + */ + +package org.jdesktop.j3d.examples.texture; + +import java.applet.Applet; +import java.awt.*; +import com.sun.j3d.utils.applet.MainFrame; +import com.sun.j3d.utils.universe.*; +import com.sun.j3d.utils.image.TextureLoader; +import com.sun.j3d.utils.geometry.Box; +import javax.media.j3d.*; +import javax.vecmath.*; +import java.util.Map; +import org.jdesktop.j3d.examples.Resources; + +public class TextureImageNPOT extends Applet { + + private static final String defaultFileName = "resources/images/Java3d.jpg"; + private java.net.URL texImage = null; + + private SimpleUniverse u = null; + private boolean allowNonPowerOfTwo = true; + private boolean mipmap = true; + + public BranchGroup createSceneGraph() { + // Create the root of the branch graph + BranchGroup objRoot = new BranchGroup(); + + // Create the transform group node and initialize it to the + // identity. Enable the TRANSFORM_WRITE capability so that + // our behavior code can modify it at runtime. Add it to the + // root of the subgraph. + TransformGroup objTrans = new TransformGroup(); + objTrans.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE); + objRoot.addChild(objTrans); + + // Create the scaling transform group node and initialize it to the + // identity. Enable the TRANSFORM_WRITE capability so that + // our behavior code can modify it at runtime. Add it to the + // objTrans group + TransformGroup objScale = new TransformGroup(); + objScale.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE); + objTrans.addChild(objScale); + + // Create appearance object for textured cube + Appearance app = new Appearance(); + int flags = 0; + if (allowNonPowerOfTwo) { + flags |= TextureLoader.ALLOW_NON_POWER_OF_TWO; + } + if (mipmap) { + flags |= TextureLoader.GENERATE_MIPMAP; + } + Texture tex = new TextureLoader(texImage, flags, this).getTexture(); + tex.setMagFilter(Texture.BASE_LEVEL_LINEAR); + if (mipmap) { + tex.setMinFilter(Texture.MULTI_LEVEL_LINEAR); + } else { + tex.setMinFilter(Texture.BASE_LEVEL_LINEAR); + } + app.setTexture(tex); + TextureAttributes texAttr = new TextureAttributes(); + texAttr.setTextureMode(TextureAttributes.MODULATE); + app.setTextureAttributes(texAttr); + + // Create textured cube and add it to the scene graph. + Box textureCube = new Box(0.4f, 0.4f, 0.4f, + Box.GENERATE_TEXTURE_COORDS, app); + objScale.addChild(textureCube); + + // Create a new Behavior object that will perform the desired + // operation on the specified transform object and add it into + // the scene graph. + Transform3D yAxis = new Transform3D(); + Alpha rotationAlpha = new Alpha(-1, Alpha.INCREASING_ENABLE, + 0, 0, + 50000, 0, 0, + 0, 0, 0); + + RotationInterpolator rotator = + new RotationInterpolator(rotationAlpha, objTrans, yAxis, + 0.0f, (float) Math.PI*2.0f); + BoundingSphere bounds = + new BoundingSphere(new Point3d(0.0,0.0,0.0), 100.0); + rotator.setSchedulingBounds(bounds); + objTrans.addChild(rotator); + + // Create a new Behavior object that will perform the desired + // operation on the specified transform object and add it into + // the scene graph. + Alpha scaleAlpha = new Alpha(-1, + Alpha.INCREASING_ENABLE | Alpha.DECREASING_ENABLE, + 0, 0, + 8000, 0, 0, + 8000, 0, 0); + + ScaleInterpolator scaler = + new ScaleInterpolator(scaleAlpha, objScale, yAxis, + 0.01f, 1.5f); + scaler.setSchedulingBounds(bounds); + objScale.addChild(scaler); + + // Have Java 3D perform optimizations on this scene graph. + objRoot.compile(); + + return objRoot; + } + + public TextureImageNPOT() { + } + + public TextureImageNPOT(java.net.URL url) { + texImage = url; + } + + public void init() { + if (texImage == null) { + // the path to the image for an applet + texImage = Resources.getResource(defaultFileName); + if (texImage == null) { + System.err.println(defaultFileName + " not found"); + System.exit(1); + } + } + setLayout(new BorderLayout()); + GraphicsConfiguration config = + SimpleUniverse.getPreferredConfiguration(); + + Canvas3D c = new Canvas3D(config); + + Map map = c.queryProperties(); + Boolean value = (Boolean) map.get("textureNonPowerOfTwoAvailable"); + if (value != null) { + System.out.println("textureNonPowerOfTwoAvailable property = " + value); + } else { + System.out.println("textureNonPowerOfTwoAvailable property not found"); + } + + add("Center", c); + + // Create a simple scene and attach it to the virtual universe + BranchGroup scene = createSceneGraph(); + u = new SimpleUniverse(c); + + // This will move the ViewPlatform back a bit so the + // objects in the scene can be viewed. + u.getViewingPlatform().setNominalViewingTransform(); + + u.addBranchGraph(scene); + } + + public void destroy() { + u.cleanup(); + } + + // + // The following allows TextureImageNPOT to be run as an application + // as well as an applet + // + public static void main(String[] args) { + java.net.URL url = null; + if (args.length > 0) { + try { + url = new java.net.URL("file:" + args[0]); + } catch (java.net.MalformedURLException ex) { + System.out.println(ex.getMessage()); + System.exit(1); + } + } else { + // the path to the image for an application + url = Resources.getResource(defaultFileName); + if (url == null) { + System.err.println(defaultFileName + " not found"); + System.exit(1); + } + } + new MainFrame(new TextureImageNPOT(url), 512, 512); + } + +} -- cgit v1.2.3