diff options
Diffstat (limited to 'demos/MiscDemos')
| -rwxr-xr-x | demos/MiscDemos/DrawColoredPrimitives.java | 2 | ||||
| -rw-r--r-- | demos/MiscDemos/DrawColoredPrimitives2.java | 2 | ||||
| -rwxr-xr-x | demos/MiscDemos/GLImageWorld1.java | 28 | ||||
| -rwxr-xr-x | demos/MiscDemos/TriangleRotate.java | 2 | ||||
| -rw-r--r-- | demos/MiscDemos/accanti.java | 2 | ||||
| -rw-r--r-- | demos/MiscDemos/alpha3D.java | 2 | ||||
| -rw-r--r-- | demos/MiscDemos/gears.java | 37 | ||||
| -rw-r--r-- | demos/MiscDemos/glutFontBitmapTest2Applet.java | 27 | ||||
| -rw-r--r-- | demos/MiscDemos/index.html | 12 | ||||
| -rw-r--r-- | demos/MiscDemos/index_plugin13.html | 12 | ||||
| -rwxr-xr-x | demos/MiscDemos/morph3d.java | 21 | ||||
| -rw-r--r-- | demos/MiscDemos/nurbs.java | 2 | ||||
| -rwxr-xr-x | demos/MiscDemos/pngTextureTestApplet.java | 79 | ||||
| -rw-r--r-- | demos/MiscDemos/select.java | 2 | ||||
| -rw-r--r-- | demos/MiscDemos/spectex.java | 2 | ||||
| -rw-r--r-- | demos/MiscDemos/stencil.java | 2 | ||||
| -rw-r--r-- | demos/MiscDemos/tess.java | 2 | ||||
| -rwxr-xr-x | demos/MiscDemos/tessdemo.java | 13 | ||||
| -rwxr-xr-x | demos/MiscDemos/tesswind.java | 2 |
19 files changed, 141 insertions, 110 deletions
diff --git a/demos/MiscDemos/DrawColoredPrimitives.java b/demos/MiscDemos/DrawColoredPrimitives.java index 0e6725b..e65d322 100755 --- a/demos/MiscDemos/DrawColoredPrimitives.java +++ b/demos/MiscDemos/DrawColoredPrimitives.java @@ -60,7 +60,7 @@ public class DrawColoredPrimitives extends SimpleGLAnimApplet1 Dimension ps = applet.getPreferredSize();
f.setBounds(-100,-100,99,99);
f.setVisible(true);
- f.setVisible(false);
+ //f.setVisible(false);
Insets i = f.getInsets();
f.setBounds(0,0,
ps.width+i.left+i.right,
diff --git a/demos/MiscDemos/DrawColoredPrimitives2.java b/demos/MiscDemos/DrawColoredPrimitives2.java index fad8668..e67f46b 100644 --- a/demos/MiscDemos/DrawColoredPrimitives2.java +++ b/demos/MiscDemos/DrawColoredPrimitives2.java @@ -54,7 +54,7 @@ public class DrawColoredPrimitives2 extends SimpleGLAnimApplet1 Dimension ps = applet.getPreferredSize();
f.setBounds(-100,-100,99,99);
f.setVisible(true);
- f.setVisible(false);
+ //f.setVisible(false);
Insets i = f.getInsets();
f.setBounds(0,0,
ps.width+i.left+i.right,
diff --git a/demos/MiscDemos/GLImageWorld1.java b/demos/MiscDemos/GLImageWorld1.java index 6ac78f5..cfef4f8 100755 --- a/demos/MiscDemos/GLImageWorld1.java +++ b/demos/MiscDemos/GLImageWorld1.java @@ -64,7 +64,10 @@ public class GLImageWorld1 extends GLCanvas if(fetchGL) { if( glj.gljMakeCurrent() == false ) + { System.out.println("problem in use() method"); + return; + } } TranlateObj(0f,0f,-10f); @@ -346,12 +349,6 @@ public class GLImageWorld1 extends GLCanvas float axisY, float axisZ) { - if( glj.gljMakeCurrent() == false ) - { - System.out.println("problem in use() method"); - return; - } - gl.glMatrixMode (GL_MODELVIEW); gl.glLoadIdentity (); @@ -359,18 +356,10 @@ public class GLImageWorld1 extends GLCanvas gl.glRotatef(degree,axisX,axisY,axisZ); gl.glMultMatrixf(mPosObjRot); gl.glGetFloatv(GL_MODELVIEW_MATRIX,mPosObjRot); - - repaint(); } void TranlateObj(float x,float y,float z) { - if( glj.gljMakeCurrent() == false ) - { - System.out.println("problem in use() method"); - return; - } - gl.glMatrixMode (GL_MODELVIEW); gl.glLoadIdentity (); @@ -378,8 +367,6 @@ public class GLImageWorld1 extends GLCanvas gl.glLoadMatrixf(mPosObjTrans); gl.glTranslatef(x,y,z); gl.glGetFloatv(GL_MODELVIEW_MATRIX,mPosObjTrans); - - repaint(); } // entfernt rotationen aus aktueller matrix @@ -433,6 +420,12 @@ public class GLImageWorld1 extends GLCanvas Point dif=new Point(mousePoint.x-oldMousePoint.x, mousePoint.y-oldMousePoint.y); + if( glj.gljMakeCurrent() == false ) + { + System.out.println("problem in use() method"); + return; + } + if(e.isShiftDown()==true) TranlateObj((float)dif.x/6.0f,(float)dif.y/-6.0f,0f); else if(e.isAltDown()==true) @@ -445,6 +438,9 @@ public class GLImageWorld1 extends GLCanvas RotateObj(dif.x,0f,1f,0f); RotateObj(dif.y,1f,0f,0f); } + + glj.gljFree(); + repaint(); } } public void mouseMoved(MouseEvent e) diff --git a/demos/MiscDemos/TriangleRotate.java b/demos/MiscDemos/TriangleRotate.java index c2d93f7..695575b 100755 --- a/demos/MiscDemos/TriangleRotate.java +++ b/demos/MiscDemos/TriangleRotate.java @@ -56,7 +56,7 @@ public class TriangleRotate extends SimpleGLAnimApplet1 Dimension ps = applet.getPreferredSize();
f.setBounds(-100,-100,99,99);
f.setVisible(true);
- f.setVisible(false);
+ //f.setVisible(false);
Insets i = f.getInsets();
f.setBounds(0,0,
ps.width+i.left+i.right,
diff --git a/demos/MiscDemos/accanti.java b/demos/MiscDemos/accanti.java index 3191452..f15287a 100644 --- a/demos/MiscDemos/accanti.java +++ b/demos/MiscDemos/accanti.java @@ -82,7 +82,7 @@ public class accanti extends Applet Dimension ps = applet.getPreferredSize(); f.setBounds(-100,-100,99,99); f.setVisible(true); - f.setVisible(false); + //f.setVisible(false); Insets i = f.getInsets(); f.setBounds(0,0, ps.width+i.left+i.right, diff --git a/demos/MiscDemos/alpha3D.java b/demos/MiscDemos/alpha3D.java index a982375..3d59134 100644 --- a/demos/MiscDemos/alpha3D.java +++ b/demos/MiscDemos/alpha3D.java @@ -67,7 +67,7 @@ public class alpha3D extends SimpleGLAnimApplet1 Dimension ps = applet.getPreferredSize(); f.setBounds(-100,-100,99,99); f.setVisible(true); - f.setVisible(false); + //f.setVisible(false); Insets i = f.getInsets(); f.setBounds(0,0, ps.width+i.left+i.right, diff --git a/demos/MiscDemos/gears.java b/demos/MiscDemos/gears.java index b61d711..44f709e 100644 --- a/demos/MiscDemos/gears.java +++ b/demos/MiscDemos/gears.java @@ -40,6 +40,7 @@ public class gears extends SimpleGLAnimApplet1 public static void main( String args[] )
{
int i = 0;
+ String gljLib = null;
String glLib = null;
String gluLib = null;
boolean perftest=false;
@@ -49,6 +50,11 @@ public class gears extends SimpleGLAnimApplet1 if(args[i].equals("-perftest"))
{
perftest=true;
+ } else if(args[i].equals("-gljLib"))
+ {
+ i++;
+ if(args.length>i)
+ gljLib=args[i];
} else if(args[i].equals("-glLib"))
{
i++;
@@ -67,16 +73,32 @@ public class gears extends SimpleGLAnimApplet1 if(!perftest)
{
- GLContext.gljNativeDebug = true;
- GLContext.gljClassDebug = true;
+ GLContext.gljNativeDebug = false;
+ GLContext.gljThreadDebug = false;
+ GLContext.gljClassDebug = false;
}
- System.out.println("loading libs(gl, glu): "+
- glLib+", "+gluLib+": "+
- GLContext.loadNativeLibraries(null, glLib, gluLib));
+ if(perftest)
+ GLContext.gljClassDebug=true;
+ GLContext.loadNativeLibraries(gljLib, glLib, gluLib);
+ if(perftest)
+ GLContext.gljClassDebug=false;
Frame mainFrame = new Frame("gears");
+ mainFrame.addWindowListener( new WindowAdapter()
+ {
+ public void windowClosed(WindowEvent e)
+ {
+ System.exit(0);
+ }
+ public void windowClosing(WindowEvent e)
+ {
+ windowClosed(e);
+ }
+ }
+ );
+
gears applet = new gears();
applet.setSize(300, 300);
@@ -90,6 +112,9 @@ public class gears extends SimpleGLAnimApplet1 applet.canvas.getUseFpsSleep());
System.out.println("useRepaint: "+
applet.canvas.getUseRepaint());
+
+ System.out.println("useFpsSleep: "+
+ applet.canvas.getUseFpsSleep());
}
applet.start();
@@ -104,7 +129,7 @@ public class gears extends SimpleGLAnimApplet1 /* Local GLAnimCanvas extension class */
- private class gearsCanvas extends GLAnimCanvas implements MouseListener, MouseMotionListener
+ public class gearsCanvas extends GLAnimCanvas implements MouseListener, MouseMotionListener
{
private static final float M_PI = 3.14159265f;
diff --git a/demos/MiscDemos/glutFontBitmapTest2Applet.java b/demos/MiscDemos/glutFontBitmapTest2Applet.java index 0985385..3059bb0 100644 --- a/demos/MiscDemos/glutFontBitmapTest2Applet.java +++ b/demos/MiscDemos/glutFontBitmapTest2Applet.java @@ -209,12 +209,6 @@ public class glutFontBitmapTest2Applet extends Applet float axisY,
float axisZ)
{
- if( glj.gljMakeCurrent() == false )
- {
- System.out.println("problem in use() method");
- return;
- }
-
gl.glMatrixMode (GL_MODELVIEW);
gl.glLoadIdentity ();
@@ -222,18 +216,10 @@ public class glutFontBitmapTest2Applet extends Applet gl.glRotatef(degree,axisX,axisY,axisZ);
gl.glMultMatrixf(mPosObjRot);
gl.glGetFloatv(GL_MODELVIEW_MATRIX,mPosObjRot);
-
- repaint();
}
void TranlateObj(float x,float y,float z)
{
- if( glj.gljMakeCurrent() == false )
- {
- System.out.println("problem in use() method");
- return;
- }
-
gl.glMatrixMode (GL_MODELVIEW);
gl.glLoadIdentity ();
@@ -241,8 +227,6 @@ public class glutFontBitmapTest2Applet extends Applet gl.glLoadMatrixf(mPosObjTrans);
gl.glTranslatef(x,y,z);
gl.glGetFloatv(GL_MODELVIEW_MATRIX,mPosObjTrans);
-
- repaint();
}
// entfernt rotationen aus aktueller matrix
@@ -296,6 +280,12 @@ public class glutFontBitmapTest2Applet extends Applet Point dif=new Point(mousePoint.x-oldMousePoint.x,
mousePoint.y-oldMousePoint.y);
+ if( glj.gljMakeCurrent() == false )
+ {
+ System.out.println("problem in use() method");
+ return;
+ }
+
if(e.isShiftDown()==true)
TranlateObj((float)dif.x/6.0f,(float)dif.y/-6.0f,0f);
else if(e.isAltDown()==true)
@@ -308,6 +298,11 @@ public class glutFontBitmapTest2Applet extends Applet RotateObj(dif.x,0f,1f,0f);
RotateObj(dif.y,1f,0f,0f);
}
+
+ glj.gljFree();
+
+ repaint();
+
}
}
public void mouseMoved(MouseEvent e)
diff --git a/demos/MiscDemos/index.html b/demos/MiscDemos/index.html index 0c01565..b9fb0a0 100644 --- a/demos/MiscDemos/index.html +++ b/demos/MiscDemos/index.html @@ -7,7 +7,7 @@ <title>Misc Demos</title> </head> <BODY LINK="#0000ff" VLINK="#800080" BGCOLOR="#e6e6ff"> -<p>Here are the demos-II for <B> GL4Java >= 2.4.0.0: </B> <br> +<p>Here are the demos-II for <B> GL4Java >= 2.5.2.0: </B> <br> <br> <p><a href="index_plugin13.html">To use the Java2 Plug-In (Java2, JRE, Plug-In 1.3), click here !</a><br> <br> @@ -57,19 +57,19 @@ : GLUT Font Bitmap 2 (GLUT DEMO) <br> <br> -<br> <a href="tess.html">Tessellator Demo 1</a> +<p> <a href="tess.html">Tessellator Demo 1</a> : test/shows 2 tesselated geometries -<br> <a href="tesswind.html">Tessellator Demo 2</a> +<p> <a href="tesswind.html">Tessellator Demo 2</a> : test/shows tesselated geometries with different winding rules -<br> <a href="tessdemo.html">Tessellator Demo 3</a> +<p> <a href="tessdemo.html">Tessellator Demo 3</a> : test/shows self created tesselated geometries <br> <br> -<br> <a href="SharedGLTest2.html">Shared GL-Context</a> +<p> <a href="SharedGLTest2.html">Shared GL-Context</a> : test/shows the usage of a shared GLContext for Display-Lists <br> <br> -<br> <a href="select.html">Selection Demo 1</a> +<p> <a href="select.html">Selection Demo 1</a> : test/shows selection <br> <br> diff --git a/demos/MiscDemos/index_plugin13.html b/demos/MiscDemos/index_plugin13.html index 082aab8..47de881 100644 --- a/demos/MiscDemos/index_plugin13.html +++ b/demos/MiscDemos/index_plugin13.html @@ -7,7 +7,7 @@ <title>Misc Demos</title> </head> <BODY LINK="#0000ff" VLINK="#800080" BGCOLOR="#e6e6ff"> -<p>Here are the demos-II for <B> GL4Java >= 2.4.0.0: & Java2 Plug-In 1.3</B> +<p>Here are the demos-II for <B> GL4Java >= 2.5.2.0: & Java2 Plug-In 1.3</B> <hr> <br> <a href="../../Installer/java.policy">The Java2 (sdk, jre, plugin 1.3) policy file example to give GL4Java the necessary permissions (Click here) !</a> @@ -59,19 +59,19 @@ : GLUT Font Bitmap 2 (GLUT DEMO) <br> <br> -<br> <a href="tess_plugin13.html">Tessellator Demo 1</a> +<p> <a href="tess_plugin13.html">Tessellator Demo 1</a> : test/shows 2 tesselated geometries -<br> <a href="tesswind_plugin13.html">Tessellator Demo 2</a> +<p> <a href="tesswind_plugin13.html">Tessellator Demo 2</a> : test/shows tesselated geometries with different winding rules -<br> <a href="tessdemo_plugin13.html">Tessellator Demo 3</a> +<p> <a href="tessdemo_plugin13.html">Tessellator Demo 3</a> : test/shows self created tesselated geometries <br> <br> -<br> <a href="SharedGLTest2_plugin13.html">Shared GL-Context</a> +<p> <a href="SharedGLTest2_plugin13.html">Shared GL-Context</a> : test/shows the usage of a shared GLContext for Display-Lists <br> <br> -<br> <a href="select_plugin13.html">Selection Demo 1</a> +<p> <a href="select_plugin13.html">Selection Demo 1</a> : test/shows selection <br> <br> diff --git a/demos/MiscDemos/morph3d.java b/demos/MiscDemos/morph3d.java index 7c8a8fe..6669163 100755 --- a/demos/MiscDemos/morph3d.java +++ b/demos/MiscDemos/morph3d.java @@ -171,16 +171,29 @@ public class morph3d extends SimpleGLAnimApplet1 public void init() { - super.init(); - Dimension d = getSize(); - canvas = new morph3dCanvas(d.width, d.height); - add("Center", canvas); + super.init(); + Dimension d = getSize(); + canvas = new morph3dCanvas(d.width, d.height); + add("Center", canvas); } public static void main( String args[] ) { Frame mainFrame = new Frame("morph3d"); + mainFrame.addWindowListener( new WindowAdapter() + { + public void windowClosed(WindowEvent e) + { + System.exit(0); + } + public void windowClosing(WindowEvent e) + { + windowClosed(e); + } + } + ); + GLContext.gljNativeDebug = true; GLContext.gljClassDebug = true; diff --git a/demos/MiscDemos/nurbs.java b/demos/MiscDemos/nurbs.java index 52ecd99..fe9ab6c 100644 --- a/demos/MiscDemos/nurbs.java +++ b/demos/MiscDemos/nurbs.java @@ -102,7 +102,7 @@ public class nurbs extends SimpleGLAnimApplet1 };
- int theNurb;
+ long theNurb;
public gldemo(int w, int h)
{
diff --git a/demos/MiscDemos/pngTextureTestApplet.java b/demos/MiscDemos/pngTextureTestApplet.java index 99ea0bb..18c05d2 100755 --- a/demos/MiscDemos/pngTextureTestApplet.java +++ b/demos/MiscDemos/pngTextureTestApplet.java @@ -59,7 +59,7 @@ public class pngTextureTestApplet extends Applet Dimension ps = applet.getPreferredSize(); f.setBounds(-100,-100,99,99); f.setVisible(true); - f.setVisible(false); + //f.setVisible(false); Insets i = f.getInsets(); f.setBounds(0,0, ps.width+i.left+i.right, @@ -305,47 +305,6 @@ public class pngTextureTestApplet extends Applet glu.gluPerspective(60f,aspect,.01,100); } - void RotateObj(float degree, - float axisX, - float axisY, - float axisZ) - { - if( glj.gljMakeCurrent() == false ) - { - System.out.println("problem in use() method"); - return; - } - - gl.glMatrixMode (GL_MODELVIEW); - gl.glLoadIdentity (); - - // kamera setzen - gl.glRotatef(degree,axisX,axisY,axisZ); - gl.glMultMatrixf(mPosObjRot); - gl.glGetFloatv(GL_MODELVIEW_MATRIX,mPosObjRot); - - repaint(); - } - - void TranlateObj(float x,float y,float z) - { - if( glj.gljMakeCurrent() == false ) - { - System.out.println("problem in use() method"); - return; - } - - gl.glMatrixMode (GL_MODELVIEW); - gl.glLoadIdentity (); - - // kamera setzen - gl.glLoadMatrixf(mPosObjTrans); - gl.glTranslatef(x,y,z); - gl.glGetFloatv(GL_MODELVIEW_MATRIX,mPosObjTrans); - - repaint(); - } - // entfernt rotationen aus aktueller matrix double Billboard() { @@ -397,6 +356,12 @@ public class pngTextureTestApplet extends Applet Point dif=new Point(mousePoint.x-oldMousePoint.x, mousePoint.y-oldMousePoint.y); + if( glj.gljMakeCurrent() == false ) + { + System.out.println("problem in use() method"); + return; + } + if(e.isShiftDown()==true) TranlateObj((float)dif.x/6.0f,(float)dif.y/-6.0f,0f); else if(e.isAltDown()==true) @@ -409,12 +374,42 @@ public class pngTextureTestApplet extends Applet RotateObj(dif.x,0f,1f,0f); RotateObj(dif.y,1f,0f,0f); } + + glj.gljFree(); + repaint(); + } } public void mouseMoved(MouseEvent e) { } + void RotateObj(float degree, + float axisX, + float axisY, + float axisZ) + { + gl.glMatrixMode (GL_MODELVIEW); + gl.glLoadIdentity (); + + // kamera setzen + gl.glRotatef(degree,axisX,axisY,axisZ); + gl.glMultMatrixf(mPosObjRot); + gl.glGetFloatv(GL_MODELVIEW_MATRIX,mPosObjRot); + } + + void TranlateObj(float x,float y,float z) + { + gl.glMatrixMode (GL_MODELVIEW); + gl.glLoadIdentity (); + + // kamera setzen + gl.glLoadMatrixf(mPosObjTrans); + gl.glTranslatef(x,y,z); + gl.glGetFloatv(GL_MODELVIEW_MATRIX,mPosObjTrans); + + } + } } diff --git a/demos/MiscDemos/select.java b/demos/MiscDemos/select.java index a1020c3..3605e97 100644 --- a/demos/MiscDemos/select.java +++ b/demos/MiscDemos/select.java @@ -95,7 +95,7 @@ public class select extends Applet Dimension ps = applet.getPreferredSize(); f.setBounds(-100,-100,99,99); f.setVisible(true); - f.setVisible(false); + //f.setVisible(false); Insets i = f.getInsets(); f.setBounds(0,0, ps.width+i.left+i.right, diff --git a/demos/MiscDemos/spectex.java b/demos/MiscDemos/spectex.java index 55d4aae..fe0b323 100644 --- a/demos/MiscDemos/spectex.java +++ b/demos/MiscDemos/spectex.java @@ -59,7 +59,7 @@ public class spectex extends SimpleGLAnimApplet1 final float M_PI_2 = 1.57079632f;
int view = 0; /* 0 = front, 1 = top, 2 = bottom */
- int Quadric;
+ long Quadric;
int Sphere;
float LightPos[/*4*/] = {10.0f, 10.0f, 10.0f, 1.0f};
float Delta = 1.0f;
diff --git a/demos/MiscDemos/stencil.java b/demos/MiscDemos/stencil.java index a2d163f..b5f7fe7 100644 --- a/demos/MiscDemos/stencil.java +++ b/demos/MiscDemos/stencil.java @@ -261,7 +261,7 @@ public class stencil extends Applet gl.glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
gl.glCallList(BLUEMAT);
- int qobj = glu.gluNewQuadric();
+ long qobj = glu.gluNewQuadric();
glu.gluQuadricOrientation(qobj,GLU_OUTSIDE);
glu.gluQuadricNormals(qobj,GLU_SMOOTH);
glu.gluQuadricTexture(qobj,false);
diff --git a/demos/MiscDemos/tess.java b/demos/MiscDemos/tess.java index 2cf3a7a..72943aa 100644 --- a/demos/MiscDemos/tess.java +++ b/demos/MiscDemos/tess.java @@ -132,7 +132,7 @@ public class tess extends Applet { int i; glut = new GLUTFuncLightImplWithFonts(gl, glu); - int tobj; + long tobj; gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/demos/MiscDemos/tessdemo.java b/demos/MiscDemos/tessdemo.java index 899b27a..91d9754 100755 --- a/demos/MiscDemos/tessdemo.java +++ b/demos/MiscDemos/tessdemo.java @@ -14,8 +14,15 @@ /* * $Log$ - * Revision 1.1 2000/11/18 06:53:19 sven - * Initial revision + * Revision 1.2 2001/02/13 05:32:09 sven + * JAWT Support JDK >=1.3 + * + * Revision 1.1.1.2 2000/11/18 10:41:27 sven + * still working for the initial check in + * + * Revision 1.1.1.1 2000/11/18 06:53:19 sven + * Initial import into CVS. + * Version 2.5.0.0 beta 1 * * Revision 1.3f.2.1f 1999/11/16 11:09:09 gareth * Added combine callback. Converted vertices from ints to floats. @@ -316,7 +323,7 @@ public class tessdemo extends Applet { public void tesse( ) { - int tobj; + long tobj; double data[] = new double[3]; int i, j, point_cnt; diff --git a/demos/MiscDemos/tesswind.java b/demos/MiscDemos/tesswind.java index b25ca42..d37e79c 100755 --- a/demos/MiscDemos/tesswind.java +++ b/demos/MiscDemos/tesswind.java @@ -175,7 +175,7 @@ public class tesswind extends Applet { double currentWinding = GLU_TESS_WINDING_ODD; int currentShape = 0; - int tobj; + long tobj; int list; public void init() { |