diff options
10 files changed, 46 insertions, 101 deletions
@@ -74,14 +74,11 @@ <copy todir="${build}/classes/org/jdesktop/j3d/examples/resources"> <fileset dir="${src}/resources"/> </copy> - <!-- Cg shader --> - <copy todir="${build}/classes/org/jdesktop/j3d/examples/cg_shader"> - <fileset dir="${src}/classes/org/jdesktop/j3d/examples/cg_shader" includes ="*.cg"/> + + <!-- Copy all non class files from src to build --> + <copy todir="${build}/classes/org/jdesktop/j3d/examples"> + <fileset dir="${src}/classes/org/jdesktop/j3d/examples" includes ="**/*.vert **/*.frag **/*.cg **/*.cfg **/*.html"/> </copy> - <!-- GLSL shader --> - <copy todir="${build}/classes/org/jdesktop/j3d/examples/glsl_shader"> - <fileset dir="${src}/classes/org/jdesktop/j3d/examples/glsl_shader" includes ="*.vert, *.frag"/> - </copy> </target> @@ -148,13 +145,41 @@ </java> </target> + <target name="run.Applet3D" depends="init-run"> + <java fork="true" + classname="org.jdesktop.j3d.examples.applet3d.Applet3D"> + <classpath refid="run.classpath"/> + </java> + </target> + <target name="run.BackgroudGeometry" depends="init-run"> <java fork="true" classname="org.jdesktop.j3d.examples.background.BackgroundGeometry"> <classpath refid="run.classpath"/> </java> </target> + + <target name="run.ConfigObjLoad" depends="init-run"> + <java fork="true" + classname="org.jdesktop.j3d.examples.configured_universe.ConfigObjLoad"> + <classpath refid="run.classpath"/> + </java> + </target> + + <target name="run.DepthFuncTest" depends="init-run"> + <java fork="true" + classname="org.jdesktop.j3d.examples.depth_func.DepthFuncTest"> + <classpath refid="run.classpath"/> + </java> + </target> + <target name="run.FourByFour" depends="init-run"> + <java fork="true" + classname="org.jdesktop.j3d.examples.four_by_four.FourByFour"> + <classpath refid="run.classpath"/> + </java> + </target> + <target name="run.HelloUniverse" depends="init-run"> <java fork="true" classname="org.jdesktop.j3d.examples.hello_universe.HelloUniverse"> @@ -238,6 +263,13 @@ <classpath refid="run.classpath"/> </java> </target> + + <target name="run.TickTockCollision" depends="init-run"> + <java fork="true" + classname="org.jdesktop.j3d.examples.collision.TickTockCollision"> + <classpath refid="run.classpath"/> + </java> + </target> <target name="run.Viewer" depends="init-run"> <java fork="true" diff --git a/src/classes/org/jdesktop/j3d/examples/appearance/AppearanceMixed.java b/src/classes/org/jdesktop/j3d/examples/appearance/AppearanceMixed.java index f499fd0..b6f76c1 100644 --- a/src/classes/org/jdesktop/j3d/examples/appearance/AppearanceMixed.java +++ b/src/classes/org/jdesktop/j3d/examples/appearance/AppearanceMixed.java @@ -51,9 +51,6 @@ import javax.vecmath.*; import java.awt.GraphicsConfiguration; import org.jdesktop.j3d.examples.Resources; -/** - * Simple Java 3D example program to display a spinning cube. - */ public class AppearanceMixed extends javax.swing.JFrame { private java.net.URL texImage = null; diff --git a/src/classes/org/jdesktop/j3d/examples/appearance/AppearanceTest.java b/src/classes/org/jdesktop/j3d/examples/appearance/AppearanceTest.java index 86091f7..f53c24d 100644 --- a/src/classes/org/jdesktop/j3d/examples/appearance/AppearanceTest.java +++ b/src/classes/org/jdesktop/j3d/examples/appearance/AppearanceTest.java @@ -51,9 +51,6 @@ import javax.vecmath.*; import java.awt.GraphicsConfiguration; import org.jdesktop.j3d.examples.Resources; -/** - * Simple Java 3D example program to display a spinning cube. - */ public class AppearanceTest extends javax.swing.JFrame { private java.net.URL texImage = null; @@ -111,7 +108,6 @@ public class AppearanceTest extends javax.swing.JFrame { return objRoot; } - private Appearance createAppearance(int idx) { Appearance app = new Appearance(); diff --git a/src/classes/org/jdesktop/j3d/examples/applet3d/Applet3D.html b/src/classes/org/jdesktop/j3d/examples/applet3d/Applet3D.html index 8ab3a5d..9cb15a4 100644 --- a/src/classes/org/jdesktop/j3d/examples/applet3d/Applet3D.html +++ b/src/classes/org/jdesktop/j3d/examples/applet3d/Applet3D.html @@ -3,7 +3,7 @@ <TITLE>Hello, Universe</TITLE> </HEAD> <BODY BGCOLOR="#000000"> -<applet align=middle code="Applet3D.class" width=256 height=256> +<applet align=middle codebase="../../../../.." code="org.jdesktop.j3d.examples.applet3d.Applet3D" width=256 height=256> <blockquote> <hr> If you were using a Java-capable browser, diff --git a/src/classes/org/jdesktop/j3d/examples/applet3d/Applet3D_plugin.html b/src/classes/org/jdesktop/j3d/examples/applet3d/Applet3D_plugin.html deleted file mode 100644 index e47eecc..0000000 --- a/src/classes/org/jdesktop/j3d/examples/applet3d/Applet3D_plugin.html +++ /dev/null @@ -1,39 +0,0 @@ -<HTML> -<HEAD> -<TITLE>Hello, Universe!</TITLE> -</HEAD> -<BODY BGCOLOR="#000000"> -<!--"CONVERTED_APPLET"--> -<!-- CONVERTER VERSION 1.3 --> -<OBJECT classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" -WIDTH = 256 HEIGHT = 256 ALIGN = middle codebase="http://java.sun.com/products/plugin/1.3/jinstall-13-win32.cab#Version=1,3,0,0"> -<PARAM NAME = CODE VALUE = "Applet3D.class" > - -<PARAM NAME="type" VALUE="application/x-java-applet;version=1.2.2"> -<PARAM NAME="scriptable" VALUE="false"> -<COMMENT> -<EMBED type="application/x-java-applet;version=1.2.2" CODE = "Applet3D.class" WIDTH = 256 HEIGHT = 256 ALIGN = middle scriptable=false pluginspage="http://java.sun.com/products/plugin/1.3/plugin-install.html"><NOEMBED></COMMENT> -<blockquote> -<hr> -If you were using a Java-capable browser, -you would see Hello Universe! instead of this paragraph. -<hr> -</blockquote> -</NOEMBED></EMBED> -</OBJECT> - -<!-- -<APPLET CODE = "Applet3D.class" WIDTH = 256 HEIGHT = 256 ALIGN = middle> -<blockquote> -<hr> -If you were using a Java-capable browser, -you would see Hello Universe! instead of this paragraph. -<hr> -</blockquote> - -</APPLET> ---> -<!--"END_CONVERTED_APPLET"--> - -</BODY> -</HTML> diff --git a/src/classes/org/jdesktop/j3d/examples/background/BackgroundGeometry.java b/src/classes/org/jdesktop/j3d/examples/background/BackgroundGeometry.java index e3391b4..cdf656c 100644 --- a/src/classes/org/jdesktop/j3d/examples/background/BackgroundGeometry.java +++ b/src/classes/org/jdesktop/j3d/examples/background/BackgroundGeometry.java @@ -53,9 +53,6 @@ import javax.vecmath.*; import java.awt.GraphicsConfiguration; import org.jdesktop.j3d.examples.Resources; -/** - * Simple Java 3D example program to display a spinning cube. - */ public class BackgroundGeometry extends javax.swing.JFrame { private SimpleUniverse univ = null; @@ -197,7 +194,7 @@ public class BackgroundGeometry extends javax.swing.JFrame { } /** - * Creates new form HelloUniverse + * Creates new form BackgroundGeometry */ public BackgroundGeometry() { diff --git a/src/classes/org/jdesktop/j3d/examples/collision/TickTockCollision.java b/src/classes/org/jdesktop/j3d/examples/collision/TickTockCollision.java index 5a85067..86fbf44 100644 --- a/src/classes/org/jdesktop/j3d/examples/collision/TickTockCollision.java +++ b/src/classes/org/jdesktop/j3d/examples/collision/TickTockCollision.java @@ -53,7 +53,7 @@ import javax.vecmath.*; import java.awt.GraphicsConfiguration; /** - * Simple Java 3D example program to display a spinning cube. + * Simple Java 3D example program to display how collision work. */ public class TickTockCollision extends javax.swing.JFrame { @@ -206,7 +206,7 @@ public class TickTockCollision extends javax.swing.JFrame { } /** - * Creates new form HelloUniverse + * Creates new form TickTockCollision */ public TickTockCollision() { // Initialize the GUI components 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 fb94bfd..16d1060 100644 --- a/src/classes/org/jdesktop/j3d/examples/configured_universe/ConfigObjLoad.java +++ b/src/classes/org/jdesktop/j3d/examples/configured_universe/ConfigObjLoad.java @@ -166,7 +166,7 @@ public class ConfigObjLoad { private void usage() { System.out.println( - "Usage: java ObjLoad [-s] [-n] [-t] [-c degrees] <.obj file>"); + "Usage: java ConfigObjLoad [-s] [-n] [-t] [-c degrees] <.obj file>"); System.out.println(" -s Spin (no user interaction)"); System.out.println(" -n No triangulation"); System.out.println(" -t No stripification"); @@ -193,6 +193,7 @@ public class ConfigObjLoad { URL configURL = Resources.getResource("configured_universe/j3d1x1-windows.cfg"); // Create a simple scene and attach it to the virtual universe BranchGroup scene = createSceneGraph(); + u = new ConfiguredUniverse(configURL); // Get the ViewingPlatform. diff --git a/src/classes/org/jdesktop/j3d/examples/four_by_four/FourByFour.html b/src/classes/org/jdesktop/j3d/examples/four_by_four/FourByFour.html index 8adb168..db06814 100644 --- a/src/classes/org/jdesktop/j3d/examples/four_by_four/FourByFour.html +++ b/src/classes/org/jdesktop/j3d/examples/four_by_four/FourByFour.html @@ -3,7 +3,7 @@ <TITLE>Drag the mouse in the window</TITLE> </HEAD> <BODY BGCOLOR="#0C0C33"> -<applet align=middle code="FourByFour.class" width=716 height=410> +<applet align=middle codebase="../../../../.." code="org.jdesktop.j3d.examples.four_by_four.FourByFour" width=716 height=410> <blockquote> <hr> If you were using a Java-capable browser, diff --git a/src/classes/org/jdesktop/j3d/examples/four_by_four/FourByFour_plugin.html b/src/classes/org/jdesktop/j3d/examples/four_by_four/FourByFour_plugin.html deleted file mode 100644 index 55e1cf4..0000000 --- a/src/classes/org/jdesktop/j3d/examples/four_by_four/FourByFour_plugin.html +++ /dev/null @@ -1,39 +0,0 @@ -<HTML> -<HEAD> -<TITLE>Drag the mouse in the window</TITLE> -</HEAD> -<BODY BGCOLOR="#0C0C33"> -<!--"CONVERTED_APPLET"--> -<!-- CONVERTER VERSION 1.3 --> -<OBJECT classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" -WIDTH = 716 HEIGHT = 410 ALIGN = middle codebase="http://java.sun.com/products/plugin/1.3/jinstall-13-win32.cab#Version=1,3,0,0"> -<PARAM NAME = CODE VALUE = "FourByFour.class" > - -<PARAM NAME="type" VALUE="application/x-java-applet;version=1.2.2"> -<PARAM NAME="scriptable" VALUE="false"> -<COMMENT> -<EMBED type="application/x-java-applet;version=1.2.2" CODE = "FourByFour.class" WIDTH = 716 HEIGHT = 410 ALIGN = middle scriptable=false pluginspage="http://java.sun.com/products/plugin/1.3/plugin-install.html"><NOEMBED></COMMENT> -<blockquote> -<hr> -If you were using a Java-capable browser, -you would see "FourByFour" instead of this paragraph. -<hr> -</blockquote> -</NOEMBED></EMBED> -</OBJECT> - -<!-- -<APPLET CODE = "FourByFour.class" WIDTH = 716 HEIGHT = 410 ALIGN = middle> -<blockquote> -<hr> -If you were using a Java-capable browser, -you would see "FourByFour" instead of this paragraph. -<hr> -</blockquote> - -</APPLET> ---> -<!--"END_CONVERTED_APPLET"--> - -</BODY> -</HTML> |