Merge branch 'master' into stash_glyphcache

Conflicts:
	make/scripts/tests.sh
	src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
	src/jogl/classes/com/jogamp/graph/curve/Region.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
	src/jogl/classes/com/jogamp/graph/font/Font.java
	src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java

14 files changed, 71 insertions, 23 deletions

diff --git a/make/resources/android/AndroidManifest-jogl.xml b/make/resources/android/AndroidManifest-jogl.xml
index 1c08cc484..1b6c46356 100644
--- a/make/resources/android/AndroidManifest-jogl.xml
+++ b/make/resources/android/AndroidManifest-jogl.xml
@@ -4,11 +4,12 @@
       package="javax.media.opengl">
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet -->
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 
     <uses-library android:name="com.jogamp.common" android:required="true" />
 
-    <uses-sdk android:minSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
 
     <application android:icon="@drawable/icon" 
                  android:label="@string/app_name"
@@ -19,8 +20,8 @@
                   android:finishOnTaskLaunch="true"
                   android:launchMode="singleTop"
                   android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_v_name"
-                  android:description="@string/activity_v_descr"
+                  android:label="@string/activity_version_name"
+                  android:description="@string/activity_version_descr"
                   >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml
index 3c2046df1..0251eb505 100644
--- a/make/resources/android/AndroidManifest-test.xml
+++ b/make/resources/android/AndroidManifest-test.xml
@@ -4,13 +4,14 @@
       package="com.jogamp.opengl.test">
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet -->
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 
     <uses-library android:name="com.jogamp.common" android:required="true" />
     <uses-library android:name="javax.media.opengl" android:required="true" />
     <uses-library android:name="jogamp.android.launcher" android:required="true" />
 
-    <uses-sdk android:minSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
 
     <application android:icon="@drawable/icon" 
                  android:label="@string/app_name"
@@ -18,9 +19,9 @@
                  android:persistent="false"
                  >
 
-        <activity android:name="com.jogamp.opengl.test.android.NEWTRedSquareES1ActivityLauncher"
-                  android:label="@string/activity_redsquarees1_name"
-                  android:description="@string/activity_redsquarees1_descr"
+        <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2ActivityLauncher"
+                  android:label="@string/activity_gearses2_name"
+                  android:description="@string/activity_gearses2_descr"
                   android:theme="@android:style/Theme.NoDisplay"
                   >
             <intent-filter>
@@ -28,9 +29,19 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTRedSquareES2ActivityLauncher"
-                  android:label="@string/activity_redsquarees2_name"
-                  android:description="@string/activity_redsquarees2_descr"
+        <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2RGB565ActivityLauncher"
+                  android:label="@string/activity_gearses2rgb565_name"
+                  android:description="@string/activity_gearses2rgb565_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.NEWTGearsES2ECTActivityLauncher"
+                  android:label="@string/activity_gearses2ect_name"
+                  android:description="@string/activity_gearses2ect_descr"
                   android:theme="@android:style/Theme.NoDisplay"
                   >
             <intent-filter>
@@ -38,7 +49,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES1ActivityLauncher"
                   android:label="@string/activity_gearses1_name"
                   android:description="@string/activity_gearses1_descr"
@@ -49,9 +59,20 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2ActivityLauncher"
-                  android:label="@string/activity_gearses2_name"
-                  android:description="@string/activity_gearses2_descr"
+
+        <activity android:name="com.jogamp.opengl.test.android.NEWTRedSquareES2ActivityLauncher"
+                  android:label="@string/activity_redsquarees2_name"
+                  android:description="@string/activity_redsquarees2_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.NEWTRedSquareES1ActivityLauncher"
+                  android:label="@string/activity_redsquarees1_name"
+                  android:description="@string/activity_redsquarees1_descr"
                   android:theme="@android:style/Theme.NoDisplay"
                   >
             <intent-filter>
@@ -100,8 +121,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00a"
-                  android:label="@string/activity_moviesimple0a_name"
+        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00b"
+                  android:label="@string/activity_moviesimple0b_name"
                   android:description="@string/activity_moviesimple_descr"
                   android:theme="@android:style/Theme.NoDisplay"
                   >
@@ -110,8 +131,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00b"
-                  android:label="@string/activity_moviesimple0b_name"
+        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00c"
+                  android:label="@string/activity_moviesimple0c_name"
                   android:description="@string/activity_moviesimple_descr"
                   android:theme="@android:style/Theme.NoDisplay"
                   >
