diff options
| author | Sven Gothel <[email protected]> | 2012-04-11 19:46:37 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-04-11 19:46:37 +0200 |
| commit | f10b30c16aeec428378d1d560d030b2d39801c4e (patch) | |
| tree | 869ca02373385659ed356d781a602fdc2d7d1666 /make/resources | |
| parent | 41b75429e3801f8bf8d5eea679487ccc49ce2584 (diff) | |
Refine GLMediaPlayer/TextureSequence, add MovieCube demo, fix minor bug in Texture
- Add TextureSequence, base interface of GLMediaPlayer to genralize texture streams
- TextureSequence / GLMediaPlayer: Use inner classes for event and texture data
- getLastTexture() shall never return 'null', initialization of TextureSequence (initGLStream(..), etc)
shall provide a TextureFrame w/ the stream's dimension.
- GLMediaPlayerImpl.createTexImageImpl() y-flip defaults to 'false'
impl. shall define y-flip, if required.
- Added MovieCube demo
- Fix Texture: initialize aspectRation for 'wrapping' ctor
-
Diffstat (limited to 'make/resources')
| -rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 10 | ||||
| -rw-r--r-- | make/resources/android/res-test/values/strings.xml | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index c8779cda9..4e6a5a2ba 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -145,6 +145,16 @@ <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" + 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> </application> </manifest> diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-test/values/strings.xml index 5f41a1be7..fcaf102ac 100644 --- a/make/resources/android/res-test/values/strings.xml +++ b/make/resources/android/res-test/values/strings.xml @@ -25,4 +25,6 @@ <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_moviecube_descr">MovieCube</string> </resources> |