Skip to content

Commit

Permalink
Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.* (Par…
Browse files Browse the repository at this point in the history
…t 1)

sed -i 's/javax\.media\.opengl/com\.jogamp\.opengl/g' `grep -Rl "javax\.media\.opengl" src`
sed -i 's/javax\.media\.nativewindow/com\.jogamp\.nativewindow/g' `grep -Rl "javax\.media\.nativewindow" src`
sed -i 's/javax\/media\//com\/jogamp\//g' `grep -Rl "javax/media/" src`
sed -i 's/javax\/media\//com\/jogamp\//g' `grep -Rl "javax/media/" doc`

Manually edited all occurences within make/**
  • Loading branch information
sgothel committed Feb 2, 2015
1 parent 2174059 commit 1ec8244
Show file tree
Hide file tree
Showing 871 changed files with 3,950 additions and 3,950 deletions.
2 changes: 1 addition & 1 deletion doc/Implementation/AWTPrinting.txt
Expand Up @@ -13,7 +13,7 @@ Print code:
AWTPrintLifecycle:
<http://jogamp.org/git/?p=jogl.git;a=blob;f=src/nativewindow/classes/com/jogamp/nativewindow/awt/AWTPrintLifecycle.java;hb=HEAD>
GLCanvas:
<http://jogamp.org/git/?p=jogl.git;a=blob;f=src/jogl/classes/javax/media/opengl/awt/GLCanvas.java;hb=HEAD#l731>
<http://jogamp.org/git/?p=jogl.git;a=blob;f=src/jogl/classes/com/jogamp/opengl/awt/GLCanvas.java;hb=HEAD#l731>
...
AWTTilePainter (common code):
<http://jogamp.org/git/?p=jogl.git;a=blob;f=src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java;hb=HEAD>
Expand Down
6 changes: 3 additions & 3 deletions doc/NEWT-Overview.html
Expand Up @@ -36,7 +36,7 @@ <h4>NEWT Usage</h4>
<a href="http://jogamp.org/git/?p=jogl.git;a=blob;f=src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java;hb=HEAD">GearsES2.java</a>
[<a href="http://jogamp.org/git/?p=jogl.git;a=blob;f=src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java;h=d92d98894acc4cfe42e77ec316858d16d202b5b8;hb=HEAD">v2.0-rc3</a>],
which implements a
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GLEventListener.html">GLEventEventListener</a>.</p>
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GLEventListener.html">GLEventEventListener</a>.</p>

<p>
The simple application
Expand All @@ -45,7 +45,7 @@ <h4>NEWT Usage</h4>
creates a NEWT
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/opengl/GLWindow.html">GLWindow</a>,
which implements a
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GLAutoDrawable.html">GLAutoDrawable</a>
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GLAutoDrawable.html">GLAutoDrawable</a>
and hence is able to add the demo code.
NEWT&#8217;s GLWindow also implements the NEWT <a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/Window.html">Window</a>,
which gives you full control of the native windowing, as shown in the demo.</p>
Expand Down Expand Up @@ -102,7 +102,7 @@ <h4>NEWT&#8217;s AWT integration and NEWT Applet&#8217;s</h4>
Last but not least, the above mechanism can be used to show NEWT Window&#8217;s in an AWT Applet.<br/>
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">JOGLNewtApplet1Run</a>
is an Applet launcher for any
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GLEventListener.html">GLEventEventListener</a>
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GLEventListener.html">GLEventEventListener</a>
exposing a default constructor.
See it <a href="/deployment/jogamp-next/jogl-test-applets.html"><i>alive</i> here</a>.
</p>
Expand Down
36 changes: 18 additions & 18 deletions doc/Overview-OpenGL-Evolution-And-JOGL.html
Expand Up @@ -135,27 +135,27 @@ <h3>JOGL &amp; The OpenGL Evolution</h3>
This is essential since creating an OpenGL context for each class of OpenGL profiles
requires it's <a href="/deployment/jogamp-next/javadoc/jogl/javadoc/overview-summary.html#GLAPIInclusionCriteria">specific initialisation</a>.<br/>
Some OpenGL profiles like
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GLES2.html">GLES2</a>
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GLES2.html">GLES2</a>
for embedded may not be available on desktop machines.</p>

Fixed Function (FFP) Only Profiles:
<ul>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GLES1.html">GLES1</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GLES1.html">GLES1</a></li>
</ul><br/>

Programmable Shader (PSP) Only Profiles:
<ul>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GLES2.html">GLES2</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GLES3.html">GLES3</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL3.html">GL3</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL4.html">GL4</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GLES2.html">GLES2</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GLES3.html">GLES3</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL3.html">GL3</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL4.html">GL4</a></li>
</ul><br/>

FFP &amp; PSP Profiles:
<ul>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL2.html">GL2</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL3bc.html">GL3bc</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL4bc.html">GL4bc</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL2.html">GL2</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL3bc.html">GL3bc</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL4bc.html">GL4bc</a></li>
</ul><br/>

<p>
Expand All @@ -164,25 +164,25 @@ <h3>JOGL &amp; The OpenGL Evolution</h3>

Common OpenGL Profile Subsets:
<ul>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL.html">GL</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL.html">GL</a></li>
<li>Fixed Function (FFP) Only:
<ul>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL2ES1.html">GL2ES1</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL2GL3.html">GL2GL3</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL2ES1.html">GL2ES1</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL2GL3.html">GL2GL3</a></li>
</ul></li>
<li>Programmable Shader (PSP) Only:
<ul>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL2ES2.html">GL2ES2</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL3ES3.html">GL3ES3</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL4ES3.html">GL4ES3</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL2ES2.html">GL2ES2</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL3ES3.html">GL3ES3</a></li>
<li><a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL4ES3.html">GL4ES3</a></li>
</ul></li>
</ul><br/>

<br/>
For example using the common interface
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL2ES2.html">GL2ES2</a>
of <a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GL2.html">GL2</a>
and <a href="/deployment/jogamp-next/javadoc/jogl/javadoc/javax/media/opengl/GLES2.html">GLES2</a>,
<a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL2ES2.html">GL2ES2</a>
of <a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GL2.html">GL2</a>
and <a href="/deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/opengl/GLES2.html">GLES2</a>,
ensures the code complies with the GL2 and GLES2 profile and an implementation may use both:<br/>
<pre>
void renderSomethingForGL2(GL2 gl, int program) {
Expand Down
6 changes: 3 additions & 3 deletions doc/deployment/lstjars/lstjars.linux_amd64-20100420.log
Expand Up @@ -128,9 +128,9 @@ all vs allparts delta
-com/jogamp/test/junit/jogl/util/texture/gl2/TextureGL2ListenerDraw1.class
-com/jogamp/test/junit/newt/TestWindows01NEWT.class
-com/jogamp/test/junit/util/MiscUtils.class
javax/media/nativewindow/AbstractGraphicsConfiguration.class
javax/media/nativewindow/AbstractGraphicsDevice.class
javax/media/nativewindow/AbstractGraphicsScreen.class
com/jogamp/nativewindow/AbstractGraphicsConfiguration.class
com/jogamp/nativewindow/AbstractGraphicsDevice.class
com/jogamp/nativewindow/AbstractGraphicsScreen.class
JOGL Deployment Payload for jar

JOGL ES1 NEWT CORE
Expand Down
2 changes: 1 addition & 1 deletion etc/test.bat
Expand Up @@ -6,7 +6,7 @@ echo CP_ALL %CP_ALL%

set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"

REM java -classpath %CP_ALL% %X_ARGS% javax.media.opengl.awt.GLCanvas > java-win64.log 2>&1
REM java -classpath %CP_ALL% %X_ARGS% com.jogamp.opengl.awt.GLCanvas > java-win64.log 2>&1

REM java -classpath %CP_ALL% %X_ARGS% com.jogamp.common.GlueGenVersion > test.log 2>&1
REM java -classpath %CP_ALL% %X_ARGS% com.jogamp.nativewindow.NativeWindowVersion >> test.log 2>&1
Expand Down
2 changes: 1 addition & 1 deletion etc/test.sh
Expand Up @@ -39,6 +39,6 @@ X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false"
#java $X_ARGS $ARGS_AWT $D_ARGS com.jogamp.nativewindow.NativeWindowVersion 2>&1 | tee -a $logfile
#java $X_ARGS $ARGS_AWT $D_ARGS com.jogamp.opengl.JoglVersion 2>&1 | tee -a $logfile
#java $X_ARGS $ARGS_AWT $D_ARGS com.jogamp.newt.NewtVersion 2>&1 | tee -a $logfile
#java $X_ARGS $ARGS_AWT $D_ARGS javax.media.opengl.awt.GLCanvas 2>&1 | tee -a $logfile
#java $X_ARGS $ARGS_AWT $D_ARGS com.jogamp.opengl.awt.GLCanvas 2>&1 | tee -a $logfile
java $X_ARGS $ARGS_NEWT $D_ARGS com.jogamp.newt.opengl.GLWindow 2>&1 | tee -a $logfile

2 changes: 1 addition & 1 deletion etc/test_dbg.sh
Expand Up @@ -39,6 +39,6 @@ X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false"
#java $X_ARGS $ARGS_AWT $D_ARGS com.jogamp.nativewindow.NativeWindowVersion 2>&1 | tee -a $logfile
#java $X_ARGS $ARGS_AWT $D_ARGS com.jogamp.opengl.JoglVersion 2>&1 | tee -a $logfile
#java $X_ARGS $ARGS_AWT $D_ARGS com.jogamp.newt.NewtVersion 2>&1 | tee -a $logfile
#java $X_ARGS $ARGS_AWT $D_ARGS javax.media.opengl.awt.GLCanvas 2>&1 | tee -a $logfile
#java $X_ARGS $ARGS_AWT $D_ARGS com.jogamp.opengl.awt.GLCanvas 2>&1 | tee -a $logfile
java $X_ARGS $ARGS_NEWT $D_ARGS com.jogamp.newt.opengl.GLWindow 2>&1 | tee -a $logfile

0 comments on commit 1ec8244

Please sign in to comment.