@@ -160,6 +181,26 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher1a"
+                  android:label="@string/activity_moviecube1a_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.MovieCubeActivityLauncher1b"
+                  android:label="@string/activity_moviecube1b_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-jogl/values/strings.xml b/make/resources/android/res-jogl/values/strings.xml
index 3064dad88..e88a0a4e0 100644
--- a/make/resources/android/res-jogl/values/strings.xml
+++ b/make/resources/android/res-jogl/values/strings.xml
@@ -3,6 +3,6 @@
     <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\'s Version</string>
-    <string name="activity_v_descr">Shows the version of the JOGL Library and runtime GL infos.</string>
+    <string name="activity_version_name">Jogl\'s Version</string>
+    <string name="activity_version_descr">Shows the version of the JOGL Library and runtime GL infos.</string>
 </resources>
diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-test/values/strings.xml
index fcaf102ac..072cf47e6 100644
--- a/make/resources/android/res-test/values/strings.xml
+++ b/make/resources/android/res-test/values/strings.xml
@@ -11,6 +11,10 @@
     <string name="activity_gearses1_descr">GearsES1</string>
     <string name="activity_gearses2_name">GearsES2</string>
     <string name="activity_gearses2_descr">GearsES2</string>
+    <string name="activity_gearses2rgb565_name">Gears565</string>
+    <string name="activity_gearses2rgb565_descr">Gears565</string>
+    <string name="activity_gearses2ect_name">GearsECT</string>
+    <string name="activity_gearses2ect_descr">GearsECT</string>
     <string name="activity_gearses2t_name">GearsES2T</string>
     <string name="activity_gearses2t_descr">GearsES2T</string>
     <string name="activity_graphui1p_name">GraphUI1p</string>
@@ -19,12 +23,14 @@
     <string name="activity_graphui2p_descr">GraphUI 2-pass</string>
     <string name="activity_elektro_name">Elektro</string>
     <string name="activity_elektro_descr">Elektro</string>
-    <string name="activity_moviesimple0a_name">MovieSimple0a</string>
     <string name="activity_moviesimple0b_name">MovieSimple0b</string>
+    <string name="activity_moviesimple0c_name">CamSimple0</string>
     <string name="activity_moviesimple1a_name">MovieSimple1a</string>
     <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_moviecube1a_name">CamCube0</string>
+    <string name="activity_moviecube1b_name">CamCube1</string>
     <string name="activity_moviecube_descr">MovieCube</string>
 </resources>
diff --git a/make/resources/assets-test/crosshair-grey-alpha-64x64.png b/make/resources/assets-test/crosshair-grey-alpha-64x64.png
new file mode 100644
index 000000000..9be285335
--- /dev/null
+++ b/make/resources/assets-test/crosshair-grey-alpha-64x64.png
diff --git a/make/resources/assets-test/jogamp-pointer-64x64.png b/make/resources/assets-test/jogamp-pointer-64x64.png
new file mode 100644
index 000000000..a965dcab1
--- /dev/null
+++ b/make/resources/assets-test/jogamp-pointer-64x64.png
diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png b/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png
new file mode 100644
index 000000000..0a1488c6b
--- /dev/null
+++ b/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png
diff --git a/make/resources/assets/newt/data/cross-grey-alpha-16x16.png b/make/resources/assets/newt/data/cross-grey-alpha-16x16.png
new file mode 100644
index 000000000..303c454fa
--- /dev/null
+++ b/make/resources/assets/newt/data/cross-grey-alpha-16x16.png
diff --git a/make/resources/assets/newt/data/jogamp-16x16.png b/make/resources/assets/newt/data/jogamp-16x16.png
new file mode 100644
index 000000000..02df8997f
--- /dev/null
+++ b/make/resources/assets/newt/data/jogamp-16x16.png
diff --git a/make/resources/assets/newt/data/jogamp-32x32.png b/make/resources/assets/newt/data/jogamp-32x32.png
new file mode 100644
index 000000000..ab21c6e1b
--- /dev/null
+++ b/make/resources/assets/newt/data/jogamp-32x32.png
diff --git a/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png b/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png
new file mode 100644
index 000000000..98b2c8640
--- /dev/null
+++ b/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png
diff --git a/make/resources/misc/jogamp-48x48.png b/make/resources/misc/jogamp-48x48.png
new file mode 100644
index 000000000..216f8c0b7
--- /dev/null
+++ b/make/resources/misc/jogamp-48x48.png
diff --git a/make/resources/misc/jogamp-64x64.png b/make/resources/misc/jogamp-64x64.png
new file mode 100644
index 000000000..9936616ca
--- /dev/null
+++ b/make/resources/misc/jogamp-64x64.png
diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png b/make/resources/misc/test-ntsc01-160x90.png
index 3df47432e..3df47432e 100644
--- a/make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png
+++ b/make/resources/misc/test-ntsc01-160x90.png