diff options
Diffstat (limited to 'demos/HodglimsNeHe')
| -rw-r--r-- | demos/HodglimsNeHe/Lesson1.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson11.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson12.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson16.java | 7 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson18.java | 15 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson2.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson3.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson4.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson5.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson6.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson7.java | 7 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson8.java | 7 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/Lesson9.java | 1 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/index.html | 2 | ||||
| -rw-r--r-- | demos/HodglimsNeHe/index_plugin13.html | 2 |
15 files changed, 45 insertions, 4 deletions
diff --git a/demos/HodglimsNeHe/Lesson1.java b/demos/HodglimsNeHe/Lesson1.java index fb05de2..b1e883b 100644 --- a/demos/HodglimsNeHe/Lesson1.java +++ b/demos/HodglimsNeHe/Lesson1.java @@ -197,6 +197,7 @@ public class Lesson1 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/Lesson11.java b/demos/HodglimsNeHe/Lesson11.java index ad566ee..265a2d2 100644 --- a/demos/HodglimsNeHe/Lesson11.java +++ b/demos/HodglimsNeHe/Lesson11.java @@ -318,6 +318,7 @@ public class Lesson11 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/Lesson12.java b/demos/HodglimsNeHe/Lesson12.java index 86a9f02..5de7084 100644 --- a/demos/HodglimsNeHe/Lesson12.java +++ b/demos/HodglimsNeHe/Lesson12.java @@ -346,6 +346,7 @@ public class Lesson12 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/Lesson16.java b/demos/HodglimsNeHe/Lesson16.java index 82fa7b7..0d7d125 100644 --- a/demos/HodglimsNeHe/Lesson16.java +++ b/demos/HodglimsNeHe/Lesson16.java @@ -373,6 +373,7 @@ public class Lesson16 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
@@ -393,6 +394,10 @@ public class Lesson16 extends Applet */
public void keyPressed(KeyEvent e)
{
+ //Ensure GL is initialised correctly
+ if (glj.gljMakeCurrent(true) == false)
+ return;
+
switch(e.getKeyCode())
{
//Switch ON/OFF light when L is pressed
@@ -487,6 +492,8 @@ public class Lesson16 extends Applet break;
}
}
+ glj.gljFree();
+
}
diff --git a/demos/HodglimsNeHe/Lesson18.java b/demos/HodglimsNeHe/Lesson18.java index b63a627..98bc1cc 100644 --- a/demos/HodglimsNeHe/Lesson18.java +++ b/demos/HodglimsNeHe/Lesson18.java @@ -107,7 +107,7 @@ public class Lesson18 extends Applet int part2; // End Of Disc
int p1=0; // Increase 1
int p2=1; // Increase 2
- int quadratic; // Storage For Our Quadratic Objects
+ long quadratic; // Storage For Our Quadratic Objects
int object=0; // Which Object To Draw
public renderCanvas(int w, int h) {
@@ -278,7 +278,11 @@ public class Lesson18 extends Applet }
public void display() {
- //Clear The Screen And The Depth Buffer
+ //Ensure GL is initialised correctly
+ if (glj.gljMakeCurrent(true) == false)
+ return;
+
+//Clear The Screen And The Depth Buffer
gl.glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
//Reset The View
gl.glLoadIdentity();
@@ -332,12 +336,17 @@ public class Lesson18 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
public void keyTyped(KeyEvent e) {
//We are not handling any keyboard events yet
}
public void keyPressed(KeyEvent e) {
+ //Ensure GL is initialised correctly
+ if (glj.gljMakeCurrent(true) == false)
+ return;
+
switch(e.getKeyCode()) {
//Switch ON/OFF light when L is pressed
case KeyEvent.VK_L:
@@ -398,6 +407,8 @@ public class Lesson18 extends Applet }
break;
}
+ glj.gljFree();
+
}
public void keyReleased(KeyEvent e) {
switch(e.getKeyCode()) {
diff --git a/demos/HodglimsNeHe/Lesson2.java b/demos/HodglimsNeHe/Lesson2.java index 8f6eb2c..12fa7bd 100644 --- a/demos/HodglimsNeHe/Lesson2.java +++ b/demos/HodglimsNeHe/Lesson2.java @@ -216,6 +216,7 @@ public class Lesson2 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/Lesson3.java b/demos/HodglimsNeHe/Lesson3.java index b5e3377..d4ac6ea 100644 --- a/demos/HodglimsNeHe/Lesson3.java +++ b/demos/HodglimsNeHe/Lesson3.java @@ -220,6 +220,7 @@ public class Lesson3 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/Lesson4.java b/demos/HodglimsNeHe/Lesson4.java index ada7dd5..270b08b 100644 --- a/demos/HodglimsNeHe/Lesson4.java +++ b/demos/HodglimsNeHe/Lesson4.java @@ -240,6 +240,7 @@ public class Lesson4 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/Lesson5.java b/demos/HodglimsNeHe/Lesson5.java index 026ecb3..25b565d 100644 --- a/demos/HodglimsNeHe/Lesson5.java +++ b/demos/HodglimsNeHe/Lesson5.java @@ -291,6 +291,7 @@ public class Lesson5 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/Lesson6.java b/demos/HodglimsNeHe/Lesson6.java index ae85d76..129a44b 100644 --- a/demos/HodglimsNeHe/Lesson6.java +++ b/demos/HodglimsNeHe/Lesson6.java @@ -293,6 +293,7 @@ public class Lesson6 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/Lesson7.java b/demos/HodglimsNeHe/Lesson7.java index d6f65f4..a19a016 100644 --- a/demos/HodglimsNeHe/Lesson7.java +++ b/demos/HodglimsNeHe/Lesson7.java @@ -351,6 +351,7 @@ public class Lesson7 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
// Methods required for the implementation of MouseListener
@@ -396,6 +397,10 @@ public class Lesson7 extends Applet */
public void keyPressed(KeyEvent e)
{
+ //Ensure GL is initialised correctly
+ if (glj.gljMakeCurrent(true) == false)
+ return;
+
switch(e.getKeyCode())
{
//Switch ON/OFF light when L is pressed
@@ -473,6 +478,8 @@ public class Lesson7 extends Applet break;
}
}
+ glj.gljFree();
+
}
diff --git a/demos/HodglimsNeHe/Lesson8.java b/demos/HodglimsNeHe/Lesson8.java index f8735d5..f0dc1cc 100644 --- a/demos/HodglimsNeHe/Lesson8.java +++ b/demos/HodglimsNeHe/Lesson8.java @@ -360,6 +360,7 @@ public class Lesson8 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
@@ -380,6 +381,10 @@ public class Lesson8 extends Applet */
public void keyPressed(KeyEvent e)
{
+ //Ensure GL is initialised correctly
+ if (glj.gljMakeCurrent(true) == false)
+ return;
+
switch(e.getKeyCode())
{
//Switch ON/OFF light when L is pressed
@@ -481,6 +486,8 @@ public class Lesson8 extends Applet break;
}
}
+ glj.gljFree();
+
}
diff --git a/demos/HodglimsNeHe/Lesson9.java b/demos/HodglimsNeHe/Lesson9.java index 4c4a92d..0a43cb8 100644 --- a/demos/HodglimsNeHe/Lesson9.java +++ b/demos/HodglimsNeHe/Lesson9.java @@ -313,6 +313,7 @@ public class Lesson9 extends Applet //Swap buffers
glj.gljSwap();
+ glj.gljFree();
}
diff --git a/demos/HodglimsNeHe/index.html b/demos/HodglimsNeHe/index.html index 88ac1fb..d1993ea 100644 --- a/demos/HodglimsNeHe/index.html +++ b/demos/HodglimsNeHe/index.html @@ -11,7 +11,7 @@ <a href="http://nehe.gamedev.net/opengl.asp">NeHe OpenGL Tutorial Demos</a> originally ported by <a href="http://dev.knowledgeassociates.com/Hodglim/nehe/nehe.shtml">Hodglim</a> -for <B> GL4Java >= 2.4.0.0: </B> <br> +for <B> GL4Java >= 2.5.2.0: </B> <br> <br> This demos have added <I>requestFocus()</I> statements, especially for the events: <I>mouseEntered</I> and <I>mouseClicked</I> !<br> diff --git a/demos/HodglimsNeHe/index_plugin13.html b/demos/HodglimsNeHe/index_plugin13.html index 754940c..802b8ee 100644 --- a/demos/HodglimsNeHe/index_plugin13.html +++ b/demos/HodglimsNeHe/index_plugin13.html @@ -11,7 +11,7 @@ <a href="http://nehe.gamedev.net/opengl.asp">NeHe OpenGL Tutorial Demos</a> originally ported by <a href="http://dev.knowledgeassociates.com/Hodglim/nehe/nehe.shtml">Hodglim</a> -for <B> GL4Java >= 2.4.0.0: </B> <br> +for <B> GL4Java >= 2.5.2.0: </B> <br> <br> This demos have added <I>requestFocus()</I> statements, especially for the events: <I>mouseEntered</I> and <I>mouseClicked</I> !<br> |