Fix applet html pages, add gears and gearsjoal NApplet.

author: Sven Gothel <[email protected]> 2013-06-21 10:10:53 +0200
committer: Sven Gothel <[email protected]> 2013-06-21 10:10:53 +0200
commit: 5e456d1d490cb34941671ba430366a8cc378091d (patch)
tree: 20995e8c90e6be85d137e28704b0cd452c3ac6e9
parent: e2960f0e707446e065b7e7b815c8acbf3b8790ca (diff)
8 files changed, 45 insertions, 24 deletions
diff --git a/jnlp-files/applet-gearsjoal-launcheronly.html b/jnlp-files/applet-gearsjoal-launcheronly.html
index 5126f2f..e225aed 100644
--- a/jnlp-files/applet-gearsjoal-launcheronly.html
+++ b/jnlp-files/applet-gearsjoal-launcheronly.html
@@ -33,7 +33,8 @@ rendering and OpenAL audio:
                                 ../jar/gluegen-rt.jar,
                                 ../jar/jogl-all.jar,
                                 ../jar/joal.jar,
-                                jar/jogl-demos.jar">
+                                jar/jogl-demos.jar,
+                                jar/jogl-demos-data.jar">
    <param name="codebase_lookup" value="false">
    <param name="subapplet.classname" value="demos.applets.GearsJOALApplet">
    <param name="subapplet.displayname" value="JOGL / JOAL Gears Applet">
@@ -52,7 +53,8 @@ rendering and OpenAL audio:
                    ../jar/gluegen-rt.jar,
                    ../jar/jogl-all.jar,
                    ../jar/joal.jar,
-                   jar/jogl-demos.jar"
+                   jar/jogl-demos.jar,
+                   jar/jogl-demos-data.jar"
           codebase_lookup="false"
           subapplet.classname="demos.applets.GearsJOALApplet"
           subapplet.displayname" value="JOGL / JOAL Gears Applet"
diff --git a/jnlp-files/applet-gearsjoal.html b/jnlp-files/applet-gearsjoal.html
index 6aeba46..ff0db7b 100644
--- a/jnlp-files/applet-gearsjoal.html
+++ b/jnlp-files/applet-gearsjoal.html
@@ -5,6 +5,7 @@
 </head>
 <body>
 
+JOGL JNLP Applet GearsJOAL
 <P>
 
 <object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
@@ -14,7 +15,8 @@
                                 ../jar/gluegen-rt.jar,
                                 ../jar/jogl-all.jar,
                                 ../jar/joal.jar,
-                                jar/jogl-demos.jar">
+                                jar/jogl-demos.jar,
+                                jar/jogl-demos-data.jar">
    <param name="codebase_lookup" value="false">
    <param name="subapplet.classname" value="demos.applets.GearsJOALApplet">
    <param name="subapplet.displayname" value="JOGL / JOAL Gears Applet">
@@ -34,7 +36,8 @@
                    ../jar/gluegen-rt.jar,
                    ../jar/jogl-all.jar,
                    ../jar/joal.jar,
-                   jar/jogl-demos.jar"
+                   jar/jogl-demos.jar,
+                   jar/jogl-demos-data.jar"
           codebase_lookup="false"
           subapplet.classname="demos.applets.GearsJOALApplet"
           subapplet.displayname" value="JOGL / JOAL Gears Applet"
diff --git a/jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html b/jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html
index 89fffc3..7822382 100644
--- a/jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html
+++ b/jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-<title>JOGL NEWT JNLP Applet Runner - GL2ES1 Angeles</title>
+<title>JOGL NEWT Applet Runner - GL2ES1 Angeles</title>
 </head>
 <body>
 
@@ -43,7 +43,7 @@
 
 </P>
 <P>
-JOGL NEWT JNLP Applet Runner Special Keys:<br>
+JOGL NEWT Applet Runner Special Keys:<br>
 <ul>
     <li> d - toggle decoration </li>
     <li> f - toggle fullscreen </li>
diff --git a/jnlp-files/jogl-newt-applet-runner-cube.html b/jnlp-files/jogl-newt-applet-runner-cube.html
index 6c0c1d8..84076f3 100644
--- a/jnlp-files/jogl-newt-applet-runner-cube.html
+++ b/jnlp-files/jogl-newt-applet-runner-cube.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-<title>JOGL NEWT JNLP Applet Runner - ES1 Cube</title>
+<title>JOGL NEWT Applet Runner - ES1 Cube</title>
 </head>
 <body>
 
