Enable compilation using JogAmp 2.4.0 (one demo needs vecmath, dependency issue)HEADmaster

2 files changed, 41 insertions, 36 deletions

diff --git a/src/net/java/joglutils/msg/impl/BufferFactory.java b/src/net/java/joglutils/msg/impl/BufferFactory.java
index 191c5c7..3ad80dd 100644
--- a/src/net/java/joglutils/msg/impl/BufferFactory.java
+++ b/src/net/java/joglutils/msg/impl/BufferFactory.java
@@ -1,21 +1,21 @@
 /*
  * Copyright (c) 2007 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
@@ -28,18 +28,22 @@
  * 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 or intended for use
  * in the design, construction, operation or maintenance of any nuclear
  * facility.
- * 
+ *
  */
 
 package net.java.joglutils.msg.impl;
 
-import java.nio.*;
-import java.util.*;
-import com.sun.opengl.util.*;
+import java.nio.ByteBuffer;
+import java.nio.DoubleBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
+
+import com.jogamp.common.nio.Buffers;
 
 /** Assists in allocation of direct Buffers. On some platforms when a
     small direct Buffer is allocated there is a large amount of
@@ -57,82 +61,82 @@ public class BufferFactory {
   // I believe the rounding-up size of direct Buffers on Unix platforms is 8K
   private static final int CHUNK_SIZE = 8 * 1024;
 
-  public static synchronized ByteBuffer newByteBuffer(int numElements) {
-    int sz = numElements * BufferUtil.SIZEOF_BYTE;
+  public static synchronized ByteBuffer newByteBuffer(final int numElements) {
+    final int sz = numElements * Buffers.SIZEOF_BYTE;
     if (sz > CHUNK_SIZE) {
       // Just allocate a fresh ByteBuffer and don't worry about
       // rounding up its allocation size and re-using the end portion
-      return BufferUtil.newByteBuffer(numElements);
+      return Buffers.newDirectByteBuffer(numElements);
     }
     if (curByteBuf == null || curByteBuf.remaining() < numElements) {
-      curByteBuf = BufferUtil.newByteBuffer(CHUNK_SIZE / BufferUtil.SIZEOF_BYTE);
+      curByteBuf = Buffers.newDirectByteBuffer(CHUNK_SIZE / Buffers.SIZEOF_BYTE);
     }
     curByteBuf.limit(curByteBuf.position() + numElements);
-    ByteBuffer res = curByteBuf.slice();
+    final ByteBuffer res = curByteBuf.slice();
     curByteBuf.position(curByteBuf.limit());
     return res;
   }
 
-  public static synchronized ShortBuffer newShortBuffer(int numElements) {
-    int sz = numElements * BufferUtil.SIZEOF_SHORT;
+  public static synchronized ShortBuffer newShortBuffer(final int numElements) {
+    final int sz = numElements * Buffers.SIZEOF_SHORT;
     if (sz > CHUNK_SIZE) {
       // Just allocate a fresh ShortBuffer and don't worry about
       // rounding up its allocation size and re-using the end portion
-      return BufferUtil.newShortBuffer(numElements);
+      return Buffers.newDirectShortBuffer(numElements);
     }
     if (curShortBuf == null || curShortBuf.remaining() < numElements) {
-      curShortBuf = BufferUtil.newShortBuffer(CHUNK_SIZE / BufferUtil.SIZEOF_SHORT);
+      curShortBuf = Buffers.newDirectShortBuffer(CHUNK_SIZE / Buffers.SIZEOF_SHORT);
     }
     curShortBuf.limit(curShortBuf.position() + numElements);
-    ShortBuffer res = curShortBuf.slice();
+    final ShortBuffer res = curShortBuf.slice();
     curShortBuf.position(curShortBuf.limit());
     return res;
   }
 
-  public static synchronized IntBuffer newIntBuffer(int numElements) {
-    int sz = numElements * BufferUtil.SIZEOF_INT;
+  public static synchronized IntBuffer newIntBuffer(final int numElements) {
+    final int sz = numElements * Buffers.SIZEOF_INT;
     if (sz > CHUNK_SIZE) {
       // Just allocate a fresh IntBuffer and don't worry about
       // rounding up its allocation size and re-using the end portion
-      return BufferUtil.newIntBuffer(numElements);
+      return Buffers.newDirectIntBuffer(numElements);
     }
     if (curIntBuf == null || curIntBuf.remaining() < numElements) {
-      curIntBuf = BufferUtil.newIntBuffer(CHUNK_SIZE / BufferUtil.SIZEOF_INT);
+      curIntBuf = Buffers.newDirectIntBuffer(CHUNK_SIZE / Buffers.SIZEOF_INT);
     }
     curIntBuf.limit(curIntBuf.position() + numElements);
-    IntBuffer res = curIntBuf.slice();
+    final IntBuffer res = curIntBuf.slice();
     curIntBuf.position(curIntBuf.limit());
     return res;
   }
 
-  public static synchronized FloatBuffer newFloatBuffer(int numElements) {
-    int sz = numElements * BufferUtil.SIZEOF_FLOAT;
+  public static synchronized FloatBuffer newFloatBuffer(final int numElements) {
+    final int sz = numElements * Buffers.SIZEOF_FLOAT;
     if (sz > CHUNK_SIZE) {
       // Just allocate a fresh FloatBuffer and don't worry about
       // rounding up its allocation size and re-using the end portion
-      return BufferUtil.newFloatBuffer(numElements);
+      return Buffers.newDirectFloatBuffer(numElements);
     }
     if (curFloatBuf == null || curFloatBuf.remaining() < numElements) {
-      curFloatBuf = BufferUtil.newFloatBuffer(CHUNK_SIZE / BufferUtil.SIZEOF_FLOAT);
+      curFloatBuf = Buffers.newDirectFloatBuffer(CHUNK_SIZE / Buffers.SIZEOF_FLOAT);
     }
     curFloatBuf.limit(curFloatBuf.position() + numElements);
-    FloatBuffer res = curFloatBuf.slice();
+    final FloatBuffer res = curFloatBuf.slice();
     curFloatBuf.position(curFloatBuf.limit());
     return res;
   }
 
-  public static synchronized DoubleBuffer newDoubleBuffer(int numElements) {
-    int sz = numElements * BufferUtil.SIZEOF_DOUBLE;
+  public static synchronized DoubleBuffer newDoubleBuffer(final int numElements) {
+    final int sz = numElements * Buffers.SIZEOF_DOUBLE;
     if (sz > CHUNK_SIZE) {
       // Just allocate a fresh DoubleBuffer and don't worry about
       // rounding up its allocation size and re-using the end portion
-      return BufferUtil.newDoubleBuffer(numElements);
+      return Buffers.newDirectDoubleBuffer(numElements);
     }
     if (curDoubleBuf == null || curDoubleBuf.remaining() < numElements) {
-      curDoubleBuf = BufferUtil.newDoubleBuffer(CHUNK_SIZE / BufferUtil.SIZEOF_DOUBLE);
+      curDoubleBuf = Buffers.newDirectDoubleBuffer(CHUNK_SIZE / Buffers.SIZEOF_DOUBLE);
     }
     curDoubleBuf.limit(curDoubleBuf.position() + numElements);
-    DoubleBuffer res = curDoubleBuf.slice();
+    final DoubleBuffer res = curDoubleBuf.slice();
     curDoubleBuf.position(curDoubleBuf.limit());
     return res;
   }
diff --git a/src/net/java/joglutils/msg/impl/RayTriangleIntersection.java b/src/net/java/joglutils/msg/impl/RayTriangleIntersection.java
index 13d49e9..7af420c 100644
--- a/src/net/java/joglutils/msg/impl/RayTriangleIntersection.java
+++ b/src/net/java/joglutils/msg/impl/RayTriangleIntersection.java
@@ -37,7 +37,8 @@
 
 package net.java.joglutils.msg.impl;
 
-import net.java.joglutils.msg.math.*;
+import net.java.joglutils.msg.math.Line;
+import net.java.joglutils.msg.math.Vec3f;
 
 /** Intersection of ray with triangle. Computes parameteric t along
     with barycentric coordinates (u, v) indicating weight of vert1 and