Extract dependency to AWT into own implementation

laeubi · Jun 23, 2021 · bb82d70 · bb82d70
1 parent 9cc9b2d
commit bb82d70
Show file tree

Hide file tree

Showing 132 changed files with 948 additions and 877 deletions.
diff --git a/jzy3d-jGL/src/main/java/examples/applets/bezcurve.java b/jzy3d-jGL/src/main/java/examples/applets/bezcurve.java
@@ -4,15 +4,16 @@
 import java.awt.Graphics;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
+
+import jgl.awt.GL;
 // must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
+import jgl.awt.GLAUX;
 
 public class bezcurve extends Applet implements ComponentListener {
   // must use GL to use jGL.....
   // and use GLAUX to use the aux functions.....
   // remember to give GL to initialize GLAUX
-  GL myGL = new GL();
+	GL myGL = new GL();
   GLAUX myAUX = new GLAUX(myGL);
 
   private static final float ctrlpoints[][] =

diff --git a/jzy3d-jGL/src/main/java/examples/applets/bezmesh.java b/jzy3d-jGL/src/main/java/examples/applets/bezmesh.java
@@ -4,9 +4,10 @@
 import java.awt.Graphics;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-// must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
+
+
+import jgl.awt.GLAUX;
+import jgl.awt.GL;
 
 public class bezmesh extends Applet implements ComponentListener {
   // must use GL to use jGL.....

diff --git a/jzy3d-jGL/src/main/java/examples/applets/bezsurf.java b/jzy3d-jGL/src/main/java/examples/applets/bezsurf.java
@@ -4,9 +4,10 @@
 import java.awt.Graphics;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-// must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
+
+
+import jgl.awt.GLAUX;
+import jgl.awt.GL;
 
 public class bezsurf extends Applet implements ComponentListener {
   // must use GL to use jGL.....

diff --git a/jzy3d-jGL/src/main/java/examples/applets/checker.java b/jzy3d-jGL/src/main/java/examples/applets/checker.java
@@ -4,10 +4,11 @@
 import java.awt.Graphics;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-// must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
-import jgl.GLU;
+
+
+import jgl.awt.GLAUX;
+import jgl.awt.GLU;
+import jgl.awt.GL;
 
 public class checker extends Applet implements ComponentListener {
   // must use GL to use jGL.....

diff --git a/jzy3d-jGL/src/main/java/examples/applets/clip.java b/jzy3d-jGL/src/main/java/examples/applets/clip.java
@@ -4,10 +4,11 @@
 import java.awt.Graphics;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-// must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
-import jgl.GLU;
+
+
+import jgl.awt.GLAUX;
+import jgl.awt.GLU;
+import jgl.awt.GL;
 
 public class clip extends Applet implements ComponentListener {
   // must use GL to use jGL.....

diff --git a/jzy3d-jGL/src/main/java/examples/applets/colormat.java b/jzy3d-jGL/src/main/java/examples/applets/colormat.java
@@ -7,9 +7,10 @@
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-// must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
+
+
+import jgl.awt.GLAUX;
+import jgl.awt.GL;
 
 public class colormat extends Applet implements ComponentListener, MouseListener {
   // must use GL to use jGL.....

diff --git a/jzy3d-jGL/src/main/java/examples/applets/cube.java b/jzy3d-jGL/src/main/java/examples/applets/cube.java
@@ -4,9 +4,10 @@
 import java.awt.Graphics;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-// must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
+
+
+import jgl.awt.GLAUX;
+import jgl.awt.GL;
 
 public class cube extends Applet implements ComponentListener {
   // must use GL to use jGL.....

diff --git a/jzy3d-jGL/src/main/java/examples/applets/doublebuffer.java b/jzy3d-jGL/src/main/java/examples/applets/doublebuffer.java
@@ -7,9 +7,10 @@
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-// must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
+
+
+import jgl.awt.GLAUX;
+import jgl.awt.GL;
 
 // "double" is a reserved word in Java
 public class doublebuffer extends Applet implements ComponentListener, MouseListener, Runnable {

diff --git a/jzy3d-jGL/src/main/java/examples/applets/drawf.java b/jzy3d-jGL/src/main/java/examples/applets/drawf.java
@@ -4,9 +4,10 @@
 import java.awt.Graphics;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-// must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
+
+
+import jgl.awt.GLAUX;
+import jgl.awt.GL;
 
 public class drawf extends Applet implements ComponentListener {
   // must use GL to use jGL.....

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/alpha.java b/jzy3d-jGL/src/main/java/examples/applets/glut/alpha.java
@@ -5,7 +5,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class alpha extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/alpha3D.java b/jzy3d-jGL/src/main/java/examples/applets/glut/alpha3D.java
@@ -6,7 +6,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class alpha3D extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/bezcurve.java b/jzy3d-jGL/src/main/java/examples/applets/glut/bezcurve.java
@@ -4,7 +4,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class bezcurve extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/bezmesh.java b/jzy3d-jGL/src/main/java/examples/applets/glut/bezmesh.java
@@ -5,7 +5,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class bezmesh extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/bezsurf.java b/jzy3d-jGL/src/main/java/examples/applets/glut/bezsurf.java
@@ -4,7 +4,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class bezsurf extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/checker.java b/jzy3d-jGL/src/main/java/examples/applets/glut/checker.java
@@ -5,7 +5,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class checker extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/clip.java b/jzy3d-jGL/src/main/java/examples/applets/glut/clip.java
@@ -4,7 +4,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class clip extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/colormat.java b/jzy3d-jGL/src/main/java/examples/applets/glut/colormat.java
@@ -5,8 +5,8 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
-import jgl.GLUT;
+import jgl.awt.GLApplet;
+import jgl.awt.GLUT;
 
 public class colormat extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/cube.java b/jzy3d-jGL/src/main/java/examples/applets/glut/cube.java
@@ -5,7 +5,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class cube extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/doublebuffer.java b/jzy3d-jGL/src/main/java/examples/applets/glut/doublebuffer.java
@@ -5,8 +5,8 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
-import jgl.GLUT;
+import jgl.awt.GLApplet;
+import jgl.awt.GLUT;
 
 // "double" is a reserved word in Java
 public class doublebuffer extends GLApplet {

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/drawf.java b/jzy3d-jGL/src/main/java/examples/applets/glut/drawf.java
@@ -4,9 +4,10 @@
 import java.awt.Graphics;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
+
+import jgl.awt.GL;
 // must import jgl.GL....
-import jgl.GL;
-import jgl.GLAUX;
+import jgl.awt.GLAUX;
 
 public class drawf extends Applet implements ComponentListener {
   // must use GL to use jGL.....

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/hello.java b/jzy3d-jGL/src/main/java/examples/applets/glut/hello.java
@@ -4,7 +4,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class hello extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/light.java b/jzy3d-jGL/src/main/java/examples/applets/glut/light.java
@@ -5,7 +5,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class light extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/lines.java b/jzy3d-jGL/src/main/java/examples/applets/glut/lines.java
@@ -4,7 +4,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class lines extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/list.java b/jzy3d-jGL/src/main/java/examples/applets/glut/list.java
@@ -5,7 +5,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class list extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/material.java b/jzy3d-jGL/src/main/java/examples/applets/glut/material.java
@@ -5,8 +5,9 @@
  */
 
 import java.util.Date;
+
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class material extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/mipmap.java b/jzy3d-jGL/src/main/java/examples/applets/glut/mipmap.java
@@ -6,7 +6,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class mipmap extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/model.java b/jzy3d-jGL/src/main/java/examples/applets/glut/model.java
@@ -4,7 +4,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class model extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/movelight.java b/jzy3d-jGL/src/main/java/examples/applets/glut/movelight.java
@@ -13,8 +13,8 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
-import jgl.GLUT;
+import jgl.awt.GLApplet;
+import jgl.awt.GLUT;
 
 public class movelight extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/pickdepth.java b/jzy3d-jGL/src/main/java/examples/applets/glut/pickdepth.java
@@ -1,8 +1,8 @@
 package examples.applets.glut;
 
 import jgl.GL;
-import jgl.GLApplet;
-import jgl.GLUT;
+import jgl.awt.GLApplet;
+import jgl.awt.GLUT;
 
 public class pickdepth extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/picksquare.java b/jzy3d-jGL/src/main/java/examples/applets/glut/picksquare.java
@@ -1,8 +1,8 @@
 package examples.applets.glut;
 
 import jgl.GL;
-import jgl.GLApplet;
-import jgl.GLUT;
+import jgl.awt.GLApplet;
+import jgl.awt.GLUT;
 
 public class picksquare extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/planet.java b/jzy3d-jGL/src/main/java/examples/applets/glut/planet.java
@@ -6,7 +6,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class planet extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/polys.java b/jzy3d-jGL/src/main/java/examples/applets/glut/polys.java
@@ -4,7 +4,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class polys extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/quadric.java b/jzy3d-jGL/src/main/java/examples/applets/glut/quadric.java
@@ -6,8 +6,8 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
-import jgl.GLU;
+import jgl.awt.GLApplet;
+import jgl.awt.GLU;
 import jgl.glu.GLUquadricObj;
 
 public class quadric extends GLApplet {

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/robot.java b/jzy3d-jGL/src/main/java/examples/applets/glut/robot.java
@@ -6,7 +6,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class robot extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/scene.java b/jzy3d-jGL/src/main/java/examples/applets/glut/scene.java
@@ -5,7 +5,7 @@
  */
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class scene extends GLApplet {
 

diff --git a/jzy3d-jGL/src/main/java/examples/applets/glut/select.java b/jzy3d-jGL/src/main/java/examples/applets/glut/select.java
@@ -1,7 +1,7 @@
 package examples.applets.glut;
 
 import jgl.GL;
-import jgl.GLApplet;
+import jgl.awt.GLApplet;
 
 public class select extends GLApplet {