aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/jogl/classes/jogamp/opengl/assets/test-ntsc01-28x16.pngbin0 -> 396 bytes
-rw-r--r--src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java2
-rw-r--r--src/newt/classes/com/jogamp/newt/NewtFactory.java2
-rw-r--r--src/newt/classes/com/jogamp/newt/Window.java6
-rw-r--r--src/newt/classes/com/jogamp/newt/opengl/util/NEWTDemoListener.java4
-rw-r--r--src/newt/classes/jogamp/newt/DisplayImpl.java3
-rw-r--r--src/newt/classes/jogamp/newt/assets/cross-grey-alpha-16x16.pngbin0 -> 286 bytes
-rw-r--r--src/newt/classes/jogamp/newt/assets/jogamp-16x16.pngbin0 -> 549 bytes
-rw-r--r--src/newt/classes/jogamp/newt/assets/jogamp-32x32.pngbin0 -> 1020 bytes
-rw-r--r--src/newt/classes/jogamp/newt/assets/pointer-grey-alpha-16x24.pngbin0 -> 511 bytes
-rw-r--r--src/newt/classes/jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java2
-rw-r--r--src/newt/classes/jogamp/newt/driver/egl/gbm/DisplayDriver.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2SimpleNEWT.java6
13 files changed, 16 insertions, 11 deletions
diff --git a/src/jogl/classes/jogamp/opengl/assets/test-ntsc01-28x16.png b/src/jogl/classes/jogamp/opengl/assets/test-ntsc01-28x16.png
new file mode 100644
index 000000000..4601a214e
--- /dev/null
+++ b/src/jogl/classes/jogamp/opengl/assets/test-ntsc01-28x16.png
Binary files differ
diff --git a/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
index 92ed2d749..59dba68f2 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
@@ -108,7 +108,7 @@ public class NullGLMediaPlayer extends GLMediaPlayerImpl {
public final static TextureData createTestTextureData() {
TextureData res = null;
try {
- final URLConnection urlConn = IOUtil.getResource("jogl/util/data/av/test-ntsc01-28x16.png", NullGLMediaPlayer.class.getClassLoader());
+ final URLConnection urlConn = IOUtil.getResource("jogamp/opengl/assets/test-ntsc01-28x16.png", NullGLMediaPlayer.class.getClassLoader());
if(null != urlConn) {
res = TextureIO.newTextureData(GLProfile.getGL2ES2(), urlConn.getInputStream(), false, TextureIO.PNG);
}
diff --git a/src/newt/classes/com/jogamp/newt/NewtFactory.java b/src/newt/classes/com/jogamp/newt/NewtFactory.java
index 61d21026a..12e61d0b2 100644
--- a/src/newt/classes/com/jogamp/newt/NewtFactory.java
+++ b/src/newt/classes/com/jogamp/newt/NewtFactory.java
@@ -60,7 +60,7 @@ public class NewtFactory {
public static final String DRIVER_DEFAULT_ROOT_PACKAGE = "jogamp.newt.driver";
private static IOUtil.ClassResources defaultWindowIcons;
- private static String sysPaths = "newt/data/jogamp-16x16.png newt/data/jogamp-32x32.png";
+ private static String sysPaths = "jogamp/newt/assets/jogamp-16x16.png jogamp/newt/assets/jogamp-32x32.png";
static {
SecurityUtil.doPrivileged(new PrivilegedAction<Object>() {
diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java
index 3a84bd79c..60ed53c9f 100644
--- a/src/newt/classes/com/jogamp/newt/Window.java
+++ b/src/newt/classes/com/jogamp/newt/Window.java
@@ -87,12 +87,12 @@ import com.jogamp.nativewindow.util.SurfaceSize;
* The location must be resolvable via classpath, i.e. shall reference a location within the jar file.
* Example (our default):
* <pre>
- * -Dnewt.window.icons="newt/data/jogamp-16x16.png,newt/data/jogamp-32x32.png"
- * -Djnlp.newt.window.icons="newt/data/jogamp-16x16.png,newt/data/jogamp-32x32.png"
+ * -Dnewt.window.icons="jogamp/newt/assets/jogamp-16x16.png,jogamp/newt/assets/jogamp-32x32.png"
+ * -Djnlp.newt.window.icons="jogamp/newt/assets/jogamp-16x16.png,jogamp/newt/assets/jogamp-32x32.png"
* </pre>
* The property can also be set programmatically, which must happen before any NEWT classes are <i>touched</i>:
* <pre>
- * System.setProperty("newt.window.icons", "newt/data/jogamp-16x16.png, newt/data/jogamp-32x32.png");
+ * System.setProperty("newt.window.icons", "jogamp/newt/assets/jogamp-16x16.png,jogamp/newt/assets/jogamp-32x32.png");
* </pre>
* To disable even Jogamp's own window icons in favor of system icons,
* simply set a non-existing location, e.g.:
diff --git a/src/newt/classes/com/jogamp/newt/opengl/util/NEWTDemoListener.java b/src/newt/classes/com/jogamp/newt/opengl/util/NEWTDemoListener.java
index aaed713a8..563c09474 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/util/NEWTDemoListener.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/util/NEWTDemoListener.java
@@ -493,7 +493,7 @@ public class NEWTDemoListener extends WindowAdapter implements KeyListener, Mous
disp.createNative();
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "newt/data/cross-grey-alpha-16x16.png" }, disp.getClass().getClassLoader(), null);
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "jogamp/newt/assets/cross-grey-alpha-16x16.png" }, disp.getClass().getClassLoader(), null);
try {
_pointerIcon = disp.createPointerIcon(res, 8, 8);
pointerIcons.add(_pointerIcon);
@@ -504,7 +504,7 @@ public class NEWTDemoListener extends WindowAdapter implements KeyListener, Mous
}
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "newt/data/pointer-grey-alpha-16x24.png" }, disp.getClass().getClassLoader(), null);
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "jogamp/newt/assets/pointer-grey-alpha-16x24.png" }, disp.getClass().getClassLoader(), null);
try {
_pointerIcon = disp.createPointerIcon(res, 0, 0);
pointerIcons.add(_pointerIcon);
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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 ) {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2SimpleNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2SimpleNEWT.java
index d87a18b2f..262d71092 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2SimpleNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2SimpleNEWT.java
@@ -109,10 +109,12 @@ public class TestGearsES2SimpleNEWT extends UITestCase {
glWindow.addWindowListener(quitAdapter);
glWindow.addWindowListener(new WindowAdapter() {
+ @Override
public void windowResized(final WindowEvent e) {
System.err.println("window resized: "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getSurfaceWidth()+"x"+glWindow.getSurfaceHeight());
setTitle(glWindow, caps);
}
+ @Override
public void windowMoved(final WindowEvent e) {
System.err.println("window moved: "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getSurfaceWidth()+"x"+glWindow.getSurfaceHeight());
setTitle(glWindow, caps);
@@ -126,7 +128,7 @@ public class TestGearsES2SimpleNEWT extends UITestCase {
int idx = 0;
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "newt/data/cross-grey-alpha-16x16.png" }, glWindow.getClass().getClassLoader(), null);
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "jogamp/newt/assets/cross-grey-alpha-16x16.png" }, glWindow.getClass().getClassLoader(), null);
try {
_pointerIcon = disp.createPointerIcon(res, 8, 8);
System.err.printf("Create PointerIcon #%02d: %s%n", idx, _pointerIcon.toString());
@@ -138,7 +140,7 @@ public class TestGearsES2SimpleNEWT extends UITestCase {
idx++;
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "newt/data/pointer-grey-alpha-16x24.png" }, glWindow.getClass().getClassLoader(), null);
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(new String[] { "jogamp/newt/assets/pointer-grey-alpha-16x24.png" }, glWindow.getClass().getClassLoader(), null);
try {
_pointerIcon = disp.createPointerIcon(res, 0, 0);
System.err.printf("Create PointerIcon #%02d: %s%n", idx, _pointerIcon.toString());
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-19 18:44:45 +0000