summaryrefslogtreecommitdiffstats
path: root/src/demos/es1/angeles
diff options
context:
space:
mode:
Diffstat (limited to 'src/demos/es1/angeles')
-rwxr-xr-xsrc/demos/es1/angeles/AngelesES1.java29
-rwxr-xr-xsrc/demos/es1/angeles/AngelesGL.java32
-rwxr-xr-xsrc/demos/es1/angeles/AngelesGLil.java24
-rwxr-xr-xsrc/demos/es1/angeles/Main.java5
4 files changed, 45 insertions, 45 deletions
diff --git a/src/demos/es1/angeles/AngelesES1.java b/src/demos/es1/angeles/AngelesES1.java
index edba727..6c868c4 100755
--- a/src/demos/es1/angeles/AngelesES1.java
+++ b/src/demos/es1/angeles/AngelesES1.java
@@ -24,6 +24,7 @@
package demos.es1.angeles;
+import com.jogamp.gluegen.runtime.Buffers;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
import com.jogamp.opengl.util.*;
@@ -37,7 +38,7 @@ public class AngelesES1 implements GLEventListener {
public AngelesES1(boolean enableBlending) {
blendingEnabled = enableBlending;
- quadVertices = BufferUtil.newIntBuffer(12);
+ quadVertices = Buffers.newDirectIntBuffer(12);
quadVertices.put(new int[]{
-0x10000, -0x10000,
0x10000, -0x10000,
@@ -48,13 +49,13 @@ public class AngelesES1 implements GLEventListener {
});
quadVertices.flip();
- light0Position=BufferUtil.newIntBuffer(4);
- light0Diffuse=BufferUtil.newIntBuffer(4);
- light1Position=BufferUtil.newIntBuffer(4);
- light1Diffuse=BufferUtil.newIntBuffer(4);
- light2Position=BufferUtil.newIntBuffer(4);
- light2Diffuse=BufferUtil.newIntBuffer(4);
- materialSpecular=BufferUtil.newIntBuffer(4);
+ light0Position=Buffers.newDirectIntBuffer(4);
+ light0Diffuse=Buffers.newDirectIntBuffer(4);
+ light1Position=Buffers.newDirectIntBuffer(4);
+ light1Diffuse=Buffers.newDirectIntBuffer(4);
+ light2Position=Buffers.newDirectIntBuffer(4);
+ light2Diffuse=Buffers.newDirectIntBuffer(4);
+ materialSpecular=Buffers.newDirectIntBuffer(4);
light0Position.put(new int[] { -0x40000, 0x10000, 0x10000, 0 });
light0Diffuse.put(new int[] { 0x10000, 0x6666, 0, 0x10000 });
@@ -245,11 +246,11 @@ public class GLObject {
boolean useNormalArray) {
this.count = vertices;
this.vertexComponents = vertexComponents;
- this.vertexArray = BufferUtil.newIntBuffer( vertices * vertexComponents );
- this.colorArray = BufferUtil.newByteBuffer (vertices * 4 );
+ this.vertexArray = Buffers.newDirectIntBuffer( vertices * vertexComponents );
+ this.colorArray = Buffers.newDirectByteBuffer (vertices * 4 );
if (useNormalArray)
{
- this.normalArray = BufferUtil.newIntBuffer (vertices * 3 );
+ this.normalArray = Buffers.newDirectIntBuffer (vertices * 3 );
} else {
this.normalArray = null;
}
@@ -262,18 +263,18 @@ public class GLObject {
gl.glGenBuffers(3, vbo, 0);
gl.glBindBuffer(GL.GL_ARRAY_BUFFER, vbo[0]);
- gl.glBufferData(GL.GL_ARRAY_BUFFER, vertexArray.capacity() * BufferUtil.SIZEOF_INT, vertexArray, GL.GL_STATIC_DRAW);
+ gl.glBufferData(GL.GL_ARRAY_BUFFER, vertexArray.capacity() * Buffers.SIZEOF_INT, vertexArray, GL.GL_STATIC_DRAW);
gl.glVertexPointer(vertexComponents, gl.GL_FIXED, 0, 0);
gl.glBindBuffer(GL.GL_ARRAY_BUFFER, vbo[1]);
- gl.glBufferData(GL.GL_ARRAY_BUFFER, colorArray.capacity() * BufferUtil.SIZEOF_BYTE, colorArray, GL.GL_STATIC_DRAW);
+ gl.glBufferData(GL.GL_ARRAY_BUFFER, colorArray.capacity() * Buffers.SIZEOF_BYTE, colorArray, GL.GL_STATIC_DRAW);
gl.glColorPointer(4, gl.GL_UNSIGNED_BYTE, 0, 0);
if (null!=normalArray)
{
gl.glEnableClientState(gl.GL_NORMAL_ARRAY);
gl.glBindBuffer(GL.GL_ARRAY_BUFFER, vbo[2]);
- gl.glBufferData(GL.GL_ARRAY_BUFFER, normalArray.capacity() * BufferUtil.SIZEOF_INT, normalArray, GL.GL_STATIC_DRAW);
+ gl.glBufferData(GL.GL_ARRAY_BUFFER, normalArray.capacity() * Buffers.SIZEOF_INT, normalArray, GL.GL_STATIC_DRAW);
gl.glNormalPointer(gl.GL_FIXED, 0, 0);
} else {
gl.glDisableClientState(gl.GL_NORMAL_ARRAY);
diff --git a/src/demos/es1/angeles/AngelesGL.java b/src/demos/es1/angeles/AngelesGL.java
index afcc356..bc367d7 100755
--- a/src/demos/es1/angeles/AngelesGL.java
+++ b/src/demos/es1/angeles/AngelesGL.java
@@ -38,7 +38,7 @@ public class AngelesGL implements GLEventListener {
public AngelesGL(boolean enableBlending) {
blendingEnabled = enableBlending;
- quadVertices = BufferUtil.newFloatBuffer(12);
+ quadVertices = GLBuffers.newDirectFloatBuffer(12);
quadVertices.put(new float[]{
-1.0f, -1.0f,
1.0f, -1.0f,
@@ -49,13 +49,13 @@ public class AngelesGL implements GLEventListener {
});
quadVertices.flip();
- light0Position=BufferUtil.newFloatBuffer(4);
- light0Diffuse=BufferUtil.newFloatBuffer(4);
- light1Position=BufferUtil.newFloatBuffer(4);
- light1Diffuse=BufferUtil.newFloatBuffer(4);
- light2Position=BufferUtil.newFloatBuffer(4);
- light2Diffuse=BufferUtil.newFloatBuffer(4);
- materialSpecular=BufferUtil.newFloatBuffer(4);
+ light0Position=GLBuffers.newDirectFloatBuffer(4);
+ light0Diffuse=GLBuffers.newDirectFloatBuffer(4);
+ light1Position=GLBuffers.newDirectFloatBuffer(4);
+ light1Diffuse=GLBuffers.newDirectFloatBuffer(4);
+ light2Position=GLBuffers.newDirectFloatBuffer(4);
+ light2Diffuse=GLBuffers.newDirectFloatBuffer(4);
+ materialSpecular=GLBuffers.newDirectFloatBuffer(4);
light0Position.put(new float[] { FixedPoint.toFloat(-0x40000), 1.0f, 1.0f, 0.0f });
light0Diffuse.put(new float[] { 1.0f, FixedPoint.toFloat(0x6666), 0.0f, 1.0f });
@@ -271,24 +271,24 @@ public class GLSpatial {
vComps= vertexComponents;
nComps = useNormalArray ? 3 : 0;
- int bSize = BufferUtil.sizeOfGLType(GL.GL_FLOAT) * count * ( vComps + cComps + nComps) ;
- pBuffer = BufferUtil.newByteBuffer(bSize);
+ int bSize = GLBuffers.sizeOfGLType(GL.GL_FLOAT) * count * ( vComps + cComps + nComps) ;
+ pBuffer = GLBuffers.newDirectByteBuffer(bSize);
int pos = 0;
- int size= BufferUtil.sizeOfGLType(GL.GL_FLOAT) * count * vComps ;
- vertexArray = (FloatBuffer) BufferUtil.sliceGLBuffer(pBuffer, pos, size, GL.GL_FLOAT);
+ int size= GLBuffers.sizeOfGLType(GL.GL_FLOAT) * count * vComps ;
+ vertexArray = (FloatBuffer) GLBuffers.sliceGLBuffer(pBuffer, pos, size, GL.GL_FLOAT);
int vOffset = 0;
pos+=size;
- size=BufferUtil.sizeOfGLType(GL.GL_FLOAT) * count * cComps ;
- colorArray = (FloatBuffer) BufferUtil.sliceGLBuffer(pBuffer, pos, size, GL.GL_FLOAT);
+ size=GLBuffers.sizeOfGLType(GL.GL_FLOAT) * count * cComps ;
+ colorArray = (FloatBuffer) GLBuffers.sliceGLBuffer(pBuffer, pos, size, GL.GL_FLOAT);
int cOffset=pos;
pos+=size;
int nOffset=0;
if(useNormalArray) {
- size=BufferUtil.sizeOfGLType(GL.GL_FLOAT) * count * nComps ;
- normalArray = (FloatBuffer) BufferUtil.sliceGLBuffer(pBuffer, pos, size, GL.GL_FLOAT);
+ size=GLBuffers.sizeOfGLType(GL.GL_FLOAT) * count * nComps ;
+ normalArray = (FloatBuffer) GLBuffers.sliceGLBuffer(pBuffer, pos, size, GL.GL_FLOAT);
nOffset=pos;
pos+=size;
}
diff --git a/src/demos/es1/angeles/AngelesGLil.java b/src/demos/es1/angeles/AngelesGLil.java
index bbfb86a..92be109 100755
--- a/src/demos/es1/angeles/AngelesGLil.java
+++ b/src/demos/es1/angeles/AngelesGLil.java
@@ -34,7 +34,7 @@ public class AngelesGLil implements GLEventListener {
public AngelesGLil(boolean enableBlending) {
blendingEnabled = enableBlending;
- quadVertices = BufferUtil.newFloatBuffer(12);
+ quadVertices = GLBuffers.newDirectFloatBuffer(12);
quadVertices.put(new float[]{
-1.0f, -1.0f,
1.0f, -1.0f,
@@ -45,13 +45,13 @@ public class AngelesGLil implements GLEventListener {
});
quadVertices.flip();
- light0Position=BufferUtil.newFloatBuffer(4);
- light0Diffuse=BufferUtil.newFloatBuffer(4);
- light1Position=BufferUtil.newFloatBuffer(4);
- light1Diffuse=BufferUtil.newFloatBuffer(4);
- light2Position=BufferUtil.newFloatBuffer(4);
- light2Diffuse=BufferUtil.newFloatBuffer(4);
- materialSpecular=BufferUtil.newFloatBuffer(4);
+ light0Position=GLBuffers.newDirectFloatBuffer(4);
+ light0Diffuse=GLBuffers.newDirectFloatBuffer(4);
+ light1Position=GLBuffers.newDirectFloatBuffer(4);
+ light1Diffuse=GLBuffers.newDirectFloatBuffer(4);
+ light2Position=GLBuffers.newDirectFloatBuffer(4);
+ light2Diffuse=GLBuffers.newDirectFloatBuffer(4);
+ materialSpecular=GLBuffers.newDirectFloatBuffer(4);
light0Position.put(new float[] { FixedPoint.toFloat(-0x40000), 1.0f, 1.0f, 0.0f });
light0Diffuse.put(new float[] { 1.0f, FixedPoint.toFloat(0x6666), 0.0f, 1.0f });
@@ -277,15 +277,15 @@ public class GLSpatial {
vComps= vertexComponents;
nComps = useNormalArray ? 3 : 0;
- int bStride = BufferUtil.sizeOfGLType(GL.GL_FLOAT) * ( vComps + cComps + nComps );
+ int bStride = GLBuffers.sizeOfGLType(GL.GL_FLOAT) * ( vComps + cComps + nComps );
int bSize = count * bStride;
- pBuffer = BufferUtil.newByteBuffer(bSize);
+ pBuffer = GLBuffers.newDirectByteBuffer(bSize);
interlArray = pBuffer.asFloatBuffer();
int vOffset = 0;
- int cOffset = BufferUtil.sizeOfGLType(GL.GL_FLOAT) * (vComps);
- int nOffset = BufferUtil.sizeOfGLType(GL.GL_FLOAT) * (vComps + cComps);
+ int cOffset = GLBuffers.sizeOfGLType(GL.GL_FLOAT) * (vComps);
+ int nOffset = GLBuffers.sizeOfGLType(GL.GL_FLOAT) * (vComps + cComps);
int[] tmp = new int[1];
gl.glGenBuffers(1, tmp, 0);
diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java
index 40e24d0..35da6e1 100755
--- a/src/demos/es1/angeles/Main.java
+++ b/src/demos/es1/angeles/Main.java
@@ -1,10 +1,9 @@
package demos.es1.angeles;
-import java.nio.*;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.newt.*;
+import com.jogamp.newt.opengl.*;
public class Main implements WindowListener, MouseListener {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 03:29:45 +0000