@@ -43,7 +43,7 @@
 
 </P>
 <P>
-JOGL NEWT JNLP Applet Runner Special Keys:<br>
+JOGL NEWT Applet Runner Special Keys:<br>
 <ul>
     <li> d - toggle decoration </li>
     <li> f - toggle fullscreen </li>
diff --git a/jnlp-files/jogl-newt-applet-runner-fbcubes.html b/jnlp-files/jogl-newt-applet-runner-fbcubes.html
index 554ad3b..0939bd1 100644
--- a/jnlp-files/jogl-newt-applet-runner-fbcubes.html
+++ b/jnlp-files/jogl-newt-applet-runner-fbcubes.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-<title>JOGL NEWT JNLP Applet Runner - ES1 FBO Cubes</title>
+<title>JOGL NEWT Applet Runner - ES1 FBO Cubes</title>
 </head>
 <body>
 
@@ -43,7 +43,7 @@
 
 </P>
 <P>
-JOGL NEWT JNLP Applet Runner Special Keys:<br>
+JOGL NEWT Applet Runner Special Keys:<br>
 <ul>
     <li> d - toggle decoration </li>
     <li> f - toggle fullscreen </li>
diff --git a/jnlp-files/jogl-newt-applet-runner-gears.html b/jnlp-files/jogl-newt-applet-runner-gears.html
index 05a6185..c3ccd5e 100644
--- a/jnlp-files/jogl-newt-applet-runner-gears.html
+++ b/jnlp-files/jogl-newt-applet-runner-gears.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-<title>JOGL NEWT JNLP Applet Runner - Gears</title>
+<title>JOGL NEWT Applet Runner - Gears</title>
 </head>
 <body  BGCOLOR="#ffffff">
 
@@ -43,7 +43,7 @@
 
 </P>
 <P>
-JOGL NEWT JNLP Applet Runner Special Keys:<br>
+JOGL NEWT Applet Runner Special Keys:<br>
 <ul>
     <li> d - toggle decoration </li>
     <li> f - toggle fullscreen </li>
diff --git a/jnlp-files/test.html b/jnlp-files/test.html
index 8b4661e..a988624 100644
--- a/jnlp-files/test.html
+++ b/jnlp-files/test.html
@@ -9,6 +9,7 @@
 
 <H3> Version </H3>
 <ul>
+    <li><a href="../jogl-applet-version-napplet.html">NApplet</a></li>
     <li><a href="../jogl-applet-version.html">Applet (JNLP/Launcher)</a></li>
     <li><a href="../jogl-applet-version-lancheronly.html">Applet (Launcher Only)</a></li>
     <li><a href="../jogl-application-version.jnlp">Application</a></li>
@@ -26,18 +27,25 @@
 </ul>
 -->
 
+<H3> JOGL NApplet's using native <a href="../../jogl/doc/NEWT-Overview.html">NEWT's</a> via <a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">Applet Runner</a></H3>
+<ul>
+    <li><a href="applet-gears-napplet.html">Gears</a></li>
+    <li><a href="applet-gearsjoal-napplet.html">Gears w/ JOAL</a></li>
+</ul>
+
 <H3> AWT JNLP Applet's using native NEWT (JOGL NEWT Applet Runner)</H3>
 <ul>
     <li><a href="jogl-newt-applet-runner-gears.html">AWT Applet JOGL/NEWT GL2 Gears</a></li>
-    <li><a href="jogl-newt-applet-runner-cube.html">AWT Applet JOGL/NEWT GL2ES1 Cube</a></li>
-    <li><a href="jogl-newt-applet-runner-fbcubes.html">AWT Applet JOGL/NEWT GL2ES1 FBO Cubes</a></li>
     <li><a href="jogl-newt-applet-runner-angelesgl2es1.html">AWT Applet JOGL/NEWT GL2ES1 Angeles</a></li>
+    <li><a href="jogl-newt-applet-runner-fbcubes.html">AWT Applet JOGL/NEWT GL2ES1 FBO Cubes</a></li>
+    <li><a href="jogl-newt-applet-runner-cube.html">AWT Applet JOGL/NEWT GL2ES1 Cube</a></li>
 </ul>
 
-<H3> JOAL test .. </H3>
+<H3> JOGL / JOAL test .. </H3>
 <ul>
