aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xetc/profile.jogl32
-rw-r--r--make/build-jogl.xml22
-rw-r--r--make/lstjars.sh24
-rw-r--r--make/make.jogl.doc.all.x86_64.sh2
-rwxr-xr-xsrc/jogl/classes/com/sun/opengl/util/Animator.java2
-rw-r--r--src/jogl/classes/com/sun/opengl/util/awt/AWTAnimatorImpl.java (renamed from src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java)0
6 files changed, 44 insertions, 38 deletions
diff --git a/etc/profile.jogl b/etc/profile.jogl
index 969ada977..0b2007acb 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -4,7 +4,7 @@ function concat_jogl_list()
{
ITEMDIR=$1
shift
- for j in $ITEMDIR-nwi $ITEMDIR-jogl $ITEMDIR-newt ; do
+ for j in $ITEMDIR/nativewindow $ITEMDIR/jogl $ITEMDIR/newt ; do
for i in $* ; do
if [ -e $j/$i ] ; then
if [ -z "$JOGL_LIST" ] ; then
@@ -21,32 +21,32 @@ function concat_jogl_list()
uname -a | grep -i LINUX && OSS=x11
uname -a | grep -i Darwin && OSS=osx
-JOGL_AWT="jogl.awt.jar jogl.util.awt.jar newt.awt.jar nwi.awt.jar"
+JOGL_AWT="jogl.awt.jar jogl.util.awt.jar newt.awt.jar nativewindow.awt.jar"
-JOGL_CORE="nwi.core.jar jogl.core.jar newt.core.jar newt.ogl.jar"
+JOGL_CORE="nativewindow.core.jar jogl.core.jar newt.core.jar newt.ogl.jar jogl.util.jar"
-JOGL_JAR_ALL="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.util.jar jogl.util.gl2.jar $JOGL_AWT"
+JOGL_JAR_ALL="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.util.gl2.jar $JOGL_AWT"
JOGL_LIB_ALL="libjogl_gl2.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so"
JOGL_JAR_ES1_MIN="$JOGL_CORE jogl.gles1.jar jogl.egl.jar"
-JOGL_JAR_ES1_MAX="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.egl.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.util.jar $JOGL_AWT"
+JOGL_JAR_ES1_MAX="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.egl.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT"
JOGL_LIB_ES1_MIN="libjogl_es1.so libnewt.so"
-JOGL_LIB_ES1_MAX="libjogl_es1.so libnewt.so libjogl_awt.so libnwi_x11.so libnwi_awt.so"
+JOGL_LIB_ES1_MAX="libjogl_es1.so libnewt.so libjogl_awt.so libnativewindow_x11.so libnativewindow_awt.so"
-JOGL_JAR_ES2_MIN="$JOGL_CORE jogl.gles2.jar jogl.fixed.jar jogl.egl.jar"
-JOGL_JAR_ES2_MAX="$JOGL_CORE jogl.gles2.jar jogl.fixed.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.glu.tess.jar jogl.util.jar $JOGL_AWT"
+JOGL_JAR_ES2_MIN="$JOGL_CORE jogl.gles2.jar jogl.egl.jar"
+JOGL_JAR_ES2_MAX="$JOGL_CORE jogl.gles2.jar jogl.egl.jar jogl.util.fixedfuncemu.jar jogl.glu.tess.jar $JOGL_AWT"
JOGL_LIB_ES2_MIN="libjogl_es2.so libnewt.so"
-JOGL_LIB_ES2_MAX="libjogl_es2.so libnewt.so libjogl_awt.so libnwi_x11.so libnwi_awt.so"
+JOGL_LIB_ES2_MAX="libjogl_es2.so libnewt.so libjogl_awt.so libnativewindow_x11.so libnativewindow_awt.so"
JOGL_JAR_GL2ES12_MIN="$JOGL_CORE jogl.gl2es12.$OSS.jar"
-JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.gl2es12.$OSS.jar jogl.gl2es12.dbg.jar jogl.util.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT"
-JOGL_LIB_GL2ES12_MIN="libjogl_gl2es12.so libnewt.so libnwi_x11.so libnwi_awt.so"
-JOGL_LIB_GL2ES12_MAX="libjogl_gl2es12.so libnewt.so libnwi_x11.so libnwi_awt.so"
+JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.gl2es12.$OSS.jar jogl.util.fixedfuncemu.jar jogl.gl2es12.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT"
+JOGL_LIB_GL2ES12_MIN="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_LIB_GL2ES12_MAX="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.gl2.$OSS.jar"
-JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.gl2.$OSS.jar jogl.gl2.dbg.jar jogl.util.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT"
-JOGL_LIB_GL2_MIN="libjogl_gl2.so libnewt.so libnwi_x11.so libnwi_awt.so"
-JOGL_LIB_GL2_MAX="libjogl_gl2.so libnewt.so libnwi_x11.so libnwi_awt.so"
+JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.gl2.$OSS.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT"
+JOGL_LIB_GL2_MIN="libjogl_gl2.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_LIB_GL2_MAX="libjogl_gl2.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
export JOGL_JAR_ALL JOGL_JAR_ES1_MIN JOGL_JAR_ES1_MAX JOGL_JAR_ES2_MIN JOGL_JAR_ES2_MAX JOGL_JAR_GL2ES12_MIN JOGL_JAR_GL2ES12_MAX JOGL_JAR_GL2_MIN JOGL_JAR_GL2_MAX
export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GL2ES12_MIN JOGL_LIB_GL2ES12_MAX JOGL_LIB_GL2_MIN JOGL_LIB_GL2_MAX
@@ -58,7 +58,7 @@ if [ ! -z "$1" ] ; then
fi
export JOGL_JAR_DIR
-JOGL_LIB_DIR=$JOGL_JAR_DIR-nwi/obj:$JOGL_JAR_DIR-jogl/obj:$JOGL_JAR_DIR-newt/obj
+JOGL_LIB_DIR=$JOGL_JAR_DIR/nativewindow/obj:$JOGL_JAR_DIR/jogl/obj:$JOGL_JAR_DIR/newt/obj
export JOGL_LIB_DIR
if [ ! -z "$1" ] ; then
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 70b9cda82..547c8b184 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -202,7 +202,7 @@
value="javax/media/opengl/awt/**, com/sun/opengl/impl/**/awt/**"/>
<property name="java.part.util"
- value="com/sun/opengl/util/*, com/sun/opengl/util/glsl/**, com/sun/opengl/util/texture/**, com/sun/opengl/util/packrect/**"/>
+ value="com/sun/opengl/util/*, com/sun/opengl/util/texture/**, com/sun/opengl/util/packrect/**"/>
<property name="java.part.util.awt"
value="com/sun/opengl/util/**/awt/**"/>
@@ -210,8 +210,11 @@
<property name="java.part.util.gl2"
value="com/sun/opengl/util/**/gl2/**"/>
- <property name="java.part.util.fixedfunc.shaders"
- value="com/sun/opengl/util/glsl/fixedfunc/impl/shaders/*, com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/>
+ <property name="java.part.util.glsl"
+ value="com/sun/opengl/util/glsl/*, com/sun/opengl/util/glsl/sdk/*"/>
+
+ <property name="java.part.util.fixedfuncemu"
+ value="com/sun/opengl/util/glsl/fixedfunc/**"/>
<!-- condition excludes -->
@@ -459,6 +462,7 @@
<property name="jogl.util.jar" value="${build}/jogl.util.jar" />
<property name="jogl.util.gl2.jar" value="${build}/jogl.util.gl2.jar" />
<property name="jogl.util.awt.jar" value="${build}/jogl.util.awt.jar" />
+ <property name="jogl.util.fixedfuncemu.jar" value="${build}/jogl.util.fixedfuncemu.jar" />
<property name="jogl.sdk.jar" value="${build}/jogl.sdk.jar" />
<property name="jogl.all.jar" value="${build}/jogl.all.jar" />
@@ -1596,7 +1600,7 @@
<jar manifest="tempversion" destfile="${jogl.core.jar}">
<fileset dir="${classes}"
includes="javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**"
- excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.sdk}, ${java.part.openmax}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}"/>
+ excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.sdk}, ${java.part.openmax}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}"/>
</jar>
<jar manifest="tempversion" destfile="${jogl.gles1.jar}">
<fileset dir="${classes}"
@@ -1681,10 +1685,8 @@
</jar>
<jar manifest="tempversion" destfile="${jogl.util.jar}">
<fileset dir="${classes}"
- includes="${java.part.util}"
- excludes="com/sun/opengl/**/awt/**, com/sun/opengl/**/gl2/**"/>
- <fileset dir="${src.java}"
- includes="${java.part.util.fixedfunc.shaders}"/>
+ includes="${java.part.util}, ${java.part.util.glsl}"
+ excludes="${java.part.util.awt}, ${java.part.util.gl2}, ${java.part.util.fixedfuncemu}"/>
</jar>
<jar manifest="tempversion" destfile="${jogl.util.gl2.jar}">
<fileset dir="${classes}"
@@ -1695,6 +1697,10 @@
<fileset dir="${classes}"
includes="${java.part.util.awt}"/>
</jar>
+ <jar manifest="tempversion" destfile="${jogl.util.fixedfuncemu.jar}">
+ <fileset dir="${classes}"
+ includes="${java.part.util.fixedfuncemu}"/>
+ </jar>
<jar manifest="tempversion" destfile="${jogl.all.jar}">
<fileset dir="${classes}">
<include name="javax/media/opengl/**" />
diff --git a/make/lstjars.sh b/make/lstjars.sh
index 5e626e19d..8fb26291d 100644
--- a/make/lstjars.sh
+++ b/make/lstjars.sh
@@ -16,12 +16,12 @@ function report() {
rm -rf $STATDIR
mkdir -p $STATDIR
-cp -a $BUILDDIR-nwi/obj/*.so $STATDIR
-cp -a $BUILDDIR-jogl/obj/*.so $STATDIR
-cp -a $BUILDDIR-newt/obj/*.so $STATDIR
-cp -a $BUILDDIR-nwi/*.jar $STATDIR
-cp -a $BUILDDIR-jogl/*.jar $STATDIR
-cp -a $BUILDDIR-newt/*.jar $STATDIR
+cp -a $BUILDDIR/nativewindow/obj/*.so $STATDIR
+cp -a $BUILDDIR/jogl/obj/*.so $STATDIR
+cp -a $BUILDDIR/newt/obj/*.so $STATDIR
+cp -a $BUILDDIR/nativewindow/*.jar $STATDIR
+cp -a $BUILDDIR/jogl/*.jar $STATDIR
+cp -a $BUILDDIR/newt/*.jar $STATDIR
cd $STATDIR
@@ -69,27 +69,27 @@ diff -Nur allparts.lst allall.lst
OSS=x11
echo JOGL ES1 NEWT CORE
-report nwi.core.pack.gz jogl.core.pack.gz jogl.egl.pack.gz jogl.gles1.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es1.so.gz libnewt.so.gz
+report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.egl.pack.gz jogl.gles1.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es1.so.gz libnewt.so.gz
echo
echo JOGL ES2 NEWT CORE
-report nwi.core.pack.gz jogl.core.pack.gz jogl.egl.pack.gz jogl.gles2.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es2.so.gz libnewt.so.gz
+report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.egl.pack.gz jogl.gles2.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es2.so.gz libnewt.so.gz
echo
echo JOGL ES2 NEWT CORE FIXED
-report nwi.core.pack.gz jogl.core.pack.gz jogl.egl.pack.gz jogl.gles2.pack.gz jogl.fixed.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es2.so.gz libnewt.so.gz
+report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.egl.pack.gz jogl.gles2.pack.gz jogl.util.fixedfuncemu.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es2.so.gz libnewt.so.gz
echo
echo JOGL GL2ES12 NEWT
-report nwi.core.pack.gz jogl.core.pack.gz jogl.gl2es12.$OSS.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_gl2es12.so.gz libnewt.so.gz
+report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.gl2es12.$OSS.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_gl2es12.so.gz libnewt.so.gz
echo
echo JOGL GL2 NEWT
-report nwi.core.pack.gz jogl.core.pack.gz jogl.gl2.$OSS.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_gl2.so.gz libnewt.so.gz
+report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.gl2.$OSS.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_gl2.so.gz libnewt.so.gz
echo
echo JOGL GL2 AWT
-report nwi.core.pack.gz nwi.$OSS.pack.gz nwi.awt.pack.gz jogl.core.pack.gz jogl.gl2.$OSS.pack.gz jogl.awt.pack.gz libjogl_gl2.so.gz libjogl_awt.so.gz libnwi_$OSS.so.gz libnwi_awt.so.gz
+report nativewindow.core.pack.gz nativewindow.awt.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.gl2.$OSS.pack.gz jogl.awt.pack.gz libjogl_gl2.so.gz libjogl_awt.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
echo
echo JOGL GLU
diff --git a/make/make.jogl.doc.all.x86_64.sh b/make/make.jogl.doc.all.x86_64.sh
index 4ac564983..bab6d4d64 100644
--- a/make/make.jogl.doc.all.x86_64.sh
+++ b/make/make.jogl.doc.all.x86_64.sh
@@ -4,4 +4,4 @@
ant -v \
-Drootrel.build=build-x86_64 \
- javadoc.spec javadoc javadoc.dev.all $* 2>&1 | tee make.jogl.doc.all.x86_64.log
+ javadoc.spec javadoc javadoc.dev $* 2>&1 | tee make.jogl.doc.all.x86_64.log
diff --git a/src/jogl/classes/com/sun/opengl/util/Animator.java b/src/jogl/classes/com/sun/opengl/util/Animator.java
index 05a5364ab..84637433e 100755
--- a/src/jogl/classes/com/sun/opengl/util/Animator.java
+++ b/src/jogl/classes/com/sun/opengl/util/Animator.java
@@ -66,7 +66,7 @@ public class Animator {
public Animator() {
try {
// Try to use the AWT-capable Animator implementation by default
- impl = (AnimatorImpl) Class.forName("com.sun.opengl.util.AWTAnimatorImpl").newInstance();
+ impl = (AnimatorImpl) Class.forName("com.sun.opengl.util.awt.AWTAnimatorImpl").newInstance();
} catch (Exception e) {
impl = new AnimatorImpl();
}
diff --git a/src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java b/src/jogl/classes/com/sun/opengl/util/awt/AWTAnimatorImpl.java
index 9809e44d2..9809e44d2 100644
--- a/src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java
+++ b/src/jogl/classes/com/sun/opengl/util/awt/AWTAnimatorImpl.java
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 20:37:21 +0000