diff options
author | Sven Gothel <[email protected]> | 2010-03-30 02:06:00 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-03-30 02:06:00 +0200 |
commit | 2e4835c543d32791cf3c79907aecad7c4692f457 (patch) | |
tree | 613d0f21c1cb79a400b4b188534ec033343bfc87 /src/demos/util | |
parent | d3e818ea8b7c3f45ed4cfac7b0e7d3bd24f956e5 (diff) | |
parent | 0b708395a18eb6a2ae5372ff414bc75830ce19b6 (diff) |
Merge branch 'master' of github.com:mbien/jogl-demos
Diffstat (limited to 'src/demos/util')
-rw-r--r-- | src/demos/util/ObjReader.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demos/util/ObjReader.java b/src/demos/util/ObjReader.java index b78baf0..718e96e 100644 --- a/src/demos/util/ObjReader.java +++ b/src/demos/util/ObjReader.java @@ -39,6 +39,7 @@ package demos.util; +import com.jogamp.gluegen.runtime.Buffers; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -52,7 +53,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; -import com.jogamp.opengl.util.BufferUtil; @@ -321,10 +321,10 @@ public class ObjReader { newVertices.trim(); newVertexNormals.trim(); newIndices.trim(); - vertices = BufferUtil.newFloatBuffer(newVertices.size()); + vertices = Buffers.newDirectFloatBuffer(newVertices.size()); vertices.put(newVertices.getData()); vertices.rewind(); - normals = BufferUtil.newFloatBuffer(newVertexNormals.size()); + normals = Buffers.newDirectFloatBuffer(newVertexNormals.size()); normals.put(newVertexNormals.getData()); normals.rewind(); faceIndices = newIndices; |