diff options
27 files changed, 1435 insertions, 0 deletions
diff --git a/jnlp-files/atomic/nativewindow-all-awt.jnlp b/jnlp-files/atomic/nativewindow-all-awt.jnlp new file mode 100644 index 000000000..bdda477ef --- /dev/null +++ b/jnlp-files/atomic/nativewindow-all-awt.jnlp @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp codebase="JOGL_CODEBASE_TAG/atomic" + href="nativewindow-all-awt.jnlp" version="JOGAMP_VERSION"> + <information> + <title>Java(tm) NativeWindow Interface API (ALL.AWT)</title> + <vendor>JogAmp Community</vendor> + <homepage href="http://jogamp.org/"/> + <description>Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description> + <description kind="short">Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description> + <offline-allowed/> + </information> + <update check="background" policy="always"/> + <security> + <all-permissions/> + </security> + <resources> + <jar href="nativewindow.core.jar" /> + <jar href="nativewindow.awt.jar"/> + <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> + </resources> + + <resources os="Windows" arch="x86"> + <nativelib href = "nativewindow-natives-windows-i586.jar" /> + </resources> + <resources os="Windows" arch="amd64"> + <nativelib href = "nativewindow-natives-windows-amd64.jar" /> + </resources> + <resources os="Windows" arch="x86_64"> + <nativelib href = "nativewindow-natives-windows-amd64.jar" /> + </resources> + <resources os="SunOS" arch="sparc"> + <nativelib href = "nativewindow-natives-solaris-sparc.jar" /> + </resources> + <resources os="SunOS" arch="sparcv9"> + <nativelib href = "nativewindow-natives-solaris-sparcv9.jar" /> + </resources> + <resources os="SunOS" arch="x86"> + <nativelib href = "nativewindow-natives-solaris-i586.jar" /> + </resources> + <resources os="SunOS" arch="amd64"> + <nativelib href = "nativewindow-natives-solaris-amd64.jar" /> + </resources> + <resources os="SunOS" arch="x86_64"> + <nativelib href = "nativewindow-natives-solaris-amd64.jar" /> + </resources> + <resources os="Linux" arch="i386"> + <nativelib href = "nativewindow-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="x86"> + <nativelib href = "nativewindow-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="amd64"> + <nativelib href = "nativewindow-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="x86_64"> + <nativelib href = "nativewindow-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="arm"> + <nativelib href = "nativewindow-natives-linux-armv7.jar" /> + </resources> + <resources os="Linux" arch="armv7"> + <nativelib href = "nativewindow-natives-linux-armv7.jar" /> + </resources> + <resources os="Mac OS X" arch="i386"> + <nativelib href = "nativewindow-natives-macosx-universal.jar" /> + </resources> + <resources os="Mac OS X" arch="x86_64"> + <nativelib href = "nativewindow-natives-macosx-universal.jar" /> + </resources> + + <component-desc /> +</jnlp> diff --git a/jnlp-files/atomic/nativewindow.jnlp b/jnlp-files/atomic/nativewindow.jnlp new file mode 100644 index 000000000..109be0373 --- /dev/null +++ b/jnlp-files/atomic/nativewindow.jnlp @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp codebase="JOGL_CODEBASE_TAG/atomic" + href="nativewindow.jnlp" version="JOGAMP_VERSION"> + <information> + <title>Java(tm) NativeWindow Interface API (CORE)</title> + <vendor>JogAmp Community</vendor> + <homepage href="http://jogamp.org/"/> + <description>Java API for a binding to a native windowing system - 2.0 - CORE</description> + <description kind="short">Java API for a binding to a native windowing system - 2.0 - CORE</description> + <offline-allowed/> + </information> + <update check="background" policy="always"/> + <security> + <all-permissions/> + </security> + <resources> + <jar href="nativewindow.core.jar" /> + <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> + </resources> + + <resources os="Windows" arch="x86"> + <jar href="nativewindow.os.win.jar" /> + <nativelib href = "nativewindow-natives-windows-i586.jar" /> + </resources> + <resources os="Windows" arch="amd64"> + <jar href="nativewindow.os.win.jar" /> + <nativelib href = "nativewindow-natives-windows-amd64.jar" /> + </resources> + <resources os="Windows" arch="x86_64"> + <jar href="nativewindow.os.win.jar" /> + <nativelib href = "nativewindow-natives-windows-amd64.jar" /> + </resources> + <resources os="SunOS" arch="sparc"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-solaris-sparc.jar" /> + </resources> + <resources os="SunOS" arch="sparcv9"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-solaris-sparcv9.jar" /> + </resources> + <resources os="SunOS" arch="x86"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-solaris-i586.jar" /> + </resources> + <resources os="SunOS" arch="amd64"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-solaris-amd64.jar" /> + </resources> + <resources os="SunOS" arch="x86_64"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-solaris-amd64.jar" /> + </resources> + <resources os="Linux" arch="i386"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="x86"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="amd64"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="x86_64"> + <jar href="nativewindow.os.x11.jar" /> + <nativelib href = "nativewindow-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="arm"> + <nativelib href = "nativewindow-natives-linux-armv7.jar" /> + </resources> + <resources os="Linux" arch="armv7"> + <nativelib href = "nativewindow-natives-linux-armv7.jar" /> + </resources> + <resources os="Mac OS X" arch="i386"> + <nativelib href = "nativewindow-natives-macosx-universal.jar" /> + </resources> + <resources os="Mac OS X" arch="x86_64"> + <nativelib href = "nativewindow-natives-macosx-universal.jar" /> + </resources> + + <component-desc /> +</jnlp> diff --git a/jnlp-files/atomic/newt-all-awt.jnlp b/jnlp-files/atomic/newt-all-awt.jnlp new file mode 100644 index 000000000..378e2270e --- /dev/null +++ b/jnlp-files/atomic/newt-all-awt.jnlp @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp codebase="JOGL_CODEBASE_TAG/atomic" + href="newt-all-awt.jnlp" version="JOGAMP_VERSION"> + <information> + <title>NEWT - New Windowing Toolkit (AWT)</title> + <vendor>JogAmp Community</vendor> + <homepage href="http://jogamp.org/"/> + <description>NEWT - A NativeWindow Interface implementation - AWT</description> + <description kind="short">NEWT - A NativeWindow Interface implementation - AWT</description> + <offline-allowed/> + </information> + <update check="background" policy="always"/> + <security> + <all-permissions/> + </security> + <resources> + <jar href="newt.core.jar" /> + <jar href="newt.awt.jar" /> + <extension name="nativewindow-all-awt" href="JOGL_CODEBASE_TAG/nativewindow-all-awt.jnlp" /> + </resources> + + <resources os="Windows" arch="x86"> + <jar href="newt.driver.win.jar" /> + <nativelib href = "newt-natives-windows-i586.jar" /> + </resources> + <resources os="Windows" arch="amd64"> + <jar href="newt.driver.win.jar" /> + <nativelib href = "newt-natives-windows-amd64.jar" /> + </resources> + <resources os="Windows" arch="x86_64"> + <jar href="newt.driver.win.jar" /> + <nativelib href = "newt-natives-windows-amd64.jar" /> + </resources> + <resources os="SunOS" arch="sparc"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-sparc.jar" /> + </resources> + <resources os="SunOS" arch="sparcv9"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-sparcv9.jar" /> + </resources> + <resources os="SunOS" arch="x86"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-i586.jar" /> + </resources> + <resources os="SunOS" arch="amd64"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-amd64.jar" /> + </resources> + <resources os="SunOS" arch="x86_64"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-amd64.jar" /> + </resources> + <resources os="Linux" arch="i386"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="x86"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="amd64"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="x86_64"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="arm"> + <nativelib href = "newt-natives-linux-armv7.jar" /> + </resources> + <resources os="Linux" arch="armv7"> + <nativelib href = "newt-natives-linux-armv7.jar" /> + </resources> + <resources os="Mac OS X" arch="i386"> + <jar href="newt.driver.osx.jar" /> + <nativelib href = "newt-natives-macosx-universal.jar" /> + </resources> + <resources os="Mac OS X" arch="x86_64"> + <jar href="newt.driver.osx.jar" /> + <nativelib href = "newt-natives-macosx-universal.jar" /> + </resources> + + <component-desc /> +</jnlp> diff --git a/jnlp-files/atomic/newt.jnlp b/jnlp-files/atomic/newt.jnlp new file mode 100644 index 000000000..914d9dcf2 --- /dev/null +++ b/jnlp-files/atomic/newt.jnlp @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp codebase="JOGL_CODEBASE_TAG/atomic" + href="newt.jnlp" version="JOGAMP_VERSION"> + <information> + <title>NEWT - New Windowing Toolkit (CORE)</title> + <vendor>JogAmp Community</vendor> + <homepage href="http://jogamp.org/"/> + <description>NEWT - A NativeWindow Interface implementation - CORE</description> + <description kind="short">NEWT - A NativeWindow Interface implementation - CORE</description> + <offline-allowed/> + </information> + <update check="background" policy="always"/> + <security> + <all-permissions/> + </security> + <resources> + <jar href="newt.core.jar" /> + <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" /> + </resources> + + <resources os="Windows" arch="x86"> + <jar href="newt.driver.win.jar" /> + <nativelib href = "newt-natives-windows-i586.jar" /> + </resources> + <resources os="Windows" arch="amd64"> + <jar href="newt.driver.win.jar" /> + <nativelib href = "newt-natives-windows-amd64.jar" /> + </resources> + <resources os="Windows" arch="x86_64"> + <jar href="newt.driver.win.jar" /> + <nativelib href = "newt-natives-windows-amd64.jar" /> + </resources> + <resources os="SunOS" arch="sparc"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-sparc.jar" /> + </resources> + <resources os="SunOS" arch="sparcv9"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-sparcv9.jar" /> + </resources> + <resources os="SunOS" arch="x86"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-i586.jar" /> + </resources> + <resources os="SunOS" arch="amd64"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-amd64.jar" /> + </resources> + <resources os="SunOS" arch="x86_64"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-solaris-amd64.jar" /> + </resources> + <resources os="Linux" arch="i386"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="x86"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="amd64"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="x86_64"> + <jar href="newt.driver.x11.jar" /> + <nativelib href = "newt-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="arm"> + <nativelib href = "newt-natives-linux-armv7.jar" /> + </resources> + <resources os="Linux" arch="armv7"> + <nativelib href = "newt-natives-linux-armv7.jar" /> + </resources> + <resources os="Mac OS X" arch="i386"> + <jar href="newt.driver.osx.jar" /> + <nativelib href = "newt-natives-macosx-universal.jar" /> + </resources> + <resources os="Mac OS X" arch="x86_64"> + <jar href="newt.driver.osx.jar" /> + <nativelib href = "newt-natives-macosx-universal.jar" /> + </resources> + + <component-desc /> +</jnlp> diff --git a/jnlp-files/jogl-all-mobile.jnlp b/jnlp-files/jogl-all-mobile.jnlp new file mode 100644 index 000000000..602a327e3 --- /dev/null +++ b/jnlp-files/jogl-all-mobile.jnlp @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp codebase="JOGL_CODEBASE_TAG/" + href="jogl-all-mobile.jnlp" version="JOGAMP_VERSION"> + <information> + <title>Java(tm) Binding to the OpenGL(r) API (ALL.MOBILE)</title> + <vendor>JogAmp Community</vendor> + <homepage href="http://jogamp.org/"/> + <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - ALL.MOBILE</description> + <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.MOBILE</description> + <offline-allowed/> + </information> + <update check="background" policy="always"/> + <security> + <all-permissions/> + </security> + <resources> + <jar href="jogl.all-mobile.jar" /> + + <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> + </resources> + + <resources os="Windows" arch="x86"> + <nativelib href = "jogl-all-natives-windows-i586.jar" /> + </resources> + <resources os="Windows" arch="amd64"> + <nativelib href = "jogl-all-natives-windows-amd64.jar" /> + </resources> + <resources os="Windows" arch="x86_64"> + <nativelib href = "jogl-all-natives-windows-amd64.jar" /> + </resources> + <resources os="SunOS" arch="sparc"> + <nativelib href = "jogl-all-natives-solaris-sparc.jar" /> + </resources> + <resources os="SunOS" arch="sparcv9"> + <nativelib href = "jogl-all-natives-solaris-sparcv9.jar" /> + </resources> + <resources os="SunOS" arch="x86"> + <nativelib href = "jogl-all-natives-solaris-i586.jar" /> + </resources> + <resources os="SunOS" arch="amd64"> + <nativelib href = "jogl-all-natives-solaris-amd64.jar" /> + </resources> + <resources os="SunOS" arch="x86_64"> + <nativelib href = "jogl-all-natives-solaris-amd64.jar" /> + </resources> + <resources os="Linux" arch="i386"> + <nativelib href = "jogl-all-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="x86"> + <nativelib href = "jogl-all-natives-linux-i586.jar" /> + </resources> + <resources os="Linux" arch="amd64"> + <nativelib href = "jogl-all-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="x86_64"> + <nativelib href = "jogl-all-natives-linux-amd64.jar" /> + </resources> + <resources os="Linux" arch="arm"> + <nativelib href = "jogl-all-natives-linux-armv7.jar" /> + </resources> + <resources os="Linux" arch="armv7"> + <nativelib href = "jogl-all-natives-linux-armv7.jar" /> + </resources> + <resources os="Mac OS X" arch="i386"> + <nativelib href = "jogl-all-natives-macosx-universal.jar" /> + </resources> + <resources os="Mac OS X" arch="x86_64"> + <nativelib href = "jogl-all-natives-macosx-universal.jar" /> + </resources> + + <component-desc /> +</jnlp> diff --git a/make/resources/android/AndroidManifest-jogl.xml b/make/resources/android/AndroidManifest-jogl.xml new file mode 100644 index 000000000..24e7a7b78 --- /dev/null +++ b/make/resources/android/AndroidManifest-jogl.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + sharedUserId="com.jogamp.Community" + package="javax.media.opengl"> + + <uses-sdk android:minSdkVersion="9" /> + <uses-library android:name="com.jogamp.common" android:required="true" /> + + <application android:icon="@drawable/icon" + android:label="@string/app_name" + android:description="@string/app_descr" + android:persistent="false" + > + <activity android:name="jogamp.newt.driver.android.NewtVersionActivity" + android:finishOnTaskLaunch="true" + android:launchMode="singleTop" + android:label="@string/activity_v_name" + android:description="@string/activity_v_descr" + > + <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/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml new file mode 100644 index 000000000..7ce9693f1 --- /dev/null +++ b/make/resources/android/AndroidManifest-launcher.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + sharedUserId="com.jogamp.Community" + package="com.jogamp.android.launcher"> + + <uses-sdk android:minSdkVersion="9" /> + <uses-library android:name="com.jogamp.common" android:required="true" /> + <uses-library android:name="javax.media.opengl" android:required="true" /> + + <application android:icon="@drawable/icon" + android:label="@string/app_name" + android:description="@string/app_descr" + android:persistent="false" + > + <activity android:name="com.jogamp.android.launcher.NEWTLauncherVersionActivity" + android:finishOnTaskLaunch="true" + android:launchMode="singleTop" + android:label="@string/activity_v_name" + android:description="@string/activity_v_descr" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + <activity android:name="com.jogamp.android.launcher.NEWTLauncherGearsActivity" + android:finishOnTaskLaunch="true" + android:launchMode="singleTop" + android:label="@string/activity_gears1_name" + android:description="@string/activity_gears1_descr" + > + <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-jogl/drawable-hdpi/icon.png b/make/resources/android/res-jogl/drawable-hdpi/icon.png Binary files differnew file mode 100644 index 000000000..2148232c9 --- /dev/null +++ b/make/resources/android/res-jogl/drawable-hdpi/icon.png diff --git a/make/resources/android/res-jogl/drawable-ldpi/icon.png b/make/resources/android/res-jogl/drawable-ldpi/icon.png Binary files differnew file mode 100644 index 000000000..c16211f36 --- /dev/null +++ b/make/resources/android/res-jogl/drawable-ldpi/icon.png diff --git a/make/resources/android/res-jogl/drawable-mdpi/icon.png b/make/resources/android/res-jogl/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 000000000..1c26e3f83 --- /dev/null +++ b/make/resources/android/res-jogl/drawable-mdpi/icon.png diff --git a/make/resources/android/res-jogl/layout/main.xml b/make/resources/android/res-jogl/layout/main.xml new file mode 100644 index 000000000..3a5f117d3 --- /dev/null +++ b/make/resources/android/res-jogl/layout/main.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > +<TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/hello" + /> +</LinearLayout> diff --git a/make/resources/android/res-jogl/values/strings.xml b/make/resources/android/res-jogl/values/strings.xml new file mode 100644 index 000000000..6c0a469e0 --- /dev/null +++ b/make/resources/android/res-jogl/values/strings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="hello">Jogl Library</string> + <string name="app_name">JogAmp\'s Jogl Library</string> + <string name="app_descr">Contains Dalvik and native code, supporting native bindings.</string> + <string name="activity_v_name">Jogl</string> + <string name="activity_v_descr">The Jogl Library.</string> +</resources> diff --git a/make/resources/android/res-launcher/drawable-hdpi/icon.png b/make/resources/android/res-launcher/drawable-hdpi/icon.png Binary files differnew file mode 100644 index 000000000..2148232c9 --- /dev/null +++ b/make/resources/android/res-launcher/drawable-hdpi/icon.png diff --git a/make/resources/android/res-launcher/drawable-ldpi/icon.png b/make/resources/android/res-launcher/drawable-ldpi/icon.png Binary files differnew file mode 100644 index 000000000..c16211f36 --- /dev/null +++ b/make/resources/android/res-launcher/drawable-ldpi/icon.png diff --git a/make/resources/android/res-launcher/drawable-mdpi/icon.png b/make/resources/android/res-launcher/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 000000000..1c26e3f83 --- /dev/null +++ b/make/resources/android/res-launcher/drawable-mdpi/icon.png diff --git a/make/resources/android/res-launcher/layout/main.xml b/make/resources/android/res-launcher/layout/main.xml new file mode 100644 index 000000000..3a5f117d3 --- /dev/null +++ b/make/resources/android/res-launcher/layout/main.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > +<TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/hello" + /> +</LinearLayout> diff --git a/make/resources/android/res-launcher/values/strings.xml b/make/resources/android/res-launcher/values/strings.xml new file mode 100644 index 000000000..23b0248bd --- /dev/null +++ b/make/resources/android/res-launcher/values/strings.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="hello">Jogl Launcher</string> + <string name="app_name">JogAmp\'s Jogl Launcher</string> + <string name="app_descr">Launches Jogl Applications.</string> + <string name="activity_v_name">Jogl\'s Version</string> + <string name="activity_v_descr">Shows the version of the Jogl Library.</string> + <string name="activity_gears1_name">Gears ES1</string> + <string name="activity_gears1_descr">Gears ES1</string> +</resources> diff --git a/make/scripts/make.jogl.all.android-armv7-cross.sh b/make/scripts/make.jogl.all.android-armv7-cross.sh new file mode 100755 index 000000000..cbc5bda29 --- /dev/null +++ b/make/scripts/make.jogl.all.android-armv7-cross.sh @@ -0,0 +1,111 @@ +#! /bin/sh + +export HOST_UID=sven +export HOST_IP=192.168.0.52 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=beagle01 +export TARGET_ROOT=/projects +export TARGET_ANT_HOME=/usr/share/ant + +export ANDROID_VERSION=9 + +echo ANDROID_SDK_HOME $ANDROID_SDK_HOME +echo NDK_ROOT $NDK_ROOT + +if [ -z "$NDK_ROOT" ] ; then + if [ -e /usr/local/android-ndk-r6 ] ; then + NDK_ROOT=/usr/local/android-ndk-r6 + elif [ -e /opt-linux-x86/android-ndk-r6 ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk-r6 + elif [ -e /opt/android-ndk-r6 ] ; then + NDK_ROOT=/opt/android-ndk-r6 + else + echo NDK_ROOT is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $NDK_ROOT ] ; then + echo NDK_ROOT $NDK_ROOT does not exist + exit 1 +fi +export NDK_ROOT +NDK_TOOLCHAIN=$NDK_ROOT/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/arm-linux-androideabi + +if [ -z "$ANDROID_SDK_HOME" ] ; then + if [ -e /usr/local/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/usr/local/android-sdk-linux_x86 + elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86 + elif [ -e /opt/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/opt/android-sdk-linux_x86 + else + echo ANDROID_SDK_HOME is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $ANDROID_SDK_HOME ] ; then + echo ANDROID_SDK_HOME $ANDROID_SDK_HOME does not exist + exit 1 +fi +export ANDROID_SDK_HOME + +export PATH="$NDK_TOOLCHAIN/bin:$ANDROID_SDK_HOME/platform-tools:$PATH" + +export GCC_VERSION=4.4.3 +HOST_ARCH=linux-x86 +export TARGET_ARCH=arm-linux-androideabi +# mcpu: cortex-a8', `cortex-a9', `cortex-r4', `cortex-r4f', `cortex-m3', `cortex-m1', `xscale', `iwmmxt', `iwmmxt2', `ep9312'. +export TARGET_CPU_NAME=armv7-a +TARGET_CPU_TUNE=armv7-a +# mfpu: `vfp', `vfpv3', `vfpv3-d16' and `neon' +TARGET_FPU_NAME=vfpv3 +TARGET_FPU_ABI=softfp + +export TARGET_TOOL_PATH=${NDK_ROOT}/toolchains/${TARGET_ARCH}-${GCC_VERSION}/prebuilt/${HOST_ARCH} + +export TARGET_OS_PATH=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm/usr +export HOST_OS_PATH=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-x86/usr + +export NDK_XBIN_PATH=${TARGET_TOOL_PATH}/bin +export NDK_BIN_PATH=${TARGET_TOOL_PATH}/${TARGET_ARCH}/bin + +export NDK_GCC=${NDK_XBIN_PATH}/${TARGET_ARCH}-gcc +export NDK_AR=${NDK_XBIN_PATH}/${TARGET_ARCH}-ar +export NDK_STRIP=${NDK_XBIN_PATH}/${TARGET_ARCH}-strip +export NDK_READELF=${NDK_XBIN_PATH}/${TARGET_ARCH}-readelf + +export PATH=${NDK_XBIN_PATH}:$PATH + +export NDK_CFLAGS="\ +-march=${TARGET_CPU_NAME} \ +-fpic \ +-DANDROID \ +" + +export NDK_LDFLAGS="\ +-Wl,--demangle \ +-nostdlib -Bdynamic -Wl,-dynamic-linker,/system/bin/linker -Wl,--gc-sections -Wl,-z,nocopyreloc \ +${TARGET_OS_PATH}/lib/libc.so \ +${TARGET_OS_PATH}/lib/libstdc++.so \ +${TARGET_OS_PATH}/lib/libm.so \ +${TARGET_OS_PATH}/lib/crtbegin_dynamic.o \ +-Wl,--no-undefined -Wl,-rpath-link=${TARGET_OS_PATH}/lib \ +${TARGET_TOOL_PATH}/lib/gcc/${TARGET_ARCH}/${GCC_VERSION}/${TARGET_CPU_NAME}/libgcc.a \ +${TARGET_OS_PATH}/lib/crtend_android.o \ +" + + +which gcc 2>&1 | tee make.jogl.all.android-armv7-cross.log + +ant \ + -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv7.xml \ + -Drootrel.build=build-android-armv7 \ + -Dgluegen.cpptasks.detected.os=true \ + -DisUnix=true \ + -DisAndroid=true \ + -DisAndroidARMv7=true \ + -DisCrosscompilation=true \ + \ + $* 2>&1 | tee -a make.jogl.all.android-armv7-cross.log + + diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherGearsActivity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherGearsActivity.java new file mode 100644 index 000000000..785590fd7 --- /dev/null +++ b/src/android/com/jogamp/android/launcher/NEWTLauncherGearsActivity.java @@ -0,0 +1,140 @@ +/** + * 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.android.launcher; + +import java.lang.reflect.Method; + +import dalvik.system.PathClassLoader; + +import android.app.Activity; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.widget.TextView; +import android.util.Log; + +public class NEWTLauncherGearsActivity extends Activity { + static final String TAG = "JoglLauncherActivity"; + TextView tv = null; + + @Override + public void onCreate(Bundle savedInstanceState) { + Log.d(TAG, "onCreate - S"); + super.onCreate(savedInstanceState); + + String packageGlueGen = "com.jogamp.common"; + String apkGlueGen = null; + String packageJogl = "javax.media.opengl"; + String apkJogl = null; + + String clazzMDName= "jogamp.newt.driver.android.MD"; + Method mdGetInfo = null; + + try { + apkGlueGen = getPackageManager().getApplicationInfo(packageGlueGen,0).sourceDir; + apkJogl = getPackageManager().getApplicationInfo(packageJogl,0).sourceDir; + } catch (PackageManager.NameNotFoundException e) { + Log.d(TAG, "error: "+e, e); + } + if(null == apkGlueGen || null == apkJogl) { + Log.d(TAG, "not found: gluegen <"+apkGlueGen+">, jogl <"+apkJogl+">"); + } else { + String cp = apkGlueGen + ":" + apkJogl ; + Log.d(TAG, "cp: " + cp); + + // add path to apk that contains classes you wish to load + PathClassLoader pathClassLoader = new dalvik.system.PathClassLoader( + cp, + ClassLoader.getSystemClassLoader()); + + try { + Class clazzMD= Class.forName(clazzMDName, true, pathClassLoader); + Log.d(TAG, "MD: "+clazzMD); + mdGetInfo = clazzMD.getMethod("getInfo"); + } catch (Exception e) { + Log.d(TAG, "error: "+e, e); + } + } + + String mdInfo = null; + try { + mdInfo = (String) mdGetInfo.invoke(null); + } catch (Exception e) { + Log.d(TAG, "error: "+e, e); + } + tv = new TextView(this); + if(null != mdInfo) { + tv.setText(mdInfo); + } else { + tv.setText("mdInfo n/a"); + } + setContentView(tv); + Log.d(TAG, "onCreate - X"); + } + + @Override + public void onStart() { + Log.d(TAG, "onStart - S"); + super.onStart(); + Log.d(TAG, "onStart - X"); + } + + @Override + public void onRestart() { + Log.d(TAG, "onRestart - S"); + super.onRestart(); + Log.d(TAG, "onRestart - X"); + } + + @Override + public void onResume() { + Log.d(TAG, "onResume - S"); + super.onResume(); + Log.d(TAG, "onResume - X"); + } + + @Override + public void onPause() { + Log.d(TAG, "onPause - S"); + super.onPause(); + Log.d(TAG, "onPause - X"); + } + + @Override + public void onStop() { + Log.d(TAG, "onStop - S"); + super.onStop(); + Log.d(TAG, "onStop - X"); + } + + @Override + public void onDestroy() { + Log.d(TAG, "onDestroy - S"); + super.onDestroy(); + Log.d(TAG, "onDestroy - X"); + } +} diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherVersionActivity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherVersionActivity.java new file mode 100644 index 000000000..468beed0b --- /dev/null +++ b/src/android/com/jogamp/android/launcher/NEWTLauncherVersionActivity.java @@ -0,0 +1,140 @@ +/** + * 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.android.launcher; + +import java.lang.reflect.Method; + +import dalvik.system.PathClassLoader; + +import android.app.Activity; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.widget.TextView; +import android.util.Log; + +public class NEWTLauncherVersionActivity extends Activity { + static final String TAG = "JoglLauncherActivity"; + TextView tv = null; + + @Override + public void onCreate(Bundle savedInstanceState) { + Log.d(TAG, "onCreate - S"); + super.onCreate(savedInstanceState); + + String packageGlueGen = "com.jogamp.common"; + String apkGlueGen = null; + String packageJogl = "javax.media.opengl"; + String apkJogl = null; + + String clazzMDName= "jogamp.newt.driver.android.MD"; + Method mdGetInfo = null; + + try { + apkGlueGen = getPackageManager().getApplicationInfo(packageGlueGen,0).sourceDir; + apkJogl = getPackageManager().getApplicationInfo(packageJogl,0).sourceDir; + } catch (PackageManager.NameNotFoundException e) { + Log.d(TAG, "error: "+e, e); + } + if(null == apkGlueGen || null == apkJogl) { + Log.d(TAG, "not found: gluegen <"+apkGlueGen+">, jogl <"+apkJogl+">"); + } else { + String cp = apkGlueGen + ":" + apkJogl ; + Log.d(TAG, "cp: " + cp); + + // add path to apk that contains classes you wish to load + PathClassLoader pathClassLoader = new dalvik.system.PathClassLoader( + cp, + ClassLoader.getSystemClassLoader()); + + try { + Class clazzMD= Class.forName(clazzMDName, true, pathClassLoader); + Log.d(TAG, "MD: "+clazzMD); + mdGetInfo = clazzMD.getMethod("getInfo"); + } catch (Exception e) { + Log.d(TAG, "error: "+e, e); + } + } + + String mdInfo = null; + try { + mdInfo = (String) mdGetInfo.invoke(null); + } catch (Exception e) { + Log.d(TAG, "error: "+e, e); + } + tv = new TextView(this); + if(null != mdInfo) { + tv.setText(mdInfo); + } else { + tv.setText("mdInfo n/a"); + } + setContentView(tv); + Log.d(TAG, "onCreate - X"); + } + + @Override + public void onStart() { + Log.d(TAG, "onStart - S"); + super.onStart(); + Log.d(TAG, "onStart - X"); + } + + @Override + public void onRestart() { + Log.d(TAG, "onRestart - S"); + super.onRestart(); + Log.d(TAG, "onRestart - X"); + } + + @Override + public void onResume() { + Log.d(TAG, "onResume - S"); + super.onResume(); + Log.d(TAG, "onResume - X"); + } + + @Override + public void onPause() { + Log.d(TAG, "onPause - S"); + super.onPause(); + Log.d(TAG, "onPause - X"); + } + + @Override + public void onStop() { + Log.d(TAG, "onStop - S"); + super.onStop(); + Log.d(TAG, "onStop - X"); + } + + @Override + public void onDestroy() { + Log.d(TAG, "onDestroy - S"); + super.onDestroy(); + Log.d(TAG, "onDestroy - X"); + } +} diff --git a/src/newt/classes/jogamp/newt/driver/android/Display.java b/src/newt/classes/jogamp/newt/driver/android/Display.java new file mode 100644 index 000000000..e1944276f --- /dev/null +++ b/src/newt/classes/jogamp/newt/driver/android/Display.java @@ -0,0 +1,79 @@ +/** + * 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 jogamp.newt.*; +import jogamp.opengl.egl.*; +import javax.media.nativewindow.*; +import javax.media.nativewindow.egl.*; +import android.content.Context; + +public class Display extends jogamp.newt.DisplayImpl { + + /*package*/ Context appContext; + + static { + NEWTJNILibLoader.loadNEWT(); + + if (!Window.initIDs()) { + throw new NativeWindowException("Failed to initialize BCEGL Window jmethodIDs"); + } + } + + public static void initSingleton() { + // just exist to ensure static init has been run + } + + + public Display() { + } + + protected void createNativeImpl() { + long handle = CreateDisplay(Screen.fixedWidth, Screen.fixedHeight); + if (handle == EGL.EGL_NO_DISPLAY) { + throw new NativeWindowException("BC EGL CreateDisplay failed"); + } + aDevice = new EGLGraphicsDevice(handle, AbstractGraphicsDevice.DEFAULT_CONNECTION, AbstractGraphicsDevice.DEFAULT_UNIT); + } + + protected void closeNativeImpl() { + if (aDevice.getHandle() != EGL.EGL_NO_DISPLAY) { + DestroyDisplay(aDevice.getHandle()); + } + } + + protected void dispatchMessagesNative() { + // n/a .. DispatchMessages(); + } + + private native long CreateDisplay(int width, int height); + private native void DestroyDisplay(long dpy); + private native void DispatchMessages(); +} + diff --git a/src/newt/classes/jogamp/newt/driver/android/MD.java b/src/newt/classes/jogamp/newt/driver/android/MD.java new file mode 100644 index 000000000..9a2ed9824 --- /dev/null +++ b/src/newt/classes/jogamp/newt/driver/android/MD.java @@ -0,0 +1,44 @@ +/** + * 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 com.jogamp.common.GlueGenVersion; +import com.jogamp.common.os.Platform; +import com.jogamp.common.util.VersionUtil; +import com.jogamp.opengl.JoglVersion; + +public class MD { + public static final String TAG = "JogAmp.NEWT"; + + public static String getInfo() { + return VersionUtil.getPlatformInfo()+Platform.NEWLINE+ + GlueGenVersion.getInstance()+Platform.NEWLINE+ + JoglVersion.getInstance()+Platform.NEWLINE+ + Platform.NEWLINE; + } +} diff --git a/src/newt/classes/jogamp/newt/driver/android/NEWTSurfaceView.java b/src/newt/classes/jogamp/newt/driver/android/NEWTSurfaceView.java new file mode 100644 index 000000000..0a2cfcf05 --- /dev/null +++ b/src/newt/classes/jogamp/newt/driver/android/NEWTSurfaceView.java @@ -0,0 +1,45 @@ +/** + * 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 android.content.Context; +import android.view.SurfaceView; + +public class NEWTSurfaceView extends SurfaceView { + + SurfaceCallback scb; + + public NEWTSurfaceView(Context context) { + super(context); + scb = new SurfaceCallback(); + this.getHolder().addCallback(scb); + } + + public void doSomething() { + } +} diff --git a/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java b/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java new file mode 100644 index 000000000..b9452e44b --- /dev/null +++ b/src/newt/classes/jogamp/newt/driver/android/NewtVersionActivity.java @@ -0,0 +1,89 @@ +/** + * 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 android.app.Activity; +import android.os.Bundle; +import android.widget.TextView; +import android.util.Log; + +public class NewtVersionActivity extends Activity { + TextView tv = null; + + @Override + public void onCreate(Bundle savedInstanceState) { + Log.d(MD.TAG, "onCreate - S"); + super.onCreate(savedInstanceState); + tv = new TextView(this); + tv.setText("need launcher"); + setContentView(tv); + Log.d(MD.TAG, "onCreate - X"); + } + + @Override + public void onStart() { + Log.d(MD.TAG, "onStart - S"); + super.onStart(); + Log.d(MD.TAG, "onStart - X"); + } + + @Override + public void onRestart() { + Log.d(MD.TAG, "onRestart - S"); + super.onRestart(); + Log.d(MD.TAG, "onRestart - X"); + } + + @Override + public void onResume() { + Log.d(MD.TAG, "onResume - S"); + super.onResume(); + Log.d(MD.TAG, "onResume - X"); + } + + @Override + public void onPause() { + Log.d(MD.TAG, "onPause - S"); + super.onPause(); + Log.d(MD.TAG, "onPause - X"); + } + + @Override + public void onStop() { + Log.d(MD.TAG, "onStop - S"); + super.onStop(); + Log.d(MD.TAG, "onStop - X"); + } + + @Override + public void onDestroy() { + Log.d(MD.TAG, "onDestroy - S"); + super.onDestroy(); + Log.d(MD.TAG, "onDestroy - X"); + } +} diff --git a/src/newt/classes/jogamp/newt/driver/android/Screen.java b/src/newt/classes/jogamp/newt/driver/android/Screen.java new file mode 100644 index 000000000..44c7ca95f --- /dev/null +++ b/src/newt/classes/jogamp/newt/driver/android/Screen.java @@ -0,0 +1,59 @@ +/** + * 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.nativewindow.*; +import android.content.Context; + +public class Screen extends jogamp.newt.ScreenImpl { + + static { + Display.initSingleton(); + } + + + public Screen() { + } + + protected void createNativeImpl() { + aScreen = new DefaultGraphicsScreen(getDisplay().getGraphicsDevice(), screen_idx); + // WINDOW_SERVICEUse with getSystemService(String) to retrieve a WindowManager for accessing + setScreenSize(fixedWidth, fixedHeight); + } + + protected void closeNativeImpl() { } + + //---------------------------------------------------------------------- + // Internals only + // + + static final int fixedWidth = 1920; + static final int fixedHeight = 1080; +} + diff --git a/src/newt/classes/jogamp/newt/driver/android/SurfaceCallback.java b/src/newt/classes/jogamp/newt/driver/android/SurfaceCallback.java new file mode 100644 index 000000000..f953fe41d --- /dev/null +++ b/src/newt/classes/jogamp/newt/driver/android/SurfaceCallback.java @@ -0,0 +1,54 @@ +/** + * 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 jogamp.common.os.android.MD; +import android.view.SurfaceHolder; +import android.view.SurfaceHolder.Callback2; +import android.util.Log; + +public class SurfaceCallback implements Callback2 { + + public void surfaceCreated(SurfaceHolder holder) { + Log.d(MD.TAG, "surfaceCreated"); + } + + 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"); + } + + public void surfaceRedrawNeeded(SurfaceHolder holder) { + Log.d(MD.TAG, "surfaceRedrawNeeded"); + } + +} diff --git a/src/newt/classes/jogamp/newt/driver/android/Window.java b/src/newt/classes/jogamp/newt/driver/android/Window.java new file mode 100644 index 000000000..4d66debef --- /dev/null +++ b/src/newt/classes/jogamp/newt/driver/android/Window.java @@ -0,0 +1,168 @@ +/** + * 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 jogamp.opengl.egl.*; +import javax.media.nativewindow.*; +import javax.media.nativewindow.util.Point; +import javax.media.opengl.GLCapabilitiesImmutable; + +import android.content.Context; + +public class Window extends jogamp.newt.WindowImpl { + static { + Display.initSingleton(); + } + + public Window() { + } + + public Window(Context ctx) { + } + + public static Class[] getCustomConstructorArgumentTypes() { + return new Class[] { Context.class } ; + } + + protected void createNativeImpl() { + if(0!=getParentWindowHandle()) { + throw new RuntimeException("Window parenting not supported (yet)"); + } + // query a good configuration .. even thought we drop this one + // and reuse the EGLUtil choosen one later. + config = GraphicsConfigurationFactory.getFactory(getScreen().getDisplay().getGraphicsDevice()).chooseGraphicsConfiguration( + capsRequested, capsRequested, capabilitiesChooser, getScreen().getGraphicsScreen()); + if (config == null) { + throw new NativeWindowException("Error choosing GraphicsConfiguration creating window: "+this); + } + setSizeImpl(getScreen().getWidth(), getScreen().getHeight()); + + setWindowHandle(realizeWindow(true, width, height)); + if (0 == getWindowHandle()) { + throw new NativeWindowException("Error native Window Handle is null"); + } + } + + protected void closeNativeImpl() { + if(0!=windowHandleClose) { + CloseWindow(getDisplayHandle(), windowHandleClose); + } + } + + protected void setVisibleImpl(boolean visible, int x, int y, int width, int height) { + reconfigureWindowImpl(x, y, width, height, false, 0, 0); + visibleChanged(visible); + } + + protected void requestFocusImpl(boolean reparented) { } + + protected void setSizeImpl(int width, int height) { + if(0!=getWindowHandle()) { + // n/a in BroadcomEGL + System.err.println("BCEGL Window.setSizeImpl n/a in BroadcomEGL with realized window"); + } else { + this.width = width; + this.height = height; + } + } + + protected boolean reconfigureWindowImpl(int x, int y, int width, int height, + boolean parentChange, int fullScreenChange, int decorationChange) { + if(0!=getWindowHandle()) { + if(0!=fullScreenChange) { + if( fullScreenChange > 0 ) { + // n/a in BroadcomEGL + System.err.println("setFullscreen n/a in BroadcomEGL"); + return false; + } + } + } + if(width>0 || height>0) { + if(0!=getWindowHandle()) { + // n/a in BroadcomEGL + System.err.println("BCEGL Window.setSizeImpl n/a in BroadcomEGL with realized window"); + } else { + this.width=(width>0)?width:this.width; + this.height=(height>0)?height:this.height; + } + } + if(x>=0 || y>=0) { + System.err.println("BCEGL Window.setPositionImpl n/a in BroadcomEGL"); + } + return true; + } + + protected Point getLocationOnScreenImpl(int x, int y) { + return new Point(x,y); + } + + + @Override + public boolean surfaceSwap() { + SwapWindow(getDisplayHandle(), getWindowHandle()); + return true; + } + + //---------------------------------------------------------------------- + // Internals only + // + + protected static native boolean initIDs(); + private native long CreateWindow(long eglDisplayHandle, boolean chromaKey, int width, int height); + private native void CloseWindow(long eglDisplayHandle, long eglWindowHandle); + private native void SwapWindow(long eglDisplayHandle, long eglWindowHandle); + + + private long realizeWindow(boolean chromaKey, int width, int height) { + if(DEBUG_IMPLEMENTATION) { + System.err.println("BCEGL Window.realizeWindow() with: chroma "+chromaKey+", "+width+"x"+height+", "+config); + } + long handle = CreateWindow(getDisplayHandle(), chromaKey, width, height); + if (0 == handle) { + throw new NativeWindowException("Error native Window Handle is null"); + } + windowHandleClose = handle; + return handle; + } + + private void windowCreated(int cfgID, int width, int height) { + this.width = width; + this.height = height; + GLCapabilitiesImmutable capsReq = (GLCapabilitiesImmutable) config.getRequestedCapabilities(); + config = EGLGraphicsConfiguration.create(capsReq, getScreen().getGraphicsScreen(), cfgID); + if (config == null) { + throw new NativeWindowException("Error creating EGLGraphicsConfiguration from id: "+cfgID+", "+this); + } + if(DEBUG_IMPLEMENTATION) { + System.err.println("BCEGL Window.windowCreated(): "+toHexString(cfgID)+", "+width+"x"+height+", "+config); + } + } + + private long windowHandleClose; +} |
