aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/com/jogamp/opengl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-01-09 18:34:33 +0100
committerSven Gothel <[email protected]>2014-01-09 18:34:33 +0100
commit1a0b3287870beca22b0a03aa604fc6a5574a962b (patch)
tree0674a18c024b68caf119864e0fcc381e8484ac97 /src/test/com/jogamp/opengl
parentd38fbf00efa47834f754306441cb99f2ef967a21 (diff)
Bug 676: Use proper pointer icon images (artwork)
.. shameless inspired by KDE's Oxgen scheme .. (they are best)
Diffstat (limited to 'src/test/com/jogamp/opengl')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java12
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/cross-grey-alpha-16x16.pngbin0 -> 286 bytes
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-32x32.pngbin213 -> 0 bytes
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-64x64.pngbin424 -> 0 bytes
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/pointer-grey-alpha-16x24.pngbin0 -> 511 bytes
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java14
7 files changed, 17 insertions, 17 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
index 780338492..059a930ed 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
@@ -179,9 +179,9 @@ public class TestGearsES2NEWT extends UITestCase {
disp.createNative();
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/crosshair-lumina-trans-32x32.png" } );
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/cross-grey-alpha-16x16.png" } );
try {
- _pointerIcon = disp.createPointerIcon(res, 16, 16);
+ _pointerIcon = disp.createPointerIcon(res, 8, 8);
System.err.println("Create PointerIcon #01: "+_pointerIcon);
} catch (Exception e) {
e.printStackTrace();
@@ -190,9 +190,9 @@ public class TestGearsES2NEWT extends UITestCase {
}
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "jogamp-pointer-64x64.png" } );
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/pointer-grey-alpha-16x24.png" } );
try {
- _pointerIcon = disp.createPointerIcon(res, 32, 0);
+ _pointerIcon = disp.createPointerIcon(res, 0, 0);
System.err.println("Create PointerIcon #02: "+_pointerIcon);
} catch (Exception e) {
e.printStackTrace();
@@ -201,12 +201,12 @@ public class TestGearsES2NEWT extends UITestCase {
}
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "crosshair-lumina-trans-64x64.png" } );
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "jogamp-pointer-64x64.png" } );
try {
final URLConnection urlConn = res.resolve(0);
final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), null, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
System.err.println("Create PointerIcon #03: "+image);
- _pointerIcon = disp.createPointerIcon(image, 32, 32);
+ _pointerIcon = disp.createPointerIcon(image, 32, 0);
System.err.println("Create PointerIcon #03: "+_pointerIcon);
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java
index bb9bc42a8..e3ad7fc03 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java
@@ -41,14 +41,14 @@ public class PNGTstFiles {
"grayscale_texture",
"bug724-transparent-grey_orig",
"bug724-transparent-grey_gimpexp",
- "crosshair-lumina-trans-32x32",
- "crosshair-lumina-trans-64x64",
+ "cross-gray-alpha-16x16",
+ "pointer-gray-alpha-16x24",
};
static public final String[] greyBasenames = {
"grayscale_texture",
"bug724-transparent-grey_orig",
"bug724-transparent-grey_gimpexp",
- "crosshair-lumina-trans-32x32",
- "crosshair-lumina-trans-64x64",
+ "cross-gray-alpha-16x16",
+ "pointer-gray-alpha-16x24",
};
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/cross-grey-alpha-16x16.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/cross-grey-alpha-16x16.png
new file mode 100644
index 000000000..303c454fa
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/cross-grey-alpha-16x16.png
Binary files differ
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-32x32.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-32x32.png
deleted file mode 100644
index 92279640b..000000000
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-32x32.png
+++ /dev/null
Binary files differ
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-64x64.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-64x64.png
deleted file mode 100644
index 9be285335..000000000
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/crosshair-lumina-trans-64x64.png
+++ /dev/null
Binary files differ
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/pointer-grey-alpha-16x24.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/pointer-grey-alpha-16x24.png
new file mode 100644
index 000000000..98b2c8640
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/pointer-grey-alpha-16x24.png
Binary files differ
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java
index 70d01ae66..dc9aac8ea 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java
@@ -152,9 +152,9 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter {
final Display disp = glWindow.getScreen().getDisplay();
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/crosshair-lumina-trans-32x32.png" } );
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/cross-grey-alpha-16x16.png" } );
try {
- _pointerIcon = disp.createPointerIcon(res, 16, 16);
+ _pointerIcon = disp.createPointerIcon(res, 8, 8);
System.err.println("Create PointerIcon #01: "+_pointerIcon);
} catch (Exception ex) {
ex.printStackTrace();
@@ -163,9 +163,9 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter {
}
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "jogamp-pointer-64x64.png" } );
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "newt/data/pointer-grey-alpha-16x24.png" } );
try {
- _pointerIcon = disp.createPointerIcon(res, 32, 0);
+ _pointerIcon = disp.createPointerIcon(res, 0, 0);
System.err.println("Create PointerIcon #02: "+_pointerIcon);
} catch (Exception ex) {
ex.printStackTrace();
@@ -174,12 +174,12 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter {
}
{
PointerIcon _pointerIcon = null;
- final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "crosshair-lumina-trans-64x64.png" } );
+ final IOUtil.ClassResources res = new IOUtil.ClassResources(glWindow.getClass(), new String[] { "jogamp-pointer-64x64.png" } );
try {
final URLConnection urlConn = res.resolve(0);
final PNGPixelRect image = PNGPixelRect.read(urlConn.getInputStream(), null, false /* directBuffer */, 0 /* destMinStrideInBytes */, false /* destIsGLOriented */);
System.err.println("Create PointerIcon #03: "+image);
- _pointerIcon = disp.createPointerIcon(image, 32, 32);
+ _pointerIcon = disp.createPointerIcon(image, 32, 0);
System.err.println("Create PointerIcon #03: "+_pointerIcon);
} catch (Exception ex) {
ex.printStackTrace();
@@ -231,4 +231,4 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter {
} }.start();
}
}
-} \ No newline at end of file
+}