From fc67b7c48a7d0280c44012d5daec04f227bcf0fa Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 6 Oct 2011 03:56:49 +0200 Subject: Android: launcher manifest: adding INTERNET permission for NV's perfhud --- make/resources/android/AndroidManifest-launcher.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'make') diff --git a/make/resources/android/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml index e48b61e45..9166dd3c4 100644 --- a/make/resources/android/AndroidManifest-launcher.xml +++ b/make/resources/android/AndroidManifest-launcher.xml @@ -3,6 +3,7 @@ sharedUserId="com.jogamp.Community" package="com.jogamp.android.launcher"> + -- cgit v1.2.3 From 3f8eeefaf930bcff52e085c623de1cc927cc36c6 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 6 Oct 2011 04:05:01 +0200 Subject: test script --- make/scripts/tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'make') diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index fdba483e6..69068a23a 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -167,7 +167,7 @@ function testawtmt() { #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT $* @@ -250,7 +250,7 @@ function testawtmt() { #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $* -testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $* +#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo02 $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $* -- cgit v1.2.3 From 6d28a9ed9ff039237775ea133377f8b59ca857c1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 6 Oct 2011 04:47:07 +0200 Subject: NEWT/Android: Add TRANSLUCENT feature / Demo: 'GearsES2T' --- .../resources/android/AndroidManifest-launcher.xml | 14 ++++ .../android/res-launcher/values/colors.xml | 6 ++ .../android/res-launcher/values/strings.xml | 2 + .../android/res-launcher/values/styles.xml | 20 ++++++ .../NEWTLauncherGearsES2TransActivity.java | 15 +++++ .../jogamp/newt/driver/android/AndroidWindow.java | 9 ++- .../opengl/test/android/NEWTGearsES2Activity.java | 2 +- .../test/android/NEWTGearsES2TransActivity.java | 75 ++++++++++++++++++++++ 8 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 make/resources/android/res-launcher/values/colors.xml create mode 100644 make/resources/android/res-launcher/values/styles.xml create mode 100644 src/android/com/jogamp/android/launcher/NEWTLauncherGearsES2TransActivity.java create mode 100644 src/test/com/jogamp/opengl/test/android/NEWTGearsES2TransActivity.java (limited to 'make') diff --git a/make/resources/android/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml index 9166dd3c4..88abc8ba5 100644 --- a/make/resources/android/AndroidManifest-launcher.xml +++ b/make/resources/android/AndroidManifest-launcher.xml @@ -70,6 +70,20 @@ + + + + + + + + #ff000000 + #e0000000 + #00000000 + diff --git a/make/resources/android/res-launcher/values/strings.xml b/make/resources/android/res-launcher/values/strings.xml index f4b558df3..8b6928d9c 100644 --- a/make/resources/android/res-launcher/values/strings.xml +++ b/make/resources/android/res-launcher/values/strings.xml @@ -11,6 +11,8 @@ GearsES1 GearsES2 GearsES2 + GearsES2T + GearsES2T GraphUI1p GraphUI 1-pass GraphUI2p diff --git a/make/resources/android/res-launcher/values/styles.xml b/make/resources/android/res-launcher/values/styles.xml new file mode 100644 index 000000000..5b7eb7e2e --- /dev/null +++ b/make/resources/android/res-launcher/values/styles.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherGearsES2TransActivity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherGearsES2TransActivity.java new file mode 100644 index 000000000..c55620f4c --- /dev/null +++ b/src/android/com/jogamp/android/launcher/NEWTLauncherGearsES2TransActivity.java @@ -0,0 +1,15 @@ +package com.jogamp.android.launcher; + +public class NEWTLauncherGearsES2TransActivity extends NEWTLauncherActivity { + static String demo = "com.jogamp.opengl.test.android.NEWTGearsES2TransActivity"; + static String pkg = "com.jogamp.opengl.test"; + + @Override + public String getUserActivityName() { + return demo; + } + @Override + public String getUserPackageName() { + return pkg; + } +} diff --git a/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java b/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java index c5019bf63..2c7031dae 100644 --- a/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java +++ b/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java @@ -115,7 +115,9 @@ public class AndroidWindow extends jogamp.newt.WindowImpl implements Callback2 { public static int getFormat(CapabilitiesImmutable rCaps) { int fmt = PixelFormat.UNKNOWN; - if(rCaps.getRedBits()<=5 && + if(!rCaps.isBackgroundOpaque()) { + fmt = PixelFormat.TRANSLUCENT; + } else if(rCaps.getRedBits()<=5 && rCaps.getGreenBits()<=6 && rCaps.getBlueBits()<=5 && rCaps.getAlphaBits()==0) { @@ -313,7 +315,7 @@ public class AndroidWindow extends jogamp.newt.WindowImpl implements Callback2 { public void surfaceCreated(SurfaceHolder holder) { Log.d(MD.TAG, "surfaceCreated: "+x+"/"+y+" "+width+"x"+height); - surfaceRealized(holder); + // surfaceRealized(holder); Log.d(MD.TAG, "surfaceCreated: X"); } @@ -389,7 +391,8 @@ public class AndroidWindow extends jogamp.newt.WindowImpl implements Callback2 { class MSurfaceView extends SurfaceView { public MSurfaceView (Context ctx) { - super(ctx); + super(ctx); + setBackgroundDrawable(null); } } //---------------------------------------------------------------------- diff --git a/src/test/com/jogamp/opengl/test/android/NEWTGearsES2Activity.java b/src/test/com/jogamp/opengl/test/android/NEWTGearsES2Activity.java index 164857760..939bfa210 100644 --- a/src/test/com/jogamp/opengl/test/android/NEWTGearsES2Activity.java +++ b/src/test/com/jogamp/opengl/test/android/NEWTGearsES2Activity.java @@ -54,7 +54,7 @@ public class NEWTGearsES2Activity extends NewtBaseActivity { GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES2)); Log.d(TAG, "req caps: "+caps); GLWindow glWindow = GLWindow.create(caps); - glWindow.setFullscreen(true); + glWindow.setFullscreen(true); setContentView(getWindow(), glWindow); glWindow.addGLEventListener(new GearsES2(1)); diff --git a/src/test/com/jogamp/opengl/test/android/NEWTGearsES2TransActivity.java b/src/test/com/jogamp/opengl/test/android/NEWTGearsES2TransActivity.java new file mode 100644 index 000000000..1862b1ba1 --- /dev/null +++ b/src/test/com/jogamp/opengl/test/android/NEWTGearsES2TransActivity.java @@ -0,0 +1,75 @@ +/** + * 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 com.jogamp.opengl.test.android; + +import javax.media.opengl.GLCapabilities; +import javax.media.opengl.GLProfile; + +import jogamp.newt.driver.android.NewtBaseActivity; + +import com.jogamp.newt.ScreenMode; +import com.jogamp.newt.event.ScreenModeListener; +import com.jogamp.newt.opengl.GLWindow; + +import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +import com.jogamp.opengl.util.Animator; + +import android.os.Bundle; +import android.util.Log; + +public class NEWTGearsES2TransActivity extends NewtBaseActivity { + static String TAG = "NEWTGearsES2TransActivity"; + + @Override + public void onCreate(Bundle savedInstanceState) { + Log.d(TAG, "onCreate - 0"); + super.onCreate(savedInstanceState); + + // create GLWindow (-> incl. underlying NEWT Display, Screen & Window) + GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GLES2)); + caps.setBackgroundOpaque(false); + Log.d(TAG, "req caps: "+caps); + GLWindow glWindow = GLWindow.create(caps); + glWindow.setFullscreen(true); + setContentView(getWindow(), glWindow); + + glWindow.addGLEventListener(new GearsES2(1)); + glWindow.getWindow().getScreen().addScreenModeListener(new ScreenModeListener() { + public void screenModeChangeNotify(ScreenMode sm) { } + public void screenModeChanged(ScreenMode sm, boolean success) { + System.err.println("ScreenMode Changed: "+sm); + } + }); + glWindow.setVisible(true); + Animator animator = new Animator(glWindow); + animator.setUpdateFPSFrames(60, System.err); + setAnimator(animator); + + Log.d(TAG, "onCreate - X"); + } +} -- cgit v1.2.3