-    <li><a href="applet-gearsjoal.html">JOGL/JOAL Applet test</a></li>
-    <li><a href="applet-gearsjoal-launcheronly.html">JOGL/JOAL Applet test (Launcher Only)</a></li>
+    <li><a href="applet-gearsjoal-napplet.html">NApplet</a></li>
+    <li><a href="applet-gearsjoal.html">JNLP Applet w/ Launcher Fallback</a></li>
+    <li><a href="applet-gearsjoal-launcheronly.html">Applet Launcher Only</a></li>
 </ul>
 
 <H3> JNLP Launcher .. </H3>
diff --git a/www/index.html b/www/index.html
index d205fd5..65dd32e 100644
--- a/www/index.html
+++ b/www/index.html
@@ -37,10 +37,10 @@
                     <ul>
                         <li><a href="../../wiki/index.php/Jogl_Tutorial">JOGL Tutorial</a></li>
                         <li><a href="../doc/readme.html">Demo Documentation</a></li>
-                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">JOGL JNLP Applet test incl. Applet-Launcher fallback</a></li>
-                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears-launcheronly.html">JOGL Applet-Launcher only test</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears-napplet.html">JOGL NApplet Test</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">JOGL JNLP Applet Test</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-napplet.html">JOGL / JOAL NApplet Test</a></li>
                         <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal.html">JOGL / JOAL JNLP Applet</a></li>
-                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-launcheronly.html">JOGL / JOAL Applet-Launcher only test</a></li>
                         <li><a href="http://ak.kiet.le.googlepages.com/theredbookinjava.html">OpenGL Red Book examples using JOGL</a></li>
                         <li><a href="http://pepijn.fab4.be/software/nehe-java-ports/">NeHe examples ported to JOGL</a></li>
                         <!--
@@ -99,17 +99,25 @@
                 <ul>
                     <li><a href="../../deployment/jogamp-current/jogl-test-applets.html">JOGL Applet Tests</a>
                         (<a href="../../deployment/jogamp-next/jogl-test-applets.html"><i>next version</i></a>)</li>
+                    <li>NApplet w/ AWT: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-napplet.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-napplet.html">Gears w/ JOAL</a></li>
+                    <li>NApplet w/ <a href="../../jogl/doc/NEWT-Overview.html">NEWT's</a> 
+                        <a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">Applet Runner</a>:
+                    <ul>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-gears.html">Gears</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-angelesgl2es1.html">Angeles</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-fbcubes.html">FBO Cubes</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-cube.html">Cube</a></li>
+                    </ul></li>
                     <li>JNLP Applet with Applet-Launcher fallback: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal.html">Gears w/ JOAL</a></li>
-                    <li>Applet-Launcher Only: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-launcheronly.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-launcheronly.html">Gears w/ JOAL</a></li>
-                    <li>Simple Applet w/ auto native JAR loading, using <i>Applets Runner</i> <a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">JOGLNewtApplet1Run</a> and <a href="../../jogl/doc/NEWT-Overview.html">NEWT</a>: <a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-cube.html">Cube</a>, <a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-fbcubes.html">FBO Cubes</a>, <a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-angelesgl2es1.html">Angeles</a>, <a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-gears.html">Gears</a></li>
+                    <!--li>Applet-Launcher Only: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-launcheronly.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-launcheronly.html">Gears w/ JOAL</a></li-->
                     <li><a href="../../deployment/jogamp-current/jogl-demos/test.html">Plain test page</a>
                         (<a href="../../deployment/jogamp-next/jogl-demos/test.html"><i>next version</i></a>)</li>
                 </ul>
 
                 <p>
-                Quick Version Info: Current [ <a href="../../deployment/jogamp-current/jogl-applet-version.html">Applet</a>, 
+                Quick Version Info: Current [ <a href="../../deployment/jogamp-current/jogl-applet-version-napplet.html">NApplet</a>, 
                                               <a href="../../deployment/jogamp-current/jogl-application-version.jnlp">Application</a> ], 
-                                    Next [ <a href="../../deployment/jogamp-next/jogl-applet-version.html">Applet</a>, 
+                                    Next [ <a href="../../deployment/jogamp-next/jogl-applet-version-napplet.html">NApplet</a>, 
                                            <a href="../../deployment/jogamp-next/jogl-application-version.jnlp">Application</a> ].
                 </p>
author	Sven Gothel <[email protected]>	2013-06-21 10:10:53 +0200
committer	Sven Gothel <[email protected]>	2013-06-21 10:10:53 +0200
commit	5e456d1d490cb34941671ba430366a8cc378091d (patch)
tree	20995e8c90e6be85d137e28704b0cd452c3ac6e9
parent	e2960f0e707446e065b7e7b815c8acbf3b8790ca (diff)