summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
Diffstat (limited to 'demos')
-rw-r--r--demos/src/jgudemos/BasicGLJFrameDemo.java8
-rw-r--r--demos/src/jgudemos/BouncingText3D.java78
-rw-r--r--demos/src/jgudemos/FontDrawerDemo.java45
-rw-r--r--demos/src/jgudemos/TestRenderer3D.java52
4 files changed, 93 insertions, 90 deletions
diff --git a/demos/src/jgudemos/BasicGLJFrameDemo.java b/demos/src/jgudemos/BasicGLJFrameDemo.java
index e7d1858..8b4d329 100644
--- a/demos/src/jgudemos/BasicGLJFrameDemo.java
+++ b/demos/src/jgudemos/BasicGLJFrameDemo.java
@@ -37,6 +37,7 @@
package jgudemos;
import net.java.joglutils.*;
+
import javax.media.opengl.*;
/**
@@ -55,16 +56,17 @@ public class BasicGLJFrameDemo {
}
public void display(GLAutoDrawable drawable) {
- GL gl = drawable.getGL();
+ GL2 gl = drawable.getGL().getGL2();
+ gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT);
gl.glColor3f(1.0f,0.323f,0.8f);
- gl.glBegin(GL.GL_TRIANGLE_STRIP);
+ gl.glBegin(GL2.GL_TRIANGLE_STRIP);
gl.glVertex2d(0,0);
gl.glVertex2d(0.5,1.0);
gl.glVertex2d(-0.3,-0.9);
gl.glEnd();
}
- public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {
+ public void dispose(GLAutoDrawable drawable) {
}
});
diff --git a/demos/src/jgudemos/BouncingText3D.java b/demos/src/jgudemos/BouncingText3D.java
index 7ab16ab..4be64a3 100644
--- a/demos/src/jgudemos/BouncingText3D.java
+++ b/demos/src/jgudemos/BouncingText3D.java
@@ -18,15 +18,13 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Random;
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCanvas;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUquadric;
+import javax.media.opengl.*;
+import javax.media.opengl.awt.*;
+import javax.media.opengl.glu.*;
import javax.vecmath.Point3f;
-import com.geofx.opengl.util.TextRenderer3D;
+import net.java.joglutils.jogltext.TextRenderer3D;
+
import com.sun.opengl.util.Animator;
/**
@@ -53,7 +51,7 @@ public class BouncingText3D implements GLEventListener
private ArrayList<TextInfo3D> textInfo = new ArrayList<TextInfo3D>();
private GLU glu = new GLU();
- protected GLUquadric QUADRIC = glu.gluNewQuadric();
+ protected GLUquadric QUADRIC;
/**
* Main entry point for the app. The only argument that is parsed
@@ -111,7 +109,9 @@ public class BouncingText3D implements GLEventListener
*/
public void init(GLAutoDrawable drawable)
{
- GL gl = drawable.getGL();
+ QUADRIC = glu.gluNewQuadric();
+
+ GL2 gl = drawable.getGL().getGL2();
System.out.println("INIT GL IS: " + gl.getClass().getName());
System.out.println("init GL called. GL Class: " + gl.getClass().getName()
@@ -121,18 +121,18 @@ public class BouncingText3D implements GLEventListener
// Setup the drawing area and shading mode
gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
- gl.glShadeModel(GL.GL_SMOOTH);
+ gl.glShadeModel(GL2.GL_SMOOTH);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, LightAmbient, 0);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, LightDiffuse, 0);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, LightPosition, 0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_DIFFUSE, LightAmbient, 0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_DIFFUSE, LightDiffuse, 0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION, LightPosition, 0);
- gl.glEnable(GL.GL_DEPTH_TEST);
- gl.glDepthFunc(GL.GL_LESS);
+ gl.glEnable(GL2.GL_DEPTH_TEST);
+ gl.glDepthFunc(GL2.GL_LESS);
- gl.glEnable(GL.GL_BLEND);
- gl.glEnable(GL.GL_LINE_SMOOTH);
- gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
+ gl.glEnable(GL2.GL_BLEND);
+ gl.glEnable(GL2.GL_LINE_SMOOTH);
+ gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
// Note that it has to be a TRUETYPE font - not OpenType. Apparently, AWT can't
// handle CFF glyphs
@@ -153,18 +153,18 @@ public class BouncingText3D implements GLEventListener
*/
public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
{
- GL gl = drawable.getGL();
+ GL2 gl = drawable.getGL().getGL2();
if (height <= 0) // avoid a divide by zero error!
height = 1;
final float h = (float) width / (float) height;
gl.glViewport(0, 0, width, height);
- gl.glMatrixMode(GL.GL_PROJECTION);
+ gl.glMatrixMode(GL2.GL_PROJECTION);
gl.glLoadIdentity();
glu.gluPerspective(45.0f, h, 1.0, 20.0);
- gl.glMatrixMode(GL.GL_MODELVIEW);
+ gl.glMatrixMode(GL2.GL_MODELVIEW);
gl.glLoadIdentity();
}
@@ -174,13 +174,13 @@ public class BouncingText3D implements GLEventListener
*/
public void display(GLAutoDrawable drawable)
{
- GL gl = drawable.getGL();
+ GL2 gl = drawable.getGL().getGL2();
// Clear the drawing area
- gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+ gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT);
- gl.glMaterialfv(GL.GL_FRONT, GL.GL_SPECULAR, mat_specular, 0);
- gl.glMaterialfv(GL.GL_FRONT, GL.GL_SHININESS, mat_shininess, 0);
+ gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_SPECULAR, mat_specular, 0);
+ gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_SHININESS, mat_shininess, 0);
// Reset the current matrix to the "identity"
gl.glLoadIdentity();
@@ -191,8 +191,8 @@ public class BouncingText3D implements GLEventListener
try
{
- gl.glEnable(GL.GL_LIGHTING);
- gl.glEnable(GL.GL_LIGHT0);
+ gl.glEnable(GL2.GL_LIGHTING);
+ gl.glEnable(GL2.GL_LIGHT0);
drawAxes(gl);
@@ -202,10 +202,10 @@ public class BouncingText3D implements GLEventListener
updateTextInfo( info );
- gl.glPushAttrib(GL.GL_TRANSFORM_BIT);
- gl.glMatrixMode(GL.GL_MODELVIEW);
+ gl.glPushAttrib(GL2.GL_TRANSFORM_BIT);
+ gl.glMatrixMode(GL2.GL_MODELVIEW);
gl.glPushMatrix();
- gl.glEnable( GL.GL_NORMALIZE);
+ gl.glEnable( GL2.GL_NORMALIZE);
gl.glTranslatef(info.position.x, info.position.y, info.position.z);
gl.glRotatef(info.angle.x, 1, 0, 0);
@@ -214,7 +214,7 @@ public class BouncingText3D implements GLEventListener
// System.out.println(" x,y,z: " + info.position.x + " " + info.position.y + " " + info.position.z + " angle: " + info.angle );
- gl.glMaterialfv(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE, info.material, 0);
+ gl.glMaterialfv(GL2.GL_FRONT_AND_BACK, GL2.GL_AMBIENT_AND_DIFFUSE, info.material, 0);
tr3.call(info.index);
@@ -229,10 +229,10 @@ public class BouncingText3D implements GLEventListener
}
}
- /**
- * This method essentially always ignored.
- */
- public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged)
+ /**
+ * No explicit cleanup necessary.
+ */
+ public void dispose(GLAutoDrawable drawable)
{
}
@@ -399,7 +399,7 @@ public class BouncingText3D implements GLEventListener
}
// draw some striped-pole axes for visdual reference
- protected void drawAxes(GL gl)
+ protected void drawAxes(GL2 gl)
{
float[] mat_ambient_red = { 1.0f, 0.0f, 0.0f, 1.0f };
float[] mat_ambient_green = { 0.0f, 1.0f, 0.0f, 1.0f };
@@ -413,7 +413,7 @@ public class BouncingText3D implements GLEventListener
}
// draw a single striped pole axis
- private void drawAxis(GL gl, int rot, float[] material )
+ private void drawAxis(GL2 gl, int rot, float[] material )
{
float[] mat_ambient_grey = { 0.5f, 0.5f, 0.5f, 1.0f };
final double AXIS_RADIUS = 0.01;
@@ -434,9 +434,9 @@ public class BouncingText3D implements GLEventListener
while ( pos < AXIS_HEIGHT/2.0f )
{
if ((i++ & 1)==0)
- gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, material, 0);
+ gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE, material, 0);
else
- gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, mat_ambient_grey, 0);
+ gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE, mat_ambient_grey, 0);
glu.gluCylinder(QUADRIC, AXIS_RADIUS, AXIS_RADIUS, AXIS_STEP, 8, 1);
gl.glTranslatef(0.0f, 0.0f, AXIS_STEP);
diff --git a/demos/src/jgudemos/FontDrawerDemo.java b/demos/src/jgudemos/FontDrawerDemo.java
index 8aab2b5..2bf0959 100644
--- a/demos/src/jgudemos/FontDrawerDemo.java
+++ b/demos/src/jgudemos/FontDrawerDemo.java
@@ -106,7 +106,7 @@ public class FontDrawerDemo {
}
public void init(GLAutoDrawable drawable) {
- drawable.setGL(new DebugGL(drawable.getGL()));
+ drawable.setGL(new DebugGL2(drawable.getGL().getGL2()));
glu = new GLU();
switch(argsFin.length) {
case 6:
@@ -127,7 +127,7 @@ public class FontDrawerDemo {
dttf.setNormal(FontDrawer.NormalMode.FLAT);
xrot = 0;yrot = 0;zrot = 0;
- GL gl = drawable.getGL();
+ GL2 gl = drawable.getGL().getGL2();
// lt = new net.java.joglutils.lighting.Light(gl);
//mt = new net.java.joglutils.lighting.Material(gl);
@@ -138,14 +138,14 @@ public class FontDrawerDemo {
// lt.enable();
// lt.apply();
//mt.apply();
- gl.glColorMaterial( GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE ) ;
+ gl.glColorMaterial( GL2.GL_FRONT_AND_BACK, GL2.GL_AMBIENT_AND_DIFFUSE ) ;
float[] mamb = {0,0,0,0};
- gl.glLightModelfv(GL.GL_LIGHT_MODEL_AMBIENT,mamb,0);
+ gl.glLightModelfv(GL2.GL_LIGHT_MODEL_AMBIENT,mamb,0);
- gl.glEnable(GL.GL_DEPTH_TEST);
- gl.glEnable(GL.GL_LIGHTING);
- gl.glEnable(GL.GL_LIGHT0);
- gl.glEnable(GL.GL_NORMALIZE);
+ gl.glEnable(GL2.GL_DEPTH_TEST);
+ gl.glEnable(GL2.GL_LIGHTING);
+ gl.glEnable(GL2.GL_LIGHT0);
+ gl.glEnable(GL2.GL_NORMALIZE);
@@ -153,9 +153,9 @@ public class FontDrawerDemo {
gl.glClearColor(0.3f,0.5f,0.2f,0);
}
- public void drawAxis(GL gl) {
- gl.glDisable(GL.GL_LIGHTING);
- gl.glBegin(GL.GL_LINES);
+ public void drawAxis(GL2 gl) {
+ gl.glDisable(GL2.GL_LIGHTING);
+ gl.glBegin(GL2.GL_LINES);
gl.glColor3f(1,0,0);
gl.glVertex3i(0,0,0);
gl.glVertex3i(10,0,0);
@@ -166,27 +166,27 @@ public class FontDrawerDemo {
gl.glVertex3i(0,0,0);
gl.glVertex3i(0,0,10);
gl.glEnd();
- gl.glEnable(GL.GL_LIGHTING);
+ gl.glEnable(GL2.GL_LIGHTING);
}
public void display(GLAutoDrawable drawable) {
- GL gl = drawable.getGL();
- gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+ GL2 gl = drawable.getGL().getGL2();
+ gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT);
- gl.glMatrixMode(GL.GL_PROJECTION);
+ gl.glMatrixMode(GL2.GL_PROJECTION);
gl.glLoadIdentity();
//glu.gluPerspective(90,1,0.001,10);
//gl.glFrustum(-1.5f,1.5f,-1.5f,1.5f,1,5);
gl.glOrtho(-1.5,1.5,-1.5,1.5,-5,5);
- gl.glMatrixMode(GL.GL_MODELVIEW);
+ gl.glMatrixMode(GL2.GL_MODELVIEW);
gl.glLoadIdentity();
//Manual lighting activation before transform
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT, light_ambient,0);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, light_diffuse,0);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_SPECULAR, light_specular,0);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, light_position,0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_AMBIENT, light_ambient,0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_DIFFUSE, light_diffuse,0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_SPECULAR, light_specular,0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION, light_position,0);
glu.gluLookAt(0,0,2,0,0,0,0,1,0);
//drawAxis(gl);
@@ -209,7 +209,10 @@ public class FontDrawerDemo {
dttf.drawString(lowerStr.toString(),glu,gl,-0.8f,-0.8f,0);
}
- public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {
+ /**
+ * No explicit cleanup necessary.
+ */
+ public void dispose(GLAutoDrawable drawable) {
}
};
diff --git a/demos/src/jgudemos/TestRenderer3D.java b/demos/src/jgudemos/TestRenderer3D.java
index a084b7c..2398520 100644
--- a/demos/src/jgudemos/TestRenderer3D.java
+++ b/demos/src/jgudemos/TestRenderer3D.java
@@ -7,7 +7,7 @@
*/
package jgudemos;
-import com.geofx.opengl.util.TextRenderer3D;
+import net.java.joglutils.jogltext.TextRenderer3D;
import com.sun.opengl.util.Animator;
import java.awt.Font;
@@ -16,11 +16,9 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.geom.Rectangle2D;
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCanvas;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.glu.GLU;
+import javax.media.opengl.*;
+import javax.media.opengl.awt.*;
+import javax.media.opengl.glu.*;
/**
* TestRenderer3D
@@ -79,22 +77,22 @@ public class TestRenderer3D implements GLEventListener
*/
public void init(GLAutoDrawable drawable)
{
- GL gl = drawable.getGL();
+ GL2 gl = drawable.getGL().getGL2();
System.out.println("init GL called. GL Class: " + gl.getClass().getName()
+ " and this: " + this.getClass().getName());
gl.setSwapInterval(1);
gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
- gl.glShadeModel(GL.GL_SMOOTH);
+ gl.glShadeModel(GL2.GL_SMOOTH);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, LightAmbient, 0);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, LightDiffuse, 0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_DIFFUSE, LightAmbient, 0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_DIFFUSE, LightDiffuse, 0);
- gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, LightPosition, 0);
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION, LightPosition, 0);
- gl.glEnable(GL.GL_DEPTH_TEST);
- gl.glDepthFunc(GL.GL_LESS);
+ gl.glEnable(GL2.GL_DEPTH_TEST);
+ gl.glDepthFunc(GL2.GL_LESS);
// Be sure to use a font name on your system otherwise you will get the default
tr3 = new TextRenderer3D(new Font("Times New Roman", Font.TRUETYPE_FONT, 3), 0.25f);
@@ -106,7 +104,7 @@ public class TestRenderer3D implements GLEventListener
*/
public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
{
- GL gl = drawable.getGL();
+ GL2 gl = drawable.getGL().getGL2();
GLU glu = new GLU();
if (height <= 0) // avoid a divide by zero error!
@@ -114,10 +112,10 @@ public class TestRenderer3D implements GLEventListener
final float h = (float) width / (float) height;
gl.glViewport(0, 0, width, height);
- gl.glMatrixMode(GL.GL_PROJECTION);
+ gl.glMatrixMode(GL2.GL_PROJECTION);
gl.glLoadIdentity();
glu.gluPerspective(45.0f, h, 1.0, 20.0);
- gl.glMatrixMode(GL.GL_MODELVIEW);
+ gl.glMatrixMode(GL2.GL_MODELVIEW);
gl.glLoadIdentity();
}
@@ -127,10 +125,10 @@ public class TestRenderer3D implements GLEventListener
*/
public void display(GLAutoDrawable drawable)
{
- GL gl = drawable.getGL();
+ GL2 gl = drawable.getGL().getGL2();
// Clear the drawing area
- gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+ gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT);
// Reset the current matrix to the "identity"
gl.glLoadIdentity();
@@ -144,12 +142,12 @@ public class TestRenderer3D implements GLEventListener
float offY = (float) rect.getCenterY();
float offZ = tr3.getDepth() / 2.0f;
- gl.glEnable(GL.GL_LIGHTING);
- gl.glEnable(GL.GL_LIGHT0);
+ gl.glEnable(GL2.GL_LIGHTING);
+ gl.glEnable(GL2.GL_LIGHT0);
- gl.glMaterialfv(GL.GL_FRONT, GL.GL_SPECULAR, mat_specular, 0);
- gl.glMaterialfv(GL.GL_FRONT, GL.GL_SHININESS, mat_shininess, 0);
- gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, mat_ambient_magenta, 0);
+ gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_SPECULAR, mat_specular, 0);
+ gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_SHININESS, mat_shininess, 0);
+ gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE, mat_ambient_magenta, 0);
tr3.draw(str, -offX, offY, -offZ, 1.0f);
@@ -157,10 +155,10 @@ public class TestRenderer3D implements GLEventListener
gl.glFlush();
}
- /**
- * This method essentially always ignored.
- */
- public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged)
+ /**
+ * No explicit cleanup necessary.
+ */
+ public void dispose(GLAutoDrawable drawable)
{
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 13:33:13 +0000