Added msg.jar target. Added dispose() method to Texture2. Fixed small

bug just introduced in DisplayShelf causing half the images to be
skipped.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/joglutils/trunk@53 83d24430-9974-4f80-8418-2cc3294053b9

4 files changed, 25 insertions, 3 deletions

diff --git a/build/joglutils.jar b/build/joglutils.jar
index 10bd695..034e95e 100644
--- a/build/joglutils.jar
+++ b/build/joglutils.jar
diff --git a/make/build.xml b/make/build.xml
index b407cf9..afd1433 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -37,12 +37,23 @@
         </javadoc>
     </target>
 
-    <target name="all">
+    <target name="compile">
         <mkdir dir="${output.tmp.dir}" />
         <javac destdir="${output.tmp.dir}" source="5" debug="true" debuglevel="source,lines">
             <src path="${src.dir}" />
             <classpath refid="build.classpath" />
         </javac>
+    </target>
+
+    <target name="msg.jar" depends="compile">
+        <jar destfile="${output.dir}/msg.jar">
+            <fileset dir="${output.tmp.dir}"
+                     includes="net/java/joglutils/msg/**"
+                     excludes="net/java/joglutils/msg/test/**" />
+        </jar>
+    </target>
+
+    <target name="all" depends="compile">
         <jar destfile="${output.jar}">
             <fileset dir="${output.tmp.dir}" />
         </jar>
diff --git a/src/net/java/joglutils/msg/nodes/Texture2.java b/src/net/java/joglutils/msg/nodes/Texture2.java
index 122de74..02763fc 100644
--- a/src/net/java/joglutils/msg/nodes/Texture2.java
+++ b/src/net/java/joglutils/msg/nodes/Texture2.java
@@ -252,6 +252,19 @@ public class Texture2 extends Node {
     }
   }
 
+  /** Disposes of the OpenGL texture and/or TextureRenderer this
+      Texture2 node refers to. An OpenGL context must be current at
+      the point this method is called. */
+  public void dispose() throws GLException {
+    disposeTexture();
+    disposeTextureRenderer();
+    lazyDispose();
+    data = null;
+    subImageData = null;
+    dirty = false;
+    subImageDirty = false;
+  }
+
   private synchronized void disposeTextureRenderer() {
     if (textureRenderer != null) {
       disposedRenderers.add(textureRenderer);
diff --git a/src/net/java/joglutils/msg/test/DisplayShelfRenderer.java b/src/net/java/joglutils/msg/test/DisplayShelfRenderer.java
index e9eb1ea..adf1263 100644
--- a/src/net/java/joglutils/msg/test/DisplayShelfRenderer.java
+++ b/src/net/java/joglutils/msg/test/DisplayShelfRenderer.java
@@ -296,8 +296,6 @@ public class DisplayShelfRenderer implements GLEventListener {
         // Add this to each rendering root
         imageRoot.addChild(sep);
         mirrorRoot.addChild(sep);
-
-        ++i;
       }
 
       // Now produce the floor geometry