summaryrefslogtreecommitdiffstats
path: root/src/demos/es1
diff options
context:
space:
mode:
Diffstat (limited to 'src/demos/es1')
-rwxr-xr-xsrc/demos/es1/RedSquare.java8
-rwxr-xr-xsrc/demos/es1/angeles/AngelesGL.java14
-rwxr-xr-xsrc/demos/es1/angeles/AngelesGLil.java12
-rwxr-xr-xsrc/demos/es1/angeles/Main.java4
-rw-r--r--src/demos/es1/cube/Cube.java4
-rw-r--r--src/demos/es1/cube/CubeImmModeSink.java2
-rwxr-xr-xsrc/demos/es1/cubefbo/Main.java4
7 files changed, 24 insertions, 24 deletions
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 1049ee7..0a672e5 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -131,12 +131,12 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
window.addKeyListener(this);
window.addGLEventListener(this);
- window.enablePerfLog(true);
+ window.setUpdateFPSFrames(FPSCounter.DEFAULT_FRAMES_PER_INTERVAL, System.err);
// Size OpenGL to Video Surface
window.setSize(width, height);
// window.setFullscreen(true);
window.setVisible(true);
- window.enablePerfLog(true);
+ window.setUpdateFPSFrames(FPSCounter.DEFAULT_FRAMES_PER_INTERVAL, System.err);
if(!oneThread) {
if(useAnimator) {
@@ -152,7 +152,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
} else {
do {
display();
- } while (!quit && window.getDuration() < 11000) ;
+ } while (!quit && window.getTotalFPSDuration() < 11000) ;
shutdown();
}
}
@@ -284,7 +284,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
gl.glMatrixMode(gl.GL_MODELVIEW);
gl.glLoadIdentity();
gl.glTranslatef(0, 0, -10);
- float ang = ((float) window.getDuration() * 360.0f) / 4000.0f;
+ float ang = ((float) window.getTotalFPSDuration() * 360.0f) / 4000.0f;
gl.glRotatef(ang, 0, 0, 1);
gl.glRotatef(ang, 0, 1, 0);
diff --git a/src/demos/es1/angeles/AngelesGL.java b/src/demos/es1/angeles/AngelesGL.java
index bc367d7..713cca7 100755
--- a/src/demos/es1/angeles/AngelesGL.java
+++ b/src/demos/es1/angeles/AngelesGL.java
@@ -298,14 +298,14 @@ public class GLSpatial {
int[] tmp = new int[1];
gl.glGenBuffers(1, tmp, 0);
vboName = tmp[0];
-
- vArrayData = GLArrayDataWrapper.createFixed(gl, gl.GL_VERTEX_ARRAY, vComps, GL.GL_FLOAT, false,
- 0, pBuffer, vboName, vOffset);
- cArrayData = GLArrayDataWrapper.createFixed(gl, gl.GL_COLOR_ARRAY, cComps, GL.GL_FLOAT, false,
- 0, pBuffer, vboName, cOffset);
+
+ vArrayData = GLArrayDataWrapper.createFixed(gl.GL_VERTEX_ARRAY, vComps, GL.GL_FLOAT, false,
+ 0, pBuffer, vboName, vOffset, GL.GL_STATIC_DRAW);
+ cArrayData = GLArrayDataWrapper.createFixed(gl.GL_COLOR_ARRAY, cComps, GL.GL_FLOAT, false,
+ 0, pBuffer, vboName, cOffset, GL.GL_STATIC_DRAW);
if(useNormalArray) {
- nArrayData = GLArrayDataWrapper.createFixed(gl, gl.GL_NORMAL_ARRAY, nComps, GL.GL_FLOAT, false,
- 0, pBuffer, vboName, nOffset);
+ nArrayData = GLArrayDataWrapper.createFixed(gl.GL_NORMAL_ARRAY, nComps, GL.GL_FLOAT, false,
+ 0, pBuffer, vboName, nOffset, GL.GL_STATIC_DRAW);
}
}
diff --git a/src/demos/es1/angeles/AngelesGLil.java b/src/demos/es1/angeles/AngelesGLil.java
index 92be109..fab211f 100755
--- a/src/demos/es1/angeles/AngelesGLil.java
+++ b/src/demos/es1/angeles/AngelesGLil.java
@@ -298,13 +298,13 @@ public class GLSpatial {
interlArray.position(count*(vComps+cComps+nComps));
interlArray.flip();
- vArrayData = GLArrayDataWrapper.createFixed(gl, gl.GL_VERTEX_ARRAY, vComps, GL.GL_FLOAT, false,
- bStride, pBuffer, vboName, vOffset);
- cArrayData = GLArrayDataWrapper.createFixed(gl, gl.GL_COLOR_ARRAY, cComps, GL.GL_FLOAT, false,
- bStride, pBuffer, vboName, cOffset);
+ vArrayData = GLArrayDataWrapper.createFixed(gl.GL_VERTEX_ARRAY, vComps, GL.GL_FLOAT, false,
+ bStride, pBuffer, vboName, vOffset, GL.GL_STATIC_DRAW);
+ cArrayData = GLArrayDataWrapper.createFixed(gl.GL_COLOR_ARRAY, cComps, GL.GL_FLOAT, false,
+ bStride, pBuffer, vboName, cOffset, GL.GL_STATIC_DRAW);
if(useNormalArray) {
- nArrayData = GLArrayDataWrapper.createFixed(gl, gl.GL_NORMAL_ARRAY, nComps, GL.GL_FLOAT, false,
- bStride, pBuffer, vboName, nOffset);
+ nArrayData = GLArrayDataWrapper.createFixed(gl.GL_NORMAL_ARRAY, nComps, GL.GL_FLOAT, false,
+ bStride, pBuffer, vboName, nOffset, GL.GL_STATIC_DRAW);
}
}
diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java
index 743f961..ad1a5b5 100755
--- a/src/demos/es1/angeles/Main.java
+++ b/src/demos/es1/angeles/Main.java
@@ -75,7 +75,7 @@ public class Main implements WindowListener, MouseListener {
window.addWindowListener(this);
window.addMouseListener(this);
- window.enablePerfLog(true);
+ window.setUpdateFPSFrames(FPSCounter.DEFAULT_FRAMES_PER_INTERVAL, System.err);
window.setSize(width, height);
window.setFullscreen(true);
window.setVisible(true);
@@ -97,7 +97,7 @@ public class Main implements WindowListener, MouseListener {
}
}
- while (!quit && window.getDuration() < 215000) {
+ while (!quit && window.getTotalFPSDuration() < 215000) {
window.display();
}
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index fa88674..769bbe6 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -338,13 +338,13 @@ public class Cube implements GLEventListener {
window.addGLEventListener(this);
- window.enablePerfLog(true);
+ window.setUpdateFPSFrames(FPSCounter.DEFAULT_FRAMES_PER_INTERVAL, System.err);
// Size OpenGL to Video Surface
window.setSize(width, height);
window.setFullscreen(true);
window.setVisible(true);
- while (!quit && window.getDuration() < 31000) {
+ while (!quit && window.getTotalFPSDuration() < 31000) {
window.display();
}
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index a75b274..944cad0 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -403,7 +403,7 @@ public class CubeImmModeSink implements GLEventListener {
window.addGLEventListener(this);
- window.enablePerfLog(true);
+ window.setUpdateFPSFrames(FPSCounter.DEFAULT_FRAMES_PER_INTERVAL, System.err);
// Size OpenGL to Video Surface
window.setSize(width, height);
window.setFullscreen(true);
diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java
index cd26556..b2da7a5 100755
--- a/src/demos/es1/cubefbo/Main.java
+++ b/src/demos/es1/cubefbo/Main.java
@@ -76,7 +76,7 @@ public class Main implements WindowListener, MouseListener {
window.addWindowListener(this);
window.addMouseListener(this);
- window.enablePerfLog(true);
+ window.setUpdateFPSFrames(FPSCounter.DEFAULT_FRAMES_PER_INTERVAL, System.err);
window.setSize(width, height);
window.setFullscreen(false);
window.setVisible(true);
@@ -85,7 +85,7 @@ public class Main implements WindowListener, MouseListener {
FBCubes cubes = new FBCubes();
window.addGLEventListener(cubes);
- while ( !quit && window.getDuration() < 31000) {
+ while ( !quit && window.getTotalFPSDuration() < 31000) {
window.display();
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 22:44:42 +0000