Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 801: Adjust Tests: GPUUIScene* use window proportional button siz…
…e; Add Android MovieCubeActivity0a for 'no text' version
  • Loading branch information
sgothel committed Mar 25, 2014
1 parent b078f74 commit 38febaa
Show file tree
Hide file tree
Showing 15 changed files with 386 additions and 86 deletions.
14 changes: 12 additions & 2 deletions make/resources/android/AndroidManifest-test.xml
Expand Up @@ -171,8 +171,18 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0"
android:label="@string/activity_moviecube0_name"
<activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0a"
android:label="@string/activity_moviecube0a_name"
android:description="@string/activity_moviecube_descr"
android:theme="@android:style/Theme.NoDisplay"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0b"
android:label="@string/activity_moviecube0b_name"
android:description="@string/activity_moviecube_descr"
android:theme="@android:style/Theme.NoDisplay"
>
Expand Down
3 changes: 2 additions & 1 deletion make/resources/android/res-test/values/strings.xml
Expand Up @@ -29,7 +29,8 @@
<string name="activity_moviesimple1b_name">MovieSimple1b</string>
<string name="activity_moviesimple2_name">MovieSimple2</string>
<string name="activity_moviesimple_descr">MovieSimple</string>
<string name="activity_moviecube0_name">MovieCube0</string>
<string name="activity_moviecube0a_name">MovieCube0</string>
<string name="activity_moviecube0b_name">MovieCube1</string>
<string name="activity_moviecube1a_name">CamCube0</string>
<string name="activity_moviecube1b_name">CamCube1</string>
<string name="activity_moviecube_descr">MovieCube</string>
Expand Down
5 changes: 4 additions & 1 deletion make/scripts/adb-launch-activity.sh
Expand Up @@ -3,7 +3,10 @@
#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGenericActivity"
#ANAME="com.jogamp.android.launcher/com.jogamp.android.launcher.NEWTLauncherActivity2"
#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGearsES2ActivityLauncher"
ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.MovieCubeActivityLauncher0"
ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.MovieCubeActivityLauncher0a"
#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.MovieCubeActivityLauncher0b"
#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGraphUI1pActivityLauncher"
#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGraphUI2pActivityLauncher"

