diff options
author | Sven Gothel <[email protected]> | 2011-08-09 20:09:38 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-08-09 20:09:38 +0200 |
commit | 4087b1635ec5f20befae2c812caa01b2b61f2257 (patch) | |
tree | ee375c3eb0ab8e56a3c7c9227b3a919003202cab /src | |
parent | 75b7379caf263a8e44a21c2daf1fc994f4761dc8 (diff) |
reloc files: NEWT Android driver, demos OneTriangle
Diffstat (limited to 'src')
-rw-r--r-- | src/newt/classes/jogamp/newt/driver/android/AndroidDisplay.java (renamed from src/newt/classes/jogamp/newt/driver/android/Display.java) | 0 | ||||
-rw-r--r-- | src/newt/classes/jogamp/newt/driver/android/AndroidScreen.java (renamed from src/newt/classes/jogamp/newt/driver/android/Screen.java) | 0 | ||||
-rw-r--r-- | src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java (renamed from src/newt/classes/jogamp/newt/driver/android/Window.java) | 0 | ||||
-rw-r--r-- | src/newt/classes/jogamp/newt/driver/android/NEWTSurfaceView.java | 84 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/OneTriangle.java (renamed from src/test/com/jogamp/opengl/test/junit/jogl/swt/OneTriangle.java) | 0 |
5 files changed, 0 insertions, 84 deletions
diff --git a/src/newt/classes/jogamp/newt/driver/android/Display.java b/src/newt/classes/jogamp/newt/driver/android/AndroidDisplay.java index e1944276f..e1944276f 100644 --- a/src/newt/classes/jogamp/newt/driver/android/Display.java +++ b/src/newt/classes/jogamp/newt/driver/android/AndroidDisplay.java diff --git a/src/newt/classes/jogamp/newt/driver/android/Screen.java b/src/newt/classes/jogamp/newt/driver/android/AndroidScreen.java index 44c7ca95f..44c7ca95f 100644 --- a/src/newt/classes/jogamp/newt/driver/android/Screen.java +++ b/src/newt/classes/jogamp/newt/driver/android/AndroidScreen.java diff --git a/src/newt/classes/jogamp/newt/driver/android/Window.java b/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java index 4d66debef..4d66debef 100644 --- a/src/newt/classes/jogamp/newt/driver/android/Window.java +++ b/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java diff --git a/src/newt/classes/jogamp/newt/driver/android/NEWTSurfaceView.java b/src/newt/classes/jogamp/newt/driver/android/NEWTSurfaceView.java deleted file mode 100644 index cdbe40471..000000000 --- a/src/newt/classes/jogamp/newt/driver/android/NEWTSurfaceView.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Copyright 2011 JogAmp Community. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of JogAmp Community. - */ -package jogamp.newt.driver.android; - -import javax.media.opengl.GLProfile; -import javax.microedition.khronos.egl.EGL10; -import javax.microedition.khronos.egl.EGLContext; -import javax.microedition.khronos.egl.EGLDisplay; - -import android.content.Context; -import android.util.Log; -import android.view.Surface; -import android.view.SurfaceHolder; -import android.view.SurfaceView; -import android.view.SurfaceHolder.Callback2; - -public class NEWTSurfaceView extends SurfaceView implements Callback2 { - - public NEWTSurfaceView(Context context) { - super(context); - - System.setProperty("nativewindow.debug", "all"); - System.setProperty("jogl.debug", "all"); - System.setProperty("jogamp.debug.JNILibLoader", "true"); - System.setProperty("jogamp.debug.NativeLibrary", "true"); - System.setProperty("jogamp.debug.NativeLibrary.Lookup", "true"); - getHolder().addCallback(this); - } - - boolean created = false; - - public final boolean isCreated() { - return created; - } - - public void surfaceCreated(SurfaceHolder holder) { - Surface surface = getHolder().getSurface(); - Log.d(MD.TAG, "surfaceCreated - 0 - isValid: "+surface.isValid()); - GLProfile.initSingleton(true); - Log.d(MD.TAG, "surfaceCreated - 1"); - Log.d(MD.TAG, MD.getInfo()); - Log.d(MD.TAG, "surfaceCreated - X"); - created = true; - } - - public void surfaceChanged(SurfaceHolder holder, int format, int width, - int height) { - Log.d(MD.TAG, "surfaceChanged: f "+Integer.toString(format)+", "+width+"x"+height); - } - - public void surfaceDestroyed(SurfaceHolder holder) { - Log.d(MD.TAG, "surfaceDestroyed"); - created = false; - } - - public void surfaceRedrawNeeded(SurfaceHolder holder) { - Log.d(MD.TAG, "surfaceRedrawNeeded"); - } -} diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/OneTriangle.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/OneTriangle.java index 655e590a3..655e590a3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/OneTriangle.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/OneTriangle.java |