1) Copy shader related files to respective classes directory instead of under resources directory.

2) Added more examples to run with ant command.

1 files changed, 77 insertions, 7 deletions

diff --git a/build.xml b/build.xml
index a78f370..fd37a03 100644
--- a/build.xml
+++ b/build.xml
@@ -79,11 +79,11 @@
         <fileset dir="${src}/resources"/>
     </copy>
     <!-- Cg shader -->   
-    <copy todir="${build}/classes/org/jdesktop/j3d/examples/resources/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>
     <!-- GLSL shader -->
-    <copy todir="${build}/classes/org/jdesktop/j3d/examples/resources/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>   
     
@@ -119,9 +119,16 @@
    **************************************************
    -->
 
-  <target name="run.HelloUniverse" depends="init-run">
+  <target name="run.AppearanceMixed" depends="init-run">
     <java fork="true"
-          classname="org.jdesktop.j3d.examples.hello_universe.HelloUniverse">
+          classname="org.jdesktop.j3d.examples.appearance.AppearanceMixed">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+  
+  <target name="run.AppearanceTest" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.appearance.AppearanceTest">
       <classpath refid="run.classpath"/>
     </java>
   </target>
@@ -133,6 +140,48 @@
     </java>
   </target>
   
+  <target name="run.HelloUniverse" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.hello_universe.HelloUniverse">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+
+  <target name="run.Morphing" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.morphing.Morphing">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+    
+  <target name="run.MultiTextureTest" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.texture.MultiTextureTest">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+  
+  <target name="run.ObjLoad" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.objload.ObjLoad">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+
+  <target name="run.ObjLoadGLSL" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.glsl_shader.ObjLoadGLSL">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+
+  <target name="run.PhongShadingGLSL" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.glsl_shader.PhongShadingGLSL">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+
   <target name="run.QueryProperties" depends="init-run">
     <java fork="true"
           classname="org.jdesktop.j3d.examples.package_info.QueryProperties">
@@ -140,18 +189,39 @@
     </java>
   </target>
 
+  <target name="run.ShaderTestGLSL" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.glsl_shader.ShaderTestGLSL">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+  
   <target name="run.SphereMotion" depends="init-run">
     <java fork="true"
           classname="org.jdesktop.j3d.examples.sphere_motion.SphereMotion">
       <classpath refid="run.classpath"/>
     </java>
   </target>
+
+  <target name="run.SphereGLSL" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.glsl_shader.SphereGLSL">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
   
-  <target name="run.ObjLoad" depends="init-run">
+  <target name="run.TextureByReference" depends="init-run">
     <java fork="true"
-          classname="org.jdesktop.j3d.examples.objload.ObjLoad">
+          classname="org.jdesktop.j3d.examples.texture_by_ref.TextureByReference">
       <classpath refid="run.classpath"/>
     </java>
   </target>
-
+  
+  <target name="run.TextureImage" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.texture.TextureImage">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+  
 </project>