diff options
| author | Sven Gothel <[email protected]> | 2011-02-09 02:50:09 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-02-09 02:50:09 +0100 |
| commit | 360b6716f68b44b28fd8c4f8e61ab86d5a56738b (patch) | |
| tree | 765cb43350428d7775f9624745714eac7f5fbc02 /src/jogl/classes/jogamp/opengl/glu | |
| parent | 4cda4b70dbcd21cf57e1e253ddba32b88bcaec18 (diff) | |
Move implementation private files from com.jogamp.<module>.impl. to jogamp.<module> (2/2) - edit files
- com.jogamp.opengl.impl -> jogamp.opengl
- com.jogamp.opengl.util.glsl.fixedfunc.impl -> jogamp.opengl.util.glsl.fixedfunc
- com.jogamp.nativewindow.impl -> jogamp.nativewindow
- com.jogamp.newt.impl -> jogamp.newt
This sorts implementation details from the top level, ie skipping the public 'com',
allowing a better seperation of public classes and implementation details
and also reduces strings.
This approach of public/private seperation is also used in the OpenJDK.
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/glu')
95 files changed, 252 insertions, 252 deletions
diff --git a/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java b/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java index d7e6a23c1..5eb73cd2e 100644 --- a/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java +++ b/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java @@ -113,7 +113,7 @@ * facility. */ -package com.jogamp.opengl.impl.glu; +package jogamp.opengl.glu; import javax.media.opengl.*; import javax.media.opengl.glu.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/Glue.java b/src/jogl/classes/jogamp/opengl/glu/Glue.java index 7c360c574..636d17f29 100644 --- a/src/jogl/classes/jogamp/opengl/glu/Glue.java +++ b/src/jogl/classes/jogamp/opengl/glu/Glue.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu; +package jogamp.opengl.glu; /** * diff --git a/src/jogl/classes/jogamp/opengl/glu/error/Error.java b/src/jogl/classes/jogamp/opengl/glu/error/Error.java index 7c7e6b0d8..2f49db9a4 100644 --- a/src/jogl/classes/jogamp/opengl/glu/error/Error.java +++ b/src/jogl/classes/jogamp/opengl/glu/error/Error.java @@ -42,11 +42,11 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.error; +package jogamp.opengl.glu.error; import javax.media.opengl.GL; import javax.media.opengl.glu.GLU; -import com.jogamp.opengl.impl.glu.Glue; +import jogamp.opengl.glu.Glue; /** * diff --git a/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2Backend.java b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2Backend.java index 42ddeea50..2cc5e06ae 100644 --- a/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2Backend.java +++ b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2Backend.java @@ -1,5 +1,5 @@ -package com.jogamp.opengl.impl.glu.gl2.nurbs; -import com.jogamp.opengl.impl.glu.nurbs.*; +package jogamp.opengl.glu.gl2.nurbs; +import jogamp.opengl.glu.nurbs.*; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2CurveEvaluator.java b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2CurveEvaluator.java index adb8c51d8..043edac89 100644 --- a/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2CurveEvaluator.java +++ b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2CurveEvaluator.java @@ -1,5 +1,5 @@ -package com.jogamp.opengl.impl.glu.gl2.nurbs; -import com.jogamp.opengl.impl.glu.nurbs.*; +package jogamp.opengl.glu.gl2.nurbs; +import jogamp.opengl.glu.nurbs.*; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2SurfaceEvaluator.java b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2SurfaceEvaluator.java index 393601ff7..bc63994cb 100644 --- a/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2SurfaceEvaluator.java +++ b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GL2SurfaceEvaluator.java @@ -1,5 +1,5 @@ -package com.jogamp.opengl.impl.glu.gl2.nurbs; -import com.jogamp.opengl.impl.glu.nurbs.*; +package jogamp.opengl.glu.gl2.nurbs; +import jogamp.opengl.glu.nurbs.*; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GLUgl2nurbsImpl.java b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GLUgl2nurbsImpl.java index 13b68138c..bd0eaf771 100644 --- a/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GLUgl2nurbsImpl.java +++ b/src/jogl/classes/jogamp/opengl/glu/gl2/nurbs/GLUgl2nurbsImpl.java @@ -1,5 +1,5 @@ -package com.jogamp.opengl.impl.glu.gl2.nurbs; -import com.jogamp.opengl.impl.glu.nurbs.*; +package jogamp.opengl.glu.gl2.nurbs; +import jogamp.opengl.glu.nurbs.*; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/BuildMipmap.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/BuildMipmap.java index 42f55f982..f5fe17a7b 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/BuildMipmap.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/BuildMipmap.java @@ -42,12 +42,12 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import javax.media.opengl.GL; import javax.media.opengl.GL2; import javax.media.opengl.glu.GLU; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import com.jogamp.common.nio.Buffers; import java.nio.*; import java.io.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract.java index be86585e7..a564269fb 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1010102.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1010102.java index 7e172b1ce..10ea1d729 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1010102.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1010102.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1555rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1555rev.java index 37895096e..1234da5f8 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1555rev.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract1555rev.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract2101010rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract2101010rev.java index 077f3037b..226254f99 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract2101010rev.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract2101010rev.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract233rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract233rev.java index fa35c6fbc..9fa2a3a54 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract233rev.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract233rev.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract332.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract332.java index 35936466c..92d141be5 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract332.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract332.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444.java index bac4f57aa..af99d154c 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444rev.java index b1bea75e1..e5bce60d8 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444rev.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract4444rev.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract5551.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract5551.java index a6247844f..5c383103e 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract5551.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract5551.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565.java index 624a4f3f2..f6193dd2d 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565rev.java index 4ab6d7e98..2e455adfa 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565rev.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract565rev.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888.java index 90d7e57c9..137fa3c21 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888rev.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888rev.java index 10970573b..2ac942c84 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888rev.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Extract8888rev.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractFloat.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractFloat.java index c42799470..52c2191b9 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractFloat.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractFloat.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractPrimitive.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractPrimitive.java index 8b986d6d0..926096649 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractPrimitive.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractPrimitive.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSByte.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSByte.java index 4f61015f4..2e1a9a0a6 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSByte.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSByte.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSInt.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSInt.java index 2d5ac5329..ca80747c4 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSInt.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSInt.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSShort.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSShort.java index 8b8d50cbf..979c3b449 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSShort.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractSShort.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUByte.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUByte.java index d33213f89..4d14212ab 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUByte.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUByte.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUInt.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUInt.java index 873668a43..c088ca301 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUInt.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUInt.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUShort.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUShort.java index 86bbb95f1..81db60f0f 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUShort.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ExtractUShort.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/HalveImage.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/HalveImage.java index 893d33c66..7549044ba 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/HalveImage.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/HalveImage.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import javax.media.opengl.GL; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Image.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Image.java index b2aaad2f7..b610ce86b 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Image.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Image.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import javax.media.opengl.GL; import javax.media.opengl.GL2; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java index 4e3f6c298..f38b62e37 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Mipmap.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import javax.media.opengl.GL; import javax.media.opengl.GL2; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/PixelStorageModes.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/PixelStorageModes.java index 43b5c5691..0b1af8323 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/PixelStorageModes.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/PixelStorageModes.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; /** * diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/ScaleInternal.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/ScaleInternal.java index 804845fe2..5f086ceff 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/ScaleInternal.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/ScaleInternal.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import javax.media.opengl.GL; import javax.media.opengl.GL2; diff --git a/src/jogl/classes/jogamp/opengl/glu/mipmap/Type_Widget.java b/src/jogl/classes/jogamp/opengl/glu/mipmap/Type_Widget.java index 0aeca8f1c..38113f601 100644 --- a/src/jogl/classes/jogamp/opengl/glu/mipmap/Type_Widget.java +++ b/src/jogl/classes/jogamp/opengl/glu/mipmap/Type_Widget.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.mipmap; +package jogamp.opengl.glu.mipmap; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Arc.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Arc.java index 9ee2494a1..422f8d4df 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Arc.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Arc.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcSdirSorter.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcSdirSorter.java index 3955e3176..0d04d4cd6 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcSdirSorter.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcSdirSorter.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTdirSorter.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTdirSorter.java index 098ba97b7..bee98b8c3 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTdirSorter.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTdirSorter.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTesselator.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTesselator.java index edfb8905f..2e4d3eb96 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTesselator.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/ArcTesselator.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Backend.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Backend.java index 39097720c..4959f8000 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Backend.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Backend.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/BezierArc.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/BezierArc.java index d9b390b67..9f7984bb7 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/BezierArc.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/BezierArc.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Bin.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Bin.java index 61316f348..df8b16ab5 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Bin.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Bin.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Breakpt.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Breakpt.java index b5b88ad96..f45571dac 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Breakpt.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Breakpt.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfArcs.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfArcs.java index 0646e1d9f..aaa8cb5f2 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfArcs.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfArcs.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /** * Class replacing C language pointer diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfBreakpts.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfBreakpts.java index e47fdf966..5112b07fc 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfBreakpts.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfBreakpts.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /** * Class replacing C language pointer diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfFloats.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfFloats.java index 60cef9919..39ef841ec 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfFloats.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfFloats.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /** * Class replacing C language pointer diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfQuiltspecs.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfQuiltspecs.java index ef16a8204..4b21f2d50 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfQuiltspecs.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CArrayOfQuiltspecs.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /** * Class replacing C language pointer diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Curve.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Curve.java index fb1a5acea..b0ff4e6e5 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Curve.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Curve.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/CurveEvaluator.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/CurveEvaluator.java index c27ffd4c4..92dadf648 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/CurveEvaluator.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/CurveEvaluator.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Curvelist.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Curvelist.java index fc3018833..80baf207b 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Curvelist.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Curvelist.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/DisplayList.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/DisplayList.java index 39a3a28f4..5c80ffd30 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/DisplayList.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/DisplayList.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Flist.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Flist.java index 00757ed7e..6983691d9 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Flist.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Flist.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotspec.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotspec.java index 9251aa231..4f97b1271 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotspec.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotspec.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotvector.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotvector.java index 658a1cbda..89389dea6 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotvector.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Knotvector.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Mapdesc.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Mapdesc.java index 568eddc51..8fab114ff 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Mapdesc.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Mapdesc.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Maplist.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Maplist.java index b23a1f665..af8024109 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Maplist.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Maplist.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/NurbsConsts.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/NurbsConsts.java index ee7f3b31b..55a176db8 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/NurbsConsts.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/NurbsConsts.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_curve.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_curve.java index 900f8e56f..d6b565433 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_curve.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_curve.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbscurve.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbscurve.java index 81110813f..05c89ebcf 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbscurve.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbscurve.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbssurface.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbssurface.java index b598f525d..867f43657 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbssurface.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_nurbssurface.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_pwlcurve.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_pwlcurve.java index e50f41d81..27ca3501d 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_pwlcurve.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_pwlcurve.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_surface.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_surface.java index 76ac79f0a..96d455bca 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_surface.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_surface.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_trim.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_trim.java index 17e5002df..4cbec01be 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/O_trim.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/O_trim.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Patch.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Patch.java index d3066cc84..51c43fca7 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Patch.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Patch.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Patchlist.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Patchlist.java index 8b439a02f..f60a0cc43 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Patchlist.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Patchlist.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Property.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Property.java index b486a0ead..25b4dc441 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Property.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Property.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Pspec.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Pspec.java index 1e60ed335..0289b274c 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Pspec.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Pspec.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/PwlArc.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/PwlArc.java index 0c9eca91e..bcbd20a16 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/PwlArc.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/PwlArc.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Quilt.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Quilt.java index 03e809d23..6d732a44f 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Quilt.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Quilt.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Quiltspec.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Quiltspec.java index 6c8e55e06..eaec1c9a2 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Quiltspec.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Quiltspec.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Renderhints.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Renderhints.java index d1a23fbab..4729e2421 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Renderhints.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Renderhints.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Splinespec.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Splinespec.java index 487b47f2d..f1c779c2f 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Splinespec.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Splinespec.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/Subdivider.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/Subdivider.java index 99c1b740b..3378dba8d 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/Subdivider.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/Subdivider.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/SurfaceEvaluator.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/SurfaceEvaluator.java index fe23f9c08..35ad1b7e7 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/SurfaceEvaluator.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/SurfaceEvaluator.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/nurbs/TrimVertex.java b/src/jogl/classes/jogamp/opengl/glu/nurbs/TrimVertex.java index 6608f8f40..e88d69709 100644 --- a/src/jogl/classes/jogamp/opengl/glu/nurbs/TrimVertex.java +++ b/src/jogl/classes/jogamp/opengl/glu/nurbs/TrimVertex.java @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl.glu.nurbs; +package jogamp.opengl.glu.nurbs; /* ** License Applicability. Except to the extent portions of this file are diff --git a/src/jogl/classes/jogamp/opengl/glu/registry/Registry.java b/src/jogl/classes/jogamp/opengl/glu/registry/Registry.java index 21b15f4d4..3d669d9bb 100644 --- a/src/jogl/classes/jogamp/opengl/glu/registry/Registry.java +++ b/src/jogl/classes/jogamp/opengl/glu/registry/Registry.java @@ -42,7 +42,7 @@ * compliant with the OpenGL(R) version 1.2.1 Specification. */ -package com.jogamp.opengl.impl.glu.registry; +package jogamp.opengl.glu.registry; import javax.media.opengl.glu.GLU; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/ActiveRegion.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/ActiveRegion.java index 85397dd6a..13c226a7c 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/ActiveRegion.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/ActiveRegion.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class ActiveRegion { diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/CachedVertex.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/CachedVertex.java index 8948acfec..91072e310 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/CachedVertex.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/CachedVertex.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class CachedVertex { public double[] coords = new double[3]; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/Dict.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Dict.java index d26948e7f..3ac9df67a 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/Dict.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Dict.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class Dict { DictNode head; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/DictNode.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/DictNode.java index 8864de127..93cf2314f 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/DictNode.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/DictNode.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class DictNode { Object key; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUface.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUface.java index 2ff4aae59..b15bf7195 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUface.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUface.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class GLUface { public GLUface next; /* next face (never NULL) */ diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUhalfEdge.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUhalfEdge.java index c2128b616..385a4384b 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUhalfEdge.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUhalfEdge.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class GLUhalfEdge { public GLUhalfEdge next; /* doubly-linked list (prev==Sym->next) */ @@ -58,10 +58,10 @@ class GLUhalfEdge { public GLUhalfEdge Onext; /* next edge CCW around origin */ public GLUhalfEdge Lnext; /* next edge CCW around left face */ public GLUvertex Org; /* origin vertex (Overtex too long) */ - public com.jogamp.opengl.impl.glu.tessellator.GLUface Lface; /* left face */ + public jogamp.opengl.glu.tessellator.GLUface Lface; /* left face */ /* Internal data (keep hidden) */ - public com.jogamp.opengl.impl.glu.tessellator.ActiveRegion activeRegion; /* a region with this upper edge (sweep.c) */ + public jogamp.opengl.glu.tessellator.ActiveRegion activeRegion; /* a region with this upper edge (sweep.c) */ public int winding; /* change in winding number when crossing */ public boolean first; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUmesh.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUmesh.java index 493eb20f4..dfdf5be70 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUmesh.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUmesh.java @@ -50,11 +50,11 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class GLUmesh { GLUvertex vHead = new GLUvertex(); /* dummy header for vertex list */ - com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = new GLUface(); /* dummy header for face list */ - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHead = new GLUhalfEdge(true); /* dummy header for edge list */ - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false); /* and its symmetric counterpart */ + jogamp.opengl.glu.tessellator.GLUface fHead = new GLUface(); /* dummy header for face list */ + jogamp.opengl.glu.tessellator.GLUhalfEdge eHead = new GLUhalfEdge(true); /* dummy header for edge list */ + jogamp.opengl.glu.tessellator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false); /* and its symmetric counterpart */ } diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUtessellatorImpl.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUtessellatorImpl.java index b21998355..182820bbc 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUtessellatorImpl.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUtessellatorImpl.java @@ -50,9 +50,9 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; -import com.jogamp.opengl.impl.glu.tessellator.*; +import jogamp.opengl.glu.tessellator.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUvertex.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUvertex.java index af294caad..c30d75946 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUvertex.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/GLUvertex.java @@ -50,12 +50,12 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class GLUvertex { public GLUvertex next; /* next vertex (never NULL) */ public GLUvertex prev; /* previous vertex (never NULL) */ - public com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge anEdge; /* a half-edge with this origin */ + public jogamp.opengl.glu.tessellator.GLUhalfEdge anEdge; /* a half-edge with this origin */ public Object data; /* client's data */ /* Internal data (keep hidden) */ diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/Geom.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Geom.java index 2710346d1..3da2d267e 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/Geom.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Geom.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class Geom { private Geom() { diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/Mesh.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Mesh.java index b8be9f80f..942dfe8d1 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/Mesh.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Mesh.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class Mesh { private Mesh() { @@ -61,19 +61,19 @@ class Mesh { * No vertex or face structures are allocated, but these must be assigned * before the current edge operation is completed. */ - static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge MakeEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNext) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eSym; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge ePrev; + static jogamp.opengl.glu.tessellator.GLUhalfEdge MakeEdge(jogamp.opengl.glu.tessellator.GLUhalfEdge eNext) { + jogamp.opengl.glu.tessellator.GLUhalfEdge e; + jogamp.opengl.glu.tessellator.GLUhalfEdge eSym; + jogamp.opengl.glu.tessellator.GLUhalfEdge ePrev; // EdgePair * pair = (EdgePair *) // memAlloc(sizeof(EdgePair)); // if (pair == NULL) return NULL; // // e = &pair - > e; - e = new com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge(true); + e = new jogamp.opengl.glu.tessellator.GLUhalfEdge(true); // eSym = &pair - > eSym; - eSym = new com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge(false); + eSym = new jogamp.opengl.glu.tessellator.GLUhalfEdge(false); /* Make sure eNext points to the first edge of the edge pair */ @@ -115,9 +115,9 @@ class Mesh { * depending on whether a and b belong to different face or vertex rings. * For more explanation see __gl_meshSplice() below. */ - static void Splice(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge a, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge b) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge aOnext = a.Onext; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge bOnext = b.Onext; + static void Splice(jogamp.opengl.glu.tessellator.GLUhalfEdge a, jogamp.opengl.glu.tessellator.GLUhalfEdge b) { + jogamp.opengl.glu.tessellator.GLUhalfEdge aOnext = a.Onext; + jogamp.opengl.glu.tessellator.GLUhalfEdge bOnext = b.Onext; aOnext.Sym.Lnext = b; bOnext.Sym.Lnext = a; @@ -131,11 +131,11 @@ class Mesh { * the new vertex *before* vNext so that algorithms which walk the vertex * list will not see the newly created vertices. */ - static void MakeVertex(com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex, - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.jogamp.opengl.impl.glu.tessellator.GLUvertex vNext) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex vPrev; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex vNew = newVertex; + static void MakeVertex(jogamp.opengl.glu.tessellator.GLUvertex newVertex, + jogamp.opengl.glu.tessellator.GLUhalfEdge eOrig, jogamp.opengl.glu.tessellator.GLUvertex vNext) { + jogamp.opengl.glu.tessellator.GLUhalfEdge e; + jogamp.opengl.glu.tessellator.GLUvertex vPrev; + jogamp.opengl.glu.tessellator.GLUvertex vNew = newVertex; assert (vNew != null); @@ -164,10 +164,10 @@ class Mesh { * the new face *before* fNext so that algorithms which walk the face * list will not see the newly created faces. */ - static void MakeFace(com.jogamp.opengl.impl.glu.tessellator.GLUface newFace, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.jogamp.opengl.impl.glu.tessellator.GLUface fNext) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; - com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev; - com.jogamp.opengl.impl.glu.tessellator.GLUface fNew = newFace; + static void MakeFace(jogamp.opengl.glu.tessellator.GLUface newFace, jogamp.opengl.glu.tessellator.GLUhalfEdge eOrig, jogamp.opengl.glu.tessellator.GLUface fNext) { + jogamp.opengl.glu.tessellator.GLUhalfEdge e; + jogamp.opengl.glu.tessellator.GLUface fPrev; + jogamp.opengl.glu.tessellator.GLUface fNew = newFace; assert (fNew != null); @@ -199,8 +199,8 @@ class Mesh { /* KillEdge( eDel ) destroys an edge (the half-edges eDel and eDel->Sym), * and removes from the global edge list. */ - static void KillEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDel) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge ePrev, eNext; + static void KillEdge(jogamp.opengl.glu.tessellator.GLUhalfEdge eDel) { + jogamp.opengl.glu.tessellator.GLUhalfEdge ePrev, eNext; /* Half-edges are allocated in pairs, see EdgePair above */ if (!eDel.first) { @@ -218,9 +218,9 @@ class Mesh { /* KillVertex( vDel ) destroys a vertex and removes it from the global * vertex list. It updates the vertex loop to point to a given new vertex. */ - static void KillVertex(com.jogamp.opengl.impl.glu.tessellator.GLUvertex vDel, com.jogamp.opengl.impl.glu.tessellator.GLUvertex newOrg) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = vDel.anEdge; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex vPrev, vNext; + static void KillVertex(jogamp.opengl.glu.tessellator.GLUvertex vDel, jogamp.opengl.glu.tessellator.GLUvertex newOrg) { + jogamp.opengl.glu.tessellator.GLUhalfEdge e, eStart = vDel.anEdge; + jogamp.opengl.glu.tessellator.GLUvertex vPrev, vNext; /* change the origin of all affected edges */ e = eStart; @@ -239,9 +239,9 @@ class Mesh { /* KillFace( fDel ) destroys a face and removes it from the global face * list. It updates the face loop to point to a given new face. */ - static void KillFace(com.jogamp.opengl.impl.glu.tessellator.GLUface fDel, com.jogamp.opengl.impl.glu.tessellator.GLUface newLface) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = fDel.anEdge; - com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev, fNext; + static void KillFace(jogamp.opengl.glu.tessellator.GLUface fDel, jogamp.opengl.glu.tessellator.GLUface newLface) { + jogamp.opengl.glu.tessellator.GLUhalfEdge e, eStart = fDel.anEdge; + jogamp.opengl.glu.tessellator.GLUface fPrev, fNext; /* change the left face of all affected edges */ e = eStart; @@ -263,11 +263,11 @@ class Mesh { /* __gl_meshMakeEdge creates one edge, two vertices, and a loop (face). * The loop consists of the two new half-edges. */ - public static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshMakeEdge(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) { - com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex1 = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex(); - com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex2 = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex(); - com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface(); - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; + public static jogamp.opengl.glu.tessellator.GLUhalfEdge __gl_meshMakeEdge(jogamp.opengl.glu.tessellator.GLUmesh mesh) { + jogamp.opengl.glu.tessellator.GLUvertex newVertex1 = new jogamp.opengl.glu.tessellator.GLUvertex(); + jogamp.opengl.glu.tessellator.GLUvertex newVertex2 = new jogamp.opengl.glu.tessellator.GLUvertex(); + jogamp.opengl.glu.tessellator.GLUface newFace = new jogamp.opengl.glu.tessellator.GLUface(); + jogamp.opengl.glu.tessellator.GLUhalfEdge e; e = MakeEdge(mesh.eHead); if (e == null) return null; @@ -302,7 +302,7 @@ class Mesh { * If eDst == eOrg->Onext, the new vertex will have a single edge. * If eDst == eOrg->Oprev, the old vertex will have a single edge. */ - public static boolean __gl_meshSplice(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDst) { + public static boolean __gl_meshSplice(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrg, jogamp.opengl.glu.tessellator.GLUhalfEdge eDst) { boolean joiningLoops = false; boolean joiningVertices = false; @@ -323,7 +323,7 @@ class Mesh { Splice(eDst, eOrg); if (!joiningVertices) { - com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex(); + jogamp.opengl.glu.tessellator.GLUvertex newVertex = new jogamp.opengl.glu.tessellator.GLUvertex(); /* We split one vertex into two -- the new vertex is eDst.Org. * Make sure the old vertex points to a valid half-edge. @@ -332,7 +332,7 @@ class Mesh { eOrg.Org.anEdge = eOrg; } if (!joiningLoops) { - com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface(); + jogamp.opengl.glu.tessellator.GLUface newFace = new jogamp.opengl.glu.tessellator.GLUface(); /* We split one loop into two -- the new loop is eDst.Lface. * Make sure the old face points to a valid half-edge. @@ -355,8 +355,8 @@ class Mesh { * plus a few calls to memFree, but this would allocate and delete * unnecessary vertices and faces. */ - static boolean __gl_meshDelete(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDel) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDelSym = eDel.Sym; + static boolean __gl_meshDelete(jogamp.opengl.glu.tessellator.GLUhalfEdge eDel) { + jogamp.opengl.glu.tessellator.GLUhalfEdge eDelSym = eDel.Sym; boolean joiningLoops = false; /* First step: disconnect the origin vertex eDel.Org. We make all @@ -377,7 +377,7 @@ class Mesh { Splice(eDel, eDel.Sym.Lnext); if (!joiningLoops) { - com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface(); + jogamp.opengl.glu.tessellator.GLUface newFace = new jogamp.opengl.glu.tessellator.GLUface(); /* We are splitting one loop into two -- create a new loop for eDel. */ MakeFace(newFace, eDel, eDel.Lface); @@ -415,9 +415,9 @@ class Mesh { * eNew == eOrg.Lnext, and eNew.Dst is a newly created vertex. * eOrg and eNew will have the same left face. */ - static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshAddEdgeVertex(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg); + static jogamp.opengl.glu.tessellator.GLUhalfEdge __gl_meshAddEdgeVertex(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrg) { + jogamp.opengl.glu.tessellator.GLUhalfEdge eNewSym; + jogamp.opengl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg); eNewSym = eNew.Sym; @@ -427,7 +427,7 @@ class Mesh { /* Set the vertex and face information */ eNew.Org = eOrg.Sym.Org; { - com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex(); + jogamp.opengl.glu.tessellator.GLUvertex newVertex = new jogamp.opengl.glu.tessellator.GLUvertex(); MakeVertex(newVertex, eNewSym, eNew.Org); } @@ -441,9 +441,9 @@ class Mesh { * such that eNew == eOrg.Lnext. The new vertex is eOrg.Sym.Org == eNew.Org. * eOrg and eNew will have the same left face. */ - public static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshSplitEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg); + public static jogamp.opengl.glu.tessellator.GLUhalfEdge __gl_meshSplitEdge(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrg) { + jogamp.opengl.glu.tessellator.GLUhalfEdge eNew; + jogamp.opengl.glu.tessellator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg); eNew = tempHalfEdge.Sym; @@ -472,10 +472,10 @@ class Mesh { * If (eOrg.Lnext == eDst), the old face is reduced to a single edge. * If (eOrg.Lnext.Lnext == eDst), the old face is reduced to two edges. */ - static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshConnect(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDst) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym; + static jogamp.opengl.glu.tessellator.GLUhalfEdge __gl_meshConnect(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrg, jogamp.opengl.glu.tessellator.GLUhalfEdge eDst) { + jogamp.opengl.glu.tessellator.GLUhalfEdge eNewSym; boolean joiningLoops = false; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg); + jogamp.opengl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg); eNewSym = eNew.Sym; @@ -498,7 +498,7 @@ class Mesh { eOrg.Lface.anEdge = eNewSym; if (!joiningLoops) { - com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface(); + jogamp.opengl.glu.tessellator.GLUface newFace = new jogamp.opengl.glu.tessellator.GLUface(); /* We split one loop into two -- the new loop is eNew.Lface */ MakeFace(newFace, eNew, eOrg.Lface); @@ -516,10 +516,10 @@ class Mesh { * An entire mesh can be deleted by zapping its faces, one at a time, * in any order. Zapped faces cannot be used in further mesh operations! */ - static void __gl_meshZapFace(com.jogamp.opengl.impl.glu.tessellator.GLUface fZap) { - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart = fZap.anEdge; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext, eSym; - com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev, fNext; + static void __gl_meshZapFace(jogamp.opengl.glu.tessellator.GLUface fZap) { + jogamp.opengl.glu.tessellator.GLUhalfEdge eStart = fZap.anEdge; + jogamp.opengl.glu.tessellator.GLUhalfEdge e, eNext, eSym; + jogamp.opengl.glu.tessellator.GLUface fPrev, fNext; /* walk around face, deleting edges whose right face is also null */ eNext = eStart.Lnext; @@ -561,12 +561,12 @@ class Mesh { /* __gl_meshNewMesh() creates a new mesh with no edges, no vertices, * and no loops (what we usually call a "face"). */ - public static com.jogamp.opengl.impl.glu.tessellator.GLUmesh __gl_meshNewMesh() { - com.jogamp.opengl.impl.glu.tessellator.GLUvertex v; - com.jogamp.opengl.impl.glu.tessellator.GLUface f; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eSym; - com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh = new com.jogamp.opengl.impl.glu.tessellator.GLUmesh(); + public static jogamp.opengl.glu.tessellator.GLUmesh __gl_meshNewMesh() { + jogamp.opengl.glu.tessellator.GLUvertex v; + jogamp.opengl.glu.tessellator.GLUface f; + jogamp.opengl.glu.tessellator.GLUhalfEdge e; + jogamp.opengl.glu.tessellator.GLUhalfEdge eSym; + jogamp.opengl.glu.tessellator.GLUmesh mesh = new jogamp.opengl.glu.tessellator.GLUmesh(); v = mesh.vHead; f = mesh.fHead; @@ -609,13 +609,13 @@ class Mesh { /* __gl_meshUnion( mesh1, mesh2 ) forms the union of all structures in * both meshes, and returns the new mesh (the old meshes are destroyed). */ - static com.jogamp.opengl.impl.glu.tessellator.GLUmesh __gl_meshUnion(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh1, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh2) { - com.jogamp.opengl.impl.glu.tessellator.GLUface f1 = mesh1.fHead; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex v1 = mesh1.vHead; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e1 = mesh1.eHead; - com.jogamp.opengl.impl.glu.tessellator.GLUface f2 = mesh2.fHead; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex v2 = mesh2.vHead; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e2 = mesh2.eHead; + static jogamp.opengl.glu.tessellator.GLUmesh __gl_meshUnion(jogamp.opengl.glu.tessellator.GLUmesh mesh1, jogamp.opengl.glu.tessellator.GLUmesh mesh2) { + jogamp.opengl.glu.tessellator.GLUface f1 = mesh1.fHead; + jogamp.opengl.glu.tessellator.GLUvertex v1 = mesh1.vHead; + jogamp.opengl.glu.tessellator.GLUhalfEdge e1 = mesh1.eHead; + jogamp.opengl.glu.tessellator.GLUface f2 = mesh2.fHead; + jogamp.opengl.glu.tessellator.GLUvertex v2 = mesh2.vHead; + jogamp.opengl.glu.tessellator.GLUhalfEdge e2 = mesh2.eHead; /* Add the faces, vertices, and edges of mesh2 to those of mesh1 */ if (f2.next != f2) { @@ -645,8 +645,8 @@ class Mesh { /* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh. */ - static void __gl_meshDeleteMeshZap(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) { - com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead; + static void __gl_meshDeleteMeshZap(jogamp.opengl.glu.tessellator.GLUmesh mesh) { + jogamp.opengl.glu.tessellator.GLUface fHead = mesh.fHead; while (fHead.next != fHead) { __gl_meshZapFace(fHead.next); @@ -656,10 +656,10 @@ class Mesh { /* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh. */ - public static void __gl_meshDeleteMesh(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) { - com.jogamp.opengl.impl.glu.tessellator.GLUface f, fNext; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vNext; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext; + public static void __gl_meshDeleteMesh(jogamp.opengl.glu.tessellator.GLUmesh mesh) { + jogamp.opengl.glu.tessellator.GLUface f, fNext; + jogamp.opengl.glu.tessellator.GLUvertex v, vNext; + jogamp.opengl.glu.tessellator.GLUhalfEdge e, eNext; for (f = mesh.fHead.next; f != mesh.fHead; f = fNext) { fNext = f.next; @@ -677,13 +677,13 @@ class Mesh { /* __gl_meshCheckMesh( mesh ) checks a mesh for self-consistency. */ - public static void __gl_meshCheckMesh(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) { - com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex vHead = mesh.vHead; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHead = mesh.eHead; - com.jogamp.opengl.impl.glu.tessellator.GLUface f, fPrev; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vPrev; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, ePrev; + public static void __gl_meshCheckMesh(jogamp.opengl.glu.tessellator.GLUmesh mesh) { + jogamp.opengl.glu.tessellator.GLUface fHead = mesh.fHead; + jogamp.opengl.glu.tessellator.GLUvertex vHead = mesh.vHead; + jogamp.opengl.glu.tessellator.GLUhalfEdge eHead = mesh.eHead; + jogamp.opengl.glu.tessellator.GLUface f, fPrev; + jogamp.opengl.glu.tessellator.GLUvertex v, vPrev; + jogamp.opengl.glu.tessellator.GLUhalfEdge e, ePrev; fPrev = fHead; for (fPrev = fHead; (f = fPrev.next) != fHead; fPrev = f) { diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/Normal.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Normal.java index fe1a20c49..7d5acd9f8 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/Normal.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Normal.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; import javax.media.opengl.*; import javax.media.opengl.glu.*; @@ -110,17 +110,17 @@ class Normal { } static void ComputeNormal(GLUtessellatorImpl tess, double[] norm) { - com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, v1, v2; + jogamp.opengl.glu.tessellator.GLUvertex v, v1, v2; double c, tLen2, maxLen2; double[] maxVal, minVal, d1, d2, tNorm; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex[] maxVert, minVert; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex vHead = tess.mesh.vHead; + jogamp.opengl.glu.tessellator.GLUvertex[] maxVert, minVert; + jogamp.opengl.glu.tessellator.GLUvertex vHead = tess.mesh.vHead; int i; maxVal = new double[3]; minVal = new double[3]; - minVert = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex[3]; - maxVert = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex[3]; + minVert = new jogamp.opengl.glu.tessellator.GLUvertex[3]; + maxVert = new jogamp.opengl.glu.tessellator.GLUvertex[3]; d1 = new double[3]; d2 = new double[3]; tNorm = new double[3]; @@ -194,9 +194,9 @@ class Normal { static void CheckOrientation(GLUtessellatorImpl tess) { double area; - com.jogamp.opengl.impl.glu.tessellator.GLUface f, fHead = tess.mesh.fHead; - com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; + jogamp.opengl.glu.tessellator.GLUface f, fHead = tess.mesh.fHead; + jogamp.opengl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead; + jogamp.opengl.glu.tessellator.GLUhalfEdge e; /* When we compute the normal automatically, we choose the orientation * so that the the sum of the signed areas of all contours is non-negative. @@ -225,7 +225,7 @@ class Normal { * of the polygon. */ public static void __gl_projectPolygon(GLUtessellatorImpl tess) { - com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead; + jogamp.opengl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead; double w; double[] norm = new double[3]; double[] sUnit, tUnit; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQ.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQ.java index b77305ae2..25405ad64 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQ.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQ.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; abstract class PriorityQ { public static final int INIT_SIZE = 32; @@ -76,7 +76,7 @@ abstract class PriorityQ { /* Violates modularity, but a little faster */ // #include "geom.h" public static boolean LEQ(Leq leq, Object x, Object y) { - return com.jogamp.opengl.impl.glu.tessellator.Geom.VertLeq((com.jogamp.opengl.impl.glu.tessellator.GLUvertex) x, (com.jogamp.opengl.impl.glu.tessellator.GLUvertex) y); + return jogamp.opengl.glu.tessellator.Geom.VertLeq((jogamp.opengl.glu.tessellator.GLUvertex) x, (jogamp.opengl.glu.tessellator.GLUvertex) y); } static PriorityQ pqNewPriorityQ(Leq leq) { diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQHeap.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQHeap.java index 61aa9574f..899df2e3d 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQHeap.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQHeap.java @@ -50,25 +50,25 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; -class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] nodes; - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] handles; +class PriorityQHeap extends jogamp.opengl.glu.tessellator.PriorityQ { + jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] nodes; + jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] handles; int size, max; int freeList; boolean initialized; - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq; + jogamp.opengl.glu.tessellator.PriorityQ.Leq leq; /* really __gl_pqHeapNewPriorityQ */ - public PriorityQHeap(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq) { + public PriorityQHeap(jogamp.opengl.glu.tessellator.PriorityQ.Leq leq) { size = 0; - max = com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE; - nodes = new com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1]; + max = jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE; + nodes = new jogamp.opengl.glu.tessellator.PriorityQ.PQnode[jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE + 1]; for (int i = 0; i < nodes.length; i++) { nodes[i] = new PQnode(); } - handles = new com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1]; + handles = new jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE + 1]; for (int i = 0; i < handles.length; i++) { handles[i] = new PQhandleElem(); } @@ -87,8 +87,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { } void FloatDown(int curr) { - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes; - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles; + jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] n = nodes; + jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles; int hCurr, hChild; int child; @@ -116,8 +116,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { void FloatUp(int curr) { - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes; - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles; + jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] n = nodes; + jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles; int hCurr, hParent; int parent; @@ -158,8 +158,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { curr = ++size; if ((curr * 2) > max) { - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] saveNodes = nodes; - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] saveHandles = handles; + jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] saveNodes = nodes; + jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] saveHandles = handles; /* If the heap overflows, double its size. */ max <<= 1; @@ -208,8 +208,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { /* really __gl_pqHeapExtractMin */ Object pqExtractMin() { - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes; - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles; + jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] n = nodes; + jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles; int hMin = n[1].handle; Object min = h[hMin].key; @@ -230,8 +230,8 @@ class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { /* really __gl_pqHeapDelete */ void pqDelete(int hCurr) { - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes; - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles; + jogamp.opengl.glu.tessellator.PriorityQ.PQnode[] n = nodes; + jogamp.opengl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles; int curr; assert (hCurr >= 1 && hCurr <= max && h[hCurr].key != null); diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQSort.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQSort.java index f115b8f49..f37f98ace 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQSort.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/PriorityQSort.java @@ -45,10 +45,10 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; -class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { - com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap heap; +class PriorityQSort extends jogamp.opengl.glu.tessellator.PriorityQ { + jogamp.opengl.glu.tessellator.PriorityQHeap heap; Object[] keys; // JAVA: 'order' contains indices into the keys array. @@ -57,15 +57,15 @@ class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { int[] order; int size, max; boolean initialized; - com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq; + jogamp.opengl.glu.tessellator.PriorityQ.Leq leq; - public PriorityQSort(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq) { - heap = new com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap(leq); + public PriorityQSort(jogamp.opengl.glu.tessellator.PriorityQ.Leq leq) { + heap = new jogamp.opengl.glu.tessellator.PriorityQHeap(leq); - keys = new Object[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE]; + keys = new Object[jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE]; size = 0; - max = com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE; + max = jogamp.opengl.glu.tessellator.PriorityQ.INIT_SIZE; initialized = false; this.leq = leq; } @@ -77,12 +77,12 @@ class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { keys = null; } - private static boolean LT(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) { - return (!com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, y, x)); + private static boolean LT(jogamp.opengl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) { + return (!jogamp.opengl.glu.tessellator.PriorityQHeap.LEQ(leq, y, x)); } - private static boolean GT(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) { - return (!com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, x, y)); + private static boolean GT(jogamp.opengl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) { + return (!jogamp.opengl.glu.tessellator.PriorityQHeap.LEQ(leq, x, y)); } private static void Swap(int[] array, int a, int b) { @@ -249,7 +249,7 @@ class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ { sortMin = keys[order[size - 1]]; if (!heap.pqIsEmpty()) { heapMin = heap.pqMinimum(); - if (com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) { + if (jogamp.opengl.glu.tessellator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) { return heapMin; } } diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/Render.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Render.java index 9761200e0..34b7ee55b 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/Render.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Render.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; import javax.media.opengl.*; import javax.media.opengl.glu.*; @@ -73,19 +73,19 @@ class Render { public FaceCount() { } - public FaceCount(long size, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart, renderCallBack render) { + public FaceCount(long size, jogamp.opengl.glu.tessellator.GLUhalfEdge eStart, renderCallBack render) { this.size = size; this.eStart = eStart; this.render = render; } long size; /* number of triangles used */ - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart; /* edge where this primitive starts */ + jogamp.opengl.glu.tessellator.GLUhalfEdge eStart; /* edge where this primitive starts */ renderCallBack render; }; private static interface renderCallBack { - void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size); + void render(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUhalfEdge e, long size); } /************************ Strips and Fans decomposition ******************/ @@ -97,8 +97,8 @@ class Render { * * The rendering output is provided as callbacks (see the api). */ - public static void __gl_renderMesh(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) { - com.jogamp.opengl.impl.glu.tessellator.GLUface f; + public static void __gl_renderMesh(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUmesh mesh) { + jogamp.opengl.glu.tessellator.GLUface f; /* Make a list of separate triangles so we can render them all at once */ tess.lonelyTriList = null; @@ -124,7 +124,7 @@ class Render { } - static void RenderMaximumFaceGroup(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUface fOrig) { + static void RenderMaximumFaceGroup(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUface fOrig) { /* We want to find the largest triangle fan or strip of unmarked faces * which includes the given face fOrig. There are 3 possible fans * passing through fOrig (one centered at each vertex), and 3 possible @@ -132,7 +132,7 @@ class Render { * is to try all of these, and take the primitive which uses the most * triangles (a greedy approach). */ - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e = fOrig.anEdge; + jogamp.opengl.glu.tessellator.GLUhalfEdge e = fOrig.anEdge; FaceCount max = new FaceCount(); FaceCount newFace = new FaceCount(); @@ -178,17 +178,17 @@ class Render { * more complicated, and we need a general tracking method like the * one here. */ - private static boolean Marked(com.jogamp.opengl.impl.glu.tessellator.GLUface f) { + private static boolean Marked(jogamp.opengl.glu.tessellator.GLUface f) { return !f.inside || f.marked; } - private static GLUface AddToTrail(com.jogamp.opengl.impl.glu.tessellator.GLUface f, com.jogamp.opengl.impl.glu.tessellator.GLUface t) { + private static GLUface AddToTrail(jogamp.opengl.glu.tessellator.GLUface f, jogamp.opengl.glu.tessellator.GLUface t) { f.trail = t; f.marked = true; return f; } - private static void FreeTrail(com.jogamp.opengl.impl.glu.tessellator.GLUface t) { + private static void FreeTrail(jogamp.opengl.glu.tessellator.GLUface t) { if (true) { while (t != null) { t.marked = false; @@ -199,14 +199,14 @@ class Render { } } - static FaceCount MaximumFan(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) { + static FaceCount MaximumFan(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrig) { /* eOrig.Lface is the face we want to render. We want to find the size * of a maximal fan around eOrig.Org. To do this we just walk around * the origin vertex as far as possible in both directions. */ FaceCount newFace = new FaceCount(0, null, renderFan); - com.jogamp.opengl.impl.glu.tessellator.GLUface trail = null; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; + jogamp.opengl.glu.tessellator.GLUface trail = null; + jogamp.opengl.glu.tessellator.GLUhalfEdge e; for (e = eOrig; !Marked(e.Lface); e = e.Onext) { trail = AddToTrail(e.Lface, trail); @@ -227,7 +227,7 @@ class Render { return (n & 0x1L) == 0; } - static FaceCount MaximumStrip(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) { + static FaceCount MaximumStrip(jogamp.opengl.glu.tessellator.GLUhalfEdge eOrig) { /* Here we are looking for a maximal strip that contains the vertices * eOrig.Org, eOrig.Dst, eOrig.Lnext.Dst (in that order or the * reverse, such that all triangles are oriented CCW). @@ -240,8 +240,8 @@ class Render { */ FaceCount newFace = new FaceCount(0, null, renderStrip); long headSize = 0, tailSize = 0; - com.jogamp.opengl.impl.glu.tessellator.GLUface trail = null; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eTail, eHead; + jogamp.opengl.glu.tessellator.GLUface trail = null; + jogamp.opengl.glu.tessellator.GLUhalfEdge e, eTail, eHead; for (e = eOrig; !Marked(e.Lface); ++tailSize, e = e.Onext) { trail = AddToTrail(e.Lface, trail); @@ -279,7 +279,7 @@ class Render { } private static class RenderTriangle implements renderCallBack { - public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) { + public void render(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUhalfEdge e, long size) { /* Just add the triangle to a triangle list, so we can render all * the separate triangles at once. */ @@ -289,11 +289,11 @@ class Render { } - static void RenderLonelyTriangles(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUface f) { + static void RenderLonelyTriangles(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUface f) { /* Now we render all the separate triangles which could not be * grouped into a triangle fan or strip. */ - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; + jogamp.opengl.glu.tessellator.GLUhalfEdge e; int newState; int edgeState = -1; /* force edge state output for first vertex */ @@ -323,7 +323,7 @@ class Render { } private static class RenderFan implements renderCallBack { - public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) { + public void render(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUhalfEdge e, long size) { /* Render as many CCW triangles as possible in a fan starting from * edge "e". The fan *should* contain exactly "size" triangles * (otherwise we've goofed up somewhere). @@ -345,7 +345,7 @@ class Render { } private static class RenderStrip implements renderCallBack { - public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) { + public void render(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUhalfEdge e, long size) { /* Render as many CCW triangles as possible in a strip starting from * edge "e". The strip *should* contain exactly "size" triangles * (otherwise we've goofed up somewhere). @@ -378,9 +378,9 @@ class Render { * contour for each face marked "inside". The rendering output is * provided as callbacks (see the api). */ - public static void __gl_renderBoundary(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) { - com.jogamp.opengl.impl.glu.tessellator.GLUface f; - com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e; + public static void __gl_renderBoundary(GLUtessellatorImpl tess, jogamp.opengl.glu.tessellator.GLUmesh mesh) { + jogamp.opengl.glu.tessellator.GLUface f; + jogamp.opengl.glu.tessellator.GLUhalfEdge e; for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) { if (f.inside) { @@ -409,7 +409,7 @@ class Render { * are degenerate return 0; otherwise (no consistent orientation) return * SIGN_INCONSISTENT. */ { - com.jogamp.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache; + jogamp.opengl.glu.tessellator.CachedVertex[] v = tess.cache; // CachedVertex vn = v0 + tess.cacheCount; int vn = tess.cacheCount; // CachedVertex vc; @@ -488,7 +488,7 @@ class Render { * output is provided as callbacks (see the api). */ public static boolean __gl_renderCache(GLUtessellatorImpl tess) { - com.jogamp.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache; + jogamp.opengl.glu.tessellator.CachedVertex[] v = tess.cache; // CachedVertex vn = v0 + tess.cacheCount; int vn = tess.cacheCount; // CachedVertex vc; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java index 8ffeadb67..95eb5dda1 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; import javax.media.opengl.*; import javax.media.opengl.glu.*; diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/TessMono.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/TessMono.java index ef89b1613..5db543c80 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/TessMono.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/TessMono.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class TessMono { /* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/TessState.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/TessState.java index a8aa41d9f..c25de2d91 100644 --- a/src/jogl/classes/jogamp/opengl/glu/tessellator/TessState.java +++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/TessState.java @@ -50,7 +50,7 @@ ** Java Port: Pepijn Van Eeckhoudt, July 2003 ** Java Port: Nathan Parker Burg, August 2003 */ -package com.jogamp.opengl.impl.glu.tessellator; +package jogamp.opengl.glu.tessellator; class TessState { public static final int T_DORMANT = 0; |