From 360b6716f68b44b28fd8c4f8e61ab86d5a56738b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 9 Feb 2011 02:50:09 +0100 Subject: Move implementation private files from com.jogamp..impl. to jogamp. (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. --- jnlp-files/applet-version-jnlp.html | 2 +- jnlp-files/applet-version-lancheronly.html | 2 +- jnlp-files/applet-version.jnlp | 2 +- jnlp-files/application-version.jnlp | 2 +- jnlp-files/javaws-version.jnlp | 2 +- make/build-jogl.xml | 85 +++++------ make/build-nativewindow.xml | 28 ++-- make/build-newt.xml | 72 ++++++---- make/build-test.xml | 7 +- make/build.xml | 2 +- make/config/jogl/cg-common.cfg | 2 +- make/config/jogl/cgl-macosx.cfg | 2 +- make/config/jogl/cglext.cfg | 4 +- make/config/jogl/egl-common.cfg | 2 +- make/config/jogl/egl.cfg | 2 +- make/config/jogl/eglext.cfg | 6 +- make/config/jogl/gl-common.cfg | 2 +- make/config/jogl/gl-es1.cfg | 2 +- make/config/jogl/gl-es2.cfg | 2 +- make/config/jogl/gl-gl4bc.cfg | 2 +- make/config/jogl/gl-if-gl3.cfg | 2 +- make/config/jogl/gl-impl-CustomCCode-gl4bc.c | 12 +- make/config/jogl/gl-impl-CustomCCode-gles1.c | 8 +- make/config/jogl/gl-impl-CustomCCode-gles2.c | 8 +- make/config/jogl/glu-CustomJavaCode-base.java | 4 +- make/config/jogl/glu-CustomJavaCode-gl2es1.java | 2 +- make/config/jogl/glu-base.cfg | 4 +- make/config/jogl/glu-common.cfg | 6 +- make/config/jogl/glu-gl2.cfg | 12 +- make/config/jogl/glu-gl2es1.cfg | 2 +- make/config/jogl/glx-CustomCCode.c | 22 +-- make/config/jogl/glx-x11.cfg | 4 +- make/config/jogl/glxext.cfg | 8 +- make/config/jogl/wgl-win32.cfg | 2 +- make/config/jogl/wglext.cfg | 4 +- .../jawt-DrawingSurfaceInfo-CustomJavaCode.java | 6 +- make/config/nativewindow/jawt-common.cfg | 4 +- make/config/nativewindow/jawt-macosx.cfg | 2 +- make/config/nativewindow/jawt-win32.cfg | 2 +- make/config/nativewindow/jawt-x11.cfg | 2 +- make/config/nativewindow/win32-lib.cfg | 6 +- make/config/nativewindow/x11-lib.cfg | 2 +- make/scripts/lstjars.sh | 12 +- make/scripts/tests-x64.bat | 2 +- make/scripts/tests.sh | 7 +- .../gluegen/opengl/BuildComposablePipeline.java | 2 +- .../com/jogamp/opengl/util/AnimatorBase.java | 2 +- .../com/jogamp/opengl/util/GLArrayDataClient.java | 2 +- .../com/jogamp/opengl/util/GLArrayDataWrapper.java | 2 +- src/jogl/classes/com/jogamp/opengl/util/Gamma.java | 2 +- .../classes/com/jogamp/opengl/util/PMVMatrix.java | 2 +- .../com/jogamp/opengl/util/awt/TextRenderer.java | 2 +- .../com/jogamp/opengl/util/glsl/ShaderCode.java | 2 +- .../com/jogamp/opengl/util/glsl/ShaderState.java | 2 +- .../opengl/util/glsl/fixedfunc/FixedFuncUtil.java | 2 +- .../com/jogamp/opengl/util/texture/Texture.java | 2 +- .../util/texture/TextureIO.java.javame_cdc_fp | 2 +- .../opengl/util/texture/TextureIO.java.javase | 2 +- .../util/texture/spi/awt/IIOTextureProvider.java | 2 +- .../classes/com/jogamp/openmax/OMXInstance.java | 8 +- .../media/opengl/DefaultGLCapabilitiesChooser.java | 2 +- .../classes/javax/media/opengl/GLAutoDrawable.java | 2 +- src/jogl/classes/javax/media/opengl/GLContext.java | 4 +- .../javax/media/opengl/GLDrawableFactory.java | 12 +- .../javax/media/opengl/GLPipelineFactory.java | 2 +- src/jogl/classes/javax/media/opengl/GLProfile.java | 18 +-- src/jogl/classes/javax/media/opengl/Threading.java | 2 +- .../classes/javax/media/opengl/awt/GLCanvas.java | 8 +- .../classes/javax/media/opengl/awt/GLJPanel.java | 16 +-- .../media/opengl/glu/GLUtessellatorCallback.java | 2 +- .../opengl/glu/GLUtessellatorCallbackAdapter.java | 2 +- src/jogl/classes/jogamp/opengl/Debug.java | 2 +- .../opengl/DesktopGLDynamicLibraryBundleInfo.java | 2 +- .../opengl/DesktopGLDynamicLookupHelper.java | 2 +- .../jogamp/opengl/ExtensionAvailabilityCache.java | 2 +- .../classes/jogamp/opengl/GLBufferSizeTracker.java | 2 +- .../jogamp/opengl/GLBufferStateTracker.java | 2 +- src/jogl/classes/jogamp/opengl/GLContextImpl.java | 2 +- src/jogl/classes/jogamp/opengl/GLContextLock.java | 2 +- .../classes/jogamp/opengl/GLContextShareSet.java | 2 +- .../jogamp/opengl/GLDrawableFactoryImpl.java | 2 +- .../classes/jogamp/opengl/GLDrawableHelper.java | 2 +- src/jogl/classes/jogamp/opengl/GLDrawableImpl.java | 2 +- .../jogamp/opengl/GLDynamicLibraryBundleInfo.java | 2 +- .../jogamp/opengl/GLDynamicLookupHelper.java | 2 +- .../opengl/GLGraphicsConfigurationFactory.java | 2 +- .../jogamp/opengl/GLGraphicsConfigurationUtil.java | 2 +- src/jogl/classes/jogamp/opengl/GLPbufferImpl.java | 2 +- src/jogl/classes/jogamp/opengl/GLRunnableTask.java | 2 +- src/jogl/classes/jogamp/opengl/GLStateTracker.java | 2 +- .../classes/jogamp/opengl/GLVersionNumber.java | 2 +- src/jogl/classes/jogamp/opengl/GLWorkerThread.java | 2 +- src/jogl/classes/jogamp/opengl/MemoryObject.java | 2 +- src/jogl/classes/jogamp/opengl/ProjectFloat.java | 2 +- .../jogamp/opengl/SharedResourceRunner.java | 2 +- .../jogamp/opengl/SystemUtil.java.javame_cdc_fp | 2 +- .../classes/jogamp/opengl/SystemUtil.java.javase | 2 +- src/jogl/classes/jogamp/opengl/ThreadingImpl.java | 6 +- .../classes/jogamp/opengl/ThreadingPlugin.java | 2 +- .../jogamp/opengl/awt/AWTThreadingPlugin.java | 4 +- src/jogl/classes/jogamp/opengl/awt/AWTUtil.java | 6 +- src/jogl/classes/jogamp/opengl/awt/Java2D.java | 4 +- .../classes/jogamp/opengl/awt/Java2DGLContext.java | 4 +- src/jogl/classes/jogamp/opengl/egl/EGLContext.java | 4 +- .../classes/jogamp/opengl/egl/EGLDrawable.java | 6 +- .../jogamp/opengl/egl/EGLDrawableFactory.java | 8 +- .../opengl/egl/EGLDynamicLibraryBundleInfo.java | 4 +- .../opengl/egl/EGLES1DynamicLibraryBundleInfo.java | 4 +- .../opengl/egl/EGLES2DynamicLibraryBundleInfo.java | 4 +- .../jogamp/opengl/egl/EGLExternalContext.java | 4 +- .../jogamp/opengl/egl/EGLGLCapabilities.java | 2 +- .../opengl/egl/EGLGraphicsConfiguration.java | 4 +- .../egl/EGLGraphicsConfigurationFactory.java | 8 +- .../jogamp/opengl/egl/EGLOnscreenContext.java | 4 +- .../jogamp/opengl/egl/EGLOnscreenDrawable.java | 2 +- .../jogamp/opengl/egl/EGLPbufferContext.java | 4 +- .../jogamp/opengl/egl/EGLPbufferDrawable.java | 2 +- .../classes/jogamp/opengl/gl2/ProjectDouble.java | 4 +- src/jogl/classes/jogamp/opengl/gl2/Util.java | 4 +- .../jogamp/opengl/gl2/fixme/GLObjectTracker.java | 4 +- .../classes/jogamp/opengl/glu/GLUquadricImpl.java | 2 +- src/jogl/classes/jogamp/opengl/glu/Glue.java | 2 +- .../classes/jogamp/opengl/glu/error/Error.java | 4 +- .../jogamp/opengl/glu/gl2/nurbs/GL2Backend.java | 4 +- .../opengl/glu/gl2/nurbs/GL2CurveEvaluator.java | 4 +- .../opengl/glu/gl2/nurbs/GL2SurfaceEvaluator.java | 4 +- .../opengl/glu/gl2/nurbs/GLUgl2nurbsImpl.java | 4 +- .../jogamp/opengl/glu/mipmap/BuildMipmap.java | 4 +- .../classes/jogamp/opengl/glu/mipmap/Extract.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract1010102.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract1555rev.java | 2 +- .../opengl/glu/mipmap/Extract2101010rev.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract233rev.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract332.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract4444.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract4444rev.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract5551.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract565.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract565rev.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract8888.java | 2 +- .../jogamp/opengl/glu/mipmap/Extract8888rev.java | 2 +- .../jogamp/opengl/glu/mipmap/ExtractFloat.java | 2 +- .../jogamp/opengl/glu/mipmap/ExtractPrimitive.java | 2 +- .../jogamp/opengl/glu/mipmap/ExtractSByte.java | 2 +- .../jogamp/opengl/glu/mipmap/ExtractSInt.java | 2 +- .../jogamp/opengl/glu/mipmap/ExtractSShort.java | 2 +- .../jogamp/opengl/glu/mipmap/ExtractUByte.java | 2 +- .../jogamp/opengl/glu/mipmap/ExtractUInt.java | 2 +- .../jogamp/opengl/glu/mipmap/ExtractUShort.java | 2 +- .../jogamp/opengl/glu/mipmap/HalveImage.java | 2 +- .../classes/jogamp/opengl/glu/mipmap/Image.java | 2 +- .../classes/jogamp/opengl/glu/mipmap/Mipmap.java | 2 +- .../opengl/glu/mipmap/PixelStorageModes.java | 2 +- .../jogamp/opengl/glu/mipmap/ScaleInternal.java | 2 +- .../jogamp/opengl/glu/mipmap/Type_Widget.java | 2 +- src/jogl/classes/jogamp/opengl/glu/nurbs/Arc.java | 2 +- .../jogamp/opengl/glu/nurbs/ArcSdirSorter.java | 2 +- .../jogamp/opengl/glu/nurbs/ArcTdirSorter.java | 2 +- .../jogamp/opengl/glu/nurbs/ArcTesselator.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Backend.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/BezierArc.java | 2 +- src/jogl/classes/jogamp/opengl/glu/nurbs/Bin.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Breakpt.java | 2 +- .../jogamp/opengl/glu/nurbs/CArrayOfArcs.java | 2 +- .../jogamp/opengl/glu/nurbs/CArrayOfBreakpts.java | 2 +- .../jogamp/opengl/glu/nurbs/CArrayOfFloats.java | 2 +- .../opengl/glu/nurbs/CArrayOfQuiltspecs.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Curve.java | 2 +- .../jogamp/opengl/glu/nurbs/CurveEvaluator.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Curvelist.java | 2 +- .../jogamp/opengl/glu/nurbs/DisplayList.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Flist.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Knotspec.java | 2 +- .../jogamp/opengl/glu/nurbs/Knotvector.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Mapdesc.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Maplist.java | 2 +- .../jogamp/opengl/glu/nurbs/NurbsConsts.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/O_curve.java | 2 +- .../jogamp/opengl/glu/nurbs/O_nurbscurve.java | 2 +- .../jogamp/opengl/glu/nurbs/O_nurbssurface.java | 2 +- .../jogamp/opengl/glu/nurbs/O_pwlcurve.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/O_surface.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/O_trim.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Patch.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Patchlist.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Property.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Pspec.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/PwlArc.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Quilt.java | 2 +- .../classes/jogamp/opengl/glu/nurbs/Quiltspec.java | 2 +- .../jogamp/opengl/glu/nurbs/Renderhints.java | 2 +- .../jogamp/opengl/glu/nurbs/Splinespec.java | 2 +- .../jogamp/opengl/glu/nurbs/Subdivider.java | 2 +- .../jogamp/opengl/glu/nurbs/SurfaceEvaluator.java | 2 +- .../jogamp/opengl/glu/nurbs/TrimVertex.java | 2 +- .../jogamp/opengl/glu/registry/Registry.java | 2 +- .../opengl/glu/tessellator/ActiveRegion.java | 2 +- .../opengl/glu/tessellator/CachedVertex.java | 2 +- .../jogamp/opengl/glu/tessellator/Dict.java | 2 +- .../jogamp/opengl/glu/tessellator/DictNode.java | 2 +- .../jogamp/opengl/glu/tessellator/GLUface.java | 2 +- .../jogamp/opengl/glu/tessellator/GLUhalfEdge.java | 6 +- .../jogamp/opengl/glu/tessellator/GLUmesh.java | 8 +- .../opengl/glu/tessellator/GLUtessellatorImpl.java | 4 +- .../jogamp/opengl/glu/tessellator/GLUvertex.java | 4 +- .../jogamp/opengl/glu/tessellator/Geom.java | 2 +- .../jogamp/opengl/glu/tessellator/Mesh.java | 158 ++++++++++----------- .../jogamp/opengl/glu/tessellator/Normal.java | 20 +-- .../jogamp/opengl/glu/tessellator/PriorityQ.java | 4 +- .../opengl/glu/tessellator/PriorityQHeap.java | 38 ++--- .../opengl/glu/tessellator/PriorityQSort.java | 26 ++-- .../jogamp/opengl/glu/tessellator/Render.java | 54 +++---- .../jogamp/opengl/glu/tessellator/Sweep.java | 2 +- .../jogamp/opengl/glu/tessellator/TessMono.java | 2 +- .../jogamp/opengl/glu/tessellator/TessState.java | 2 +- .../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 4 +- .../opengl/macosx/cgl/MacOSXCGLDrawable.java | 4 +- .../macosx/cgl/MacOSXCGLDrawableFactory.java | 8 +- .../cgl/MacOSXCGLDynamicLibraryBundleInfo.java | 4 +- .../macosx/cgl/MacOSXCGLGraphicsConfiguration.java | 2 +- .../cgl/MacOSXCGLGraphicsConfigurationFactory.java | 6 +- .../macosx/cgl/MacOSXExternalCGLContext.java | 6 +- .../macosx/cgl/MacOSXOffscreenCGLContext.java | 4 +- .../macosx/cgl/MacOSXOffscreenCGLDrawable.java | 4 +- .../macosx/cgl/MacOSXOnscreenCGLContext.java | 4 +- .../macosx/cgl/MacOSXOnscreenCGLDrawable.java | 4 +- .../opengl/macosx/cgl/MacOSXPbufferCGLContext.java | 4 +- .../macosx/cgl/MacOSXPbufferCGLDrawable.java | 4 +- .../cgl/awt/MacOSXAWTCGLDrawableFactory.java | 4 +- .../MacOSXAWTCGLGraphicsConfigurationFactory.java | 8 +- .../macosx/cgl/awt/MacOSXJava2DCGLContext.java | 10 +- .../opengl/util/glsl/fixedfunc/FixedFuncHook.java | 2 +- .../util/glsl/fixedfunc/FixedFuncPipeline.java | 2 +- .../opengl/windows/wgl/WGLGLCapabilities.java | 6 +- .../windows/wgl/WindowsBitmapWGLContext.java | 2 +- .../windows/wgl/WindowsBitmapWGLDrawable.java | 8 +- .../windows/wgl/WindowsDummyWGLDrawable.java | 6 +- .../windows/wgl/WindowsExternalWGLContext.java | 8 +- .../windows/wgl/WindowsExternalWGLDrawable.java | 6 +- .../windows/wgl/WindowsOnscreenWGLContext.java | 4 +- .../windows/wgl/WindowsOnscreenWGLDrawable.java | 4 +- .../windows/wgl/WindowsPbufferWGLContext.java | 4 +- .../windows/wgl/WindowsPbufferWGLDrawable.java | 4 +- .../opengl/windows/wgl/WindowsWGLContext.java | 10 +- .../opengl/windows/wgl/WindowsWGLDrawable.java | 10 +- .../windows/wgl/WindowsWGLDrawableFactory.java | 22 +-- .../wgl/WindowsWGLDynamicLibraryBundleInfo.java | 4 +- .../wgl/WindowsWGLGraphicsConfiguration.java | 12 +- .../WindowsWGLGraphicsConfigurationFactory.java | 14 +- .../WindowsAWTWGLGraphicsConfigurationFactory.java | 10 +- .../classes/jogamp/opengl/x11/glx/GLXUtil.java | 2 +- .../jogamp/opengl/x11/glx/X11DummyGLXDrawable.java | 6 +- .../opengl/x11/glx/X11ExternalGLXContext.java | 6 +- .../opengl/x11/glx/X11ExternalGLXDrawable.java | 4 +- .../jogamp/opengl/x11/glx/X11GLCapabilities.java | 4 +- .../jogamp/opengl/x11/glx/X11GLXContext.java | 6 +- .../jogamp/opengl/x11/glx/X11GLXDrawable.java | 4 +- .../opengl/x11/glx/X11GLXDrawableFactory.java | 10 +- .../x11/glx/X11GLXDynamicLibraryBundleInfo.java | 4 +- .../x11/glx/X11GLXGraphicsConfiguration.java | 6 +- .../glx/X11GLXGraphicsConfigurationFactory.java | 14 +- .../opengl/x11/glx/X11OnscreenGLXContext.java | 2 +- .../opengl/x11/glx/X11OnscreenGLXDrawable.java | 2 +- .../opengl/x11/glx/X11PbufferGLXContext.java | 2 +- .../opengl/x11/glx/X11PbufferGLXDrawable.java | 2 +- .../jogamp/opengl/x11/glx/X11PixmapGLXContext.java | 2 +- .../opengl/x11/glx/X11PixmapGLXDrawable.java | 4 +- .../awt/X11AWTGLXGraphicsConfigurationFactory.java | 8 +- .../media/nativewindow/DefaultGraphicsDevice.java | 4 +- .../nativewindow/GraphicsConfigurationFactory.java | 6 +- .../media/nativewindow/NativeWindowFactory.java | 26 ++-- .../javax/media/nativewindow/ToolkitLock.java | 4 +- .../nativewindow/awt/AWTGraphicsConfiguration.java | 2 +- .../nativewindow/awt/AWTWindowClosingProtocol.java | 2 +- .../nativewindow/x11/X11GraphicsConfiguration.java | 2 +- .../media/nativewindow/x11/X11GraphicsDevice.java | 4 +- .../media/nativewindow/x11/X11GraphicsScreen.java | 2 +- .../classes/jogamp/nativewindow/Debug.java | 2 +- .../DefaultGraphicsConfigurationFactoryImpl.java | 2 +- .../jogamp/nativewindow/NWJNILibLoader.java | 2 +- .../nativewindow/NativeWindowFactoryImpl.java | 8 +- .../jogamp/nativewindow/NullToolkitLock.java | 2 +- .../classes/jogamp/nativewindow/ProxySurface.java | 2 +- .../classes/jogamp/nativewindow/awt/AWTMisc.java | 2 +- .../jogamp/nativewindow/jawt/JAWTJNILibLoader.java | 4 +- .../jogamp/nativewindow/jawt/JAWTToolkitLock.java | 2 +- .../classes/jogamp/nativewindow/jawt/JAWTUtil.java | 6 +- .../jogamp/nativewindow/jawt/JAWTWindow.java | 2 +- .../nativewindow/jawt/JAWT_PlatformInfo.java | 4 +- .../nativewindow/jawt/macosx/MacOSXJAWTWindow.java | 12 +- .../jawt/windows/Win32SunJDKReflection.java | 2 +- .../jawt/windows/WindowsJAWTWindow.java | 14 +- .../nativewindow/jawt/x11/X11JAWTToolkitLock.java | 6 +- .../nativewindow/jawt/x11/X11JAWTWindow.java | 14 +- .../nativewindow/jawt/x11/X11SunJDKReflection.java | 2 +- .../nativewindow/windows/RegisteredClass.java | 2 +- .../windows/RegisteredClassFactory.java | 4 +- .../x11/X11GraphicsConfigurationFactory.java | 2 +- .../jogamp/nativewindow/x11/X11ToolkitLock.java | 2 +- .../classes/jogamp/nativewindow/x11/X11Util.java | 6 +- src/nativewindow/native/JAWT_DrawingSurfaceInfo.c | 2 +- src/nativewindow/native/windows/GDImisc.c | 32 ++--- src/nativewindow/native/x11/Xmisc.c | 52 +++---- src/newt/classes/com/jogamp/newt/Display.java | 4 +- src/newt/classes/com/jogamp/newt/NewtFactory.java | 8 +- src/newt/classes/com/jogamp/newt/Screen.java | 2 +- src/newt/classes/com/jogamp/newt/Window.java | 2 +- .../classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 4 +- .../com/jogamp/newt/awt/NewtFactoryAWT.java | 4 +- .../com/jogamp/newt/event/awt/AWTAdapter.java | 2 +- .../classes/com/jogamp/newt/opengl/GLWindow.java | 4 +- .../classes/com/jogamp/newt/util/MainThread.java | 4 +- src/newt/classes/jogamp/newt/Debug.java | 2 +- src/newt/classes/jogamp/newt/DefaultEDTUtil.java | 2 +- src/newt/classes/jogamp/newt/DisplayImpl.java | 14 +- src/newt/classes/jogamp/newt/NEWTJNILibLoader.java | 2 +- src/newt/classes/jogamp/newt/OffscreenWindow.java | 2 +- src/newt/classes/jogamp/newt/ScreenImpl.java | 12 +- src/newt/classes/jogamp/newt/ScreenModeStatus.java | 2 +- src/newt/classes/jogamp/newt/WindowImpl.java | 12 +- src/newt/classes/jogamp/newt/awt/AWTCanvas.java | 2 +- src/newt/classes/jogamp/newt/awt/AWTDisplay.java | 4 +- src/newt/classes/jogamp/newt/awt/AWTScreen.java | 4 +- src/newt/classes/jogamp/newt/awt/AWTWindow.java | 4 +- .../jogamp/newt/awt/opengl/VersionApplet.java | 2 +- .../classes/jogamp/newt/event/NEWTEventTask.java | 2 +- .../classes/jogamp/newt/intel/gdl/Display.java | 6 +- src/newt/classes/jogamp/newt/intel/gdl/Screen.java | 6 +- src/newt/classes/jogamp/newt/intel/gdl/Window.java | 4 +- .../classes/jogamp/newt/macosx/MacDisplay.java | 4 +- src/newt/classes/jogamp/newt/macosx/MacScreen.java | 4 +- src/newt/classes/jogamp/newt/macosx/MacWindow.java | 4 +- .../jogamp/newt/opengl/broadcom/egl/Display.java | 8 +- .../jogamp/newt/opengl/broadcom/egl/Screen.java | 4 +- .../jogamp/newt/opengl/broadcom/egl/Window.java | 6 +- .../classes/jogamp/newt/opengl/kd/KDDisplay.java | 6 +- .../classes/jogamp/newt/opengl/kd/KDScreen.java | 4 +- .../classes/jogamp/newt/opengl/kd/KDWindow.java | 6 +- .../jogamp/newt/windows/WindowsDisplay.java | 10 +- .../classes/jogamp/newt/windows/WindowsScreen.java | 6 +- .../classes/jogamp/newt/windows/WindowsWindow.java | 6 +- src/newt/classes/jogamp/newt/x11/X11Display.java | 6 +- src/newt/classes/jogamp/newt/x11/X11Screen.java | 6 +- src/newt/classes/jogamp/newt/x11/X11Window.java | 6 +- src/newt/native/BroadcomEGL.c | 16 +-- src/newt/native/IntelGDL.c | 24 ++-- src/newt/native/KDWindow.c | 20 +-- src/newt/native/MacWindow.m | 62 ++++---- src/newt/native/WindowsWindow.c | 58 ++++---- src/newt/native/X11Window.c | 108 +++++++------- .../test/junit/jogl/caps/MultisampleDemo01.java | 4 +- .../opengl/test/junit/util/AWTRobotUtil.java | 2 +- src/test/jogamp/newt/WindowImplAccess.java | 2 +- 353 files changed, 1098 insertions(+), 1083 deletions(-) diff --git a/jnlp-files/applet-version-jnlp.html b/jnlp-files/applet-version-jnlp.html index 6f91908ea..218f21fa5 100644 --- a/jnlp-files/applet-version-jnlp.html +++ b/jnlp-files/applet-version-jnlp.html @@ -24,7 +24,7 @@ JNLP Applet with AppletLauncher fallback version. JOGL_CODEBASE_TAG/nativewindow.all.jar, JOGL_CODEBASE_TAG/gluegen-rt.jar"> - + diff --git a/jnlp-files/applet-version-lancheronly.html b/jnlp-files/applet-version-lancheronly.html index 804aeebbb..718e9eba8 100644 --- a/jnlp-files/applet-version-lancheronly.html +++ b/jnlp-files/applet-version-lancheronly.html @@ -24,7 +24,7 @@ AppletLauncher only version. JOGL_CODEBASE_TAG/nativewindow.all.jar, JOGL_CODEBASE_TAG/gluegen-rt.jar"> - + diff --git a/jnlp-files/applet-version.jnlp b/jnlp-files/applet-version.jnlp index 821cef0c7..c621b46bb 100644 --- a/jnlp-files/applet-version.jnlp +++ b/jnlp-files/applet-version.jnlp @@ -17,7 +17,7 @@ diff --git a/jnlp-files/application-version.jnlp b/jnlp-files/application-version.jnlp index efce7adda..3fac56c29 100644 --- a/jnlp-files/application-version.jnlp +++ b/jnlp-files/application-version.jnlp @@ -15,5 +15,5 @@ - + diff --git a/jnlp-files/javaws-version.jnlp b/jnlp-files/javaws-version.jnlp index 6bf59e915..fa14f95ab 100755 --- a/jnlp-files/javaws-version.jnlp +++ b/jnlp-files/javaws-version.jnlp @@ -15,5 +15,5 @@ - + diff --git a/make/build-jogl.xml b/make/build-jogl.xml index ddfbc25f7..9b81c9149 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -71,59 +71,59 @@ value="com/jogamp/gluegen/opengl/** com/jogamp/gluegen/runtime/opengl/*"/> + value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/gluegen/runtime/opengl/* com/jogamp/opengl/* jogamp/opengl/* jogamp/opengl/glu/* jogamp/opengl/glu/error/*"/> + value="com/jogamp/opengl/cg com/jogamp/opengl/cg/* jogamp/opengl/cg/*"/> + value="jogamp/opengl/egl/*"/> + value="jogamp/opengl/glu/tessellator/**"/> + value="jogamp/opengl/glu/mipmap/**"/> + value="jogamp/opengl/glu/gl2/** jogamp/opengl/glu/nurbs/** jogamp/opengl/glu/registry/** javax/media/opengl/glu/gl2/**"/> + value="com/jogamp/openmax/** jogamp/openmax/**"/> + value="jogamp/opengl/x11/glx/*"/> + value="jogamp/opengl/windows/wgl/*"/> + value="jogamp/opengl/macosx/cgl/*"/> + value="jogamp/opengl/**/gl2/** jogamp/opengl/**/gl3/** jogamp/opengl/**/gl4/**"/> + value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/** jogamp/opengl/**/es1/**"/> + value="javax/media/opengl/**/es2/** com/jogamp/opengl/**/es2/** jogamp/opengl/**/es2/**"/> + value="javax/media/opengl/awt/** jogamp/opengl/**/awt/**"/> @@ -138,10 +138,10 @@ value="com/jogamp/opengl/util/glsl/* com/jogamp/opengl/util/glsl/fixedfunc/*"/> + value="jogamp/opengl/util/glsl/fixedfunc/**"/> + value="jogamp/opengl/util/glsl/fixedfunc/shaders/* jogamp/opengl/util/glsl/fixedfunc/shaders/bin/**"/> @@ -158,10 +158,10 @@ + value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/> + value="jogamp/opengl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" /> @@ -271,7 +271,7 @@ - + @@ -295,14 +295,14 @@ - + - + @@ -974,28 +974,28 @@ - + targetfile="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc/FixedFuncImpl.java" /> - - - + + + + includes="jogamp/opengl/util/glsl/fixedfunc/FixedFuncImpl.java" /> @@ -1024,7 +1024,7 @@ + excludes="com/jogamp/opengl/cg/** jogamp/opengl/gl2/** jogamp/opengl/gl3/** jogamp/opengl/gl4/** jogamp/opengl/glu/gl2/** javax/media/opengl/glu/gl2/**"/> @@ -1568,7 +1568,7 @@ @@ -1590,13 +1590,12 @@ - + - - - + @@ -1605,8 +1604,12 @@ + includes="${java.part.openmax}" + excludes="${java.part.awt} ${java.part.util.awt}"> + + + + @@ -1615,8 +1618,8 @@ + includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}" + excludes="${java.excludes.cdcfp}"/> @@ -1660,8 +1663,8 @@ + includes="${java.part.gldesktop} ${java.part.openmax}" + excludes="${java.part.gldesktop.dbg} ${java.part.glugldesktop}"/> @@ -1676,7 +1679,7 @@ + excludes="${java.part.awt} ${java.part.util.awt}"/> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index be8f6a7a2..2ed2bca04 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -73,16 +73,16 @@ + value="javax/media/nativewindow/*, javax/media/nativewindow/util/*, javax/media/nativewindow/egl/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/jogamp/nativewindow/*, jogamp/nativewindow/*, jogamp/nativewindow/jvm/*"/> + value="javax/media/nativewindow/awt/*, jogamp/nativewindow/jawt/**, jogamp/nativewindow/**/awt/**"/> + value="jogamp/nativewindow/x11/** javax/media/nativewindow/x11/*" /> + value="jogamp/nativewindow/windows/** javax/media/nativewindow/windows/*" /> @@ -159,7 +159,7 @@ - + @@ -201,13 +201,13 @@ + targetfile="${src.generated.java}/jogamp/nativewindow/x11/X11Lib.java"> + targetfile="${src.generated.java}/jogamp/nativewindow/jawt/JAWT.java"> @@ -234,7 +234,7 @@ + includes="jogamp/nativewindow/x11/** jogamp/nativewindow/windows/**" /> @@ -254,7 +254,7 @@ + includes="jogamp/nativewindow/jawt/**" /> @@ -645,7 +645,7 @@ - + - + + includes="javax/media/nativewindow/** com/jogamp/nativewindow/** jogamp/nativewindow/**" /> + includes="javax/media/nativewindow/** com/jogamp/nativewindow/** jogamp/nativewindow/**" /> diff --git a/make/build-newt.xml b/make/build-newt.xml index 87e1173f4..68b527ab6 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -87,28 +87,28 @@ + value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* jogamp/newt/* jogamp/newt/event/*"/> + value="com/jogamp/newt/awt/* com/jogamp/newt/event/awt/* jogamp/newt/awt/**"/> + value="jogamp/newt/x11/*"/> + value="jogamp/newt/windows/*"/> + value="jogamp/newt/macosx/*"/> + value="com/jogamp/newt/opengl/* jogamp/newt/opengl/kd/*"/> + value="jogamp/newt/opengl/broadcom/egl/*"/> + value="jogamp/newt/intel/gdl/*"/> @@ -515,29 +515,29 @@ - + - - - + + + - + - - - - - - - - - + + + + + + + + + @@ -674,28 +674,40 @@ - + + + + - + + + + + + + + + excludes="${java.part.awt}"> + + + + excludes="${java.excludes.cdcfp}" > + + + diff --git a/make/build-test.xml b/make/build-test.xml index 07e37faf6..93f0d0e7e 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -21,7 +21,7 @@ - + @@ -90,9 +90,8 @@ - - - + diff --git a/make/build.xml b/make/build.xml index 69be99472..69609881b 100644 --- a/make/build.xml +++ b/make/build.xml @@ -238,7 +238,7 @@ - + diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg index 45bba955b..7ec47390f 100644 --- a/make/config/jogl/cg-common.cfg +++ b/make/config/jogl/cg-common.cfg @@ -101,7 +101,7 @@ Ignore cgGetParameterValues Ignore cgGetProgramOptions # And NativeLibLoader for help loading the native libraries -Import com.jogamp.opengl.impl.* +Import jogamp.opengl.* Import com.jogamp.common.os.DynamicLookupHelper Import com.jogamp.common.os.DynamicLibraryBundle Import com.jogamp.opengl.cg.CgDynamicLibraryBundleInfo diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg index 2b28d3c68..38034a7ad 100644 --- a/make/config/jogl/cgl-macosx.cfg +++ b/make/config/jogl/cgl-macosx.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/MacOSX -Package com.jogamp.opengl.impl.macosx.cgl +Package jogamp.opengl.macosx.cgl JavaClass CGL Style AllStatic Include gl-common.cfg diff --git a/make/config/jogl/cglext.cfg b/make/config/jogl/cglext.cfg index 404a852b0..721fe911b 100644 --- a/make/config/jogl/cglext.cfg +++ b/make/config/jogl/cglext.cfg @@ -6,10 +6,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/MacOSX -Package com.jogamp.opengl.impl.macosx.cgl +Package jogamp.opengl.macosx.cgl Style InterfaceAndImpl JavaClass CGLExt -ImplPackage com.jogamp.opengl.impl.macosx.cgl +ImplPackage jogamp.opengl.macosx.cgl ImplJavaClass CGLExtImpl Include gl-common.cfg Include gl-desktop.cfg diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg index fd65d5c10..da0e3320a 100644 --- a/make/config/jogl/egl-common.cfg +++ b/make/config/jogl/egl-common.cfg @@ -7,7 +7,7 @@ GLHeader EGL/eglext.h Import java.util.* Import javax.media.opengl.* Import javax.media.opengl.fixedfunc.* -Import com.jogamp.opengl.impl.* +Import jogamp.opengl.* # Treat all of the EGL types as opaque longs # Opaque long EGLConfig diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg index c194de2d0..ea299bfcc 100644 --- a/make/config/jogl/egl.cfg +++ b/make/config/jogl/egl.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/egl -Package com.jogamp.opengl.impl.egl +Package jogamp.opengl.egl JavaClass EGL Style AllStatic # Shouldn't matter which one of these we pick up diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg index 3b46aca57..3af90d3af 100644 --- a/make/config/jogl/eglext.cfg +++ b/make/config/jogl/eglext.cfg @@ -3,15 +3,15 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/egl -Package com.jogamp.opengl.impl.egl +Package jogamp.opengl.egl Style InterfaceAndImpl JavaClass EGLExt -ImplPackage com.jogamp.opengl.impl.egl +ImplPackage jogamp.opengl.egl ImplJavaClass EGLExtImpl # Shouldn't matter which one of these we pick up Include egl-common.cfg -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/egl/EGL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/jogamp/opengl/egl/EGL.java HierarchicalNativeOutput false diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index f74976d90..2c59a74ed 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -11,7 +11,7 @@ UnsupportedExceptionType GLException Import java.util.* Import javax.media.opengl.* Import javax.media.opengl.fixedfunc.* -Import com.jogamp.opengl.impl.* +Import jogamp.opengl.* ##################################################################### # Mostly desktop OpenGL stuff below diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 4543b7fd2..5c69be9b7 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -17,7 +17,7 @@ JavaClass GLES1 Extends GLES1 GLBase Extends GLES1 GL Extends GLES1 GL2ES1 -ImplPackage com.jogamp.opengl.impl.es1 +ImplPackage jogamp.opengl.es1 ImplJavaClass GLES1Impl Implements GLES1Impl GLBase Implements GLES1Impl GL diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg index 9caa3b7f7..dcdc39b29 100644 --- a/make/config/jogl/gl-es2.cfg +++ b/make/config/jogl/gl-es2.cfg @@ -12,7 +12,7 @@ JavaClass GLES2 Extends GLES2 GLBase Extends GLES2 GL Extends GLES2 GL2ES2 -ImplPackage com.jogamp.opengl.impl.es2 +ImplPackage jogamp.opengl.es2 ImplJavaClass GLES2Impl Implements GLES2Impl GLBase Implements GLES2Impl GL diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index 33105d5f0..06a9c76f1 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -27,7 +27,7 @@ Extends GL4bc GL2 Extends GL4bc GL3 Extends GL4bc GL3bc Extends GL4bc GL4 -ImplPackage com.jogamp.opengl.impl.gl4 +ImplPackage jogamp.opengl.gl4 ImplJavaClass GL4bcImpl Implements GL4bcImpl GLBase Implements GL4bcImpl GL diff --git a/make/config/jogl/gl-if-gl3.cfg b/make/config/jogl/gl-if-gl3.cfg index 6682e4145..3ccc2c58c 100644 --- a/make/config/jogl/gl-if-gl3.cfg +++ b/make/config/jogl/gl-if-gl3.cfg @@ -14,7 +14,7 @@ Extends GL3 GLBase Extends GL3 GL Extends GL3 GL2ES2 Extends GL3 GL2GL3 -ImplPackage com.jogamp.opengl.impl.gl3 +ImplPackage jogamp.opengl.gl3 ImplJavaClass GL3Impl Implements GL3Impl GLBase Implements GL3Impl GL diff --git a/make/config/jogl/gl-impl-CustomCCode-gl4bc.c b/make/config/jogl/gl-impl-CustomCCode-gl4bc.c index 778559eba..d389db298 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gl4bc.c +++ b/make/config/jogl/gl-impl-CustomCCode-gl4bc.c @@ -1,10 +1,10 @@ /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.gl4.GL4bcImpl + * Java package: jogamp.opengl.gl4.GL4bcImpl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_jogamp_opengl_gl4_GL4bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -14,12 +14,12 @@ Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapBuffer(JNIEnv *env, job } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.gl4.GL4bcImpl + * Java package: jogamp.opengl.gl4.GL4bcImpl * Java method: long dispatch_glMapNamedBufferEXT(int target, int access) * C function: void * glMapNamedBufferEXT(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapNamedBufferEXT(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_jogamp_opengl_gl4_GL4bcImpl_dispatch_1glMapNamedBufferEXT(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPNAMEDBUFFEREXTPROC ptr_glMapNamedBufferEXT; void * _res; ptr_glMapNamedBufferEXT = (PFNGLMAPNAMEDBUFFEREXTPROC) (intptr_t) glProcAddress; @@ -29,11 +29,11 @@ Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_dispatch_1glMapNamedBufferEXT(JNIEnv * } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.gl4.GL4bcImpl + * Java package: jogamp.opengl.gl4.GL4bcImpl * Java method: ByteBuffer newDirectByteBuffer(long addr, long capacity); * C function: jobject newDirectByteBuffer(jlong addr, jlong capacity); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_gl4_GL4bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { +Java_jogamp_opengl_gl4_GL4bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gles1.c b/make/config/jogl/gl-impl-CustomCCode-gles1.c index 422935ba7..0155c13f8 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gles1.c +++ b/make/config/jogl/gl-impl-CustomCCode-gles1.c @@ -1,11 +1,11 @@ typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.es1.GLES1Impl + * Java package: jogamp.opengl.es1.GLES1Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_jogamp_opengl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -15,11 +15,11 @@ Java_com_jogamp_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, job } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.es1.GLES1Impl + * Java package: jogamp.opengl.es1.GLES1Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, long capacity); * C function: jobject newDirectByteBuffer(jlong addr, jlong capacity); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { +Java_jogamp_opengl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gles2.c b/make/config/jogl/gl-impl-CustomCCode-gles2.c index 86fc47b4b..e140df76b 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gles2.c +++ b/make/config/jogl/gl-impl-CustomCCode-gles2.c @@ -1,11 +1,11 @@ typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.es2.GLES2Impl + * Java package: jogamp.opengl.es2.GLES2Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_jogamp_opengl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -15,11 +15,11 @@ Java_com_jogamp_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, job } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.es2.GLES2Impl + * Java package: jogamp.opengl.es2.GLES2Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, long capacity); * C function: jobject newDirectByteBuffer(jlong addr, jlong capacity); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { +Java_jogamp_opengl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jlong capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java index fcbcaca24..49722b469 100644 --- a/make/config/jogl/glu-CustomJavaCode-base.java +++ b/make/config/jogl/glu-CustomJavaCode-base.java @@ -169,7 +169,7 @@ protected static boolean checkedGLUtessellatorImpl = false; protected static final void validateGLUtessellatorImpl() { if(!checkedGLUtessellatorImpl) { - availableGLUtessellatorImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl", GLU.class.getClassLoader()); + availableGLUtessellatorImpl = ReflectionUtil.isClassAvailable("jogamp.opengl.glu.tessellator.GLUtessellatorImpl", GLU.class.getClassLoader()); checkedGLUtessellatorImpl = true; } if(!availableGLUtessellatorImpl) { @@ -1220,7 +1220,7 @@ protected static final void validateGLUquadricImpl() { if(!checkedGLUquadricImpl) { synchronized (syncObject) { if(!checkedGLUquadricImpl) { - availableGLUquadricImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl", GLU.class.getClassLoader()); + availableGLUquadricImpl = ReflectionUtil.isClassAvailable("jogamp.opengl.glu.GLUquadricImpl", GLU.class.getClassLoader()); checkedGLUquadricImpl = true; } } diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java index 3f520498b..203d1eeae 100644 --- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java @@ -86,7 +86,7 @@ protected static boolean checkedMipmap = false; protected static final void validateMipmap() { if(!checkedMipmap) { - availableMipmap = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap", GLU.class.getClassLoader()); + availableMipmap = ReflectionUtil.isClassAvailable("jogamp.opengl.glu.mipmap.Mipmap", GLU.class.getClassLoader()); checkedMipmap = true; } if(!availableMipmap) { diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg index d859225ec..f4021d6d8 100644 --- a/make/config/jogl/glu-base.cfg +++ b/make/config/jogl/glu-base.cfg @@ -20,8 +20,8 @@ Ignore gluScaleImage IncludeAs CustomJavaCode GLU glu-CustomJavaCode-base.java # Imports for the Error and Registry classes -Import com.jogamp.opengl.impl.glu.error.Error -Import com.jogamp.opengl.impl.glu.registry.Registry +Import jogamp.opengl.glu.error.Error +Import jogamp.opengl.glu.registry.Registry Include glu-common.cfg diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg index f5fc7c1b3..d2a480254 100644 --- a/make/config/jogl/glu-common.cfg +++ b/make/config/jogl/glu-common.cfg @@ -11,9 +11,9 @@ TagNativeBinding true # Import javax.media.opengl.* Import javax.media.opengl.glu.* -Import com.jogamp.opengl.impl.* -Import com.jogamp.opengl.impl.glu.* -Import com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl +Import jogamp.opengl.* +Import jogamp.opengl.glu.* +Import jogamp.opengl.glu.tessellator.GLUtessellatorImpl Import com.jogamp.common.util.ReflectionUtil # Raise GLException instead of RuntimeException in glue code diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg index aec0c446a..11eeb7c50 100644 --- a/make/config/jogl/glu-gl2.cfg +++ b/make/config/jogl/glu-gl2.cfg @@ -25,7 +25,7 @@ CustomCCode #endif Include ../intptr.cfg EmitProcAddressTable true -ProcAddressTablePackage com.jogamp.opengl.impl.glu.gl2 +ProcAddressTablePackage jogamp.opengl.glu.gl2 ProcAddressTableClassName GLUgl2ProcAddressTable GetProcAddressTableExpr getGLUProcAddressTable() @@ -38,14 +38,14 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java # GLU needs access to the GLUtesselatorImpl class for GLUtesselator, # to the Mipmap class for scaling and mipmap generation, # and to the nurbs.* package for the NURBS functionality -Import com.jogamp.opengl.impl.glu.nurbs.* +Import jogamp.opengl.glu.nurbs.* Import java.security.* Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver -Import com.jogamp.opengl.impl.glu.gl2.nurbs.* -Import com.jogamp.opengl.impl.glu.mipmap.Mipmap -Import com.jogamp.opengl.impl.glu.gl2.* +Import jogamp.opengl.glu.gl2.nurbs.* +Import jogamp.opengl.glu.mipmap.Mipmap +Import jogamp.opengl.glu.gl2.* Import javax.media.opengl.GL2 -Import com.jogamp.opengl.impl.gl2.ProjectDouble +Import jogamp.opengl.gl2.ProjectDouble # # ------------------------ diff --git a/make/config/jogl/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg index af89014f4..fa7011360 100644 --- a/make/config/jogl/glu-gl2es1.cfg +++ b/make/config/jogl/glu-gl2es1.cfg @@ -20,7 +20,7 @@ Ignore gluScaleImage IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java Import javax.media.opengl.GLES1 -Import com.jogamp.opengl.impl.glu.mipmap.Mipmap +Import jogamp.opengl.glu.mipmap.Mipmap Include glu-common.cfg diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c index dec3f4583..e372e5120 100644 --- a/make/config/jogl/glx-CustomCCode.c +++ b/make/config/jogl/glx-CustomCCode.c @@ -30,29 +30,29 @@ static void _initClazzAccess(JNIEnv *env) { c = (*env)->FindClass(env, clazzNameBuffers); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameBuffers); + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX: can't find %s\n", clazzNameBuffers); (*env)->FatalError(env, clazzNameBuffers); } clazzBuffers = (jclass)(*env)->NewGlobalRef(env, c); if(NULL==clazzBuffers) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameBuffers); + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX: can't use %s\n", clazzNameBuffers); (*env)->FatalError(env, clazzNameBuffers); } c = (*env)->FindClass(env, clazzNameByteBuffer); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer); + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer); (*env)->FatalError(env, clazzNameByteBuffer); } clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer); + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer); (*env)->FatalError(env, clazzNameByteBuffer); } cstrBuffers = (*env)->GetStaticMethodID(env, clazzBuffers, clazzNameBuffersStaticCstrName, clazzNameBuffersStaticCstrSignature); if(NULL==cstrBuffers) { - fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX:: can't create %s.%s %s\n", + fprintf(stderr, "FatalError: Java_jogamp_opengl_x11_glx_GLX:: can't create %s.%s %s\n", clazzNameBuffers, clazzNameBuffersStaticCstrName, clazzNameBuffersStaticCstrSignature); (*env)->FatalError(env, clazzNameBuffersStaticCstrName); @@ -60,12 +60,12 @@ static void _initClazzAccess(JNIEnv *env) { } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.x11.glx.GLX + * Java package: jogamp.opengl.x11.glx.GLX * Java method: XVisualInfo glXGetVisualFromFBConfig(long dpy, long config) * C function: XVisualInfo * glXGetVisualFromFBConfig(Display * dpy, GLXFBConfig config); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jlong config, jlong procAddress) { +Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jlong config, jlong procAddress) { typedef XVisualInfo* (APIENTRY*_local_PFNGLXGETVISUALFROMFBCONFIG)(Display * dpy, GLXFBConfig config); _local_PFNGLXGETVISUALFROMFBCONFIG ptr_glXGetVisualFromFBConfig; XVisualInfo * _res; @@ -88,12 +88,12 @@ Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXGetVisualFromFBConfig(JNIEn } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.x11.glx.GLX + * Java package: jogamp.opengl.x11.glx.GLX * Java method: java.nio.LongBuffer glXChooseFBConfig(long dpy, int screen, java.nio.IntBuffer attribList, java.nio.IntBuffer nitems) * C function: GLXFBConfig * glXChooseFBConfig(Display * dpy, int screen, const int * attribList, int * nitems); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset, jlong procAddress) { +Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset, jlong procAddress) { typedef GLXFBConfig* (APIENTRY*_local_PFNGLXCHOOSEFBCONFIG)(Display * dpy, int screen, const int * attribList, int * nitems); _local_PFNGLXCHOOSEFBCONFIG ptr_glXChooseFBConfig; int * _ptr2 = NULL; @@ -131,12 +131,12 @@ Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, } /* Java->C glue code: - * Java package: com.jogamp.opengl.impl.x11.glx.GLX + * Java package: jogamp.opengl.x11.glx.GLX * Java method: XVisualInfo glXChooseVisual(long dpy, int screen, java.nio.IntBuffer attribList) * C function: XVisualInfo * glXChooseVisual(Display * dpy, int screen, int * attribList); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_opengl_impl_x11_glx_GLX_dispatch_1glXChooseVisual(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jlong procAddress) { +Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseVisual(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jlong procAddress) { typedef XVisualInfo* (APIENTRY*_local_PFNGLXCHOOSEVISUAL)(Display * dpy, int screen, int * attribList); _local_PFNGLXCHOOSEVISUAL ptr_glXChooseVisual; int * _ptr2 = NULL; diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg index dee1d015f..4daa78b84 100644 --- a/make/config/jogl/glx-x11.cfg +++ b/make/config/jogl/glx-x11.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/X11 -Package com.jogamp.opengl.impl.x11.glx +Package jogamp.opengl.x11.glx JavaClass GLX Style AllStatic Include gl-common.cfg @@ -21,7 +21,7 @@ EmitProcAddressTable true ProcAddressTableClassName GLXProcAddressTable GetProcAddressTableExpr glxProcAddressTable -Import com.jogamp.nativewindow.impl.x11.* +Import jogamp.nativewindow.x11.* Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver CustomJavaCode GLX private static GLXProcAddressTable glxProcAddressTable = new GLXProcAddressTable(new GLProcAddressResolver()); diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg index aeed3af4e..82490a2e8 100644 --- a/make/config/jogl/glxext.cfg +++ b/make/config/jogl/glxext.cfg @@ -3,13 +3,13 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/X11 -Package com.jogamp.opengl.impl.x11.glx +Package jogamp.opengl.x11.glx Style InterfaceAndImpl JavaClass GLXExt -ImplPackage com.jogamp.opengl.impl.x11.glx +ImplPackage jogamp.opengl.x11.glx ImplJavaClass GLXExtImpl -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/x11/glx/GLX.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/jogamp/opengl/x11/glx/GLX.java Include gl-common.cfg Include gl-desktop.cfg @@ -20,7 +20,7 @@ EmitProcAddressTable true ProcAddressTableClassName GLXExtProcAddressTable GetProcAddressTableExpr _context.getGLXExtProcAddressTable() -Import com.jogamp.nativewindow.impl.x11.* +Import jogamp.nativewindow.x11.* # Ignore everything that doesn't start with glX or GLX IgnoreNot ^(glX|GLX).+ diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg index 97938a853..a86834531 100644 --- a/make/config/jogl/wgl-win32.cfg +++ b/make/config/jogl/wgl-win32.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/Windows -Package com.jogamp.opengl.impl.windows.wgl +Package jogamp.opengl.windows.wgl JavaClass WGL Style AllStatic Include gl-common.cfg diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg index aca757b1c..d37a861b7 100644 --- a/make/config/jogl/wglext.cfg +++ b/make/config/jogl/wglext.cfg @@ -3,10 +3,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/Windows -Package com.jogamp.opengl.impl.windows.wgl +Package jogamp.opengl.windows.wgl Style InterfaceAndImpl JavaClass WGLExt -ImplPackage com.jogamp.opengl.impl.windows.wgl +ImplPackage jogamp.opengl.windows.wgl ImplJavaClass WGLExtImpl Include gl-common.cfg Include gl-desktop.cfg diff --git a/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java b/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java index aad0ab261..598ced346 100644 --- a/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java +++ b/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java @@ -16,12 +16,12 @@ private static JAWT_PlatformInfo newPlatformInfo(ByteBuffer buf) { try { Class factoryClass; if (osName.startsWith("wind")) { - factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo"); + factoryClass = Class.forName("jogamp.nativewindow.jawt.windows.JAWT_Win32DrawingSurfaceInfo"); } else if (osName.startsWith("mac os x")) { - factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo"); + factoryClass = Class.forName("jogamp.nativewindow.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo"); } else { // Assume Linux, Solaris, etc. Should probably test for these explicitly. - factoryClass = Class.forName("com.jogamp.nativewindow.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo"); + factoryClass = Class.forName("jogamp.nativewindow.jawt.x11.JAWT_X11DrawingSurfaceInfo"); } platformInfoFactoryMethod = factoryClass.getMethod("create", new Class[] { ByteBuffer.class }); diff --git a/make/config/nativewindow/jawt-common.cfg b/make/config/nativewindow/jawt-common.cfg index 4ed0a88f1..d633c47d6 100644 --- a/make/config/nativewindow/jawt-common.cfg +++ b/make/config/nativewindow/jawt-common.cfg @@ -1,6 +1,6 @@ # Common JAWT config file Style AllStatic -Package com.jogamp.nativewindow.impl.jawt +Package jogamp.nativewindow.jawt JavaClass JAWTFactory JavaOutputDir gensrc/classes #NativeOutputDir gensrc/native/ @@ -21,6 +21,6 @@ IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java CustomCCode #include import java.security.* -import com.jogamp.nativewindow.impl.jawt.* +import jogamp.nativewindow.jawt.* IncludeAs CustomJavaCode JAWT_DrawingSurfaceInfo jawt-DrawingSurfaceInfo-CustomJavaCode.java diff --git a/make/config/nativewindow/jawt-macosx.cfg b/make/config/nativewindow/jawt-macosx.cfg index e018af0dc..c41367f4a 100644 --- a/make/config/nativewindow/jawt-macosx.cfg +++ b/make/config/nativewindow/jawt-macosx.cfg @@ -9,6 +9,6 @@ Opaque long NSView * CustomCCode #include CustomCCode #include -StructPackage JAWT_MacOSXDrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.macosx +StructPackage JAWT_MacOSXDrawingSurfaceInfo jogamp.nativewindow.jawt.macosx EmitStruct JAWT_MacOSXDrawingSurfaceInfo Implements JAWT_MacOSXDrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg index 00b3a3322..d1fa7020a 100644 --- a/make/config/nativewindow/jawt-win32.cfg +++ b/make/config/nativewindow/jawt-win32.cfg @@ -10,6 +10,6 @@ IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette Include ../intptr.cfg -StructPackage JAWT_Win32DrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.windows +StructPackage JAWT_Win32DrawingSurfaceInfo jogamp.nativewindow.jawt.windows EmitStruct JAWT_Win32DrawingSurfaceInfo Implements JAWT_Win32DrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/jawt-x11.cfg b/make/config/nativewindow/jawt-x11.cfg index 4e7ed267b..ac9d1aa9a 100644 --- a/make/config/nativewindow/jawt-x11.cfg +++ b/make/config/nativewindow/jawt-x11.cfg @@ -10,6 +10,6 @@ IgnoreField JAWT_X11DrawingSurfaceInfo GetAWTColor CustomCCode #include -StructPackage JAWT_X11DrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.x11 +StructPackage JAWT_X11DrawingSurfaceInfo jogamp.nativewindow.jawt.x11 EmitStruct JAWT_X11DrawingSurfaceInfo Implements JAWT_X11DrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg index d4ca642bf..894211182 100644 --- a/make/config/nativewindow/win32-lib.cfg +++ b/make/config/nativewindow/win32-lib.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/Windows -Package com.jogamp.nativewindow.impl.windows +Package jogamp.nativewindow.windows JavaClass GDI Style AllStatic @@ -22,8 +22,8 @@ Opaque long void ** Import javax.media.nativewindow.util.Point Import javax.media.nativewindow.NativeWindowException -Import com.jogamp.nativewindow.impl.NWJNILibLoader -import com.jogamp.nativewindow.impl.Debug +Import jogamp.nativewindow.NWJNILibLoader +import jogamp.nativewindow.Debug CustomCCode #define WIN32_LEAN_AND_MEAN CustomCCode #include diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg index fb481ac51..8848980ea 100644 --- a/make/config/nativewindow/x11-lib.cfg +++ b/make/config/nativewindow/x11-lib.cfg @@ -1,6 +1,6 @@ # This .cfg file is used to generate the interface to the GLX routines # used internally by the X11GLContext implementation. -Package com.jogamp.nativewindow.impl.x11 +Package jogamp.nativewindow.x11 JavaClass X11Lib Style AllStatic diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh index 2a2f67bf2..a7710a280 100755 --- a/make/scripts/lstjars.sh +++ b/make/scripts/lstjars.sh @@ -7,15 +7,15 @@ shift BUILDDIR_GLUEGEN=$1 shift if [ -z "$BUILDDIR" -o -z "$BUILDDIR_GLUEGEN" ] ; then - echo "usage $0 [-skippack200]" + echo "usage $0 [-pack200]" exit 1 fi STATDIR=$BUILDDIR-stats -skippack200=0 -if [ "$1" = "-skippack200" ] ; then - skippack200=1 +pack200=0 +if [ "$1" = "-pack200" ] ; then + pack200=1 fi function report() { @@ -131,7 +131,7 @@ echo sort jogl*.lst | uniq -d mv nope/* . -mv jogl.test.lst *.cdc.lst *.all*.lst nope/ +mv jogl.test.lst *.cdc.lst *.all*.lst gluegen-gl.lst nope/ cat *.lst | sort -u > allparts.lst mv nope/* . cat *.all.lst gluegen-rt.lst | sort -u > allall.lst @@ -143,7 +143,7 @@ diff -Nur allparts.lst allall.lst listdeployment jar -if [ $skippack200 -eq 0 ] ; then +if [ $pack200 -eq 1 ] ; then for i in *.jar ; do fname=$i bname=$(basename $fname .jar) diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index 29feae682..d4aee05ce 100644 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -1,4 +1,4 @@ -REM scripts\java-win64-dbg.bat com.jogamp.newt.impl.awt.opengl.VersionApplet +REM scripts\java-win64-dbg.bat jogamp.newt.awt.opengl.VersionApplet REM scripts\java-win64-dbg.bat com.jogamp.newt.opengl.GLWindow REM scripts\java-win64-dbg.bat javax.media.opengl.awt.GLCanvas REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT -time 5000 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index e94d4223d..9a5e6fb20 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -38,7 +38,7 @@ function jrun() { #D_ARGS="-Dnewt.debug.EDT" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnewt.debug=all" - D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT -Djogl.debug.GLContext" + #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT -Djogl.debug.GLContext" #D_ARGS="-Dnewt.debug=all" #D_ARGS="-Dnativewindow.debug=all" #D_ARGS="-Djogl.debug.GraphicsConfiguration" @@ -96,7 +96,7 @@ function testawt() { # # awt (testawt) # -#testawt com.jogamp.newt.impl.awt.opengl.VersionApplet $* +#testawt jogamp.newt.awt.opengl.VersionApplet $* #testawt javax.media.opengl.awt.GLCanvas $* #testawt com.jogamp.opengl.test.junit.jogl.awt.TestAWT01GLn $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT $* @@ -110,6 +110,7 @@ function testawt() { #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT #testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT +testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417 # # newt.awt (testawt) @@ -143,7 +144,7 @@ function testawt() { #testawt $* -testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT +#testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT $spath/count-edt-start.sh java-run.log diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java index 7acba95e6..d11504a64 100644 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java @@ -550,7 +550,7 @@ public class BuildComposablePipeline { * method wrappers have been generated. */ protected void preMethodEmissionHook(PrintWriter output) { - output.println(" public static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug(\"" + getOutputName() + "\");"); + output.println(" public static final boolean DEBUG = jogamp.opengl.Debug.debug(\"" + getOutputName() + "\");"); } /** diff --git a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java index 96cfe6562..4a8579767 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java +++ b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java @@ -29,7 +29,7 @@ package com.jogamp.opengl.util; import com.jogamp.common.util.locks.RecursiveLock; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import java.util.ArrayList; import javax.media.opengl.GLAnimatorControl; import javax.media.opengl.GLAutoDrawable; diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java index 1141f6624..4586d1df5 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java +++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java @@ -8,7 +8,7 @@ import javax.media.opengl.*; import com.jogamp.opengl.util.glsl.*; -import com.jogamp.opengl.impl.SystemUtil; +import jogamp.opengl.SystemUtil; import java.nio.*; diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java index 2ab77fa1b..88a8603f9 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java +++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java @@ -3,7 +3,7 @@ package com.jogamp.opengl.util; import javax.media.opengl.*; -import com.jogamp.opengl.util.glsl.fixedfunc.impl.*; +import jogamp.opengl.util.glsl.fixedfunc.*; import java.nio.*; diff --git a/src/jogl/classes/com/jogamp/opengl/util/Gamma.java b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java index 672325cf3..c649d1c6a 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/Gamma.java +++ b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java @@ -40,7 +40,7 @@ package com.jogamp.opengl.util; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; /** Provides control over the primary display's gamma, brightness and contrast controls via the hardware gamma ramp tables. Not diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java index 47de8ce0a..0e1b7926e 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java +++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java @@ -34,7 +34,7 @@ package com.jogamp.opengl.util; import com.jogamp.common.nio.Buffers; -import com.jogamp.opengl.impl.ProjectFloat; +import jogamp.opengl.ProjectFloat; import java.nio.*; import java.util.ArrayList; diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java index 6073a75f8..86882176a 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java +++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java @@ -40,7 +40,7 @@ package com.jogamp.opengl.util.awt; import com.jogamp.common.nio.Buffers; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.packrect.*; import com.jogamp.opengl.util.texture.*; diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java index 1d7f38afe..5dd1b5a3a 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java +++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java @@ -31,7 +31,7 @@ package com.jogamp.opengl.util.glsl; import com.jogamp.common.nio.Buffers; import javax.media.opengl.*; import com.jogamp.opengl.util.*; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import java.util.*; import java.nio.*; diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java index 42bf91e65..57ae6cfda 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java +++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java @@ -29,7 +29,7 @@ package com.jogamp.opengl.util.glsl; import javax.media.opengl.*; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import java.util.HashMap; import java.util.HashSet; diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java index 7ec4ac50e..9d7eecb60 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java +++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java @@ -7,7 +7,7 @@ package com.jogamp.opengl.util.glsl.fixedfunc; import javax.media.opengl.*; import javax.media.opengl.fixedfunc.*; -import com.jogamp.opengl.util.glsl.fixedfunc.impl.*; +import jogamp.opengl.util.glsl.fixedfunc.*; /** * Tool to pipeline GL2ES2 into a fixed function emulation implementing GL2ES1. diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java index 57ac0d45a..38f8ff974 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java @@ -42,7 +42,7 @@ import java.security.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; import javax.media.nativewindow.NativeWindowFactory; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.opengl.util.texture.*; import com.jogamp.opengl.util.texture.spi.*; diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp index 3b694be68..eb65ff538 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp @@ -46,7 +46,7 @@ import java.util.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.texture.spi.*; diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase index 819a6acf5..e86ff161b 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase @@ -46,7 +46,7 @@ import java.util.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.texture.spi.*; diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java index a45821d87..6e2f1b992 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java @@ -46,7 +46,7 @@ import java.net.*; import javax.imageio.*; import javax.media.opengl.GLProfile; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import com.jogamp.opengl.util.texture.*; import com.jogamp.opengl.util.texture.awt.*; import com.jogamp.opengl.util.texture.spi.*; diff --git a/src/jogl/classes/com/jogamp/openmax/OMXInstance.java b/src/jogl/classes/com/jogamp/openmax/OMXInstance.java index d49eeb8e6..fcd055f8b 100644 --- a/src/jogl/classes/com/jogamp/openmax/OMXInstance.java +++ b/src/jogl/classes/com/jogamp/openmax/OMXInstance.java @@ -5,10 +5,10 @@ import javax.media.opengl.*; import javax.media.opengl.glu.GLU; import com.jogamp.opengl.util.texture.*; -import com.jogamp.opengl.impl.egl.EGL; -import com.jogamp.opengl.impl.egl.EGLContext; -import com.jogamp.opengl.impl.egl.EGLDrawable; -import com.jogamp.opengl.impl.egl.EGLExt; +import jogamp.opengl.egl.EGL; +import jogamp.opengl.egl.EGLContext; +import jogamp.opengl.egl.EGLDrawable; +import jogamp.opengl.egl.EGLExt; import java.net.URL; import java.nio.ByteBuffer; diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java index ecba18147..9352ad4f3 100644 --- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java +++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java @@ -41,7 +41,7 @@ package javax.media.opengl; import javax.media.nativewindow.NativeWindowException; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import java.util.List; import javax.media.nativewindow.CapabilitiesImmutable; diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java index cde327a07..cf24d1028 100644 --- a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java +++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java @@ -40,7 +40,7 @@ package javax.media.opengl; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; import java.security.*; /** A higher-level abstraction than {@link GLDrawable} which supplies diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index a0c0dd83f..b859dee00 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -43,7 +43,7 @@ package javax.media.opengl; import java.util.HashMap; import java.util.HashSet; import javax.media.nativewindow.AbstractGraphicsDevice; -import com.jogamp.opengl.impl.Debug; +import jogamp.opengl.Debug; /** Abstraction for an OpenGL rendering context. In order to perform OpenGL rendering, a context must be "made current" on the current @@ -611,7 +611,7 @@ public abstract class GLContext { } /** - * Called by {@link com.jogamp.opengl.impl.GLContextImpl#createContextARBMapVersionsAvailable} not intended to be used by + * Called by {@link jogamp.opengl.GLContextImpl#createContextARBMapVersionsAvailable} not intended to be used by * implementations. However, if {@link #createContextARB} is not being used within * {@link javax.media.opengl.GLDrawableFactory#getOrCreateSharedContext(javax.media.nativewindow.AbstractGraphicsDevice)}, * GLProfile has to map the available versions. diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java index 500173cf2..395ee3704 100644 --- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java +++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java @@ -46,7 +46,7 @@ import java.util.ArrayList; import java.util.List; import com.jogamp.common.JogampRuntimeException; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; import com.jogamp.common.util.ReflectionUtil; import javax.media.nativewindow.AbstractGraphicsDevice; @@ -92,8 +92,8 @@ public abstract class GLDrawableFactory { private static final GLDrawableFactory eglFactory; private static final GLDrawableFactory nativeOSFactory; private static final String nativeOSType; - static final String macosxFactoryClassNameCGL = "com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory"; - static final String macosxFactoryClassNameAWTCGL = "com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory"; + static final String macosxFactoryClassNameCGL = "jogamp.opengl.macosx.cgl.MacOSXCGLDrawableFactory"; + static final String macosxFactoryClassNameAWTCGL = "jogamp.opengl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory"; protected static ArrayList/**/ glDrawableFactories = new ArrayList(); @@ -119,9 +119,9 @@ public abstract class GLDrawableFactory { ClassLoader cl = GLDrawableFactory.class.getClassLoader(); if (null == factoryClassName) { if ( nativeOSType.equals(NativeWindowFactory.TYPE_X11) ) { - factoryClassName = "com.jogamp.opengl.impl.x11.glx.X11GLXDrawableFactory"; + factoryClassName = "jogamp.opengl.x11.glx.X11GLXDrawableFactory"; } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_WINDOWS) ) { - factoryClassName = "com.jogamp.opengl.impl.windows.wgl.WindowsWGLDrawableFactory"; + factoryClassName = "jogamp.opengl.windows.wgl.WindowsWGLDrawableFactory"; } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_MACOSX) ) { if(ReflectionUtil.isClassAvailable(macosxFactoryClassNameAWTCGL, cl)) { factoryClassName = macosxFactoryClassNameAWTCGL; @@ -152,7 +152,7 @@ public abstract class GLDrawableFactory { tmp = null; try { - tmp = (GLDrawableFactory) ReflectionUtil.createInstance("com.jogamp.opengl.impl.egl.EGLDrawableFactory", cl); + tmp = (GLDrawableFactory) ReflectionUtil.createInstance("jogamp.opengl.egl.EGLDrawableFactory", cl); } catch (JogampRuntimeException jre) { if (GLProfile.DEBUG) { System.err.println("Info: GLDrawableFactory.static - EGLDrawableFactory - not available"); diff --git a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java index 590e88ab7..926651c1d 100644 --- a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java +++ b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java @@ -39,7 +39,7 @@ package javax.media.opengl; import java.lang.reflect.*; import java.util.StringTokenizer; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; /** * Factory for pipelining GL instances diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 10d92b050..c46f2f5e5 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -42,10 +42,10 @@ import com.jogamp.common.jvm.JVMUtil; import com.jogamp.common.util.ReflectionUtil; import com.jogamp.common.util.VersionUtil; import com.jogamp.nativewindow.NativeWindowVersion; -import com.jogamp.opengl.impl.Debug; -import com.jogamp.opengl.impl.GLDrawableFactoryImpl; -import com.jogamp.opengl.impl.GLDynamicLookupHelper; -import com.jogamp.opengl.impl.DesktopGLDynamicLookupHelper; +import jogamp.opengl.Debug; +import jogamp.opengl.GLDrawableFactoryImpl; +import jogamp.opengl.GLDynamicLookupHelper; +import jogamp.opengl.DesktopGLDynamicLookupHelper; import com.jogamp.opengl.JoglVersion; import javax.media.nativewindow.AbstractGraphicsDevice; import javax.media.opengl.fixedfunc.GLPointerFunc; @@ -1173,7 +1173,7 @@ public class GLProfile { isAWTAvailable = NativeWindowFactory.isAWTAvailable() && ReflectionUtil.isClassAvailable("javax.media.opengl.awt.GLCanvas", classloader) ; // JOGL - hasGL234Impl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.gl4.GL4bcImpl", classloader); + hasGL234Impl = ReflectionUtil.isClassAvailable("jogamp.opengl.gl4.GL4bcImpl", classloader); // // Iteration of desktop GL availability detection @@ -1216,7 +1216,7 @@ public class GLProfile { defaultDevice = defaultDesktopDevice; } - if ( ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDrawableFactory", classloader) ) { + if ( ReflectionUtil.isClassAvailable("jogamp.opengl.egl.EGLDrawableFactory", classloader) ) { t=null; try { eglFactory = (GLDrawableFactoryImpl) GLDrawableFactory.getFactoryImpl(GLES2); @@ -1547,11 +1547,11 @@ public class GLProfile { GL3bc.equals(profileImpl) || GL3.equals(profileImpl) || GL2.equals(profileImpl) ) { - return "com.jogamp.opengl.impl.gl4.GL4bc"; + return "jogamp.opengl.gl4.GL4bc"; } else if(GLES1.equals(profileImpl) || GL2ES1.equals(profileImpl)) { - return "com.jogamp.opengl.impl.es1.GLES1"; + return "jogamp.opengl.es1.GLES1"; } else if(GLES2.equals(profileImpl) || GL2ES2.equals(profileImpl)) { - return "com.jogamp.opengl.impl.es2.GLES2"; + return "jogamp.opengl.es2.GLES2"; } else { throw new GLException("unsupported profile \"" + profileImpl + "\""); } diff --git a/src/jogl/classes/javax/media/opengl/Threading.java b/src/jogl/classes/javax/media/opengl/Threading.java index e58792b8f..d0f3ebb93 100644 --- a/src/jogl/classes/javax/media/opengl/Threading.java +++ b/src/jogl/classes/javax/media/opengl/Threading.java @@ -39,7 +39,7 @@ package javax.media.opengl; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; /** This API provides access to the threading model for the implementation of the classes in this package. diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java index 75b9ec375..b7ec1ec1a 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java @@ -92,10 +92,10 @@ import com.jogamp.common.util.VersionUtil; import com.jogamp.opengl.JoglVersion; import com.jogamp.common.util.locks.RecursiveLock; -import com.jogamp.opengl.impl.Debug; -import com.jogamp.opengl.impl.GLContextImpl; -import com.jogamp.opengl.impl.GLDrawableHelper; -import com.jogamp.opengl.impl.ThreadingImpl; +import jogamp.opengl.Debug; +import jogamp.opengl.GLContextImpl; +import jogamp.opengl.GLDrawableHelper; +import jogamp.opengl.ThreadingImpl; // FIXME: Subclasses need to call resetGLFunctionAvailability() on their // context whenever the displayChanged() function is called on our diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java index 46c799d71..d58ad0304 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java @@ -83,14 +83,14 @@ import javax.media.opengl.GLProfile; import javax.media.opengl.GLRunnable; import javax.media.opengl.Threading; import com.jogamp.opengl.util.FBObject; -import com.jogamp.opengl.impl.Debug; -import com.jogamp.opengl.impl.GLContextImpl; -import com.jogamp.opengl.impl.GLDrawableFactoryImpl; -import com.jogamp.opengl.impl.GLDrawableHelper; -import com.jogamp.opengl.impl.GLDrawableImpl; -import com.jogamp.opengl.impl.ThreadingImpl; -import com.jogamp.opengl.impl.awt.Java2D; -import com.jogamp.opengl.impl.awt.Java2DGLContext; +import jogamp.opengl.Debug; +import jogamp.opengl.GLContextImpl; +import jogamp.opengl.GLDrawableFactoryImpl; +import jogamp.opengl.GLDrawableHelper; +import jogamp.opengl.GLDrawableImpl; +import jogamp.opengl.ThreadingImpl; +import jogamp.opengl.awt.Java2D; +import jogamp.opengl.awt.Java2DGLContext; // FIXME: Subclasses need to call resetGLFunctionAvailability() on their // context whenever the displayChanged() function is called on their diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java index 72ad68ceb..0f05619a4 100644 --- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java +++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java @@ -352,5 +352,5 @@ public interface GLUtessellatorCallback { */ public void errorData(int errnum, Object polygonData); - //void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh); + //void mesh(jogamp.opengl.tessellator.GLUmesh mesh); } diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java index f380f4698..bd12dfb9d 100644 --- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java +++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java @@ -68,7 +68,7 @@ public class GLUtessellatorCallbackAdapter implements GLUtessellatorCallback { public void edgeFlag(boolean boundaryEdge) {} public void vertex(Object vertexData) {} public void end() {} -// public void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh) {} +// public void mesh(jogamp.opengl.tessellator.GLUmesh mesh) {} public void error(int errnum) {} public void combine(double[] coords, Object[] data, float[] weight, Object[] outData) {} diff --git a/src/jogl/classes/jogamp/opengl/Debug.java b/src/jogl/classes/jogamp/opengl/Debug.java index 82a5f2ff2..83c79c1d3 100644 --- a/src/jogl/classes/jogamp/opengl/Debug.java +++ b/src/jogl/classes/jogamp/opengl/Debug.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.security.*; diff --git a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java index 5cacf5087..dc33541e6 100644 --- a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.util.List; import java.util.ArrayList; diff --git a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java index 77b6ba981..4879c617e 100644 --- a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java +++ b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import com.jogamp.common.os.NativeLibrary; import java.util.*; diff --git a/src/jogl/classes/jogamp/opengl/ExtensionAvailabilityCache.java b/src/jogl/classes/jogamp/opengl/ExtensionAvailabilityCache.java index a5fa98bb3..b5223a5b6 100644 --- a/src/jogl/classes/jogamp/opengl/ExtensionAvailabilityCache.java +++ b/src/jogl/classes/jogamp/opengl/ExtensionAvailabilityCache.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import javax.media.opengl.*; import java.util.*; diff --git a/src/jogl/classes/jogamp/opengl/GLBufferSizeTracker.java b/src/jogl/classes/jogamp/opengl/GLBufferSizeTracker.java index 6ebda222b..15e3affee 100644 --- a/src/jogl/classes/jogamp/opengl/GLBufferSizeTracker.java +++ b/src/jogl/classes/jogamp/opengl/GLBufferSizeTracker.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import javax.media.opengl.*; import com.jogamp.common.util.IntLongHashMap; diff --git a/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java b/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java index 680fdc97b..d028bf98d 100644 --- a/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java +++ b/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import javax.media.opengl.*; import com.jogamp.common.util.IntIntHashMap; diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 366b7a35b..478acba4e 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.nio.ByteBuffer; import java.util.HashMap; diff --git a/src/jogl/classes/jogamp/opengl/GLContextLock.java b/src/jogl/classes/jogamp/opengl/GLContextLock.java index ea78f5209..f725508d8 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextLock.java +++ b/src/jogl/classes/jogamp/opengl/GLContextLock.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/GLContextShareSet.java b/src/jogl/classes/jogamp/opengl/GLContextShareSet.java index 7be06b698..bbb46148c 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextShareSet.java +++ b/src/jogl/classes/jogamp/opengl/GLContextShareSet.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; // FIXME: refactor Java SE dependencies // import java.awt.GraphicsConfiguration; diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java index 51c87b9ec..585590170 100644 --- a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.nio.*; import javax.media.nativewindow.*; diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java index 4aae89bcf..fe2b374a0 100644 --- a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java +++ b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.util.*; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java index 5459d886c..af14e5f43 100644 --- a/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import javax.media.nativewindow.*; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java index 34d1e9f8b..bedf431f5 100644 --- a/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import com.jogamp.common.os.DynamicLibraryBundleInfo; import java.util.*; diff --git a/src/jogl/classes/jogamp/opengl/GLDynamicLookupHelper.java b/src/jogl/classes/jogamp/opengl/GLDynamicLookupHelper.java index c88e96c5e..d2dac8148 100644 --- a/src/jogl/classes/jogamp/opengl/GLDynamicLookupHelper.java +++ b/src/jogl/classes/jogamp/opengl/GLDynamicLookupHelper.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import com.jogamp.common.os.DynamicLibraryBundle; diff --git a/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationFactory.java index 62770daf8..e51e997a3 100644 --- a/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationFactory.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.util.List; import javax.media.nativewindow.CapabilitiesChooser; diff --git a/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java index 529b32f2c..066ea8120 100644 --- a/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java +++ b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.util.ArrayList; import javax.media.opengl.GLCapabilities; diff --git a/src/jogl/classes/jogamp/opengl/GLPbufferImpl.java b/src/jogl/classes/jogamp/opengl/GLPbufferImpl.java index 5119f5360..671390fbb 100644 --- a/src/jogl/classes/jogamp/opengl/GLPbufferImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLPbufferImpl.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import com.jogamp.common.util.locks.RecursiveLock; import javax.media.nativewindow.NativeSurface; diff --git a/src/jogl/classes/jogamp/opengl/GLRunnableTask.java b/src/jogl/classes/jogamp/opengl/GLRunnableTask.java index a2a6939cd..e5b66b985 100644 --- a/src/jogl/classes/jogamp/opengl/GLRunnableTask.java +++ b/src/jogl/classes/jogamp/opengl/GLRunnableTask.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import javax.media.opengl.GLRunnable; import javax.media.opengl.GLAutoDrawable; diff --git a/src/jogl/classes/jogamp/opengl/GLStateTracker.java b/src/jogl/classes/jogamp/opengl/GLStateTracker.java index 9d896b7f8..22874c0c3 100644 --- a/src/jogl/classes/jogamp/opengl/GLStateTracker.java +++ b/src/jogl/classes/jogamp/opengl/GLStateTracker.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.util.List; import java.util.ArrayList; diff --git a/src/jogl/classes/jogamp/opengl/GLVersionNumber.java b/src/jogl/classes/jogamp/opengl/GLVersionNumber.java index fa1c5c0c4..5bd008f83 100644 --- a/src/jogl/classes/jogamp/opengl/GLVersionNumber.java +++ b/src/jogl/classes/jogamp/opengl/GLVersionNumber.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.util.StringTokenizer; import com.jogamp.common.util.VersionNumber; diff --git a/src/jogl/classes/jogamp/opengl/GLWorkerThread.java b/src/jogl/classes/jogamp/opengl/GLWorkerThread.java index c292de778..e57cbe0bc 100644 --- a/src/jogl/classes/jogamp/opengl/GLWorkerThread.java +++ b/src/jogl/classes/jogamp/opengl/GLWorkerThread.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.lang.reflect.InvocationTargetException; import java.security.*; diff --git a/src/jogl/classes/jogamp/opengl/MemoryObject.java b/src/jogl/classes/jogamp/opengl/MemoryObject.java index a691a6156..71a6b4908 100644 --- a/src/jogl/classes/jogamp/opengl/MemoryObject.java +++ b/src/jogl/classes/jogamp/opengl/MemoryObject.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.nio.ByteBuffer; import java.util.HashMap; diff --git a/src/jogl/classes/jogamp/opengl/ProjectFloat.java b/src/jogl/classes/jogamp/opengl/ProjectFloat.java index ab277e704..a6316b242 100644 --- a/src/jogl/classes/jogamp/opengl/ProjectFloat.java +++ b/src/jogl/classes/jogamp/opengl/ProjectFloat.java @@ -112,7 +112,7 @@ * in the design, construction, operation or maintenance of any nuclear * facility. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java b/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java index 765c6620d..386679992 100644 --- a/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java +++ b/src/jogl/classes/jogamp/opengl/SharedResourceRunner.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.util.Collection; import java.util.HashSet; diff --git a/src/jogl/classes/jogamp/opengl/SystemUtil.java.javame_cdc_fp b/src/jogl/classes/jogamp/opengl/SystemUtil.java.javame_cdc_fp index f686bea92..ab42de359 100644 --- a/src/jogl/classes/jogamp/opengl/SystemUtil.java.javame_cdc_fp +++ b/src/jogl/classes/jogamp/opengl/SystemUtil.java.javame_cdc_fp @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl; +package jogamp.opengl; public class SystemUtil { diff --git a/src/jogl/classes/jogamp/opengl/SystemUtil.java.javase b/src/jogl/classes/jogamp/opengl/SystemUtil.java.javase index dbb717a32..befe1a315 100644 --- a/src/jogl/classes/jogamp/opengl/SystemUtil.java.javase +++ b/src/jogl/classes/jogamp/opengl/SystemUtil.java.javase @@ -1,4 +1,4 @@ -package com.jogamp.opengl.impl; +package jogamp.opengl; public class SystemUtil { diff --git a/src/jogl/classes/jogamp/opengl/ThreadingImpl.java b/src/jogl/classes/jogamp/opengl/ThreadingImpl.java index d434f5175..d63699aad 100644 --- a/src/jogl/classes/jogamp/opengl/ThreadingImpl.java +++ b/src/jogl/classes/jogamp/opengl/ThreadingImpl.java @@ -32,7 +32,7 @@ * */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import java.lang.reflect.InvocationTargetException; import java.security.AccessController; @@ -105,10 +105,10 @@ public class ThreadingImpl { // try to fetch the AWTThreadingPlugin Exception error=null; try { - threadingPluginObj = ReflectionUtil.createInstance("com.jogamp.opengl.impl.awt.AWTThreadingPlugin", cl); + threadingPluginObj = ReflectionUtil.createInstance("jogamp.opengl.awt.AWTThreadingPlugin", cl); } catch (JogampRuntimeException jre) { error = jre; } if(AWT == mode && null==threadingPluginObj) { - throw new GLException("Mode is AWT, but class 'com.jogamp.opengl.impl.awt.AWTThreadingPlugin' is not available", error); + throw new GLException("Mode is AWT, but class 'jogamp.opengl.awt.AWTThreadingPlugin' is not available", error); } } return threadingPluginObj; diff --git a/src/jogl/classes/jogamp/opengl/ThreadingPlugin.java b/src/jogl/classes/jogamp/opengl/ThreadingPlugin.java index 37e4aac70..0b0748b59 100644 --- a/src/jogl/classes/jogamp/opengl/ThreadingPlugin.java +++ b/src/jogl/classes/jogamp/opengl/ThreadingPlugin.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl; +package jogamp.opengl; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/awt/AWTThreadingPlugin.java b/src/jogl/classes/jogamp/opengl/awt/AWTThreadingPlugin.java index a91ab785b..a681c5b8f 100644 --- a/src/jogl/classes/jogamp/opengl/awt/AWTThreadingPlugin.java +++ b/src/jogl/classes/jogamp/opengl/awt/AWTThreadingPlugin.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.awt; +package jogamp.opengl.awt; import javax.media.opengl.*; @@ -47,7 +47,7 @@ import java.awt.event.*; import java.awt.EventQueue; import java.lang.reflect.InvocationTargetException; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class AWTThreadingPlugin implements ThreadingPlugin { diff --git a/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java b/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java index 081d1f9b3..29328f216 100644 --- a/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java +++ b/src/jogl/classes/jogamp/opengl/awt/AWTUtil.java @@ -35,9 +35,9 @@ * facility. */ -package com.jogamp.opengl.impl.awt; +package jogamp.opengl.awt; -import com.jogamp.nativewindow.impl.jawt.*; +import jogamp.nativewindow.jawt.*; import javax.media.opengl.*; @@ -57,7 +57,7 @@ public class AWTUtil { headlessMode = GraphicsEnvironment.isHeadless(); if(!headlessMode) { try { - j2dClazz = Class.forName("com.jogamp.opengl.impl.awt.Java2D"); + j2dClazz = Class.forName("jogamp.opengl.awt.Java2D"); isOGLPipelineActive = j2dClazz.getMethod("isOGLPipelineActive", null); isQueueFlusherThread = j2dClazz.getMethod("isQueueFlusherThread", null); j2dOk = true; diff --git a/src/jogl/classes/jogamp/opengl/awt/Java2D.java b/src/jogl/classes/jogamp/opengl/awt/Java2D.java index 5566a3a4a..d57cde12a 100644 --- a/src/jogl/classes/jogamp/opengl/awt/Java2D.java +++ b/src/jogl/classes/jogamp/opengl/awt/Java2D.java @@ -37,9 +37,9 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.awt; +package jogamp.opengl.awt; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import java.awt.*; import java.awt.image.*; diff --git a/src/jogl/classes/jogamp/opengl/awt/Java2DGLContext.java b/src/jogl/classes/jogamp/opengl/awt/Java2DGLContext.java index 07bc54b6a..4a5b1db54 100644 --- a/src/jogl/classes/jogamp/opengl/awt/Java2DGLContext.java +++ b/src/jogl/classes/jogamp/opengl/awt/Java2DGLContext.java @@ -37,9 +37,9 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.awt; +package jogamp.opengl.awt; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import java.awt.Graphics; /** Provides a construct by which the shared GLJPanel code can diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java index 107d7fbbb..864b9583d 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java @@ -33,10 +33,10 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.gluegen.runtime.ProcAddressTable; import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver; import java.nio.*; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java index 4120b0167..7ffbf9053 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java @@ -34,10 +34,10 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; -import com.jogamp.opengl.impl.GLDynamicLookupHelper; -import com.jogamp.opengl.impl.GLDrawableImpl; +import jogamp.opengl.GLDynamicLookupHelper; +import jogamp.opengl.GLDrawableImpl; import javax.media.nativewindow.*; import javax.media.nativewindow.egl.*; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java index c32f2f22c..b6f5dabd3 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java @@ -34,7 +34,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import javax.media.nativewindow.*; import javax.media.nativewindow.egl.EGLGraphicsDevice; @@ -42,8 +42,8 @@ import javax.media.opengl.*; import com.jogamp.common.JogampRuntimeException; import com.jogamp.common.util.*; -import com.jogamp.opengl.impl.*; -import com.jogamp.nativewindow.impl.ProxySurface; +import jogamp.opengl.*; +import jogamp.nativewindow.ProxySurface; import java.util.HashMap; import java.util.List; @@ -61,7 +61,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl { // Check for other underlying stuff .. if(NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) { try { - ReflectionUtil.createInstance("com.jogamp.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory", EGLDrawableFactory.class.getClassLoader()); + ReflectionUtil.createInstance("jogamp.opengl.x11.glx.X11GLXGraphicsConfigurationFactory", EGLDrawableFactory.class.getClassLoader()); } catch (JogampRuntimeException jre) { /* n/a .. */ } } diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java index 5b4a59cd0..22d39fdae 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java @@ -26,14 +26,14 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import com.jogamp.common.os.DynamicLookupHelper; import com.jogamp.common.os.NativeLibrary; import java.util.*; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import java.security.*; /** diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java index 1507dc8c6..a62c847ca 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java @@ -26,10 +26,10 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import java.util.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo { static List/**/ glueLibNames; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java index 3c02aec88..0477fc2c7 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java @@ -26,10 +26,10 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import java.util.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo { static List/**/ glueLibNames; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLExternalContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLExternalContext.java index ae8b5bf70..78c23f710 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLExternalContext.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLExternalContext.java @@ -33,10 +33,10 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import javax.media.nativewindow.*; public class EGLExternalContext extends EGLContext { diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java index db6d485e3..cead0358d 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import java.util.Comparator; import javax.media.opengl.GLCapabilities; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java index eca324046..eb8bd522e 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java @@ -34,7 +34,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import java.util.ArrayList; import javax.media.nativewindow.*; @@ -42,7 +42,7 @@ import javax.media.nativewindow.egl.*; import javax.media.opengl.*; import com.jogamp.common.nio.PointerBuffer; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable { protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration"); diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java index 3e3d4f964..78c0da6a5 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.AbstractGraphicsDevice; @@ -50,8 +50,8 @@ import javax.media.opengl.GLProfile; import javax.media.opengl.GLDrawableFactory; import com.jogamp.common.nio.PointerBuffer; -import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory; -import com.jogamp.opengl.impl.GLGraphicsConfigurationUtil; +import jogamp.opengl.GLGraphicsConfigurationFactory; +import jogamp.opengl.GLGraphicsConfigurationUtil; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -64,7 +64,7 @@ import java.io.PrintStream; GraphicsDevice and GraphicsConfiguration abstractions. */ public class EGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory { - protected static final boolean DEBUG = GraphicsConfigurationFactory.DEBUG || com.jogamp.opengl.impl.Debug.debug("EGL"); + protected static final boolean DEBUG = GraphicsConfigurationFactory.DEBUG || jogamp.opengl.Debug.debug("EGL"); static EGLGLCapabilities.EglCfgIDComparator EglCfgIDComparator = new EGLGLCapabilities.EglCfgIDComparator(); EGLGraphicsConfigurationFactory() { diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenContext.java index cb8b01d8d..dd0a3db3a 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenContext.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenContext.java @@ -33,11 +33,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.gluegen.runtime.ProcAddressTable; import java.nio.*; import java.util.*; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenDrawable.java b/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenDrawable.java index 820ac04e9..4359f2ac3 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenDrawable.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLOnscreenDrawable.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import javax.media.opengl.*; import javax.media.nativewindow.*; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLPbufferContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferContext.java index 5c634b9bd..2cad7daac 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLPbufferContext.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferContext.java @@ -33,11 +33,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.gluegen.runtime.ProcAddressTable; import java.nio.*; import java.util.*; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java index 3189324d1..6cbd1ee6a 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.egl; +package jogamp.opengl.egl; import javax.media.nativewindow.NativeSurface; import javax.media.nativewindow.SurfaceChangeable; diff --git a/src/jogl/classes/jogamp/opengl/gl2/ProjectDouble.java b/src/jogl/classes/jogamp/opengl/gl2/ProjectDouble.java index 98cc3f323..9165dbc4b 100644 --- a/src/jogl/classes/jogamp/opengl/gl2/ProjectDouble.java +++ b/src/jogl/classes/jogamp/opengl/gl2/ProjectDouble.java @@ -112,12 +112,12 @@ * in the design, construction, operation or maintenance of any nuclear * facility. */ -package com.jogamp.opengl.impl.gl2; +package jogamp.opengl.gl2; import java.nio.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.common.nio.Buffers; /** diff --git a/src/jogl/classes/jogamp/opengl/gl2/Util.java b/src/jogl/classes/jogamp/opengl/gl2/Util.java index a542dcf19..83f98a65f 100644 --- a/src/jogl/classes/jogamp/opengl/gl2/Util.java +++ b/src/jogl/classes/jogamp/opengl/gl2/Util.java @@ -66,9 +66,9 @@ * facility. */ -package com.jogamp.opengl.impl.gl2; +package jogamp.opengl.gl2; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import java.nio.IntBuffer; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/gl2/fixme/GLObjectTracker.java b/src/jogl/classes/jogamp/opengl/gl2/fixme/GLObjectTracker.java index 6ee29b876..903a82fac 100644 --- a/src/jogl/classes/jogamp/opengl/gl2/fixme/GLObjectTracker.java +++ b/src/jogl/classes/jogamp/opengl/gl2/fixme/GLObjectTracker.java @@ -37,9 +37,9 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.gl2; +package jogamp.opengl.gl2; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import java.nio.*; import javax.media.opengl.*; 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; diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java index 3450c456e..085889739 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java @@ -38,13 +38,13 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import java.nio.*; import java.util.*; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.gluegen.runtime.ProcAddressTable; import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver; diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawable.java index 1eeaa55e1..10e061d3a 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawable.java @@ -38,11 +38,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public abstract class MacOSXCGLDrawable extends GLDrawableImpl { // The Java2D/OpenGL pipeline on OS X uses low-level CGLContextObjs diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java index 421bae715..19f3ce640 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import java.nio.*; import java.util.HashMap; @@ -50,8 +50,8 @@ import javax.media.opengl.*; import com.jogamp.common.JogampRuntimeException; import com.jogamp.common.util.*; -import com.jogamp.opengl.impl.*; -import com.jogamp.nativewindow.impl.ProxySurface; +import jogamp.opengl.*; +import jogamp.nativewindow.ProxySurface; public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl { private static final DesktopGLDynamicLookupHelper macOSXCGLDynamicLookupHelper; @@ -84,7 +84,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl { new MacOSXCGLGraphicsConfigurationFactory(); if(GLProfile.isAWTAvailable()) { try { - ReflectionUtil.createInstance("com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory", + ReflectionUtil.createInstance("jogamp.opengl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory", null, getClass().getClassLoader()); } catch (JogampRuntimeException jre) { /* n/a .. */ } } diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java index a9b1a5977..94d790cee 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDynamicLibraryBundleInfo.java @@ -26,9 +26,9 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.common.os.DynamicLookupHelper; import com.jogamp.common.os.NativeLibrary; import com.jogamp.common.os.Platform; diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java index c41b700dc..0d73b6b9c 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java @@ -34,7 +34,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import javax.media.nativewindow.*; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java index cc06a6775..d4526f04e 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java @@ -31,9 +31,9 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; -import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory; +import jogamp.opengl.GLGraphicsConfigurationFactory; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.AbstractGraphicsScreen; import javax.media.nativewindow.CapabilitiesChooser; @@ -49,7 +49,7 @@ import javax.media.opengl.GLCapabilitiesImmutable; GraphicsDevice and GraphicsConfiguration abstractions. */ public class MacOSXCGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory { - protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration"); + protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration"); MacOSXCGLGraphicsConfigurationFactory() { GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.macosx.MacOSXGraphicsDevice.class, this); diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java index 80a396a29..e0ee8ea73 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java @@ -38,13 +38,13 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.nativewindow.impl.ProxySurface; +import jogamp.nativewindow.ProxySurface; public class MacOSXExternalCGLContext extends MacOSXCGLContext { private boolean firstMakeCurrent = true; diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLContext.java index 89e293665..6dba11038 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLContext.java @@ -37,10 +37,10 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class MacOSXOffscreenCGLContext extends MacOSXPbufferCGLContext { diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLDrawable.java index f87c89f2d..bec4cf32a 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOffscreenCGLDrawable.java @@ -38,11 +38,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class MacOSXOffscreenCGLDrawable extends MacOSXPbufferCGLDrawable { diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java index e494fd121..c839c87f1 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLContext.java @@ -37,13 +37,13 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import java.util.*; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class MacOSXOnscreenCGLContext extends MacOSXCGLContext { diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLDrawable.java index 798e39ef4..bd311217d 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXOnscreenCGLDrawable.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import java.lang.ref.WeakReference; import java.security.*; @@ -46,7 +46,7 @@ import java.util.*; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class MacOSXOnscreenCGLDrawable extends MacOSXCGLDrawable { private List/*>*/ createdContexts = diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLContext.java index 93e5767b3..6eda3f068 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLContext.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import com.jogamp.common.nio.PointerBuffer; import java.security.*; @@ -39,7 +39,7 @@ import java.util.*; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class MacOSXPbufferCGLContext extends MacOSXCGLContext { diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java index 37c6cfb70..ec9ff8dd2 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java @@ -38,12 +38,12 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl; +package jogamp.opengl.macosx.cgl; import com.jogamp.common.nio.PointerBuffer; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable { private static final boolean DEBUG = Debug.debug("MacOSXPbufferCGLDrawable"); diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java index 4a80990cb..fe60710f0 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java @@ -37,11 +37,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl.awt; +package jogamp.opengl.macosx.cgl.awt; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.macosx.cgl.*; +import jogamp.opengl.macosx.cgl.*; public class MacOSXAWTCGLDrawableFactory extends MacOSXCGLDrawableFactory { diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java index 95b6f473f..68e82dc19 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java @@ -31,9 +31,9 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.macosx.cgl.awt; +package jogamp.opengl.macosx.cgl.awt; -import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory; +import jogamp.opengl.GLGraphicsConfigurationFactory; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; @@ -53,10 +53,10 @@ import javax.media.opengl.GLCapabilitiesChooser; import javax.media.opengl.GLCapabilitiesImmutable; import javax.media.opengl.GLException; -import com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLGraphicsConfiguration; +import jogamp.opengl.macosx.cgl.MacOSXCGLGraphicsConfiguration; public class MacOSXAWTCGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory { - protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration"); + protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration"); public MacOSXAWTCGLGraphicsConfigurationFactory() { GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this); diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXJava2DCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXJava2DCGLContext.java index f19fbcf6b..c5372bb5e 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXJava2DCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/awt/MacOSXJava2DCGLContext.java @@ -37,15 +37,15 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.macosx.cgl.awt; +package jogamp.opengl.macosx.cgl.awt; -import com.jogamp.opengl.impl.macosx.cgl.*; +import jogamp.opengl.macosx.cgl.*; import java.awt.Graphics; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; -import com.jogamp.opengl.impl.awt.*; -import com.jogamp.opengl.impl.macosx.cgl.*; +import jogamp.opengl.*; +import jogamp.opengl.awt.*; +import jogamp.opengl.macosx.cgl.*; /** MacOSXCGLContext implementation supporting the Java2D/JOGL bridge * on Mac OS X. The external GLDrawable mechanism does not work on Mac diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java index b8e3922a4..4e5afc683 100644 --- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java +++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java @@ -2,7 +2,7 @@ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. */ -package com.jogamp.opengl.util.glsl.fixedfunc.impl; +package jogamp.opengl.util.glsl.fixedfunc; import javax.media.opengl.*; import javax.media.opengl.fixedfunc.*; diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java index 529e4567b..b77cf4617 100644 --- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java +++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java @@ -1,5 +1,5 @@ -package com.jogamp.opengl.util.glsl.fixedfunc.impl; +package jogamp.opengl.util.glsl.fixedfunc; import com.jogamp.common.nio.Buffers; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java index b5be4bf8d..a23c5a0bc 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java @@ -26,12 +26,12 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import java.util.Comparator; -import com.jogamp.nativewindow.impl.windows.GDI; -import com.jogamp.nativewindow.impl.windows.PIXELFORMATDESCRIPTOR; +import jogamp.nativewindow.windows.GDI; +import jogamp.nativewindow.windows.PIXELFORMATDESCRIPTOR; import javax.media.opengl.GL; import javax.media.opengl.GLCapabilities; import javax.media.opengl.GLException; diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLContext.java index 7b769d971..68b26b30d 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLContext.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java index c61a8d0e4..4df3b7e34 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import com.jogamp.common.nio.PointerBuffer; import javax.media.nativewindow.NativeSurface; @@ -47,9 +47,9 @@ import javax.media.opengl.GLContext; import javax.media.opengl.GLDrawableFactory; import javax.media.opengl.GLException; -import com.jogamp.nativewindow.impl.windows.BITMAPINFO; -import com.jogamp.nativewindow.impl.windows.BITMAPINFOHEADER; -import com.jogamp.nativewindow.impl.windows.GDI; +import jogamp.nativewindow.windows.BITMAPINFO; +import jogamp.nativewindow.windows.BITMAPINFOHEADER; +import jogamp.nativewindow.windows.GDI; import javax.media.opengl.GLCapabilitiesImmutable; public class WindowsBitmapWGLDrawable extends WindowsWGLDrawable { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java index a307e295d..27d7b342e 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java @@ -38,15 +38,15 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import javax.media.opengl.GLContext; import javax.media.opengl.GLDrawableFactory; import javax.media.opengl.GLProfile; import javax.media.nativewindow.AbstractGraphicsScreen; -import com.jogamp.nativewindow.impl.ProxySurface; -import com.jogamp.nativewindow.impl.windows.GDI; +import jogamp.nativewindow.ProxySurface; +import jogamp.nativewindow.windows.GDI; import javax.media.nativewindow.AbstractGraphicsDevice; import javax.media.nativewindow.NativeSurface; import javax.media.opengl.GLCapabilities; diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java index cfe0a7899..569463db5 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import javax.media.nativewindow.AbstractGraphicsScreen; import javax.media.nativewindow.DefaultGraphicsScreen; @@ -49,9 +49,9 @@ import javax.media.opengl.GLDrawableFactory; import javax.media.opengl.GLException; import javax.media.opengl.GLProfile; -import com.jogamp.nativewindow.impl.ProxySurface; -import com.jogamp.nativewindow.impl.windows.GDI; -import com.jogamp.opengl.impl.GLContextShareSet; +import jogamp.nativewindow.ProxySurface; +import jogamp.nativewindow.windows.GDI; +import jogamp.opengl.GLContextShareSet; public class WindowsExternalWGLContext extends WindowsWGLContext { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLDrawable.java index 2851473d5..86cc705b5 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLDrawable.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import javax.media.nativewindow.AbstractGraphicsScreen; import javax.media.nativewindow.DefaultGraphicsScreen; @@ -49,8 +49,8 @@ import javax.media.opengl.GLDrawableFactory; import javax.media.opengl.GLException; import javax.media.opengl.GLProfile; -import com.jogamp.nativewindow.impl.ProxySurface; -import com.jogamp.nativewindow.impl.windows.GDI; +import jogamp.nativewindow.ProxySurface; +import jogamp.nativewindow.windows.GDI; public class WindowsExternalWGLDrawable extends WindowsWGLDrawable { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLContext.java index 475faeecc..a06ab8f0e 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLContext.java @@ -37,13 +37,13 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import java.util.*; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class WindowsOnscreenWGLContext extends WindowsWGLContext { public WindowsOnscreenWGLContext(WindowsOnscreenWGLDrawable drawable, diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLDrawable.java index b0d62a4e1..4f34c946a 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsOnscreenWGLDrawable.java @@ -38,11 +38,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class WindowsOnscreenWGLDrawable extends WindowsWGLDrawable { protected WindowsOnscreenWGLDrawable(GLDrawableFactory factory, NativeSurface component) { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLContext.java index db86b3232..48838de53 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLContext.java @@ -37,10 +37,10 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public class WindowsPbufferWGLContext extends WindowsWGLContext { // State for render-to-texture and render-to-texture-rectangle support diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java index a8d37796e..7be630187 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import javax.media.nativewindow.NativeSurface; import javax.media.nativewindow.SurfaceChangeable; @@ -49,7 +49,7 @@ import javax.media.opengl.GLException; import javax.media.opengl.GLPbuffer; import javax.media.opengl.GLProfile; -import com.jogamp.nativewindow.impl.windows.GDI; +import jogamp.nativewindow.windows.GDI; import javax.media.opengl.GLCapabilitiesImmutable; public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java index 7d38f8ee8..94017e79a 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import java.nio.ByteBuffer; import java.util.HashMap; @@ -52,10 +52,10 @@ import javax.media.opengl.GLCapabilitiesImmutable; import com.jogamp.gluegen.runtime.ProcAddressTable; import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver; -import com.jogamp.nativewindow.impl.windows.GDI; -import com.jogamp.opengl.impl.GLContextImpl; -import com.jogamp.opengl.impl.GLContextShareSet; -import com.jogamp.opengl.impl.GLDrawableImpl; +import jogamp.nativewindow.windows.GDI; +import jogamp.opengl.GLContextImpl; +import jogamp.opengl.GLContextShareSet; +import jogamp.opengl.GLDrawableImpl; public class WindowsWGLContext extends GLContextImpl { static final Map/**/ functionNameMap; diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java index 83b52fbcb..4ed9a00c3 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java @@ -38,17 +38,17 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import java.security.AccessController; import javax.media.nativewindow.NativeSurface; import javax.media.opengl.GLDrawableFactory; import javax.media.opengl.GLException; -import com.jogamp.nativewindow.impl.windows.GDI; -import com.jogamp.opengl.impl.Debug; -import com.jogamp.opengl.impl.GLDrawableImpl; -import com.jogamp.opengl.impl.GLDynamicLookupHelper; +import jogamp.nativewindow.windows.GDI; +import jogamp.opengl.Debug; +import jogamp.opengl.GLDrawableImpl; +import jogamp.opengl.GLDynamicLookupHelper; public abstract class WindowsWGLDrawable extends GLDrawableImpl { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java index f44c3c70b..ba3044505 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import java.nio.Buffer; import java.nio.ShortBuffer; @@ -64,15 +64,15 @@ import javax.media.opengl.GLProfile; import com.jogamp.common.JogampRuntimeException; import com.jogamp.common.nio.PointerBuffer; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.nativewindow.impl.ProxySurface; -import com.jogamp.nativewindow.impl.windows.GDI; -import com.jogamp.nativewindow.impl.windows.RegisteredClassFactory; -import com.jogamp.opengl.impl.DesktopGLDynamicLookupHelper; -import com.jogamp.opengl.impl.GLContextImpl; -import com.jogamp.opengl.impl.GLDrawableFactoryImpl; -import com.jogamp.opengl.impl.GLDrawableImpl; -import com.jogamp.opengl.impl.GLDynamicLookupHelper; -import com.jogamp.opengl.impl.SharedResourceRunner; +import jogamp.nativewindow.ProxySurface; +import jogamp.nativewindow.windows.GDI; +import jogamp.nativewindow.windows.RegisteredClassFactory; +import jogamp.opengl.DesktopGLDynamicLookupHelper; +import jogamp.opengl.GLContextImpl; +import jogamp.opengl.GLDrawableFactoryImpl; +import jogamp.opengl.GLDrawableImpl; +import jogamp.opengl.GLDynamicLookupHelper; +import jogamp.opengl.SharedResourceRunner; public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl { private static final DesktopGLDynamicLookupHelper windowsWGLDynamicLookupHelper; @@ -104,7 +104,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl { new WindowsWGLGraphicsConfigurationFactory(); if(GLProfile.isAWTAvailable()) { try { - ReflectionUtil.createInstance("com.jogamp.opengl.impl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory", + ReflectionUtil.createInstance("jogamp.opengl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory", null, getClass().getClassLoader()); } catch (JogampRuntimeException jre) { /* n/a .. */ } } diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java index 153680f8e..0fb7f4510 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDynamicLibraryBundleInfo.java @@ -26,9 +26,9 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import java.util.*; public class WindowsWGLDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryBundleInfo { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java index f844bad76..82d170133 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import java.util.ArrayList; import java.util.List; @@ -48,14 +48,14 @@ import javax.media.opengl.GLException; import javax.media.opengl.GLPbuffer; import javax.media.opengl.GLProfile; -import com.jogamp.nativewindow.impl.windows.GDI; -import com.jogamp.nativewindow.impl.windows.PIXELFORMATDESCRIPTOR; -import com.jogamp.opengl.impl.GLContextImpl; -import com.jogamp.opengl.impl.GLGraphicsConfigurationUtil; +import jogamp.nativewindow.windows.GDI; +import jogamp.nativewindow.windows.PIXELFORMATDESCRIPTOR; +import jogamp.opengl.GLContextImpl; +import jogamp.opengl.GLGraphicsConfigurationUtil; public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable { // Keep this under the same debug flag as the drawable factory for convenience - protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration"); + protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration"); final static String WGL_ARB_pixel_format = "WGL_ARB_pixel_format"; final static String WGL_ARB_multisample = "WGL_ARB_multisample"; diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java index a66d62485..ee3f8ae1f 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.windows.wgl; +package jogamp.opengl.windows.wgl; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.AbstractGraphicsDevice; @@ -48,11 +48,11 @@ import javax.media.opengl.GLDrawableFactory; import javax.media.opengl.GLException; import javax.media.opengl.GLProfile; -import com.jogamp.nativewindow.impl.windows.GDI; -import com.jogamp.nativewindow.impl.windows.PIXELFORMATDESCRIPTOR; -import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory; -import com.jogamp.opengl.impl.GLGraphicsConfigurationUtil; -import com.jogamp.opengl.impl.SharedResourceRunner; +import jogamp.nativewindow.windows.GDI; +import jogamp.nativewindow.windows.PIXELFORMATDESCRIPTOR; +import jogamp.opengl.GLGraphicsConfigurationFactory; +import jogamp.opengl.GLGraphicsConfigurationUtil; +import jogamp.opengl.SharedResourceRunner; import java.util.ArrayList; import java.util.Collections; @@ -64,7 +64,7 @@ import java.util.List; GraphicsDevice and GraphicsConfiguration abstractions. */ public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory { - protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration"); + protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration"); static WGLGLCapabilities.PfdIDComparator PfdIDComparator = new WGLGLCapabilities.PfdIDComparator(); WindowsWGLGraphicsConfigurationFactory() { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java index f753c08c5..1f09180eb 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java @@ -31,12 +31,12 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.windows.wgl.awt; +package jogamp.opengl.windows.wgl.awt; import com.jogamp.common.util.ArrayHashSet; -import com.jogamp.nativewindow.impl.jawt.windows.Win32SunJDKReflection; -import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory; +import jogamp.nativewindow.jawt.windows.Win32SunJDKReflection; +import jogamp.opengl.GLGraphicsConfigurationFactory; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; @@ -56,11 +56,11 @@ import javax.media.opengl.GLCapabilitiesChooser; import javax.media.opengl.GLCapabilitiesImmutable; import javax.media.opengl.GLException; -import com.jogamp.opengl.impl.windows.wgl.WindowsWGLGraphicsConfiguration; +import jogamp.opengl.windows.wgl.WindowsWGLGraphicsConfiguration; import javax.media.opengl.GLDrawableFactory; public class WindowsAWTWGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory { - protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration"); + protected static final boolean DEBUG = jogamp.opengl.Debug.debug("GraphicsConfiguration"); public WindowsAWTWGLGraphicsConfigurationFactory() { GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this); diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/GLXUtil.java b/src/jogl/classes/jogamp/opengl/x11/glx/GLXUtil.java index 46bc9460d..e95c80205 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/GLXUtil.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/GLXUtil.java @@ -30,7 +30,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11DummyGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11DummyGLXDrawable.java index 1f2bf9344..202bba9e7 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11DummyGLXDrawable.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11DummyGLXDrawable.java @@ -26,13 +26,13 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.opengl.*; import javax.media.nativewindow.x11.*; -import com.jogamp.nativewindow.impl.*; -import com.jogamp.nativewindow.impl.x11.*; +import jogamp.nativewindow.*; +import jogamp.nativewindow.x11.*; public class X11DummyGLXDrawable extends X11OnscreenGLXDrawable { private static final int f_dim = 64; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXContext.java index 76f7f6591..769d5f1da 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXContext.java @@ -38,13 +38,13 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; -import com.jogamp.nativewindow.impl.ProxySurface; +import jogamp.opengl.*; +import jogamp.nativewindow.ProxySurface; public class X11ExternalGLXContext extends X11GLXContext { private boolean firstMakeCurrent = true; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXDrawable.java index f0270fd2a..014992b88 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXDrawable.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXDrawable.java @@ -37,12 +37,12 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; import javax.media.opengl.*; -import com.jogamp.nativewindow.impl.ProxySurface; +import jogamp.nativewindow.ProxySurface; public class X11ExternalGLXDrawable extends X11GLXDrawable { diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java index 3f9d2baae..5455976da 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java @@ -26,9 +26,9 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; -import com.jogamp.nativewindow.impl.x11.XVisualInfo; +import jogamp.nativewindow.x11.XVisualInfo; import javax.media.opengl.GLCapabilities; import javax.media.opengl.GLException; import javax.media.opengl.GLProfile; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java index dd25f241e..7d7614ca2 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import java.nio.*; import java.util.*; @@ -48,10 +48,10 @@ import javax.media.nativewindow.*; import javax.media.nativewindow.x11.X11GraphicsDevice; import com.jogamp.common.util.VersionNumber; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.gluegen.runtime.ProcAddressTable; import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.x11.X11Util; public abstract class X11GLXContext extends GLContextImpl { protected static final boolean TRACE_CONTEXT_CURRENT = false; // true; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java index 9c3737d3d..d2ce629df 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java @@ -38,11 +38,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; public abstract class X11GLXDrawable extends GLDrawableImpl { protected X11GLXDrawable(GLDrawableFactory factory, NativeSurface comp, boolean realized) { diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java index 709e2ddab..44ade1513 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java @@ -35,7 +35,7 @@ * facility. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import java.util.Collection; import java.util.HashMap; @@ -46,11 +46,11 @@ import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import com.jogamp.common.JogampRuntimeException; import com.jogamp.common.util.*; -import com.jogamp.nativewindow.impl.ProxySurface; -import com.jogamp.nativewindow.impl.x11.*; +import jogamp.nativewindow.ProxySurface; +import jogamp.nativewindow.x11.*; public class X11GLXDrawableFactory extends GLDrawableFactoryImpl { @@ -90,7 +90,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl { new X11GLXGraphicsConfigurationFactory(); if(GLProfile.isAWTAvailable()) { try { - ReflectionUtil.createInstance("com.jogamp.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory", + ReflectionUtil.createInstance("jogamp.opengl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory", null, getClass().getClassLoader()); } catch (JogampRuntimeException jre) { /* n/a .. */ } } diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java index d7905aa72..51b6144c5 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDynamicLibraryBundleInfo.java @@ -26,9 +26,9 @@ * or implied, of JogAmp Community. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; -import com.jogamp.opengl.impl.*; +import jogamp.opengl.*; import java.util.*; public class X11GLXDynamicLibraryBundleInfo extends DesktopGLDynamicLibraryBundleInfo { diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java index f7779ab28..c3d4563ea 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import java.util.ArrayList; @@ -40,8 +40,8 @@ import javax.media.nativewindow.x11.*; import javax.media.opengl.*; import com.jogamp.common.nio.PointerBuffer; -import com.jogamp.opengl.impl.*; -import com.jogamp.nativewindow.impl.x11.*; +import jogamp.opengl.*; +import jogamp.nativewindow.x11.*; public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable { protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration"); diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java index b391dc948..319a52c07 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.AbstractGraphicsDevice; @@ -50,12 +50,12 @@ import javax.media.opengl.GLException; import javax.media.opengl.GLProfile; import com.jogamp.common.nio.PointerBuffer; -import com.jogamp.nativewindow.impl.x11.X11Lib; -import com.jogamp.nativewindow.impl.x11.X11Util; -import com.jogamp.nativewindow.impl.x11.XVisualInfo; -import com.jogamp.opengl.impl.Debug; -import com.jogamp.opengl.impl.GLGraphicsConfigurationFactory; -import com.jogamp.opengl.impl.GLGraphicsConfigurationUtil; +import jogamp.nativewindow.x11.X11Lib; +import jogamp.nativewindow.x11.X11Util; +import jogamp.nativewindow.x11.XVisualInfo; +import jogamp.opengl.Debug; +import jogamp.opengl.GLGraphicsConfigurationFactory; +import jogamp.opengl.GLGraphicsConfigurationUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXContext.java index ba6a566e6..ce5d466d4 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXContext.java @@ -36,7 +36,7 @@ * Sun gratefully acknowledges that this software was originally authored * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java index 5243e8c46..9e6ef911e 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.nativewindow.*; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXContext.java index 7ee5d51d4..765a8207a 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXContext.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java index 65970dab2..8ea989267 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.opengl.*; import javax.media.nativewindow.*; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXContext.java index b7b4da75d..ef8007de4 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXContext.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.opengl.*; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java index 0343ffb02..f5d321561 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java @@ -38,11 +38,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.opengl.impl.x11.glx; +package jogamp.opengl.x11.glx; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.jogamp.nativewindow.impl.x11.*; +import jogamp.nativewindow.x11.*; public class X11PixmapGLXDrawable extends X11GLXDrawable { private long pixmap; diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java index 898a8a658..55f1f034b 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.opengl.impl.x11.glx.awt; +package jogamp.opengl.x11.glx.awt; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; @@ -40,9 +40,9 @@ import javax.media.nativewindow.x11.*; import javax.media.nativewindow.awt.*; import javax.media.opengl.*; -import com.jogamp.opengl.impl.*; -import com.jogamp.nativewindow.impl.jawt.x11.*; -import com.jogamp.nativewindow.impl.x11.*; +import jogamp.opengl.*; +import jogamp.nativewindow.jawt.x11.*; +import jogamp.nativewindow.x11.*; public class X11AWTGLXGraphicsConfigurationFactory extends GLGraphicsConfigurationFactory { protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration"); diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java index 3d9f6d6ca..bf755d5bc 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java +++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java @@ -34,7 +34,7 @@ package javax.media.nativewindow; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.nativewindow.impl.NativeWindowFactoryImpl; +import jogamp.nativewindow.NativeWindowFactoryImpl; public class DefaultGraphicsDevice implements Cloneable, AbstractGraphicsDevice { private static final String separator = "_"; @@ -151,7 +151,7 @@ public class DefaultGraphicsDevice implements Cloneable, AbstractGraphicsDevice * Set the internal ToolkitLock, which is used within the * {@link #lock()} and {@link #unlock()} implementation. * - * @param locker the ToolkitLock, if null, {@link com.jogamp.nativewindow.impl.NullToolkitLock} is being used + * @param locker the ToolkitLock, if null, {@link jogamp.nativewindow.NullToolkitLock} is being used */ protected void setToolkitLock(ToolkitLock locker) { this.toolkitLock = ( null == locker ) ? NativeWindowFactoryImpl.getNullToolkitLock() : locker ; diff --git a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java index ad1bc3634..fa3923dcf 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/GraphicsConfigurationFactory.java @@ -34,8 +34,8 @@ package javax.media.nativewindow; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.nativewindow.impl.Debug; -import com.jogamp.nativewindow.impl.DefaultGraphicsConfigurationFactoryImpl; +import jogamp.nativewindow.Debug; +import jogamp.nativewindow.DefaultGraphicsConfigurationFactoryImpl; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -91,7 +91,7 @@ public abstract class GraphicsConfigurationFactory { if (NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) { try { GraphicsConfigurationFactory factory = (GraphicsConfigurationFactory) - ReflectionUtil.createInstance("com.jogamp.nativewindow.impl.x11.X11GraphicsConfigurationFactory", null, + ReflectionUtil.createInstance("jogamp.nativewindow.x11.X11GraphicsConfigurationFactory", null, GraphicsConfigurationFactory.class.getClassLoader()); registerFactory(javax.media.nativewindow.x11.X11GraphicsDevice.class, factory); } catch (Exception e) { diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java index 5d36df6ed..d0df41794 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java @@ -38,7 +38,7 @@ import java.util.*; import com.jogamp.common.util.*; import com.jogamp.common.jvm.JVMUtil; -import com.jogamp.nativewindow.impl.*; +import jogamp.nativewindow.*; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -78,11 +78,11 @@ public abstract class NativeWindowFactory { private static String nativeOSNameCustom; private static boolean isAWTAvailable; public static final String AWTComponentClassName = "java.awt.Component" ; - public static final String JAWTUtilClassName = "com.jogamp.nativewindow.impl.jawt.JAWTUtil" ; - public static final String X11UtilClassName = "com.jogamp.nativewindow.impl.x11.X11Util"; - public static final String GDIClassName = "com.jogamp.nativewindow.impl.windows.GDI"; - public static final String X11JAWTToolkitLockClassName = "com.jogamp.nativewindow.impl.jawt.x11.X11JAWTToolkitLock" ; - public static final String X11ToolkitLockClassName = "com.jogamp.nativewindow.impl.x11.X11ToolkitLock" ; + public static final String JAWTUtilClassName = "jogamp.nativewindow.jawt.JAWTUtil" ; + public static final String X11UtilClassName = "jogamp.nativewindow.x11.X11Util"; + public static final String GDIClassName = "jogamp.nativewindow.windows.GDI"; + public static final String X11JAWTToolkitLockClassName = "jogamp.nativewindow.jawt.x11.X11JAWTToolkitLock" ; + public static final String X11ToolkitLockClassName = "jogamp.nativewindow.x11.X11ToolkitLock" ; private static Class jawtUtilClass; private static Method jawtUtilGetJAWTToolkitMethod; private static Method jawtUtilInitMethod; @@ -310,11 +310,11 @@ public abstract class NativeWindowFactory { *
    *
  • If AWT available
    • *
      - *
    • return {@link com.jogamp.nativewindow.impl.jawt.JAWTToolkitLock}
      • + *
    • return {@link jogamp.nativewindow.jawt.JAWTToolkitLock}
      • *
    *
* - *
  • Otherwise return {@link com.jogamp.nativewindow.impl.NullToolkitLock}
    • + *
  • Otherwise return {@link jogamp.nativewindow.NullToolkitLock}
    • * */ public static ToolkitLock getDefaultToolkitLock(String type) { @@ -352,15 +352,15 @@ public abstract class NativeWindowFactory { *
      *
    • If AWT available
      • *
        - *
      • return {@link com.jogamp.nativewindow.impl.jawt.x11.X11JAWTToolkitLock}
        • + *
      • return {@link jogamp.nativewindow.jawt.x11.X11JAWTToolkitLock}
        • *
      *
    • If AWT not available
      • *
        - *
      • return {@link com.jogamp.nativewindow.impl.x11.X11ToolkitLock}
        • + *
      • return {@link jogamp.nativewindow.x11.X11ToolkitLock}
        • *
      *
    * - *
  • Otherwise return {@link com.jogamp.nativewindow.impl.NullToolkitLock}
    • + *
  • Otherwise return {@link jogamp.nativewindow.NullToolkitLock}
    • * */ public static ToolkitLock createDefaultToolkitLock(String type, long deviceHandle) { @@ -386,10 +386,10 @@ public abstract class NativeWindowFactory { *
      *
    • If X11 type
      • *
        - *
      • return {@link com.jogamp.nativewindow.impl.x11.X11ToolkitLock}
        • + *
      • return {@link jogamp.nativewindow.x11.X11ToolkitLock}
        • *
      *
    - *
  • Otherwise return {@link com.jogamp.nativewindow.impl.NullToolkitLock}
    • + *
  • Otherwise return {@link jogamp.nativewindow.NullToolkitLock}
    • * */ public static ToolkitLock createDefaultToolkitLockNoAWT(String type, long deviceHandle) { diff --git a/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java b/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java index 226998860..982ce469b 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java +++ b/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java @@ -28,14 +28,14 @@ package javax.media.nativewindow; -import com.jogamp.nativewindow.impl.Debug; +import jogamp.nativewindow.Debug; import java.security.AccessController; /** * Marker for a singleton global recursive blocking lock implementation, * optionally locking a native windowing toolkit as well. *
    - * One use case is the AWT locking on X11, see {@link com.jogamp.nativewindow.impl.jawt.JAWTToolkitLock}. + * One use case is the AWT locking on X11, see {@link jogamp.nativewindow.jawt.JAWTToolkitLock}. */ public interface ToolkitLock { public static final boolean TRACE_LOCK = Debug.isPropertyDefined("nativewindow.debug.ToolkitLock.TraceLock", true, AccessController.getContext()); diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java index e428bb0b1..3915158b0 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java +++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java @@ -47,7 +47,7 @@ import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; import java.awt.image.ColorModel; import javax.media.nativewindow.AbstractGraphicsConfiguration; -import com.jogamp.nativewindow.impl.Debug; +import jogamp.nativewindow.Debug; /** A wrapper for an AWT GraphicsConfiguration allowing it to be handled in a toolkit-independent manner. */ diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTWindowClosingProtocol.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTWindowClosingProtocol.java index a0e9efa49..7112f944d 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTWindowClosingProtocol.java +++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTWindowClosingProtocol.java @@ -34,7 +34,7 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import javax.media.nativewindow.WindowClosingProtocol; -import com.jogamp.nativewindow.impl.awt.AWTMisc; +import jogamp.nativewindow.awt.AWTMisc; public class AWTWindowClosingProtocol implements WindowClosingProtocol { diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java index 7b5f19047..dbf06f435 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java +++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java @@ -35,7 +35,7 @@ package javax.media.nativewindow.x11; import javax.media.nativewindow.*; import com.jogamp.common.util.ReflectionUtil; -import com.jogamp.nativewindow.impl.x11.XVisualInfo; +import jogamp.nativewindow.x11.XVisualInfo; /** Encapsulates a graphics configuration, or OpenGL pixel format, on X11 platforms. Objects of this type are returned from {@link diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java index 33799d717..48fd63e3c 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java +++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java @@ -32,8 +32,8 @@ package javax.media.nativewindow.x11; -import com.jogamp.nativewindow.impl.Debug; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.Debug; +import jogamp.nativewindow.x11.X11Util; import javax.media.nativewindow.DefaultGraphicsDevice; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.NativeWindowFactory; diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java index 9de3baa51..ffe84cb6d 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java +++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsScreen.java @@ -33,7 +33,7 @@ package javax.media.nativewindow.x11; import javax.media.nativewindow.*; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.x11.X11Util; /** Encapsulates a screen index on X11 platforms. Objects of this type are passed to {@link diff --git a/src/nativewindow/classes/jogamp/nativewindow/Debug.java b/src/nativewindow/classes/jogamp/nativewindow/Debug.java index edb682392..f1cd209dc 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/Debug.java +++ b/src/nativewindow/classes/jogamp/nativewindow/Debug.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import java.security.*; diff --git a/src/nativewindow/classes/jogamp/nativewindow/DefaultGraphicsConfigurationFactoryImpl.java b/src/nativewindow/classes/jogamp/nativewindow/DefaultGraphicsConfigurationFactoryImpl.java index f77454fac..f34b740d4 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/DefaultGraphicsConfigurationFactoryImpl.java +++ b/src/nativewindow/classes/jogamp/nativewindow/DefaultGraphicsConfigurationFactoryImpl.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import javax.media.nativewindow.*; diff --git a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java index 3b2a728e5..33e2905a0 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java +++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java @@ -27,7 +27,7 @@ */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/src/nativewindow/classes/jogamp/nativewindow/NativeWindowFactoryImpl.java b/src/nativewindow/classes/jogamp/nativewindow/NativeWindowFactoryImpl.java index 860be6f95..d514b662d 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/NativeWindowFactoryImpl.java +++ b/src/nativewindow/classes/jogamp/nativewindow/NativeWindowFactoryImpl.java @@ -30,7 +30,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import com.jogamp.common.util.*; import java.lang.reflect.*; @@ -82,12 +82,12 @@ public class NativeWindowFactoryImpl extends NativeWindowFactory { // make it easier to run this code on mobile devices if (osType.equals(TYPE_WINDOWS)) { - windowClassName = "com.jogamp.nativewindow.impl.jawt.windows.WindowsJAWTWindow"; + windowClassName = "jogamp.nativewindow.jawt.windows.WindowsJAWTWindow"; } else if (osType.equals(TYPE_MACOSX)) { - windowClassName = "com.jogamp.nativewindow.impl.jawt.macosx.MacOSXJAWTWindow"; + windowClassName = "jogamp.nativewindow.jawt.macosx.MacOSXJAWTWindow"; } else if (osType.equals(TYPE_X11)) { // Assume Linux, Solaris, etc. Should probably test for these explicitly. - windowClassName = "com.jogamp.nativewindow.impl.jawt.x11.X11JAWTWindow"; + windowClassName = "jogamp.nativewindow.jawt.x11.X11JAWTWindow"; } else { throw new IllegalArgumentException("OS " + getNativeOSName(false) + " not yet supported"); } diff --git a/src/nativewindow/classes/jogamp/nativewindow/NullToolkitLock.java b/src/nativewindow/classes/jogamp/nativewindow/NullToolkitLock.java index db4db1126..2056d205e 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/NullToolkitLock.java +++ b/src/nativewindow/classes/jogamp/nativewindow/NullToolkitLock.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import javax.media.nativewindow.ToolkitLock; diff --git a/src/nativewindow/classes/jogamp/nativewindow/ProxySurface.java b/src/nativewindow/classes/jogamp/nativewindow/ProxySurface.java index e0ad95e1f..6dfbb2a91 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/ProxySurface.java +++ b/src/nativewindow/classes/jogamp/nativewindow/ProxySurface.java @@ -35,7 +35,7 @@ * facility. */ -package com.jogamp.nativewindow.impl; +package jogamp.nativewindow; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.NativeSurface; diff --git a/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java b/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java index c61ae5531..c3518ed85 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java +++ b/src/nativewindow/classes/jogamp/nativewindow/awt/AWTMisc.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.awt; +package jogamp.nativewindow.awt; import java.awt.Window; import java.awt.Component; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java index 4ea404c09..adbd0885f 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java @@ -37,10 +37,10 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; import javax.media.nativewindow.NativeWindowFactory; -import com.jogamp.nativewindow.impl.NWJNILibLoader; +import jogamp.nativewindow.NWJNILibLoader; import java.awt.Toolkit; import java.lang.reflect.InvocationTargetException; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTToolkitLock.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTToolkitLock.java index 017d74874..37e34c01c 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTToolkitLock.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTToolkitLock.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; import javax.media.nativewindow.ToolkitLock; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java index 0c6fc3f55..e392e935f 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTUtil.java @@ -35,9 +35,9 @@ * facility. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; -import com.jogamp.nativewindow.impl.*; +import jogamp.nativewindow.*; import java.awt.EventQueue; import javax.media.nativewindow.*; @@ -78,7 +78,7 @@ public class JAWTUtil { Method m = null; if (!headlessMode) { try { - jC = Class.forName("com.jogamp.opengl.impl.awt.Java2D"); + jC = Class.forName("jogamp.opengl.awt.Java2D"); m = jC.getMethod("isQueueFlusherThread", null); ok = true; } catch (Exception e) { diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java index de6360212..944c08604 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java @@ -35,7 +35,7 @@ * facility. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; import com.jogamp.common.util.locks.RecursiveLock; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWT_PlatformInfo.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWT_PlatformInfo.java index d49e2f8d0..11651ac15 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWT_PlatformInfo.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWT_PlatformInfo.java @@ -37,9 +37,9 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt; +package jogamp.nativewindow.jawt; -import com.jogamp.nativewindow.impl.*; +import jogamp.nativewindow.*; /** Marker class for all window system-specific JAWT data structures. */ diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java index fc5607707..9c29bbd52 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt.macosx; +package jogamp.nativewindow.jawt.macosx; import java.security.AccessController; import java.security.PrivilegedAction; @@ -48,11 +48,11 @@ import javax.media.nativewindow.NativeWindow; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.util.Point; -import com.jogamp.nativewindow.impl.jawt.JAWT; -import com.jogamp.nativewindow.impl.jawt.JAWTFactory; -import com.jogamp.nativewindow.impl.jawt.JAWTWindow; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurface; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurfaceInfo; +import jogamp.nativewindow.jawt.JAWT; +import jogamp.nativewindow.jawt.JAWTFactory; +import jogamp.nativewindow.jawt.JAWTWindow; +import jogamp.nativewindow.jawt.JAWT_DrawingSurface; +import jogamp.nativewindow.jawt.JAWT_DrawingSurfaceInfo; public class MacOSXJAWTWindow extends JAWTWindow { diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java index 05d31a40e..1ff485290 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/Win32SunJDKReflection.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt.windows; +package jogamp.nativewindow.jawt.windows; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/WindowsJAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/WindowsJAWTWindow.java index d7cd55f9a..612d571f2 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/WindowsJAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/windows/WindowsJAWTWindow.java @@ -38,19 +38,19 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt.windows; +package jogamp.nativewindow.jawt.windows; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.NativeWindow; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.util.Point; -import com.jogamp.nativewindow.impl.jawt.JAWT; -import com.jogamp.nativewindow.impl.jawt.JAWTFactory; -import com.jogamp.nativewindow.impl.jawt.JAWTWindow; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurface; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurfaceInfo; -import com.jogamp.nativewindow.impl.windows.GDI; +import jogamp.nativewindow.jawt.JAWT; +import jogamp.nativewindow.jawt.JAWTFactory; +import jogamp.nativewindow.jawt.JAWTWindow; +import jogamp.nativewindow.jawt.JAWT_DrawingSurface; +import jogamp.nativewindow.jawt.JAWT_DrawingSurfaceInfo; +import jogamp.nativewindow.windows.GDI; public class WindowsJAWTWindow extends JAWTWindow { diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTToolkitLock.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTToolkitLock.java index 7eaac2ca6..5d4fa0dad 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTToolkitLock.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTToolkitLock.java @@ -25,10 +25,10 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.jawt.x11; +package jogamp.nativewindow.jawt.x11; -import com.jogamp.nativewindow.impl.jawt.*; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.jawt.*; +import jogamp.nativewindow.x11.X11Util; import javax.media.nativewindow.ToolkitLock; /** diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java index f87558dbc..2319d6269 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11JAWTWindow.java @@ -35,7 +35,7 @@ * facility. */ -package com.jogamp.nativewindow.impl.jawt.x11; +package jogamp.nativewindow.jawt.x11; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.AbstractGraphicsDevice; @@ -46,12 +46,12 @@ import javax.media.nativewindow.NativeWindowFactory; import javax.media.nativewindow.awt.AWTGraphicsDevice; import javax.media.nativewindow.util.Point; -import com.jogamp.nativewindow.impl.jawt.JAWT; -import com.jogamp.nativewindow.impl.jawt.JAWTFactory; -import com.jogamp.nativewindow.impl.jawt.JAWTWindow; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurface; -import com.jogamp.nativewindow.impl.jawt.JAWT_DrawingSurfaceInfo; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.nativewindow.jawt.JAWT; +import jogamp.nativewindow.jawt.JAWTFactory; +import jogamp.nativewindow.jawt.JAWTWindow; +import jogamp.nativewindow.jawt.JAWT_DrawingSurface; +import jogamp.nativewindow.jawt.JAWT_DrawingSurfaceInfo; +import jogamp.nativewindow.x11.X11Util; public class X11JAWTWindow extends JAWTWindow { diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java index b4a99624c..b28874ef1 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java +++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/x11/X11SunJDKReflection.java @@ -38,7 +38,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.nativewindow.impl.jawt.x11; +package jogamp.nativewindow.jawt.x11; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; diff --git a/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClass.java b/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClass.java index a30a81948..16f1046a7 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClass.java +++ b/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClass.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.windows; +package jogamp.nativewindow.windows; public class RegisteredClass { long hInstance; diff --git a/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClassFactory.java b/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClassFactory.java index d04640747..15e0a67cb 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClassFactory.java +++ b/src/nativewindow/classes/jogamp/nativewindow/windows/RegisteredClassFactory.java @@ -26,9 +26,9 @@ * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.windows; +package jogamp.nativewindow.windows; -import com.jogamp.nativewindow.impl.Debug; +import jogamp.nativewindow.Debug; import java.util.ArrayList; import javax.media.nativewindow.NativeWindowException; diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11GraphicsConfigurationFactory.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11GraphicsConfigurationFactory.java index fec7ca29d..b669bce75 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11GraphicsConfigurationFactory.java +++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11GraphicsConfigurationFactory.java @@ -31,7 +31,7 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.nativewindow.impl.x11; +package jogamp.nativewindow.x11; import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11ToolkitLock.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11ToolkitLock.java index 2e0e911b9..fb0aff10d 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11ToolkitLock.java +++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11ToolkitLock.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.nativewindow.impl.x11; +package jogamp.nativewindow.x11; import javax.media.nativewindow.ToolkitLock; diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java index c56f632d8..4098e101b 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java +++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java @@ -31,11 +31,11 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.nativewindow.impl.x11; +package jogamp.nativewindow.x11; import com.jogamp.common.util.LongObjectHashMap; -import com.jogamp.nativewindow.impl.Debug; -import com.jogamp.nativewindow.impl.NWJNILibLoader; +import jogamp.nativewindow.Debug; +import jogamp.nativewindow.NWJNILibLoader; import javax.media.nativewindow.*; diff --git a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c index a0422fa8e..470f03a49 100644 --- a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c +++ b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c @@ -50,7 +50,7 @@ #endif JNIEXPORT jobject JNICALL -Java_com_jogamp_nativewindow_impl_jawt_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) { +Java_jogamp_nativewindow_jawt_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) { JAWT_DrawingSurfaceInfo* dsi; dsi = (*env)->GetDirectBufferAddress(env, jthis0); if (dsi == NULL) { diff --git a/src/nativewindow/native/windows/GDImisc.c b/src/nativewindow/native/windows/GDImisc.c index 798edcbbf..9bead17ec 100644 --- a/src/nativewindow/native/windows/GDImisc.c +++ b/src/nativewindow/native/windows/GDImisc.c @@ -30,7 +30,7 @@ #include #include "NativewindowCommon.h" -#include "com_jogamp_nativewindow_impl_windows_GDI.h" +#include "jogamp_nativewindow_windows_GDI.h" // #define VERBOSE_ON 1 @@ -52,12 +52,12 @@ HINSTANCE GetApplicationHandle() { } /* Java->C glue code: - * Java package: com.jogamp.nativewindow.impl.windows.GDI + * Java package: jogamp.nativewindow.windows.GDI * Java method: boolean CreateWindowClass(long hInstance, java.lang.String clazzName, long wndProc) * C function: BOOL CreateWindowClass(HANDLE hInstance, LPCSTR clazzName, HANDLE wndProc); */ JNIEXPORT jboolean JNICALL -Java_com_jogamp_nativewindow_impl_windows_GDI_CreateWindowClass +Java_jogamp_nativewindow_windows_GDI_CreateWindowClass (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jClazzName, jlong wndProc) { HINSTANCE hInstance = (HINSTANCE) (intptr_t) jHInstance; @@ -101,12 +101,12 @@ Java_com_jogamp_nativewindow_impl_windows_GDI_CreateWindowClass } /* Java->C glue code: - * Java package: com.jogamp.nativewindow.impl.windows.GDI + * Java package: jogamp.nativewindow.windows.GDI * Java method: boolean DestroyWindowClass(long hInstance, java.lang.String className) * C function: BOOL DestroyWindowClass(HANDLE hInstance, LPCSTR className); */ JNIEXPORT jboolean JNICALL -Java_com_jogamp_nativewindow_impl_windows_GDI_DestroyWindowClass +Java_jogamp_nativewindow_windows_GDI_DestroyWindowClass (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jClazzName) { HINSTANCE hInstance = (HINSTANCE) (intptr_t) jHInstance; @@ -132,12 +132,12 @@ Java_com_jogamp_nativewindow_impl_windows_GDI_DestroyWindowClass /* Java->C glue code: - * Java package: com.jogamp.nativewindow.impl.windows.GDI + * Java package: jogamp.nativewindow.windows.GDI * Java method: long CreateDummyWindow0(long hInstance, java.lang.String className, java.lang.String windowName, int x, int y, int width, int height) * C function: HANDLE CreateDummyWindow0(HANDLE hInstance, LPCSTR className, LPCSTR windowName, int x, int y, int width, int height); */ JNIEXPORT jlong JNICALL -Java_com_jogamp_nativewindow_impl_windows_GDI_CreateDummyWindow0 +Java_jogamp_nativewindow_windows_GDI_CreateDummyWindow0 (JNIEnv *env, jclass _unused, jlong jHInstance, jstring jWndClassName, jstring jWndName, jint x, jint y, jint width, jint height) { HINSTANCE hInstance = (HINSTANCE) (intptr_t) jHInstance; @@ -178,26 +178,26 @@ Java_com_jogamp_nativewindow_impl_windows_GDI_CreateDummyWindow0 /* - * Class: com_jogamp_nativewindow_impl_windows_GDI + * Class: jogamp_nativewindow_windows_GDI * Method: initIDs0 * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_nativewindow_impl_windows_GDI_initIDs0 +JNIEXPORT jboolean JNICALL Java_jogamp_nativewindow_windows_GDI_initIDs0 (JNIEnv *env, jclass clazz) { if(NativewindowCommon_init(env)) { jclass c = (*env)->FindClass(env, ClazzNamePoint); if(NULL==c) { - NativewindowCommon_FatalError(env, "FatalError com_jogamp_nativewindow_impl_windows_GDI: can't find %s", ClazzNamePoint); + NativewindowCommon_FatalError(env, "FatalError jogamp_nativewindow_windows_GDI: can't find %s", ClazzNamePoint); } pointClz = (jclass)(*env)->NewGlobalRef(env, c); (*env)->DeleteLocalRef(env, c); if(NULL==pointClz) { - NativewindowCommon_FatalError(env, "FatalError com_jogamp_nativewindow_impl_windows_GDI: can't use %s", ClazzNamePoint); + NativewindowCommon_FatalError(env, "FatalError jogamp_nativewindow_windows_GDI: can't use %s", ClazzNamePoint); } pointCstr = (*env)->GetMethodID(env, pointClz, ClazzAnyCstrName, ClazzNamePointCstrSignature); if(NULL==pointCstr) { - NativewindowCommon_FatalError(env, "FatalError com_jogamp_nativewindow_impl_windows_GDI: can't fetch %s.%s %s", + NativewindowCommon_FatalError(env, "FatalError jogamp_nativewindow_windows_GDI: can't fetch %s.%s %s", ClazzNamePoint, ClazzAnyCstrName, ClazzNamePointCstrSignature); } } @@ -209,22 +209,22 @@ LRESULT CALLBACK DummyWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l } /* - * Class: com_jogamp_nativewindow_impl_windows_GDI + * Class: jogamp_nativewindow_windows_GDI * Method: getDummyWndProc0 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_windows_GDI_getDummyWndProc0 +JNIEXPORT jlong JNICALL Java_jogamp_nativewindow_windows_GDI_getDummyWndProc0 (JNIEnv *env, jclass clazz) { return (jlong) (intptr_t) DummyWndProc; } /* - * Class: com_jogamp_nativewindow_impl_windows_GDI + * Class: jogamp_nativewindow_windows_GDI * Method: GetRelativeLocation0 * Signature: (JJII)Ljavax/media/nativewindow/util/Point; */ -JNIEXPORT jobject JNICALL Java_com_jogamp_nativewindow_impl_windows_GDI_GetRelativeLocation0 +JNIEXPORT jobject JNICALL Java_jogamp_nativewindow_windows_GDI_GetRelativeLocation0 (JNIEnv *env, jclass unused, jlong jsrc_win, jlong jdest_win, jint src_x, jint src_y) { HWND src_win = (HWND) (intptr_t) jsrc_win; diff --git a/src/nativewindow/native/x11/Xmisc.c b/src/nativewindow/native/x11/Xmisc.c index 0d92880b3..1ced0fff4 100644 --- a/src/nativewindow/native/x11/Xmisc.c +++ b/src/nativewindow/native/x11/Xmisc.c @@ -81,7 +81,7 @@ Bool XF86VidModeSetGammaRamp( #endif #include "NativewindowCommon.h" -#include "com_jogamp_nativewindow_impl_x11_X11Lib.h" +#include "jogamp_nativewindow_x11_X11Lib.h" // #define VERBOSE_ON 1 @@ -114,42 +114,42 @@ static void _initClazzAccess(JNIEnv *env) { c = (*env)->FindClass(env, ClazzNameBuffers); if(NULL==c) { - NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s", ClazzNameBuffers); + NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't find %s", ClazzNameBuffers); } clazzBuffers = (jclass)(*env)->NewGlobalRef(env, c); (*env)->DeleteLocalRef(env, c); if(NULL==clazzBuffers) { - NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s", ClazzNameBuffers); + NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't use %s", ClazzNameBuffers); } c = (*env)->FindClass(env, ClazzNameByteBuffer); if(NULL==c) { - NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s", ClazzNameByteBuffer); + NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't find %s", ClazzNameByteBuffer); } clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c); (*env)->DeleteLocalRef(env, c); if(NULL==c) { - NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s", ClazzNameByteBuffer); + NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't use %s", ClazzNameByteBuffer); } cstrBuffers = (*env)->GetStaticMethodID(env, clazzBuffers, ClazzNameBuffersStaticCstrName, ClazzNameBuffersStaticCstrSignature); if(NULL==cstrBuffers) { - NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't create %s.%s %s", + NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't create %s.%s %s", ClazzNameBuffers, ClazzNameBuffersStaticCstrName, ClazzNameBuffersStaticCstrSignature); } c = (*env)->FindClass(env, ClazzNamePoint); if(NULL==c) { - NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't find %s", ClazzNamePoint); + NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't find %s", ClazzNamePoint); } pointClz = (jclass)(*env)->NewGlobalRef(env, c); (*env)->DeleteLocalRef(env, c); if(NULL==pointClz) { - NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't use %s", ClazzNamePoint); + NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't use %s", ClazzNamePoint); } pointCstr = (*env)->GetMethodID(env, pointClz, ClazzAnyCstrName, ClazzNamePointCstrSignature); if(NULL==pointCstr) { - NativewindowCommon_FatalError(env, "FatalError Java_com_jogamp_nativewindow_impl_x11_X11Lib: can't fetch %s.%s %s", + NativewindowCommon_FatalError(env, "FatalError Java_jogamp_nativewindow_x11_X11Lib: can't fetch %s.%s %s", ClazzNamePoint, ClazzAnyCstrName, ClazzNamePointCstrSignature); } } @@ -238,7 +238,7 @@ static void x11IOErrorHandlerEnable(int onoff, JNIEnv * env) { static int _initialized=0; JNIEXPORT void JNICALL -Java_com_jogamp_nativewindow_impl_x11_X11Util_initialize0(JNIEnv *env, jclass _unused, jboolean firstUIActionOnProcess) { +Java_jogamp_nativewindow_x11_X11Util_initialize0(JNIEnv *env, jclass _unused, jboolean firstUIActionOnProcess) { if(0==_initialized) { if( JNI_TRUE == firstUIActionOnProcess ) { if( 0 == XInitThreads() ) { @@ -257,17 +257,17 @@ Java_com_jogamp_nativewindow_impl_x11_X11Util_initialize0(JNIEnv *env, jclass _u } JNIEXPORT void JNICALL -Java_com_jogamp_nativewindow_impl_x11_X11Util_setX11ErrorHandler0(JNIEnv *env, jclass _unused, jboolean onoff, jboolean quiet) { +Java_jogamp_nativewindow_x11_X11Util_setX11ErrorHandler0(JNIEnv *env, jclass _unused, jboolean onoff, jboolean quiet) { x11ErrorHandlerEnableBlocking(env, ( JNI_TRUE == onoff ) ? 1 : 0, ( JNI_TRUE == quiet ) ? 1 : 0); } /* Java->C glue code: - * Java package: com.jogamp.nativewindow.impl.x11.X11Lib + * Java package: jogamp.nativewindow.x11.X11Lib * Java method: XVisualInfo XGetVisualInfo(long arg0, long arg1, XVisualInfo arg2, java.nio.IntBuffer arg3) * C function: XVisualInfo * XGetVisualInfo(Display * , long, XVisualInfo * , int * ); */ JNIEXPORT jobject JNICALL -Java_com_jogamp_nativewindow_impl_x11_X11Lib_XGetVisualInfo1__JJLjava_nio_ByteBuffer_2Ljava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg3_byte_offset) { +Java_jogamp_nativewindow_x11_X11Lib_XGetVisualInfo1__JJLjava_nio_ByteBuffer_2Ljava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg3_byte_offset) { XVisualInfo * _ptr2 = NULL; int * _ptr3 = NULL; XVisualInfo * _res; @@ -301,7 +301,7 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XGetVisualInfo1__JJLjava_nio_ByteBu } JNIEXPORT jlong JNICALL -Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass _unused, jlong display, jint screen) { +Java_jogamp_nativewindow_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass _unused, jlong display, jint screen) { jlong r; if(0==display) { NativewindowCommon_FatalError(env, "invalid display connection.."); @@ -313,12 +313,12 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_DefaultVisualID(JNIEnv *env, jclass } /* Java->C glue code: - * Java package: com.jogamp.nativewindow.impl.x11.X11Lib + * Java package: jogamp.nativewindow.x11.X11Lib * Java method: void XLockDisplay(long display) * C function: void XLockDisplay(Display * display); */ JNIEXPORT void JNICALL -Java_com_jogamp_nativewindow_impl_x11_X11Lib_XLockDisplay__J(JNIEnv *env, jclass _unused, jlong display) { +Java_jogamp_nativewindow_x11_X11Lib_XLockDisplay__J(JNIEnv *env, jclass _unused, jlong display) { if(0==display) { NativewindowCommon_FatalError(env, "invalid display connection.."); } @@ -326,12 +326,12 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XLockDisplay__J(JNIEnv *env, jclass } /* Java->C glue code: - * Java package: com.jogamp.nativewindow.impl.x11.X11Lib + * Java package: jogamp.nativewindow.x11.X11Lib * Java method: void XUnlockDisplay(long display) * C function: void XUnlockDisplay(Display * display); */ JNIEXPORT void JNICALL -Java_com_jogamp_nativewindow_impl_x11_X11Lib_XUnlockDisplay__J(JNIEnv *env, jclass _unused, jlong display) { +Java_jogamp_nativewindow_x11_X11Lib_XUnlockDisplay__J(JNIEnv *env, jclass _unused, jlong display) { if(0==display) { NativewindowCommon_FatalError(env, "invalid display connection.."); } @@ -339,12 +339,12 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XUnlockDisplay__J(JNIEnv *env, jcla } /* Java->C glue code: - * Java package: com.jogamp.nativewindow.impl.x11.X11Lib + * Java package: jogamp.nativewindow.x11.X11Lib * Java method: int XCloseDisplay(long display) * C function: int XCloseDisplay(Display * display); */ JNIEXPORT jint JNICALL -Java_com_jogamp_nativewindow_impl_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclass _unused, jlong display) { +Java_jogamp_nativewindow_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclass _unused, jlong display) { int _res; if(0==display) { NativewindowCommon_FatalError(env, "invalid display connection.."); @@ -356,11 +356,11 @@ Java_com_jogamp_nativewindow_impl_x11_X11Lib_XCloseDisplay__J(JNIEnv *env, jclas } /* - * Class: com_jogamp_nativewindow_impl_x11_X11Lib + * Class: jogamp_nativewindow_x11_X11Lib * Method: CreateDummyWindow * Signature: (JIJII)J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummyWindow +JNIEXPORT jlong JNICALL Java_jogamp_nativewindow_x11_X11Lib_CreateDummyWindow (JNIEnv *env, jclass unused, jlong display, jint screen_index, jlong visualID, jint width, jint height) { Display * dpy = (Display *)(intptr_t)display; @@ -464,11 +464,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_CreateDummy /* - * Class: com_jogamp_nativewindow_impl_x11_X11Lib + * Class: jogamp_nativewindow_x11_X11Lib * Method: DestroyDummyWindow * Signature: (JJ)V */ -JNIEXPORT void JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_DestroyDummyWindow +JNIEXPORT void JNICALL Java_jogamp_nativewindow_x11_X11Lib_DestroyDummyWindow (JNIEnv *env, jclass unused, jlong display, jlong window) { Display * dpy = (Display *)(intptr_t)display; @@ -487,11 +487,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_DestroyDummy } /* - * Class: com_jogamp_nativewindow_impl_x11_X11Lib + * Class: jogamp_nativewindow_x11_X11Lib * Method: GetRelativeLocation * Signature: (JIJJII)Ljavax/media/nativewindow/util/Point; */ -JNIEXPORT jobject JNICALL Java_com_jogamp_nativewindow_impl_x11_X11Lib_GetRelativeLocation0 +JNIEXPORT jobject JNICALL Java_jogamp_nativewindow_x11_X11Lib_GetRelativeLocation0 (JNIEnv *env, jclass unused, jlong jdisplay, jint screen_index, jlong jsrc_win, jlong jdest_win, jint src_x, jint src_y) { Display * dpy = (Display *) (intptr_t) jdisplay; diff --git a/src/newt/classes/com/jogamp/newt/Display.java b/src/newt/classes/com/jogamp/newt/Display.java index 3e5c0c25e..f879449b9 100644 --- a/src/newt/classes/com/jogamp/newt/Display.java +++ b/src/newt/classes/com/jogamp/newt/Display.java @@ -29,8 +29,8 @@ package com.jogamp.newt; import com.jogamp.newt.util.EDTUtil; -import com.jogamp.newt.impl.Debug; -import com.jogamp.newt.impl.DisplayImpl; +import jogamp.newt.Debug; +import jogamp.newt.DisplayImpl; import java.util.*; diff --git a/src/newt/classes/com/jogamp/newt/NewtFactory.java b/src/newt/classes/com/jogamp/newt/NewtFactory.java index 3b836787e..4b7eedca2 100644 --- a/src/newt/classes/com/jogamp/newt/NewtFactory.java +++ b/src/newt/classes/com/jogamp/newt/NewtFactory.java @@ -37,10 +37,10 @@ package com.jogamp.newt; import javax.media.nativewindow.*; import com.jogamp.common.jvm.JVMUtil; import com.jogamp.newt.event.WindowEvent; -import com.jogamp.newt.impl.DisplayImpl; -import com.jogamp.newt.impl.ScreenImpl; -import com.jogamp.newt.impl.WindowImpl; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.DisplayImpl; +import jogamp.newt.ScreenImpl; +import jogamp.newt.WindowImpl; +import jogamp.newt.Debug; public class NewtFactory { public static final boolean DEBUG_IMPLEMENTATION = Debug.debug("Window"); diff --git a/src/newt/classes/com/jogamp/newt/Screen.java b/src/newt/classes/com/jogamp/newt/Screen.java index bf8c6f0eb..fec3613a2 100644 --- a/src/newt/classes/com/jogamp/newt/Screen.java +++ b/src/newt/classes/com/jogamp/newt/Screen.java @@ -28,7 +28,7 @@ package com.jogamp.newt; import com.jogamp.newt.event.ScreenModeListener; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java index 9fe5089be..b78f7a9e8 100644 --- a/src/newt/classes/com/jogamp/newt/Window.java +++ b/src/newt/classes/com/jogamp/newt/Window.java @@ -31,7 +31,7 @@ package com.jogamp.newt; import com.jogamp.newt.event.WindowListener; import com.jogamp.newt.event.KeyListener; import com.jogamp.newt.event.MouseListener; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; import javax.media.nativewindow.CapabilitiesChooser; import javax.media.nativewindow.CapabilitiesImmutable; import javax.media.nativewindow.NativeWindow; diff --git a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java index 18213f94f..9154ab7d8 100644 --- a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java +++ b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java @@ -42,7 +42,7 @@ import javax.media.nativewindow.NativeWindow; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.WindowClosingProtocol; import javax.media.nativewindow.awt.AWTWindowClosingProtocol; -import com.jogamp.nativewindow.impl.awt.AWTMisc; +import jogamp.nativewindow.awt.AWTMisc; import com.jogamp.newt.event.awt.AWTAdapter; import com.jogamp.newt.event.awt.AWTParentWindowAdapter; @@ -50,7 +50,7 @@ import com.jogamp.newt.event.WindowEvent; import com.jogamp.newt.Window; import com.jogamp.newt.event.WindowAdapter; import com.jogamp.newt.event.WindowListener; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; import javax.swing.MenuSelectionManager; public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProtocol { diff --git a/src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java b/src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java index cd03454c8..e1370f05e 100644 --- a/src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java +++ b/src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java @@ -34,7 +34,7 @@ import javax.media.nativewindow.*; import javax.media.nativewindow.awt.*; import com.jogamp.newt.NewtFactory; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; public class NewtFactoryAWT extends NewtFactory { public static final boolean DEBUG_IMPLEMENTATION = Debug.debug("Window"); @@ -43,7 +43,7 @@ public class NewtFactoryAWT extends NewtFactory { * Wraps an AWT component into a {@link javax.media.nativewindow.NativeWindow} utilizing the {@link javax.media.nativewindow.NativeWindowFactory},
    * using a configuration agnostic dummy {@link javax.media.nativewindow.DefaultGraphicsConfiguration}.
    *

    - * The actual wrapping implementation is {@link com.jogamp.nativewindow.impl.jawt.JAWTWindow}.

    + * The actual wrapping implementation is {@link jogamp.nativewindow.jawt.JAWTWindow}.

    *

    * Purpose of this wrapping is to access the AWT window handle,
    * not to actually render into it.
    diff --git a/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java b/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java index c136946ac..e24002659 100644 --- a/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java +++ b/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java @@ -28,7 +28,7 @@ package com.jogamp.newt.event.awt; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; /** * Convenient adapter forwarding AWT events to NEWT via the event listener model.
    diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java index 6886fc71b..f3fab7bce 100644 --- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java +++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java @@ -41,14 +41,14 @@ import com.jogamp.common.util.VersionUtil; import com.jogamp.nativewindow.NativeWindowVersion; import com.jogamp.newt.*; import com.jogamp.newt.event.*; -import com.jogamp.newt.impl.WindowImpl; +import jogamp.newt.WindowImpl; import javax.media.nativewindow.*; import javax.media.nativewindow.util.Point; import javax.media.nativewindow.util.Insets; import javax.media.opengl.*; -import com.jogamp.opengl.impl.GLDrawableHelper; +import jogamp.opengl.GLDrawableHelper; import com.jogamp.opengl.JoglVersion; /** diff --git a/src/newt/classes/com/jogamp/newt/util/MainThread.java b/src/newt/classes/com/jogamp/newt/util/MainThread.java index 5b26cfbda..607645052 100644 --- a/src/newt/classes/com/jogamp/newt/util/MainThread.java +++ b/src/newt/classes/com/jogamp/newt/util/MainThread.java @@ -46,7 +46,7 @@ import javax.media.nativewindow.*; import com.jogamp.common.util.*; import com.jogamp.newt.*; -import com.jogamp.newt.impl.*; +import jogamp.newt.*; /** * NEWT Utility class MainThread

    @@ -181,7 +181,7 @@ public class MainThread implements EDTUtil { mainAction = new MainAction(mainClassName, mainClassArgs); if(NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false))) { - ReflectionUtil.callStaticMethod("com.jogamp.newt.impl.macosx.MacDisplay", "initSingleton", + ReflectionUtil.callStaticMethod("jogamp.newt.macosx.MacDisplay", "initSingleton", null, null, MainThread.class.getClassLoader()); } diff --git a/src/newt/classes/jogamp/newt/Debug.java b/src/newt/classes/jogamp/newt/Debug.java index 62c261d2e..85fbbe764 100644 --- a/src/newt/classes/jogamp/newt/Debug.java +++ b/src/newt/classes/jogamp/newt/Debug.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.newt.impl; +package jogamp.newt; import java.security.*; diff --git a/src/newt/classes/jogamp/newt/DefaultEDTUtil.java b/src/newt/classes/jogamp/newt/DefaultEDTUtil.java index 7a2a0c9bd..925828175 100644 --- a/src/newt/classes/jogamp/newt/DefaultEDTUtil.java +++ b/src/newt/classes/jogamp/newt/DefaultEDTUtil.java @@ -35,7 +35,7 @@ * facility. */ -package com.jogamp.newt.impl; +package jogamp.newt; import com.jogamp.common.util.RunnableTask; import com.jogamp.newt.util.EDTUtil; diff --git a/src/newt/classes/jogamp/newt/DisplayImpl.java b/src/newt/classes/jogamp/newt/DisplayImpl.java index 2af01c217..0485c4603 100644 --- a/src/newt/classes/jogamp/newt/DisplayImpl.java +++ b/src/newt/classes/jogamp/newt/DisplayImpl.java @@ -32,13 +32,13 @@ * */ -package com.jogamp.newt.impl; +package jogamp.newt; import com.jogamp.newt.Display; import com.jogamp.newt.NewtFactory; import com.jogamp.newt.event.NEWTEvent; import com.jogamp.newt.event.NEWTEventConsumer; -import com.jogamp.newt.impl.event.NEWTEventTask; +import jogamp.newt.event.NEWTEventTask; import com.jogamp.newt.util.EDTUtil; import com.jogamp.newt.util.MainThread; import java.util.ArrayList; @@ -57,15 +57,15 @@ public abstract class DisplayImpl extends Display { Class displayClass = NewtFactory.getCustomClass(type, "Display"); if(null==displayClass) { if (NativeWindowFactory.TYPE_EGL.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.impl.opengl.kd.KDDisplay"); + displayClass = Class.forName("jogamp.newt.opengl.kd.KDDisplay"); } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.impl.windows.WindowsDisplay"); + displayClass = Class.forName("jogamp.newt.windows.WindowsDisplay"); } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.impl.macosx.MacDisplay"); + displayClass = Class.forName("jogamp.newt.macosx.MacDisplay"); } else if (NativeWindowFactory.TYPE_X11.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.impl.x11.X11Display"); + displayClass = Class.forName("jogamp.newt.x11.X11Display"); } else if (NativeWindowFactory.TYPE_AWT.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.impl.awt.AWTDisplay"); + displayClass = Class.forName("jogamp.newt.awt.AWTDisplay"); } else { throw new RuntimeException("Unknown display type \"" + type + "\""); } diff --git a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java index a4d234fd5..7b89398db 100644 --- a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java +++ b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.newt.impl; +package jogamp.newt; // FIXME: refactor Java SE dependencies //import java.awt.Toolkit; diff --git a/src/newt/classes/jogamp/newt/OffscreenWindow.java b/src/newt/classes/jogamp/newt/OffscreenWindow.java index 44aa9b440..1465e084c 100644 --- a/src/newt/classes/jogamp/newt/OffscreenWindow.java +++ b/src/newt/classes/jogamp/newt/OffscreenWindow.java @@ -32,7 +32,7 @@ * */ -package com.jogamp.newt.impl; +package jogamp.newt; import javax.media.nativewindow.*; import javax.media.nativewindow.util.Point; diff --git a/src/newt/classes/jogamp/newt/ScreenImpl.java b/src/newt/classes/jogamp/newt/ScreenImpl.java index 071122a68..e940512a3 100644 --- a/src/newt/classes/jogamp/newt/ScreenImpl.java +++ b/src/newt/classes/jogamp/newt/ScreenImpl.java @@ -32,7 +32,7 @@ * */ -package com.jogamp.newt.impl; +package jogamp.newt; import com.jogamp.common.util.ArrayHashSet; import com.jogamp.common.util.IntIntHashMap; @@ -70,15 +70,15 @@ public abstract class ScreenImpl extends Screen implements ScreenModeListener { Class screenClass = NewtFactory.getCustomClass(type, "Screen"); if(null==screenClass) { if (NativeWindowFactory.TYPE_EGL.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.impl.opengl.kd.KDScreen"); + screenClass = Class.forName("jogamp.newt.opengl.kd.KDScreen"); } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.impl.windows.WindowsScreen"); + screenClass = Class.forName("jogamp.newt.windows.WindowsScreen"); } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.impl.macosx.MacScreen"); + screenClass = Class.forName("jogamp.newt.macosx.MacScreen"); } else if (NativeWindowFactory.TYPE_X11.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.impl.x11.X11Screen"); + screenClass = Class.forName("jogamp.newt.x11.X11Screen"); } else if (NativeWindowFactory.TYPE_AWT.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.impl.awt.AWTScreen"); + screenClass = Class.forName("jogamp.newt.awt.AWTScreen"); } else { throw new RuntimeException("Unknown window type \"" + type + "\""); } diff --git a/src/newt/classes/jogamp/newt/ScreenModeStatus.java b/src/newt/classes/jogamp/newt/ScreenModeStatus.java index 3ca9b638b..4d8b8b5f6 100644 --- a/src/newt/classes/jogamp/newt/ScreenModeStatus.java +++ b/src/newt/classes/jogamp/newt/ScreenModeStatus.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.newt.impl; +package jogamp.newt; import com.jogamp.common.util.ArrayHashSet; import com.jogamp.common.util.IntIntHashMap; diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java index 74186f70f..8dd4bc8e2 100644 --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -32,7 +32,7 @@ * */ -package com.jogamp.newt.impl; +package jogamp.newt; import java.util.ArrayList; import java.lang.reflect.Method; @@ -153,15 +153,15 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer Class windowClass = NewtFactory.getCustomClass(type, "Window"); if(null==windowClass) { if (NativeWindowFactory.TYPE_EGL.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.impl.opengl.kd.KDWindow"); + windowClass = Class.forName("jogamp.newt.opengl.kd.KDWindow"); } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.impl.windows.WindowsWindow"); + windowClass = Class.forName("jogamp.newt.windows.WindowsWindow"); } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.impl.macosx.MacWindow"); + windowClass = Class.forName("jogamp.newt.macosx.MacWindow"); } else if (NativeWindowFactory.TYPE_X11.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.impl.x11.X11Window"); + windowClass = Class.forName("jogamp.newt.x11.X11Window"); } else if (NativeWindowFactory.TYPE_AWT.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.impl.awt.AWTWindow"); + windowClass = Class.forName("jogamp.newt.awt.AWTWindow"); } else { throw new NativeWindowException("Unknown window type \"" + type + "\""); } diff --git a/src/newt/classes/jogamp/newt/awt/AWTCanvas.java b/src/newt/classes/jogamp/newt/awt/AWTCanvas.java index f17e530d5..5606ceb01 100644 --- a/src/newt/classes/jogamp/newt/awt/AWTCanvas.java +++ b/src/newt/classes/jogamp/newt/awt/AWTCanvas.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.impl.awt; +package jogamp.newt.awt; import com.jogamp.newt.Window; diff --git a/src/newt/classes/jogamp/newt/awt/AWTDisplay.java b/src/newt/classes/jogamp/newt/awt/AWTDisplay.java index 6f0b23210..f8a756f60 100644 --- a/src/newt/classes/jogamp/newt/awt/AWTDisplay.java +++ b/src/newt/classes/jogamp/newt/awt/AWTDisplay.java @@ -31,12 +31,12 @@ * */ -package com.jogamp.newt.impl.awt; +package jogamp.newt.awt; import java.awt.event.*; import com.jogamp.newt.Display; import com.jogamp.newt.Window; -import com.jogamp.newt.impl.DisplayImpl; +import jogamp.newt.DisplayImpl; import javax.media.nativewindow.*; import javax.media.nativewindow.awt.*; import java.util.*; diff --git a/src/newt/classes/jogamp/newt/awt/AWTScreen.java b/src/newt/classes/jogamp/newt/awt/AWTScreen.java index 5e097fdc3..83d7be57c 100644 --- a/src/newt/classes/jogamp/newt/awt/AWTScreen.java +++ b/src/newt/classes/jogamp/newt/awt/AWTScreen.java @@ -31,10 +31,10 @@ * */ -package com.jogamp.newt.impl.awt; +package jogamp.newt.awt; import com.jogamp.newt.*; -import com.jogamp.newt.impl.ScreenImpl; +import jogamp.newt.ScreenImpl; import java.awt.DisplayMode; import javax.media.nativewindow.*; import javax.media.nativewindow.awt.*; diff --git a/src/newt/classes/jogamp/newt/awt/AWTWindow.java b/src/newt/classes/jogamp/newt/awt/AWTWindow.java index ec1ae1c8a..908b6f2cb 100644 --- a/src/newt/classes/jogamp/newt/awt/AWTWindow.java +++ b/src/newt/classes/jogamp/newt/awt/AWTWindow.java @@ -32,7 +32,7 @@ * */ -package com.jogamp.newt.impl.awt; +package jogamp.newt.awt; import com.jogamp.newt.event.awt.*; import com.jogamp.newt.util.EDTUtil; @@ -42,7 +42,7 @@ import java.awt.Container; import java.awt.DisplayMode; import java.awt.EventQueue; import java.awt.Frame; -import com.jogamp.newt.impl.WindowImpl; +import jogamp.newt.WindowImpl; import java.awt.Insets; import javax.media.nativewindow.*; import javax.media.nativewindow.awt.*; diff --git a/src/newt/classes/jogamp/newt/awt/opengl/VersionApplet.java b/src/newt/classes/jogamp/newt/awt/opengl/VersionApplet.java index f31d1bc0f..7f234a0f8 100644 --- a/src/newt/classes/jogamp/newt/awt/opengl/VersionApplet.java +++ b/src/newt/classes/jogamp/newt/awt/opengl/VersionApplet.java @@ -1,4 +1,4 @@ -package com.jogamp.newt.impl.awt.opengl; +package jogamp.newt.awt.opengl; import java.applet.Applet; import java.awt.BorderLayout; diff --git a/src/newt/classes/jogamp/newt/event/NEWTEventTask.java b/src/newt/classes/jogamp/newt/event/NEWTEventTask.java index 1b4bce4b0..fae6560b4 100644 --- a/src/newt/classes/jogamp/newt/event/NEWTEventTask.java +++ b/src/newt/classes/jogamp/newt/event/NEWTEventTask.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.newt.impl.event; +package jogamp.newt.event; import com.jogamp.newt.event.NEWTEvent; diff --git a/src/newt/classes/jogamp/newt/intel/gdl/Display.java b/src/newt/classes/jogamp/newt/intel/gdl/Display.java index c08f239d9..b1afdb55e 100644 --- a/src/newt/classes/jogamp/newt/intel/gdl/Display.java +++ b/src/newt/classes/jogamp/newt/intel/gdl/Display.java @@ -31,12 +31,12 @@ * */ -package com.jogamp.newt.impl.intel.gdl; +package jogamp.newt.intel.gdl; -import com.jogamp.newt.impl.*; +import jogamp.newt.*; import javax.media.nativewindow.*; -public class Display extends com.jogamp.newt.impl.DisplayImpl { +public class Display extends jogamp.newt.DisplayImpl { static int initCounter = 0; static { diff --git a/src/newt/classes/jogamp/newt/intel/gdl/Screen.java b/src/newt/classes/jogamp/newt/intel/gdl/Screen.java index 4abee350f..b351fe6a9 100644 --- a/src/newt/classes/jogamp/newt/intel/gdl/Screen.java +++ b/src/newt/classes/jogamp/newt/intel/gdl/Screen.java @@ -31,12 +31,12 @@ * */ -package com.jogamp.newt.impl.intel.gdl; +package jogamp.newt.intel.gdl; -import com.jogamp.newt.impl.*; +import jogamp.newt.*; import javax.media.nativewindow.*; -public class Screen extends com.jogamp.newt.impl.ScreenImpl { +public class Screen extends jogamp.newt.ScreenImpl { static { Display.initSingleton(); diff --git a/src/newt/classes/jogamp/newt/intel/gdl/Window.java b/src/newt/classes/jogamp/newt/intel/gdl/Window.java index c9a322942..8ba861c7d 100644 --- a/src/newt/classes/jogamp/newt/intel/gdl/Window.java +++ b/src/newt/classes/jogamp/newt/intel/gdl/Window.java @@ -31,12 +31,12 @@ * */ -package com.jogamp.newt.impl.intel.gdl; +package jogamp.newt.intel.gdl; import javax.media.nativewindow.*; import javax.media.nativewindow.util.Point; -public class Window extends com.jogamp.newt.impl.WindowImpl { +public class Window extends jogamp.newt.WindowImpl { static { Display.initSingleton(); } diff --git a/src/newt/classes/jogamp/newt/macosx/MacDisplay.java b/src/newt/classes/jogamp/newt/macosx/MacDisplay.java index cf9d4f0a3..e4639080e 100644 --- a/src/newt/classes/jogamp/newt/macosx/MacDisplay.java +++ b/src/newt/classes/jogamp/newt/macosx/MacDisplay.java @@ -31,13 +31,13 @@ * */ -package com.jogamp.newt.impl.macosx; +package jogamp.newt.macosx; import javax.media.nativewindow.*; import javax.media.nativewindow.macosx.*; import com.jogamp.common.util.ReflectionUtil; import com.jogamp.newt.*; -import com.jogamp.newt.impl.*; +import jogamp.newt.*; import com.jogamp.newt.util.EDTUtil; import com.jogamp.newt.util.MainThread; diff --git a/src/newt/classes/jogamp/newt/macosx/MacScreen.java b/src/newt/classes/jogamp/newt/macosx/MacScreen.java index f0c388366..30028602c 100644 --- a/src/newt/classes/jogamp/newt/macosx/MacScreen.java +++ b/src/newt/classes/jogamp/newt/macosx/MacScreen.java @@ -31,10 +31,10 @@ * */ -package com.jogamp.newt.impl.macosx; +package jogamp.newt.macosx; import com.jogamp.newt.*; -import com.jogamp.newt.impl.ScreenImpl; +import jogamp.newt.ScreenImpl; import javax.media.nativewindow.*; public class MacScreen extends ScreenImpl { diff --git a/src/newt/classes/jogamp/newt/macosx/MacWindow.java b/src/newt/classes/jogamp/newt/macosx/MacWindow.java index e789a0dc9..62f0cf458 100644 --- a/src/newt/classes/jogamp/newt/macosx/MacWindow.java +++ b/src/newt/classes/jogamp/newt/macosx/MacWindow.java @@ -32,13 +32,13 @@ * */ -package com.jogamp.newt.impl.macosx; +package jogamp.newt.macosx; import javax.media.nativewindow.*; import com.jogamp.common.util.locks.RecursiveLock; import com.jogamp.newt.event.*; -import com.jogamp.newt.impl.*; +import jogamp.newt.*; import javax.media.nativewindow.util.Insets; import javax.media.nativewindow.util.Point; diff --git a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Display.java index 5a875846e..494908a81 100644 --- a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Display.java +++ b/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Display.java @@ -31,14 +31,14 @@ * */ -package com.jogamp.newt.impl.opengl.broadcom.egl; +package jogamp.newt.opengl.broadcom.egl; -import com.jogamp.newt.impl.*; -import com.jogamp.opengl.impl.egl.*; +import jogamp.newt.*; +import jogamp.opengl.egl.*; import javax.media.nativewindow.*; import javax.media.nativewindow.egl.*; -public class Display extends com.jogamp.newt.impl.DisplayImpl { +public class Display extends jogamp.newt.DisplayImpl { static { NEWTJNILibLoader.loadNEWT(); diff --git a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Screen.java b/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Screen.java index 144fe5e83..2224f7860 100644 --- a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Screen.java +++ b/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Screen.java @@ -31,11 +31,11 @@ * */ -package com.jogamp.newt.impl.opengl.broadcom.egl; +package jogamp.newt.opengl.broadcom.egl; import javax.media.nativewindow.*; -public class Screen extends com.jogamp.newt.impl.ScreenImpl { +public class Screen extends jogamp.newt.ScreenImpl { static { Display.initSingleton(); diff --git a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Window.java index cfc5bd5a9..0db21c3be 100644 --- a/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Window.java +++ b/src/newt/classes/jogamp/newt/opengl/broadcom/egl/Window.java @@ -31,15 +31,15 @@ * */ -package com.jogamp.newt.impl.opengl.broadcom.egl; +package jogamp.newt.opengl.broadcom.egl; -import com.jogamp.opengl.impl.egl.*; +import jogamp.opengl.egl.*; import javax.media.nativewindow.*; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.util.Point; import javax.media.opengl.GLCapabilitiesImmutable; -public class Window extends com.jogamp.newt.impl.WindowImpl { +public class Window extends jogamp.newt.WindowImpl { static { Display.initSingleton(); } diff --git a/src/newt/classes/jogamp/newt/opengl/kd/KDDisplay.java b/src/newt/classes/jogamp/newt/opengl/kd/KDDisplay.java index 3e677f0d7..c9d83a750 100644 --- a/src/newt/classes/jogamp/newt/opengl/kd/KDDisplay.java +++ b/src/newt/classes/jogamp/newt/opengl/kd/KDDisplay.java @@ -31,11 +31,11 @@ * */ -package com.jogamp.newt.impl.opengl.kd; +package jogamp.newt.opengl.kd; import com.jogamp.newt.*; -import com.jogamp.newt.impl.*; -import com.jogamp.opengl.impl.egl.*; +import jogamp.newt.*; +import jogamp.opengl.egl.*; import javax.media.nativewindow.*; import javax.media.nativewindow.egl.*; diff --git a/src/newt/classes/jogamp/newt/opengl/kd/KDScreen.java b/src/newt/classes/jogamp/newt/opengl/kd/KDScreen.java index 1a73d0e5d..2996fb194 100644 --- a/src/newt/classes/jogamp/newt/opengl/kd/KDScreen.java +++ b/src/newt/classes/jogamp/newt/opengl/kd/KDScreen.java @@ -31,10 +31,10 @@ * */ -package com.jogamp.newt.impl.opengl.kd; +package jogamp.newt.opengl.kd; import com.jogamp.newt.*; -import com.jogamp.newt.impl.ScreenImpl; +import jogamp.newt.ScreenImpl; import javax.media.nativewindow.*; public class KDScreen extends ScreenImpl { diff --git a/src/newt/classes/jogamp/newt/opengl/kd/KDWindow.java b/src/newt/classes/jogamp/newt/opengl/kd/KDWindow.java index b49b6f7b7..b902441d3 100644 --- a/src/newt/classes/jogamp/newt/opengl/kd/KDWindow.java +++ b/src/newt/classes/jogamp/newt/opengl/kd/KDWindow.java @@ -31,10 +31,10 @@ * */ -package com.jogamp.newt.impl.opengl.kd; +package jogamp.newt.opengl.kd; -import com.jogamp.newt.impl.*; -import com.jogamp.opengl.impl.egl.*; +import jogamp.newt.*; +import jogamp.opengl.egl.*; import javax.media.nativewindow.*; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.util.Point; diff --git a/src/newt/classes/jogamp/newt/windows/WindowsDisplay.java b/src/newt/classes/jogamp/newt/windows/WindowsDisplay.java index af32d1693..750c38092 100644 --- a/src/newt/classes/jogamp/newt/windows/WindowsDisplay.java +++ b/src/newt/classes/jogamp/newt/windows/WindowsDisplay.java @@ -32,12 +32,12 @@ * */ -package com.jogamp.newt.impl.windows; +package jogamp.newt.windows; -import com.jogamp.nativewindow.impl.windows.RegisteredClass; -import com.jogamp.nativewindow.impl.windows.RegisteredClassFactory; -import com.jogamp.newt.impl.DisplayImpl; -import com.jogamp.newt.impl.NEWTJNILibLoader; +import jogamp.nativewindow.windows.RegisteredClass; +import jogamp.nativewindow.windows.RegisteredClassFactory; +import jogamp.newt.DisplayImpl; +import jogamp.newt.NEWTJNILibLoader; import javax.media.nativewindow.AbstractGraphicsDevice; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.windows.WindowsGraphicsDevice; diff --git a/src/newt/classes/jogamp/newt/windows/WindowsScreen.java b/src/newt/classes/jogamp/newt/windows/WindowsScreen.java index e15a40e7b..ea7fe8d55 100644 --- a/src/newt/classes/jogamp/newt/windows/WindowsScreen.java +++ b/src/newt/classes/jogamp/newt/windows/WindowsScreen.java @@ -30,15 +30,15 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * */ -package com.jogamp.newt.impl.windows; +package jogamp.newt.windows; import com.jogamp.common.util.ArrayHashSet; import java.util.ArrayList; import com.jogamp.newt.*; -import com.jogamp.newt.impl.ScreenImpl; +import jogamp.newt.ScreenImpl; import com.jogamp.newt.ScreenMode; -import com.jogamp.newt.impl.ScreenModeStatus; +import jogamp.newt.ScreenModeStatus; import com.jogamp.newt.util.ScreenModeUtil; import javax.media.nativewindow.*; diff --git a/src/newt/classes/jogamp/newt/windows/WindowsWindow.java b/src/newt/classes/jogamp/newt/windows/WindowsWindow.java index 5ab0a5b79..d820be529 100644 --- a/src/newt/classes/jogamp/newt/windows/WindowsWindow.java +++ b/src/newt/classes/jogamp/newt/windows/WindowsWindow.java @@ -32,10 +32,10 @@ * */ -package com.jogamp.newt.impl.windows; +package jogamp.newt.windows; -import com.jogamp.nativewindow.impl.windows.GDI; -import com.jogamp.newt.impl.WindowImpl; +import jogamp.nativewindow.windows.GDI; +import jogamp.newt.WindowImpl; import javax.media.nativewindow.GraphicsConfigurationFactory; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.util.Insets; diff --git a/src/newt/classes/jogamp/newt/x11/X11Display.java b/src/newt/classes/jogamp/newt/x11/X11Display.java index af05c0356..d4a83abe0 100644 --- a/src/newt/classes/jogamp/newt/x11/X11Display.java +++ b/src/newt/classes/jogamp/newt/x11/X11Display.java @@ -31,12 +31,12 @@ * */ -package com.jogamp.newt.impl.x11; +package jogamp.newt.x11; import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; -import com.jogamp.newt.impl.*; -import com.jogamp.nativewindow.impl.x11.X11Util; +import jogamp.newt.*; +import jogamp.nativewindow.x11.X11Util; public class X11Display extends DisplayImpl { diff --git a/src/newt/classes/jogamp/newt/x11/X11Screen.java b/src/newt/classes/jogamp/newt/x11/X11Screen.java index 5e89a9972..4788f6b52 100644 --- a/src/newt/classes/jogamp/newt/x11/X11Screen.java +++ b/src/newt/classes/jogamp/newt/x11/X11Screen.java @@ -30,10 +30,10 @@ * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * */ -package com.jogamp.newt.impl.x11; +package jogamp.newt.x11; -import com.jogamp.nativewindow.impl.x11.X11Util; -import com.jogamp.newt.impl.ScreenImpl; +import jogamp.nativewindow.x11.X11Util; +import jogamp.newt.ScreenImpl; import com.jogamp.newt.ScreenMode; import com.jogamp.newt.util.ScreenModeUtil; import java.util.List; diff --git a/src/newt/classes/jogamp/newt/x11/X11Window.java b/src/newt/classes/jogamp/newt/x11/X11Window.java index b8f1a0c95..6f8eb0380 100644 --- a/src/newt/classes/jogamp/newt/x11/X11Window.java +++ b/src/newt/classes/jogamp/newt/x11/X11Window.java @@ -31,10 +31,10 @@ * */ -package com.jogamp.newt.impl.x11; +package jogamp.newt.x11; -import com.jogamp.nativewindow.impl.x11.X11Util; -import com.jogamp.newt.impl.WindowImpl; +import jogamp.nativewindow.x11.X11Util; +import jogamp.newt.WindowImpl; import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; import javax.media.nativewindow.util.Point; diff --git a/src/newt/native/BroadcomEGL.c b/src/newt/native/BroadcomEGL.c index ddac0ef45..0cca90420 100644 --- a/src/newt/native/BroadcomEGL.c +++ b/src/newt/native/BroadcomEGL.c @@ -41,7 +41,7 @@ #include #include -#include "com_jogamp_newt_impl_opengl_broadcom_egl_Window.h" +#include "jogamp_newt_opengl_broadcom_egl_Window.h" #include "MouseEvent.h" #include "KeyEvent.h" @@ -71,7 +71,7 @@ static jmethodID windowCreatedID = NULL; * Display */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Display_DispatchMessages +JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_DispatchMessages (JNIEnv *env, jobject obj) { // FIXME: n/a @@ -79,7 +79,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Display_Dis (void) obj; } -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Display_CreateDisplay +JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_CreateDisplay (JNIEnv *env, jobject obj, jint width, jint height) { (void) env; @@ -93,7 +93,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Display_Cr return (jlong) (intptr_t) dpy; } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Display_DestroyDisplay +JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Display_DestroyDisplay (JNIEnv *env, jobject obj, jlong display) { EGLDisplay dpy = (EGLDisplay)(intptr_t)display; @@ -110,7 +110,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Display_Des * Window */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Window_initIDs +JNIEXPORT jboolean JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_initIDs (JNIEnv *env, jclass clazz) { windowCreatedID = (*env)->GetMethodID(env, clazz, "windowCreated", "(III)V"); @@ -122,7 +122,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Window_ return JNI_TRUE; } -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Window_CreateWindow +JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_CreateWindow (JNIEnv *env, jobject obj, jlong display, jboolean chromaKey, jint width, jint height) { EGLDisplay dpy = (EGLDisplay)(intptr_t)display; @@ -166,7 +166,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Window_Cre return (jlong) (intptr_t) window; } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Window_CloseWindow +JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_CloseWindow (JNIEnv *env, jobject obj, jlong display, jlong window) { EGLDisplay dpy = (EGLDisplay) (intptr_t) display; @@ -179,7 +179,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Window_Clos DBG_PRINT( "[CloseWindow] X\n"); } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_broadcom_egl_Window_SwapWindow +JNIEXPORT void JNICALL Java_jogamp_newt_opengl_broadcom_egl_Window_SwapWindow (JNIEnv *env, jobject obj, jlong display, jlong window) { EGLDisplay dpy = (EGLDisplay) (intptr_t) display; diff --git a/src/newt/native/IntelGDL.c b/src/newt/native/IntelGDL.c index eb6becbbd..953181ccc 100644 --- a/src/newt/native/IntelGDL.c +++ b/src/newt/native/IntelGDL.c @@ -37,9 +37,9 @@ #include #include -#include "com_jogamp_newt_impl_intel_gdl_Display.h" -#include "com_jogamp_newt_impl_intel_gdl_Screen.h" -#include "com_jogamp_newt_impl_intel_gdl_Window.h" +#include "jogamp_newt_intel_gdl_Display.h" +#include "jogamp_newt_intel_gdl_Screen.h" +#include "jogamp_newt_intel_gdl_Window.h" #include "MouseEvent.h" #include "KeyEvent.h" @@ -122,7 +122,7 @@ static void JNI_ThrowNew(JNIEnv *env, const char *throwable, const char* message * Display */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Display_DispatchMessages +JNIEXPORT void JNICALL Java_jogamp_newt_intel_gdl_Display_DispatchMessages (JNIEnv *env, jobject obj, jlong displayHandle, jobject focusedWindow) { // FIXME: n/a @@ -137,7 +137,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Display_DispatchMessa } */ } -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_intel_gdl_Display_CreateDisplay +JNIEXPORT jlong JNICALL Java_jogamp_newt_intel_gdl_Display_CreateDisplay (JNIEnv *env, jobject obj) { gdl_ret_t retval; @@ -170,7 +170,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_intel_gdl_Display_CreateDispla return (jlong) (intptr_t) p_driver_info; } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Display_DestroyDisplay +JNIEXPORT void JNICALL Java_jogamp_newt_intel_gdl_Display_DestroyDisplay (JNIEnv *env, jobject obj, jlong displayHandle) { gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle; @@ -189,7 +189,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Display_DestroyDispla * Screen */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_intel_gdl_Screen_initIDs +JNIEXPORT jboolean JNICALL Java_jogamp_newt_intel_gdl_Screen_initIDs (JNIEnv *env, jclass clazz) { screenCreatedID = (*env)->GetMethodID(env, clazz, "screenCreated", "(II)V"); @@ -201,7 +201,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_intel_gdl_Screen_initIDs return JNI_TRUE; } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Screen_GetScreenInfo +JNIEXPORT void JNICALL Java_jogamp_newt_intel_gdl_Screen_GetScreenInfo (JNIEnv *env, jobject obj, jlong displayHandle, jint idx) { gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle; @@ -233,7 +233,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Screen_GetScreenInfo * Window */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_intel_gdl_Window_initIDs +JNIEXPORT jboolean JNICALL Java_jogamp_newt_intel_gdl_Window_initIDs (JNIEnv *env, jclass clazz) { updateBoundsID = (*env)->GetMethodID(env, clazz, "updateBounds", "(IIII)V"); @@ -245,7 +245,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_intel_gdl_Window_initIDs return JNI_TRUE; } -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_intel_gdl_Window_CreateSurface +JNIEXPORT jlong JNICALL Java_jogamp_newt_intel_gdl_Window_CreateSurface (JNIEnv *env, jobject obj, jlong displayHandle, jint scr_width, jint scr_height, jint x, jint y, jint width, jint height) { gdl_driver_info_t * p_driver_info = (gdl_driver_info_t *) (intptr_t) displayHandle; @@ -338,7 +338,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_intel_gdl_Window_CreateSurface return (jlong) (intptr_t) plane; } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Window_CloseSurface +JNIEXPORT void JNICALL Java_jogamp_newt_intel_gdl_Window_CloseSurface (JNIEnv *env, jobject obj, jlong display, jlong surface) { gdl_plane_id_t plane = (gdl_plane_id_t) (intptr_t) surface ; @@ -347,7 +347,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Window_CloseSurface DBG_PRINT("[CloseSurface] plane %d\n", plane); } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_intel_gdl_Window_SetBounds0 +JNIEXPORT void JNICALL Java_jogamp_newt_intel_gdl_Window_SetBounds0 (JNIEnv *env, jobject obj, jlong surface, jint scr_width, jint scr_height, jint x, jint y, jint width, jint height) { gdl_plane_id_t plane = (gdl_plane_id_t) (intptr_t) surface ; diff --git a/src/newt/native/KDWindow.c b/src/newt/native/KDWindow.c index 50ad22b5a..be0488fd1 100644 --- a/src/newt/native/KDWindow.c +++ b/src/newt/native/KDWindow.c @@ -63,7 +63,7 @@ #include -#include "com_jogamp_newt_impl_opengl_kd_KDWindow.h" +#include "jogamp_newt_opengl_kd_KDWindow.h" #include "MouseEvent.h" #include "KeyEvent.h" @@ -101,7 +101,7 @@ static jmethodID sendKeyEventID = NULL; * Display */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDDisplay_DispatchMessages +JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDDisplay_DispatchMessages (JNIEnv *env, jobject obj) { const KDEvent * evt; @@ -197,7 +197,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDDisplay_DispatchMes * Window */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_initIDs +JNIEXPORT jboolean JNICALL Java_jogamp_newt_opengl_kd_KDWindow_initIDs (JNIEnv *env, jclass clazz) { #ifdef VERBOSE_ON @@ -225,7 +225,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_initIDs return JNI_TRUE; } -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_CreateWindow +JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_kd_KDWindow_CreateWindow (JNIEnv *env, jobject obj, jlong display, jintArray jAttrs) { jint * attrs = NULL; @@ -267,7 +267,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_CreateWindo return (jlong) (intptr_t) window; } -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_RealizeWindow +JNIEXPORT jlong JNICALL Java_jogamp_newt_opengl_kd_KDWindow_RealizeWindow (JNIEnv *env, jobject obj, jlong window) { KDWindow *w = (KDWindow*) (intptr_t) window; @@ -282,7 +282,7 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_RealizeWind return (jlong) (intptr_t) nativeWindow; } -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_CloseWindow +JNIEXPORT jint JNICALL Java_jogamp_newt_opengl_kd_KDWindow_CloseWindow (JNIEnv *env, jobject obj, jlong window, jlong juserData) { KDWindow *w = (KDWindow*) (intptr_t) window; @@ -296,11 +296,11 @@ JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_CloseWindow } /* - * Class: com_jogamp_newt_impl_opengl_kd_KDWindow + * Class: jogamp_newt_opengl_kd_KDWindow * Method: setVisible0 * Signature: (JJZ)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_setVisible0 +JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDWindow_setVisible0 (JNIEnv *env, jobject obj, jlong window, jboolean visible) { KDWindow *w = (KDWindow*) (intptr_t) window; @@ -310,7 +310,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_setVisible0 (*env)->CallVoidMethod(env, obj, visibleChangedID, visible); // FIXME: or send via event ? } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_setFullScreen0 +JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDWindow_setFullScreen0 (JNIEnv *env, jobject obj, jlong window, jboolean fullscreen) { /** not supported, due to missing NV property .. @@ -327,7 +327,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_setFullScree (void)fullscreen; } -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_opengl_kd_KDWindow_setSize0 +JNIEXPORT void JNICALL Java_jogamp_newt_opengl_kd_KDWindow_setSize0 (JNIEnv *env, jobject obj, jlong window, jint width, jint height) { KDWindow *w = (KDWindow*) (intptr_t) window; diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m index e5021dcad..3b708acce 100644 --- a/src/newt/native/MacWindow.m +++ b/src/newt/native/MacWindow.m @@ -33,7 +33,7 @@ #import -#import "com_jogamp_newt_impl_macosx_MacWindow.h" +#import "jogamp_newt_macosx_MacWindow.h" #import "NewtMacWindow.h" #import "MouseEvent.h" @@ -134,11 +134,11 @@ NS_ENDHANDLER } /* - * Class: com_jogamp_newt_impl_macosx_MacDisplay + * Class: jogamp_newt_macosx_MacDisplay * Method: initIDs * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_macosx_MacDisplay_initNSApplication0 +JNIEXPORT jboolean JNICALL Java_jogamp_newt_macosx_MacDisplay_initNSApplication0 (JNIEnv *env, jclass clazz) { static int initialized = 0; @@ -168,11 +168,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_macosx_MacDisplay_initNSApp } /* - * Class: com_jogamp_newt_impl_macosx_MacDisplay + * Class: jogamp_newt_macosx_MacDisplay * Method: dispatchMessages0 * Signature: ()V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacDisplay_dispatchMessages0 +JNIEXPORT void JNICALL Java_jogamp_newt_macosx_MacDisplay_dispatchMessages0 (JNIEnv *env, jobject unused) { NSEvent* event = NULL; @@ -206,11 +206,11 @@ NS_ENDHANDLER } /* - * Class: com_jogamp_newt_impl_macosx_MacScreen + * Class: jogamp_newt_macosx_MacScreen * Method: getWidthImpl * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_macosx_MacScreen_getWidthImpl0 +JNIEXPORT jint JNICALL Java_jogamp_newt_macosx_MacScreen_getWidthImpl0 (JNIEnv *env, jclass clazz, jint screen_idx) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -227,11 +227,11 @@ JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_macosx_MacScreen_getWidthImpl0 } /* - * Class: com_jogamp_newt_impl_macosx_MacScreen + * Class: jogamp_newt_macosx_MacScreen * Method: getHeightImpl * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_macosx_MacScreen_getHeightImpl0 +JNIEXPORT jint JNICALL Java_jogamp_newt_macosx_MacScreen_getHeightImpl0 (JNIEnv *env, jclass clazz, jint screen_idx) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -248,11 +248,11 @@ JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_macosx_MacScreen_getHeightImpl0 } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: initIDs * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_initIDs0 +JNIEXPORT jboolean JNICALL Java_jogamp_newt_macosx_MacWindow_initIDs0 (JNIEnv *env, jclass clazz) { static int initialized = 0; @@ -269,11 +269,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_initIDs0 } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: createWindow0 * Signature: (JIIIIZIIIJ)J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_createWindow0 +JNIEXPORT jlong JNICALL Java_jogamp_newt_macosx_MacWindow_createWindow0 (JNIEnv *env, jobject jthis, jlong parent, jint x, jint y, jint w, jint h, jboolean fullscreen, jint styleMask, jint bufferingType, jint screen_idx, jlong jview) { @@ -355,11 +355,11 @@ NS_ENDHANDLER } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: makeKeyAndOrderFront * Signature: (J)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_makeKeyAndOrderFront0 +JNIEXPORT void JNICALL Java_jogamp_newt_macosx_MacWindow_makeKeyAndOrderFront0 (JNIEnv *env, jobject unused, jlong window) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -369,11 +369,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_makeKeyAndOrde } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: makeKey * Signature: (J)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_makeKey0 +JNIEXPORT void JNICALL Java_jogamp_newt_macosx_MacWindow_makeKey0 (JNIEnv *env, jobject unused, jlong window) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -383,11 +383,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_makeKey0 } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: orderOut * Signature: (J)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_orderOut0 +JNIEXPORT void JNICALL Java_jogamp_newt_macosx_MacWindow_orderOut0 (JNIEnv *env, jobject unused, jlong window) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -397,11 +397,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_orderOut0 } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: close0 * Signature: (J)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_close0 +JNIEXPORT void JNICALL Java_jogamp_newt_macosx_MacWindow_close0 (JNIEnv *env, jobject unused, jlong window) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -422,11 +422,11 @@ NS_ENDHANDLER } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: setTitle0 * Signature: (JLjava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_setTitle0 +JNIEXPORT void JNICALL Java_jogamp_newt_macosx_MacWindow_setTitle0 (JNIEnv *env, jobject unused, jlong window, jstring title) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -438,11 +438,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_setTitle0 } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: contentView * Signature: (J)J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_contentView0 +JNIEXPORT jlong JNICALL Java_jogamp_newt_macosx_MacWindow_contentView0 (JNIEnv *env, jobject unused, jlong window) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -453,11 +453,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_contentView0 } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: changeContentView * Signature: (J)J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_changeContentView0 +JNIEXPORT jlong JNICALL Java_jogamp_newt_macosx_MacWindow_changeContentView0 (JNIEnv *env, jobject jthis, jlong parent, jlong window, jlong jview) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -473,11 +473,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_changeContent } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: setContentSize * Signature: (JII)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_setContentSize0 +JNIEXPORT void JNICALL Java_jogamp_newt_macosx_MacWindow_setContentSize0 (JNIEnv *env, jobject unused, jlong window, jint w, jint h) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -488,11 +488,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_setContentSize } /* - * Class: com_jogamp_newt_impl_macosx_MacWindow + * Class: jogamp_newt_macosx_MacWindow * Method: setFrameTopLeftPoint * Signature: (JII)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacWindow_setFrameTopLeftPoint0 +JNIEXPORT void JNICALL Java_jogamp_newt_macosx_MacWindow_setFrameTopLeftPoint0 (JNIEnv *env, jobject unused, jlong parent, jlong window, jint x, jint y) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c index 998743e75..95f036b39 100644 --- a/src/newt/native/WindowsWindow.c +++ b/src/newt/native/WindowsWindow.c @@ -96,9 +96,9 @@ #define DISPLAY_DEVICE_ACTIVE 0x00000001 #endif -#include "com_jogamp_newt_impl_windows_WindowsDisplay.h" -#include "com_jogamp_newt_impl_windows_WindowsScreen.h" -#include "com_jogamp_newt_impl_windows_WindowsWindow.h" +#include "jogamp_newt_windows_WindowsDisplay.h" +#include "jogamp_newt_windows_WindowsScreen.h" +#include "jogamp_newt_windows_WindowsWindow.h" #include "MouseEvent.h" #include "InputEvent.h" @@ -1015,11 +1015,11 @@ static LRESULT CALLBACK wndProc(HWND wnd, UINT message, } /* - * Class: com_jogamp_newt_impl_windows_WindowsDisplay + * Class: jogamp_newt_windows_WindowsDisplay * Method: DispatchMessages * Signature: ()V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsDisplay_DispatchMessages0 +JNIEXPORT void JNICALL Java_jogamp_newt_windows_WindowsDisplay_DispatchMessages0 (JNIEnv *env, jclass clazz) { int i = 0; @@ -1044,22 +1044,22 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsDisplay_Dispatch } /* - * Class: com_jogamp_newt_impl_windows_WindowsScreen + * Class: jogamp_newt_windows_WindowsScreen * Method: getWidthImpl * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_windows_WindowsScreen_getWidthImpl0 +JNIEXPORT jint JNICALL Java_jogamp_newt_windows_WindowsScreen_getWidthImpl0 (JNIEnv *env, jobject obj, jint scrn_idx) { return (jint)GetSystemMetrics(SM_CXSCREEN); } /* - * Class: com_jogamp_newt_impl_windows_WindowsScreen + * Class: jogamp_newt_windows_WindowsScreen * Method: getHeightImpl * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_windows_WindowsScreen_getHeightImpl0 +JNIEXPORT jint JNICALL Java_jogamp_newt_windows_WindowsScreen_getHeightImpl0 (JNIEnv *env, jobject obj, jint scrn_idx) { return (jint)GetSystemMetrics(SM_CYSCREEN); @@ -1139,11 +1139,11 @@ static HDC NewtScreen_createDisplayDC(LPCTSTR displayDeviceName) { } /* - * Class: com_jogamp_newt_impl_windows_WindowsScreen + * Class: jogamp_newt_windows_WindowsScreen * Method: getScreenMode0 * Signature: (II)[I */ -JNIEXPORT jintArray JNICALL Java_com_jogamp_newt_impl_windows_WindowsScreen_getScreenMode0 +JNIEXPORT jintArray JNICALL Java_jogamp_newt_windows_WindowsScreen_getScreenMode0 (JNIEnv *env, jobject obj, jint scrn_idx, jint mode_idx) { DISPLAY_DEVICE device; @@ -1212,11 +1212,11 @@ JNIEXPORT jintArray JNICALL Java_com_jogamp_newt_impl_windows_WindowsScreen_getS } /* - * Class: com_jogamp_newt_impl_windows_WindowsScreen + * Class: jogamp_newt_windows_WindowsScreen * Method: setScreenMode0 * Signature: (IIIIII)Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_windows_WindowsScreen_setScreenMode0 +JNIEXPORT jboolean JNICALL Java_jogamp_newt_windows_WindowsScreen_setScreenMode0 (JNIEnv *env, jobject object, jint scrn_idx, jint width, jint height, jint bits, jint rate, jint rot) { DISPLAY_DEVICE device; @@ -1249,11 +1249,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_windows_WindowsScreen_setSc } /* - * Class: com_jogamp_newt_impl_windows_WindowsWindow + * Class: jogamp_newt_windows_WindowsWindow * Method: initIDs0 * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_initIDs0 +JNIEXPORT jboolean JNICALL Java_jogamp_newt_windows_WindowsWindow_initIDs0 (JNIEnv *env, jclass clazz) { NewtCommon_init(env); @@ -1292,21 +1292,21 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_initI } /* - * Class: com_jogamp_newt_impl_windows_WindowsWindow + * Class: jogamp_newt_windows_WindowsWindow * Method: getNewtWndProc0 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_getNewtWndProc0 +JNIEXPORT jlong JNICALL Java_jogamp_newt_windows_WindowsWindow_getNewtWndProc0 (JNIEnv *env, jclass clazz) { return (jlong) (intptr_t) wndProc; } /* - * Class: com_jogamp_newt_impl_windows_WindowsWindow + * Class: jogamp_newt_windows_WindowsWindow * Method: CreateWindow */ -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_CreateWindow0 +JNIEXPORT jlong JNICALL Java_jogamp_newt_windows_WindowsWindow_CreateWindow0 (JNIEnv *env, jobject obj, jlong hInstance, jstring jWndClassName, jstring jWndName, jlong parent, jlong visualID, jboolean bIsUndecorated, @@ -1382,11 +1382,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_CreateWi } /* - * Class: com_jogamp_newt_impl_windows_WindowsWindow + * Class: jogamp_newt_windows_WindowsWindow * Method: MonitorFromWindow * Signature: (J)J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_MonitorFromWindow0 +JNIEXPORT jlong JNICALL Java_jogamp_newt_windows_WindowsWindow_MonitorFromWindow0 (JNIEnv *env, jobject obj, jlong window) { #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410 || WINVER >= 0x0500) && !defined(_WIN32_WCE) @@ -1457,11 +1457,11 @@ int NewtWindow_setVisiblePosSize(JNIEnv *env, jobject obj, HWND hwnd, jboolean t } /* - * Class: com_jogamp_newt_impl_windows_WindowsWindow + * Class: jogamp_newt_windows_WindowsWindow * Method: setVisible0 * Signature: (JZ)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_setVisible0 +JNIEXPORT void JNICALL Java_jogamp_newt_windows_WindowsWindow_setVisible0 (JNIEnv *env, jobject obj, jlong window, jboolean visible, jboolean top, jint x, jint y, jint width, jint height) { HWND hwnd = (HWND) (intptr_t) window; @@ -1494,11 +1494,11 @@ static jboolean NewtWindows_setFullScreen(jboolean fullscreen) } /* - * Class: com_jogamp_newt_impl_windows_WindowsWindow + * Class: jogamp_newt_windows_WindowsWindow * Method: reconfigureWindow0 * Signature: (JIIIIZZII)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_reconfigureWindow0 +JNIEXPORT void JNICALL Java_jogamp_newt_windows_WindowsWindow_reconfigureWindow0 (JNIEnv *env, jobject obj, jlong parent, jlong window, jint x, jint y, jint width, jint height, jboolean visible, jboolean parentChange, jint fullScreenChange, jint decorationChange) { @@ -1567,11 +1567,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_reconfigu } /* - * Class: com_jogamp_newt_impl_windows_WindowsWindow + * Class: jogamp_newt_windows_WindowsWindow * Method: setTitle * Signature: (JLjava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_setTitle0 +JNIEXPORT void JNICALL Java_jogamp_newt_windows_WindowsWindow_setTitle0 (JNIEnv *env, jclass clazz, jlong window, jstring title) { HWND hwnd = (HWND) (intptr_t) window; @@ -1585,11 +1585,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_setTitle0 } /* - * Class: com_jogamp_newt_impl_windows_WindowsWindow + * Class: jogamp_newt_windows_WindowsWindow * Method: requestFocus * Signature: (JZ)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_requestFocus0 +JNIEXPORT void JNICALL Java_jogamp_newt_windows_WindowsWindow_requestFocus0 (JNIEnv *env, jobject obj, jlong window, jboolean force) { DBG_PRINT("*** WindowsWindow: RequestFocus0\n"); diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c index d30e5de59..96da040bb 100644 --- a/src/newt/native/X11Window.c +++ b/src/newt/native/X11Window.c @@ -51,9 +51,9 @@ #include -#include "com_jogamp_newt_impl_x11_X11Screen.h" -#include "com_jogamp_newt_impl_x11_X11Display.h" -#include "com_jogamp_newt_impl_x11_X11Window.h" +#include "jogamp_newt_x11_X11Screen.h" +#include "jogamp_newt_x11_X11Display.h" +#include "jogamp_newt_x11_X11Window.h" #include "MouseEvent.h" #include "KeyEvent.h" @@ -197,11 +197,11 @@ static void displayDispatchErrorHandlerEnable(int onoff, JNIEnv * env) { } /* - * Class: com_jogamp_newt_impl_x11_X11Display + * Class: jogamp_newt_x11_X11Display * Method: initIDs * Signature: (Z)Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Display_initIDs0 +JNIEXPORT jboolean JNICALL Java_jogamp_newt_x11_X11Display_initIDs0 (JNIEnv *env, jclass clazz) { jclass c; @@ -229,11 +229,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Display_initIDs0 } /* - * Class: com_jogamp_newt_impl_x11_X11Display + * Class: jogamp_newt_x11_X11Display * Method: CompleteDisplay * Signature: (J)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Display_CompleteDisplay0 +JNIEXPORT void JNICALL Java_jogamp_newt_x11_X11Display_CompleteDisplay0 (JNIEnv *env, jobject obj, jlong display) { Display * dpy = (Display *)(intptr_t)display; @@ -457,11 +457,11 @@ static void NewtWindows_setFullscreen (Display *dpy, Window root, Window w, Bool #define USE_SENDIO_DIRECT 1 /* - * Class: com_jogamp_newt_impl_x11_X11Display + * Class: jogamp_newt_x11_X11Display * Method: DispatchMessages * Signature: (JIJJ)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Display_DispatchMessages0 +JNIEXPORT void JNICALL Java_jogamp_newt_x11_X11Display_DispatchMessages0 (JNIEnv *env, jobject obj, jlong display, jlong javaObjectAtom, jlong wmDeleteAtom) { Display * dpy = (Display *) (intptr_t) display; @@ -738,11 +738,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Display_DispatchMessages */ /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: GetScreen * Signature: (JI)J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_GetScreen0 +JNIEXPORT jlong JNICALL Java_jogamp_newt_x11_X11Screen_GetScreen0 (JNIEnv *env, jclass clazz, jlong display, jint screen_index) { Display * dpy = (Display *)(intptr_t)display; @@ -765,14 +765,14 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_GetScreen0 return (jlong) (intptr_t) scrn; } -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getWidth0 +JNIEXPORT jint JNICALL Java_jogamp_newt_x11_X11Screen_getWidth0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx) { Display * dpy = (Display *) (intptr_t) display; return (jint) XDisplayWidth( dpy, scrn_idx); } -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getHeight0 +JNIEXPORT jint JNICALL Java_jogamp_newt_x11_X11Screen_getHeight0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx) { Display * dpy = (Display *) (intptr_t) display; @@ -812,11 +812,11 @@ static int NewtScreen_XRotation2Degree(JNIEnv *env, int xrotation) { } /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: getAvailableScreenModeRotations0 * Signature: (JI)I */ -JNIEXPORT jintArray JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getAvailableScreenModeRotations0 +JNIEXPORT jintArray JNICALL Java_jogamp_newt_x11_X11Screen_getAvailableScreenModeRotations0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx) { Display *dpy = (Display *) (intptr_t) display; @@ -862,18 +862,18 @@ JNIEXPORT jintArray JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getAvailable } /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: getNumScreenModeResolution0 * Signature: (JI)I */ -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getNumScreenModeResolutions0 +JNIEXPORT jint JNICALL Java_jogamp_newt_x11_X11Screen_getNumScreenModeResolutions0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx) { Display *dpy = (Display *) (intptr_t) display; Window root = RootWindow(dpy, (int)scrn_idx); if(False == NewtScreen_hasRANDR(dpy)) { - DBG_PRINT("Java_com_jogamp_newt_impl_x11_X11Screen_getNumScreenModeResolutions0: RANDR not available\n"); + DBG_PRINT("Java_jogamp_newt_x11_X11Screen_getNumScreenModeResolutions0: RANDR not available\n"); return 0; } @@ -884,18 +884,18 @@ JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getNumScreenModeR } /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: getScreenModeResolutions0 * Signature: (JII)[I */ -JNIEXPORT jintArray JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getScreenModeResolution0 +JNIEXPORT jintArray JNICALL Java_jogamp_newt_x11_X11Screen_getScreenModeResolution0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx, jint resMode_idx) { Display *dpy = (Display *) (intptr_t) display; Window root = RootWindow(dpy, (int)scrn_idx); if(False == NewtScreen_hasRANDR(dpy)) { - DBG_PRINT("Java_com_jogamp_newt_impl_x11_X11Screen_getScreenModeResolution0: RANDR not available\n"); + DBG_PRINT("Java_jogamp_newt_x11_X11Screen_getScreenModeResolution0: RANDR not available\n"); return (*env)->NewIntArray(env, 0); } @@ -927,18 +927,18 @@ JNIEXPORT jintArray JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getScreenMod } /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: getScreenModeRates0 * Signature: (JII)[I */ -JNIEXPORT jintArray JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getScreenModeRates0 +JNIEXPORT jintArray JNICALL Java_jogamp_newt_x11_X11Screen_getScreenModeRates0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx, jint resMode_idx) { Display *dpy = (Display *) (intptr_t) display; Window root = RootWindow(dpy, (int)scrn_idx); if(False == NewtScreen_hasRANDR(dpy)) { - DBG_PRINT("Java_com_jogamp_newt_impl_x11_X11Screen_getScreenModeRates0: RANDR not available\n"); + DBG_PRINT("Java_jogamp_newt_x11_X11Screen_getScreenModeRates0: RANDR not available\n"); return (*env)->NewIntArray(env, 0); } @@ -971,18 +971,18 @@ JNIEXPORT jintArray JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getScreenMod } /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: getCurrentScreenRate0 * Signature: (JI)I */ -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenRate0 +JNIEXPORT jint JNICALL Java_jogamp_newt_x11_X11Screen_getCurrentScreenRate0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx) { Display *dpy = (Display *) (intptr_t) display; Window root = RootWindow(dpy, (int)scrn_idx); if(False == NewtScreen_hasRANDR(dpy)) { - DBG_PRINT("Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenRate0: RANDR not available\n"); + DBG_PRINT("Java_jogamp_newt_x11_X11Screen_getCurrentScreenRate0: RANDR not available\n"); return -1; } @@ -997,18 +997,18 @@ JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenR } /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: getCurrentScreenRotation0 * Signature: (JI)I */ -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenRotation0 +JNIEXPORT jint JNICALL Java_jogamp_newt_x11_X11Screen_getCurrentScreenRotation0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx) { Display *dpy = (Display *) (intptr_t) display; Window root = RootWindow(dpy, (int)scrn_idx); if(False == NewtScreen_hasRANDR(dpy)) { - DBG_PRINT("Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenRotation0: RANDR not available\n"); + DBG_PRINT("Java_jogamp_newt_x11_X11Screen_getCurrentScreenRotation0: RANDR not available\n"); return -1; } @@ -1026,18 +1026,18 @@ JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenR /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: getCurrentScreenResolutionIndex0 * Signature: (JI)I */ -JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenResolutionIndex0 +JNIEXPORT jint JNICALL Java_jogamp_newt_x11_X11Screen_getCurrentScreenResolutionIndex0 (JNIEnv *env, jclass clazz, jlong display, jint scrn_idx) { Display *dpy = (Display *) (intptr_t) display; Window root = RootWindow(dpy, (int)scrn_idx); if(False == NewtScreen_hasRANDR(dpy)) { - DBG_PRINT("Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenResolutionIndex0: RANDR not available\n"); + DBG_PRINT("Java_jogamp_newt_x11_X11Screen_getCurrentScreenResolutionIndex0: RANDR not available\n"); return -1; } @@ -1055,18 +1055,18 @@ JNIEXPORT jint JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_getCurrentScreenR } /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: setCurrentScreenModeStart0 * Signature: (JIIII)Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_setCurrentScreenModeStart0 +JNIEXPORT jboolean JNICALL Java_jogamp_newt_x11_X11Screen_setCurrentScreenModeStart0 (JNIEnv *env, jclass clazz, jlong display, jint screen_idx, jint resMode_idx, jint freq, jint rotation) { Display *dpy = (Display *) (intptr_t) display; Window root = RootWindow(dpy, (int)screen_idx); if(False == NewtScreen_hasRANDR(dpy)) { - DBG_PRINT("Java_com_jogamp_newt_impl_x11_X11Screen_setCurrentScreenModeStart0: RANDR not available\n"); + DBG_PRINT("Java_jogamp_newt_x11_X11Screen_setCurrentScreenModeStart0: RANDR not available\n"); return JNI_FALSE; } @@ -1115,11 +1115,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_setCurrentScr } /* - * Class: com_jogamp_newt_impl_x11_X11Screen + * Class: jogamp_newt_x11_X11Screen * Method: setCurrentScreenModePollEnd0 * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_setCurrentScreenModePollEnd0 +JNIEXPORT jboolean JNICALL Java_jogamp_newt_x11_X11Screen_setCurrentScreenModePollEnd0 (JNIEnv *env, jclass clazz, jlong display, jint screen_idx, jint resMode_idx, jint freq, jint rotation) { Display *dpy = (Display *) (intptr_t) display; @@ -1128,7 +1128,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_setCurrentScr XRRScreenChangeNotifyEvent * scn_event = (XRRScreenChangeNotifyEvent *) &evt; if(False == NewtScreen_hasRANDR(dpy)) { - DBG_PRINT("Java_com_jogamp_newt_impl_x11_X11Screen_setCurrentScreenModePollEnd0: RANDR not available\n"); + DBG_PRINT("Java_jogamp_newt_x11_X11Screen_setCurrentScreenModePollEnd0: RANDR not available\n"); return JNI_FALSE; } @@ -1177,11 +1177,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Screen_setCurrentScr */ /* - * Class: com_jogamp_newt_impl_x11_X11Window + * Class: jogamp_newt_x11_X11Window * Method: initIDs * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Window_initIDs0 +JNIEXPORT jboolean JNICALL Java_jogamp_newt_x11_X11Window_initIDs0 (JNIEnv *env, jclass clazz) { sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(IIZ)V"); @@ -1217,11 +1217,11 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Window_initIDs0 } /* - * Class: com_jogamp_newt_impl_x11_X11Window + * Class: jogamp_newt_x11_X11Window * Method: CreateWindow * Signature: (JJIJIIII)J */ -JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_x11_X11Window_CreateWindow0 +JNIEXPORT jlong JNICALL Java_jogamp_newt_x11_X11Window_CreateWindow0 (JNIEnv *env, jobject obj, jlong parent, jlong display, jint screen_index, jlong visualID, jlong javaObjectAtom, jlong windowDeleteAtom, @@ -1350,11 +1350,11 @@ JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_x11_X11Window_CreateWindow0 } /* - * Class: com_jogamp_newt_impl_x11_X11Window + * Class: jogamp_newt_x11_X11Window * Method: CloseWindow * Signature: (JJ)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_CloseWindow0 +JNIEXPORT void JNICALL Java_jogamp_newt_x11_X11Window_CloseWindow0 (JNIEnv *env, jobject obj, jlong display, jlong window, jlong javaObjectAtom, jlong wmDeleteAtom) { Display * dpy = (Display *) (intptr_t) display; @@ -1382,7 +1382,7 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_CloseWindow0 XUnmapWindow(dpy, w); // Drain all events related to this window .. - Java_com_jogamp_newt_impl_x11_X11Display_DispatchMessages0(env, obj, display, javaObjectAtom, wmDeleteAtom); + Java_jogamp_newt_x11_X11Display_DispatchMessages0(env, obj, display, javaObjectAtom, wmDeleteAtom); XDestroyWindow(dpy, w); XSync(dpy, False); @@ -1410,11 +1410,11 @@ static void NewtWindows_setPosSize(Display *dpy, Window w, jint x, jint y, jint } /* - * Class: com_jogamp_newt_impl_x11_X11Window + * Class: jogamp_newt_x11_X11Window * Method: setVisible0 * Signature: (JJZIIII)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_setVisible0 +JNIEXPORT void JNICALL Java_jogamp_newt_x11_X11Window_setVisible0 (JNIEnv *env, jobject obj, jlong display, jlong window, jboolean visible, jint x, jint y, jint width, jint height) { Display * dpy = (Display *) (intptr_t) display; @@ -1436,11 +1436,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_setVisible0 } /* - * Class: com_jogamp_newt_impl_x11_X11Window + * Class: jogamp_newt_x11_X11Window * Method: reconfigureWindow0 * Signature: (JIJJIIIIZZII)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_reconfigureWindow0 +JNIEXPORT void JNICALL Java_jogamp_newt_x11_X11Window_reconfigureWindow0 (JNIEnv *env, jobject obj, jlong jdisplay, jint screen_index, jlong jparent, jlong jwindow, jint x, jint y, jint width, jint height, jboolean isVisible, jboolean parentChange, jint fullscreenChange, jint decorationChange) { @@ -1505,22 +1505,22 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_reconfigureWindow } /* - * Class: com_jogamp_newt_impl_x11_X11Window + * Class: jogamp_newt_x11_X11Window * Method: requestFocus0 * Signature: (JJ)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_requestFocus0 +JNIEXPORT void JNICALL Java_jogamp_newt_x11_X11Window_requestFocus0 (JNIEnv *env, jobject obj, jlong display, jlong window, jboolean force) { NewtWindows_requestFocus ( env, obj, (Display *) (intptr_t) display, (Window)window, force ) ; } /* - * Class: Java_com_jogamp_newt_impl_x11_X11Window + * Class: Java_jogamp_newt_x11_X11Window * Method: setTitle0 * Signature: (JJLjava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_setTitle0 +JNIEXPORT void JNICALL Java_jogamp_newt_x11_X11Window_setTitle0 (JNIEnv *env, jclass clazz, jlong display, jlong window, jstring title) { Display * dpy = (Display *) (intptr_t) display; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/MultisampleDemo01.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/MultisampleDemo01.java index a9995d8e8..b41501a9b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/MultisampleDemo01.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/MultisampleDemo01.java @@ -40,8 +40,8 @@ package com.jogamp.opengl.test.junit.jogl.caps; -import com.jogamp.opengl.impl.x11.glx.GLX; -import com.jogamp.opengl.impl.x11.glx.X11GLXGraphicsConfiguration; +import jogamp.opengl.x11.glx.GLX; +import jogamp.opengl.x11.glx.X11GLXGraphicsConfiguration; import javax.media.nativewindow.AbstractGraphicsConfiguration; import javax.media.nativewindow.NativeWindowFactory; import javax.media.opengl.GL; diff --git a/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java b/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java index 4a2a181ed..35522f681 100644 --- a/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java +++ b/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java @@ -28,7 +28,7 @@ package com.jogamp.opengl.test.junit.util; -import com.jogamp.newt.impl.WindowImplAccess; +import jogamp.newt.WindowImplAccess; import java.lang.reflect.InvocationTargetException; import java.awt.AWTException; import java.awt.Component; diff --git a/src/test/jogamp/newt/WindowImplAccess.java b/src/test/jogamp/newt/WindowImplAccess.java index 5a90c8094..848e58227 100644 --- a/src/test/jogamp/newt/WindowImplAccess.java +++ b/src/test/jogamp/newt/WindowImplAccess.java @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -package com.jogamp.newt.impl; +package jogamp.newt; import com.jogamp.newt.Window; import com.jogamp.newt.opengl.GLWindow; -- cgit v1.2.3