summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--java-dbg.sh4
-rw-r--r--make/make.jogl.all.win32.bat13
-rwxr-xr-xsrc/demos/GLInfo.java3
-rwxr-xr-xsrc/demos/es1/cubefbo/Main.java2
-rw-r--r--src/demos/gears/Gears.java4
5 files changed, 23 insertions, 3 deletions
diff --git a/java-dbg.sh b/java-dbg.sh
index d7d7162..455b8b6 100644
--- a/java-dbg.sh
+++ b/java-dbg.sh
@@ -11,8 +11,8 @@ fi
if [ $CPOK -eq 0 ] ; then
echo No JOGL in CLASSPATH
else
- java -Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log
- # java -Dnewt.debug=all -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log
+ # java -Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log
+ java -Dnewt.debug=all -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log
# java -Djogl.debug=all $* 2>&1 | tee java-dbg.log
fi
diff --git a/make/make.jogl.all.win32.bat b/make/make.jogl.all.win32.bat
new file mode 100644
index 0000000..5503d61
--- /dev/null
+++ b/make/make.jogl.all.win32.bat
@@ -0,0 +1,13 @@
+set THISDIR="C:\JOGL"
+
+set J2RE_HOME=c:\jre1.6.0_19
+set JAVA_HOME=c:\jdk1.6.0_19
+set ANT_PATH=C:\apache-ant-1.8.0
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
+
+set LIB_GEN=%THISDIR%\lib
+set CLASSPATH=.;%THISDIR%\build-win32\classes
+REM -Djogl.cg=1
+
+ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java
index 7050ab8..b8575e2 100755
--- a/src/demos/GLInfo.java
+++ b/src/demos/GLInfo.java
@@ -93,6 +93,9 @@ public class GLInfo extends Thread implements GLEventListener {
GL gl = drawable.getGL();
GLProfile glp = gl.getGLProfile();
+ System.err.println(glp+" GL Profile Static: "+GLProfile.glAvailabilityToString());
+ System.err.println(glp+" GL Profile Static - MaxFixedFunc: "+GLProfile.getMaxFixedFunc());
+ System.err.println(glp+" GL Profile Static - MaxProgrammable: "+GLProfile.getMaxProgrammable());
System.err.println(glp+" GLCapabilities POST: "+drawable.getChosenGLCapabilities());
System.err.println(glp+" GL Profile: "+drawable.getGLProfile());
System.err.println(glp+" GL:" + gl);
diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java
index 4b23513..6a1281d 100755
--- a/src/demos/es1/cubefbo/Main.java
+++ b/src/demos/es1/cubefbo/Main.java
@@ -74,7 +74,7 @@ public class Main implements WindowListener, MouseListener {
window.enablePerfLog(true);
window.setSize(width, height);
- window.setFullscreen(true);
+ window.setFullscreen(false);
window.setVisible(true);
GL gl = window.getGL();
diff --git a/src/demos/gears/Gears.java b/src/demos/gears/Gears.java
index 227ce87..853444d 100644
--- a/src/demos/gears/Gears.java
+++ b/src/demos/gears/Gears.java
@@ -7,6 +7,8 @@ import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import javax.media.opengl.GLProfile;
+import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GL;
import javax.media.opengl.GL2ES1;
import javax.media.opengl.GL2;
@@ -28,6 +30,8 @@ public class Gears implements GLEventListener, MouseListener, MouseMotionListene
public static void main(String[] args) {
Frame frame = new Frame("Gear Demo");
GLCanvas canvas = new GLCanvas();
+ // GLCapabilities caps = new GLCapabilities(GLProfile.getDefault());
+ // GLCanvas canvas = new GLCanvas(caps);
final Gears gears = new Gears();
canvas.addGLEventListener(gears);