Move png assets (NEWT icons + GLMediaPlayer dummy/test) to simple classpath, allowing access w/o jars. TODO: Test Android.

7 files changed, 5 insertions, 2 deletions

diff --git a/src/newt/classes/jogamp/newt/DisplayImpl.java b/src/newt/classes/jogamp/newt/DisplayImpl.java
index 8c0240ffd..aea42b66d 100644
--- a/src/newt/classes/jogamp/newt/DisplayImpl.java
+++ b/src/newt/classes/jogamp/newt/DisplayImpl.java
@@ -66,6 +66,7 @@ import com.jogamp.nativewindow.util.PointImmutable;
 
 public abstract class DisplayImpl extends Display {
     protected static final boolean DISABLE_POINTER_ICON = PropertyAccess.isPropertyDefined("newt.disable.PointerIcon", true);
+    protected static final String defaultPointerIconPath = "jogamp/newt/assets/pointer-grey-alpha-16x24.png";
     private static int serialno = 1;
     private static final boolean pngUtilAvail;
 
@@ -123,6 +124,7 @@ public abstract class DisplayImpl extends Display {
         final Exception[] ex = { null };
         final String exStr = "Could not resolve "+pngResource.resourcePaths[0];
         runOnEDTIfAvail(true, new Runnable() {
+            @Override
             public void run() {
                 try {
                     if( !DisplayImpl.this.isNativeValidAsync() ) {
@@ -198,6 +200,7 @@ public abstract class DisplayImpl extends Display {
         }
         final PointerIconImpl[] res = { null };
         runOnEDTIfAvail(true, new Runnable() {
+            @Override
             public void run() {
                 try {
                     if( !DisplayImpl.this.isNativeValidAsync() ) {
diff --git a/src/newt/classes/jogamp/newt/assets/cross-grey-alpha-16x16.png b/src/newt/classes/jogamp/newt/assets/cross-grey-alpha-16x16.png
new file mode 100644
index 000000000..303c454fa
--- /dev/null
+++ b/src/newt/classes/jogamp/newt/assets/cross-grey-alpha-16x16.png
diff --git a/src/newt/classes/jogamp/newt/assets/jogamp-16x16.png b/src/newt/classes/jogamp/newt/assets/jogamp-16x16.png
new file mode 100644
index 000000000..02df8997f
--- /dev/null
+++ b/src/newt/classes/jogamp/newt/assets/jogamp-16x16.png
diff --git a/src/newt/classes/jogamp/newt/assets/jogamp-32x32.png b/src/newt/classes/jogamp/newt/assets/jogamp-32x32.png
new file mode 100644
index 000000000..ab21c6e1b
--- /dev/null
+++ b/src/newt/classes/jogamp/newt/assets/jogamp-32x32.png
diff --git a/src/newt/classes/jogamp/newt/assets/pointer-grey-alpha-16x24.png b/src/newt/classes/jogamp/newt/assets/pointer-grey-alpha-16x24.png
new file mode 100644
index 000000000..98b2c8640
--- /dev/null
+++ b/src/newt/classes/jogamp/newt/assets/pointer-grey-alpha-16x24.png
diff --git a/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java b/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java
index 8a29f96f6..7eabbc3ee 100644
--- a/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java
@@ -67,7 +67,7 @@ public class DisplayDriver extends DisplayImpl {
 
         PNGPixelRect image = null;
         if( DisplayImpl.isPNGUtilAvailable() ) {
-            final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "newt/data/pointer-grey-alpha-16x24.png" }, DisplayDriver.class.getClassLoader(), null);
+            final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { defaultPointerIconPath }, DisplayDriver.class.getClassLoader(), null);
             try {
                 final URLConnection urlConn = res.resolve(0);
                 if( null != urlConn ) {
diff --git a/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java b/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
index 19e44b830..222adebf1 100644
--- a/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java
@@ -70,7 +70,7 @@ public class DisplayDriver extends DisplayImpl {
 
         PNGPixelRect image = null;
         if( DisplayImpl.isPNGUtilAvailable() ) {
-            final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "newt/data/pointer-grey-alpha-16x24.png" }, DisplayDriver.class.getClassLoader(), null);
+            final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { defaultPointerIconPath }, DisplayDriver.class.getClassLoader(), null);
             try {
                 final URLConnection urlConn = res.resolve(0);
                 if( null != urlConn ) {