summaryrefslogtreecommitdiffstats
path: root/src/gleem/TestTranslate2.java
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2005-09-25 07:26:00 +0000
committerKenneth Russel <[email protected]>2005-09-25 07:26:00 +0000
commit02510865a2ff5468f11df23afcba370789fc6372 (patch)
tree0ed5ff426c87969a18e9314265e16d9547e3d1f7 /src/gleem/TestTranslate2.java
parent5f73e61aea5b72ba75d3cccac848bfb2a2a799d5 (diff)
Changed GLU to be a single class rather than a separate interface and
implementing class. Broke dependence from GLContext and GLAutoDrawable down to GLU package; removed getGLU()/setGLU() routines. A GLU object may now be instantiated via "new GLU()" at any point in the program. When routines on it are called which require an OpenGL context, the GLU implementation fetches the current GLContext and the GL object from within it to do its work via the new public API GLU.getCurrentGL(). This avoids needing to pass down a GL object everywhere or to tie the GLU object to a particular GL object. Restructured GLUT implementation similarly so GL and GLU objects do not need to be passed to it as arguments any more. Restructured all demos to conform to new APIs. Fixed bugs in GlueGen around new functionality of being able to emit only an implementing class with no associated interface. Deleted obsolete GLU-related .cfg files. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JSR-231@135 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'src/gleem/TestTranslate2.java')
-rw-r--r--src/gleem/TestTranslate2.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gleem/TestTranslate2.java b/src/gleem/TestTranslate2.java
index d222ff3..96f5684 100644
--- a/src/gleem/TestTranslate2.java
+++ b/src/gleem/TestTranslate2.java
@@ -53,13 +53,11 @@ public class TestTranslate2 {
private static final int Y_SIZE = 400;
static class Listener implements GLEventListener {
- private GL gl;
- private GLU glu;
+ private GLU glu = new GLU();
private CameraParameters params = new CameraParameters();
public void init(GLAutoDrawable drawable) {
- gl = drawable.getGL();
- glu = drawable.getGLU();
+ GL gl = drawable.getGL();
gl.glClearColor(0, 0, 0, 0);
float[] lightPosition = new float[] {1, 1, 1, 0};
@@ -99,12 +97,14 @@ public class TestTranslate2 {
}
public void display(GLAutoDrawable drawable) {
+ GL gl = drawable.getGL();
gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
ManipManager.getManipManager().updateCameraParameters(drawable, params);
ManipManager.getManipManager().render(drawable, gl);
}
public void reshape(GLAutoDrawable drawable, int x, int y, int w, int h) {
+ GL gl = drawable.getGL();
float aspect, theta;
aspect = (float) w / (float) h;
if (w >= h)