adb $* shell "setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \
am start -a android.intent.action.MAIN -n $ANAME"
Expand Down
2 changes: 1 addition & 1 deletion make/scripts/tests.sh
Expand Up @@ -118,7 +118,7 @@ function jrun() {
#D_ARGS="-Djogl.debug.GLBufferStateTracker -Djogl.debug.GLBufferObjectTracker"
#D_ARGS="-Djogl.debug.GLBufferObjectTracker"
#D_ARGS="-Djogl.debug.GLBufferObjectTracker -Djogl.debug.GLArrayData -Djogl.debug.TraceGL -Djogl.debug.DebugGL"
#D_ARGS="-Djogl.debug.GLSLCode"
D_ARGS="-Djogl.debug.GLSLCode"
#D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.DebugGL"
#D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.JAWT -Dnewt.debug.Window"
#D_ARGS="-Dnativewindow.debug.JAWT -Djogl.debug.GLCanvas"
Expand Down
Expand Up @@ -55,8 +55,8 @@
import android.os.Bundle;
import android.util.Log;

public class MovieCubeActivity0 extends NewtBaseActivity {
static String TAG = "MovieCubeActivity0";
public class MovieCubeActivity0a extends NewtBaseActivity {
static String TAG = "MovieCubeActivity0a";

MouseAdapter showKeyboardMouseListener = new MouseAdapter() {
@Override
Expand Down Expand Up @@ -98,7 +98,7 @@ public void onCreate(Bundle savedInstanceState) {
glWindowMain.setVisible(true);
glWindowMain.addMouseListener(showKeyboardMouseListener);

final MovieCube demoMain = new MovieCube(MovieCube.zoom_def, 0f, 0f);
final MovieCube demoMain = new MovieCube(MovieCube.zoom_def, 0f, 0f, false);
final GLMediaPlayer mPlayer = demoMain.getGLMediaPlayer();
mPlayer.addEventListener(new GLMediaEventListener() {
@Override
Expand Down
169 changes: 169 additions & 0 deletions src/test/com/jogamp/opengl/test/android/MovieCubeActivity0b.java
@@ -0,0 +1,169 @@
/**
* 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 java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLConnection;
import java.util.Arrays;

import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;

import jogamp.newt.driver.android.NewtBaseActivity;

import com.jogamp.common.util.IOUtil;
import com.jogamp.newt.NewtFactory;
import com.jogamp.newt.event.MouseAdapter;
import com.jogamp.newt.event.MouseEvent;
import com.jogamp.newt.opengl.GLWindow;

import com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube;
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.av.GLMediaPlayer;
import com.jogamp.opengl.util.av.GLMediaPlayer.GLMediaEventListener;
import com.jogamp.opengl.util.av.GLMediaPlayer.StreamException;
import com.jogamp.opengl.util.texture.TextureSequence.TextureFrame;

import android.os.Bundle;
import android.util.Log;

public class MovieCubeActivity0b extends NewtBaseActivity {
static String TAG = "MovieCubeActivity0a";

MouseAdapter showKeyboardMouseListener = new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
if( e.getPointerCount() == 4 && e.getPressure(0, true) > 0.7f ) {
((com.jogamp.newt.Window) e.getSource()).setKeyboardVisible(true);
}
}
};

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

String[] streamLocs = new String[] {
System.getProperty("jnlp.media0_url2"),
System.getProperty("jnlp.media0_url1"),
System.getProperty("jnlp.media0_url0") };
final URI streamLoc = getURI(streamLocs, 0, false);
if(null == streamLoc) { throw new RuntimeException("no media reachable: "+Arrays.asList(streamLocs)); }

// also initializes JOGL
final GLCapabilities capsMain = new GLCapabilities(GLProfile.getGL2ES2());
capsMain.setNumSamples(4);
capsMain.setSampleBuffers(true);
capsMain.setBackgroundOpaque(false);

// screen for layout params ..
final com.jogamp.newt.Display dpy = NewtFactory.createDisplay(null);
final com.jogamp.newt.Screen scrn = NewtFactory.createScreen(dpy, 0);
scrn.addReference();

try {
final Animator anim = new Animator();

// Main
final GLWindow glWindowMain = GLWindow.create(scrn, capsMain);
glWindowMain.setFullscreen(true);
setContentView(getWindow(), glWindowMain);
anim.add(glWindowMain);
glWindowMain.setVisible(true);
glWindowMain.addMouseListener(showKeyboardMouseListener);

final MovieCube demoMain = new MovieCube(MovieCube.zoom_def, 0f, 0f, true);
final GLMediaPlayer mPlayer = demoMain.getGLMediaPlayer();
mPlayer.addEventListener(new GLMediaEventListener() {
@Override
public void newFrameAvailable(GLMediaPlayer ts, TextureFrame newFrame, long when) {
}

@Override
public void attributesChanged(final GLMediaPlayer mp, int event_mask, long when) {
System.err.println("MovieCubeActivity0 AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
System.err.println("MovieCubeActivity0 State: "+mp);
if( 0 != ( GLMediaEventListener.EVENT_CHANGE_INIT & event_mask ) ) {
glWindowMain.addGLEventListener(demoMain);
anim.setUpdateFPSFrames(60, null);
anim.resetFPSCounter();
}
if( 0 != ( GLMediaEventListener.EVENT_CHANGE_PLAY & event_mask ) ) {
anim.resetFPSCounter();
}
if( 0 != ( ( GLMediaEventListener.EVENT_CHANGE_ERR | GLMediaEventListener.EVENT_CHANGE_EOS ) & event_mask ) ) {
final StreamException se = mPlayer.getStreamException();
if( null != se ) {
se.printStackTrace();
}
getActivity().finish();
}
}
});
demoMain.initStream(streamLoc, GLMediaPlayer.STREAM_ID_AUTO, GLMediaPlayer.STREAM_ID_AUTO, 0);
} catch (IOException e) {
e.printStackTrace();
}

scrn.removeReference();

Log.d(TAG, "onCreate - X");
}

static URI getURI(String path[], int off, boolean checkAvail) {
URI uri = null;
for(int i=off; null==uri && i<path.length; i++) {
if(null != path[i] && path[i].length()>0) {
if( checkAvail ) {
final URLConnection uc = IOUtil.getResource(path[i], null);
if( null != uc ) {
try {
uri = uc.getURL().toURI();
} catch (URISyntaxException e) {
uri = null;
}
if( uc instanceof HttpURLConnection ) {
((HttpURLConnection)uc).disconnect();
}
}
} else {
try {
uri = new URI(path[i]);
} catch (URISyntaxException e) {
uri = null;
}
}
Log.d(TAG, "Stream: <"+path[i]+">: "+(null!=uri));
}
}
return uri;
}
}
Expand Up @@ -32,9 +32,9 @@

import com.jogamp.opengl.test.android.LauncherUtil.OrderedProperties;

public class MovieCubeActivityLauncher0 extends LauncherUtil.BaseActivityLauncher {
public class MovieCubeActivityLauncher0a extends LauncherUtil.BaseActivityLauncher {

static String demo = "com.jogamp.opengl.test.android.MovieCubeActivity0";
static String demo = "com.jogamp.opengl.test.android.MovieCubeActivity0a";
static String[] sys_pkgs = new String[] { "com.jogamp.common", "javax.media.opengl" };
static String[] usr_pkgs = new String[] { "com.jogamp.opengl.test" };

Expand Down
@@ -0,0 +1,88 @@
/**
* Copyright 2012 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 java.util.Arrays;
import java.util.List;

import com.jogamp.opengl.test.android.LauncherUtil.OrderedProperties;

public class MovieCubeActivityLauncher0b extends LauncherUtil.BaseActivityLauncher {

static String demo = "com.jogamp.opengl.test.android.MovieCubeActivity0b";
static String[] sys_pkgs = new String[] { "com.jogamp.common", "javax.media.opengl" };
static String[] usr_pkgs = new String[] { "com.jogamp.opengl.test" };

@Override
public void init() {
final OrderedProperties props = getProperties();
// props.setProperty("jnlp.media0_url2", "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_640x360.m4v");
props.setProperty("jnlp.media0_url2", "");
props.setProperty("jnlp.media0_url1", "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4");
props.setProperty("jnlp.media0_url0", "file:///mnt/sdcard/Movies/BigBuckBunny_320x180.mp4");
props.setProperty("jnlp.media1_url0", "http://archive.org/download/ElephantsDream/ed_1024_512kb.mp4");
// props.setProperty("jogamp.debug.JNILibLoader", "true");
// props.setProperty("jogamp.debug.NativeLibrary", "true");
// props.setProperty("jogamp.debug.NativeLibrary.Lookup", "true");
// props.setProperty("jogamp.debug.IOUtil", "true");
// props.setProperty("jogamp.debug.Lock", "true");
// props.setProperty("jogamp.debug.Lock.TraceLock", "true");
// props.setProperty("nativewindow.debug", "all");
// props.setProperty("nativewindow.debug.GraphicsConfiguration", "true");
// props.setProperty("jogl.debug", "all");
// props.setProperty("jogl.debug.GLProfile", "true");
// props.setProperty("jogl.debug.GLDrawable", "true");
// props.setProperty("jogl.debug.GLContext", "true");
props.setProperty("jogl.debug.GLMediaPlayer", "true");
props.setProperty("jogl.debug.GLSLCode", "true");
// props.setProperty("jogl.debug.CapabilitiesChooser", "true");
// props.setProperty("jogl.debug.GLSLState", "true");
// props.setProperty("jogl.debug.DebugGL", "true");
// props.setProperty("jogl.debug.TraceGL", "true");
// props.setProperty("newt.debug", "all");
// props.setProperty("newt.debug.Window", "true");
// props.setProperty("newt.debug.Window.MouseEvent", "true");
// props.setProperty("newt.debug.Window.KeyEvent", "true");
props.setProperty("jogamp.debug.IOUtil", "true");
}

@Override
public String getActivityName() {
return demo;
}

@Override
public List<String> getSysPackages() {
return Arrays.asList(sys_pkgs);
}

@Override
public List<String> getUsrPackages() {
return Arrays.asList(usr_pkgs);
}
}
Expand Up @@ -34,7 +34,7 @@

public class MovieCubeActivityLauncher1a extends LauncherUtil.BaseActivityLauncher {

static String demo = "com.jogamp.opengl.test.android.MovieCubeActivity0";
static String demo = "com.jogamp.opengl.test.android.MovieCubeActivity0a";
static String[] sys_pkgs = new String[] { "com.jogamp.common", "javax.media.opengl" };
static String[] usr_pkgs = new String[] { "com.jogamp.opengl.test" };

Expand Down
Expand Up @@ -34,7 +34,7 @@

public class MovieCubeActivityLauncher1b extends LauncherUtil.BaseActivityLauncher {

static String demo = "com.jogamp.opengl.test.android.MovieCubeActivity0";
static String demo = "com.jogamp.opengl.test.android.MovieCubeActivity0a";
static String[] sys_pkgs = new String[] { "com.jogamp.common", "javax.media.opengl" };
static String[] usr_pkgs = new String[] { "com.jogamp.opengl.test" };

Expand Down

0 comments on commit 38febaa

Please sign in to comment.