summaryrefslogtreecommitdiffstats
path: root/src/gleem
diff options
context:
space:
mode:
Diffstat (limited to 'src/gleem')
-rw-r--r--src/gleem/TestExaminerViewer.java7
-rw-r--r--src/gleem/TestHandleBox.java8
-rw-r--r--src/gleem/TestMultiWin.java7
-rw-r--r--src/gleem/TestTranslate1.java8
-rw-r--r--src/gleem/TestTranslate2.java8
5 files changed, 18 insertions, 20 deletions
diff --git a/src/gleem/TestExaminerViewer.java b/src/gleem/TestExaminerViewer.java
index 40e5607..7e52992 100644
--- a/src/gleem/TestExaminerViewer.java
+++ b/src/gleem/TestExaminerViewer.java
@@ -74,14 +74,12 @@ public class TestExaminerViewer {
}
static class Listener implements GLEventListener {
- private GL gl;
- private GLU glu;
+ private GLU glu = new GLU();
private CameraParameters params = new CameraParameters();
private ExaminerViewer viewer;
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};
@@ -125,6 +123,7 @@ public class TestExaminerViewer {
}
public void display(GLAutoDrawable drawable) {
+ GL gl = drawable.getGL();
gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
viewer.update(gl);
ManipManager.getManipManager().updateCameraParameters(drawable, viewer.getCameraParameters());
diff --git a/src/gleem/TestHandleBox.java b/src/gleem/TestHandleBox.java
index c6eb7a4..e06d004 100644
--- a/src/gleem/TestHandleBox.java
+++ b/src/gleem/TestHandleBox.java
@@ -53,13 +53,11 @@ public class TestHandleBox {
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};
@@ -98,12 +96,14 @@ public class TestHandleBox {
}
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)
diff --git a/src/gleem/TestMultiWin.java b/src/gleem/TestMultiWin.java
index e636bef..1a1fcf1 100644
--- a/src/gleem/TestMultiWin.java
+++ b/src/gleem/TestMultiWin.java
@@ -76,14 +76,12 @@ public class TestMultiWin {
}
static class Listener implements GLEventListener {
- private GL gl;
- private GLU glu;
+ private GLU glu = new GLU();
private CameraParameters params = new CameraParameters();
private ExaminerViewer viewer;
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};
@@ -124,6 +122,7 @@ public class TestMultiWin {
}
public void display(GLAutoDrawable drawable) {
+ GL gl = drawable.getGL();
gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
viewer.update(gl);
ManipManager.getManipManager().updateCameraParameters(drawable, viewer.getCameraParameters());
diff --git a/src/gleem/TestTranslate1.java b/src/gleem/TestTranslate1.java
index 6fef762..b9eb81a 100644
--- a/src/gleem/TestTranslate1.java
+++ b/src/gleem/TestTranslate1.java
@@ -53,13 +53,11 @@ public class TestTranslate1 {
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 TestTranslate1 {
}
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)
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)