aboutsummaryrefslogtreecommitdiffstats
path: root/ardor3d-jogl
diff options
context:
space:
mode:
Diffstat (limited to 'ardor3d-jogl')
-rw-r--r--ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-amd64.jarbin3538 -> 3542 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-i586.jarbin3461 -> 3465 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/gluegen-rt-natives-macosx-universal.jarbin3972 -> 3976 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-amd64.jarbin4085 -> 4089 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-i586.jarbin3395 -> 3399 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-amd64.jarbin6308 -> 6310 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-i586.jarbin4450 -> 4453 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/gluegen-rt.jarbin216362 -> 219526 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/jogl-all-natives-linux-amd64.jarbin145724 -> 146502 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/jogl-all-natives-linux-i586.jarbin144522 -> 145230 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/jogl-all-natives-macosx-universal.jarbin329959 -> 330601 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-amd64.jarbin146280 -> 147059 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-i586.jarbin111608 -> 112284 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/jogl-all-natives-windows-amd64.jarbin111515 -> 111896 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/jogl-all-natives-windows-i586.jarbin135199 -> 135463 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/jogl-all.jarbin4862080 -> 4778109 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/linux-amd64/libjogl_desktop.sobin575592 -> 575592 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/linux-amd64/libnativewindow_x11.sobin27088 -> 31200 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/linux-amd64/libnewt.sobin47704 -> 47704 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/linux-i586/libjogl_desktop.sobin546200 -> 546200 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/linux-i586/libnativewindow_x11.sobin26176 -> 26184 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/linux-i586/libnewt.sobin42640 -> 42640 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/macosx-universal/libjogl_desktop.jnilibbin1325480 -> 1325656 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/macosx-universal/libnativewindow_macosx.jnilibbin95376 -> 95376 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/macosx-universal/libnewt.jnilibbin168352 -> 168360 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/solaris-amd64/libjogl_desktop.sobin649296 -> 649584 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/solaris-amd64/libnativewindow_x11.sobin94040 -> 95528 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/solaris-amd64/libnewt.sobin104488 -> 104472 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/solaris-i586/libjogl_desktop.sobin479360 -> 479584 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/solaris-i586/libnativewindow_x11.sobin22868 -> 24192 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/solaris-i586/libnewt.sobin32488 -> 32472 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-amd64/gluegen-rt.dllbin14848 -> 14848 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-amd64/jogl_desktop.dllbin544768 -> 544768 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_awt.dllbin14336 -> 14336 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_win32.dllbin22016 -> 22016 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-amd64/newt.dllbin28160 -> 28160 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-i586/gluegen-rt.dllbin10752 -> 10752 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-i586/jogl_desktop.dllbin404992 -> 404992 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_awt.dllbin10240 -> 10240 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_win32.dllbin38912 -> 38912 bytes
-rw-r--r--ardor3d-jogl/lib/jogl/native/windows-i586/newt.dllbin45056 -> 45568 bytes
-rw-r--r--ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java76
42 files changed, 38 insertions, 38 deletions
diff --git a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-amd64.jar
index 98177cc..9cafdfa 100644
--- a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-amd64.jar
+++ b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-amd64.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-i586.jar b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-i586.jar
index 668bbbb..ec2c197 100644
--- a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-i586.jar
+++ b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-linux-i586.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-macosx-universal.jar
index 11999bc..e473a81 100644
--- a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-macosx-universal.jar
+++ b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-macosx-universal.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-amd64.jar b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-amd64.jar
index c9c75eb..746cda0 100644
--- a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-amd64.jar
+++ b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-amd64.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-i586.jar b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-i586.jar
index ccc064d..7502047 100644
--- a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-i586.jar
+++ b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-solaris-i586.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-amd64.jar
index 43c1a95..a806e70 100644
--- a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-amd64.jar
+++ b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-amd64.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-i586.jar b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-i586.jar
index b9aa134..f860ac8 100644
--- a/ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-i586.jar
+++ b/ardor3d-jogl/lib/jogl/gluegen-rt-natives-windows-i586.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/gluegen-rt.jar b/ardor3d-jogl/lib/jogl/gluegen-rt.jar
index a9957e6..312b559 100644
--- a/ardor3d-jogl/lib/jogl/gluegen-rt.jar
+++ b/ardor3d-jogl/lib/jogl/gluegen-rt.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/jogl-all-natives-linux-amd64.jar b/ardor3d-jogl/lib/jogl/jogl-all-natives-linux-amd64.jar
index 0f914e2..3c1eca6 100644
--- a/ardor3d-jogl/lib/jogl/jogl-all-natives-linux-amd64.jar
+++ b/ardor3d-jogl/lib/jogl/jogl-all-natives-linux-amd64.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/jogl-all-natives-linux-i586.jar b/ardor3d-jogl/lib/jogl/jogl-all-natives-linux-i586.jar
index e969c9b..a6708ea 100644
--- a/ardor3d-jogl/lib/jogl/jogl-all-natives-linux-i586.jar
+++ b/ardor3d-jogl/lib/jogl/jogl-all-natives-linux-i586.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/jogl-all-natives-macosx-universal.jar b/ardor3d-jogl/lib/jogl/jogl-all-natives-macosx-universal.jar
index 32f1567..b810a7c 100644
--- a/ardor3d-jogl/lib/jogl/jogl-all-natives-macosx-universal.jar
+++ b/ardor3d-jogl/lib/jogl/jogl-all-natives-macosx-universal.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-amd64.jar b/ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-amd64.jar
index cee93dd..de3bcc0 100644
--- a/ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-amd64.jar
+++ b/ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-amd64.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-i586.jar b/ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-i586.jar
index 8f2dc08..e29a4de 100644
--- a/ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-i586.jar
+++ b/ardor3d-jogl/lib/jogl/jogl-all-natives-solaris-i586.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/jogl-all-natives-windows-amd64.jar b/ardor3d-jogl/lib/jogl/jogl-all-natives-windows-amd64.jar
index 8ca3682..2b85383 100644
--- a/ardor3d-jogl/lib/jogl/jogl-all-natives-windows-amd64.jar
+++ b/ardor3d-jogl/lib/jogl/jogl-all-natives-windows-amd64.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/jogl-all-natives-windows-i586.jar b/ardor3d-jogl/lib/jogl/jogl-all-natives-windows-i586.jar
index 1ff1289..ded00b2 100644
--- a/ardor3d-jogl/lib/jogl/jogl-all-natives-windows-i586.jar
+++ b/ardor3d-jogl/lib/jogl/jogl-all-natives-windows-i586.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/jogl-all.jar b/ardor3d-jogl/lib/jogl/jogl-all.jar
index 977f5f1..9809443 100644
--- a/ardor3d-jogl/lib/jogl/jogl-all.jar
+++ b/ardor3d-jogl/lib/jogl/jogl-all.jar
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/linux-amd64/libjogl_desktop.so b/ardor3d-jogl/lib/jogl/native/linux-amd64/libjogl_desktop.so
index f91d7c6..5afbcec 100644
--- a/ardor3d-jogl/lib/jogl/native/linux-amd64/libjogl_desktop.so
+++ b/ardor3d-jogl/lib/jogl/native/linux-amd64/libjogl_desktop.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/linux-amd64/libnativewindow_x11.so b/ardor3d-jogl/lib/jogl/native/linux-amd64/libnativewindow_x11.so
index 53100af..bea6b09 100644
--- a/ardor3d-jogl/lib/jogl/native/linux-amd64/libnativewindow_x11.so
+++ b/ardor3d-jogl/lib/jogl/native/linux-amd64/libnativewindow_x11.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/linux-amd64/libnewt.so b/ardor3d-jogl/lib/jogl/native/linux-amd64/libnewt.so
index d757938..467496e 100644
--- a/ardor3d-jogl/lib/jogl/native/linux-amd64/libnewt.so
+++ b/ardor3d-jogl/lib/jogl/native/linux-amd64/libnewt.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/linux-i586/libjogl_desktop.so b/ardor3d-jogl/lib/jogl/native/linux-i586/libjogl_desktop.so
index 1fe60d5..15c8ffe 100644
--- a/ardor3d-jogl/lib/jogl/native/linux-i586/libjogl_desktop.so
+++ b/ardor3d-jogl/lib/jogl/native/linux-i586/libjogl_desktop.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/linux-i586/libnativewindow_x11.so b/ardor3d-jogl/lib/jogl/native/linux-i586/libnativewindow_x11.so
index 9e18ccd..7b30715 100644
--- a/ardor3d-jogl/lib/jogl/native/linux-i586/libnativewindow_x11.so
+++ b/ardor3d-jogl/lib/jogl/native/linux-i586/libnativewindow_x11.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/linux-i586/libnewt.so b/ardor3d-jogl/lib/jogl/native/linux-i586/libnewt.so
index 9d00b7d..78e32bf 100644
--- a/ardor3d-jogl/lib/jogl/native/linux-i586/libnewt.so
+++ b/ardor3d-jogl/lib/jogl/native/linux-i586/libnewt.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/macosx-universal/libjogl_desktop.jnilib b/ardor3d-jogl/lib/jogl/native/macosx-universal/libjogl_desktop.jnilib
index ebc22dc..b6662ac 100644
--- a/ardor3d-jogl/lib/jogl/native/macosx-universal/libjogl_desktop.jnilib
+++ b/ardor3d-jogl/lib/jogl/native/macosx-universal/libjogl_desktop.jnilib
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/macosx-universal/libnativewindow_macosx.jnilib b/ardor3d-jogl/lib/jogl/native/macosx-universal/libnativewindow_macosx.jnilib
index 9b5c146..20ed523 100644
--- a/ardor3d-jogl/lib/jogl/native/macosx-universal/libnativewindow_macosx.jnilib
+++ b/ardor3d-jogl/lib/jogl/native/macosx-universal/libnativewindow_macosx.jnilib
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/macosx-universal/libnewt.jnilib b/ardor3d-jogl/lib/jogl/native/macosx-universal/libnewt.jnilib
index 2396a03..fb75af1 100644
--- a/ardor3d-jogl/lib/jogl/native/macosx-universal/libnewt.jnilib
+++ b/ardor3d-jogl/lib/jogl/native/macosx-universal/libnewt.jnilib
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/solaris-amd64/libjogl_desktop.so b/ardor3d-jogl/lib/jogl/native/solaris-amd64/libjogl_desktop.so
index 956e497..82b8099 100644
--- a/ardor3d-jogl/lib/jogl/native/solaris-amd64/libjogl_desktop.so
+++ b/ardor3d-jogl/lib/jogl/native/solaris-amd64/libjogl_desktop.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/solaris-amd64/libnativewindow_x11.so b/ardor3d-jogl/lib/jogl/native/solaris-amd64/libnativewindow_x11.so
index 7bb9279..c6d2759 100644
--- a/ardor3d-jogl/lib/jogl/native/solaris-amd64/libnativewindow_x11.so
+++ b/ardor3d-jogl/lib/jogl/native/solaris-amd64/libnativewindow_x11.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/solaris-amd64/libnewt.so b/ardor3d-jogl/lib/jogl/native/solaris-amd64/libnewt.so
index 2b84891..28ec3ce 100644
--- a/ardor3d-jogl/lib/jogl/native/solaris-amd64/libnewt.so
+++ b/ardor3d-jogl/lib/jogl/native/solaris-amd64/libnewt.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/solaris-i586/libjogl_desktop.so b/ardor3d-jogl/lib/jogl/native/solaris-i586/libjogl_desktop.so
index cb9a072..1c8bc54 100644
--- a/ardor3d-jogl/lib/jogl/native/solaris-i586/libjogl_desktop.so
+++ b/ardor3d-jogl/lib/jogl/native/solaris-i586/libjogl_desktop.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/solaris-i586/libnativewindow_x11.so b/ardor3d-jogl/lib/jogl/native/solaris-i586/libnativewindow_x11.so
index 9693dc2..e987b1b 100644
--- a/ardor3d-jogl/lib/jogl/native/solaris-i586/libnativewindow_x11.so
+++ b/ardor3d-jogl/lib/jogl/native/solaris-i586/libnativewindow_x11.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/solaris-i586/libnewt.so b/ardor3d-jogl/lib/jogl/native/solaris-i586/libnewt.so
index 3ab2e58..71a6b9e 100644
--- a/ardor3d-jogl/lib/jogl/native/solaris-i586/libnewt.so
+++ b/ardor3d-jogl/lib/jogl/native/solaris-i586/libnewt.so
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-amd64/gluegen-rt.dll b/ardor3d-jogl/lib/jogl/native/windows-amd64/gluegen-rt.dll
index 9ea63b1..f5a12e7 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-amd64/gluegen-rt.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-amd64/gluegen-rt.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-amd64/jogl_desktop.dll b/ardor3d-jogl/lib/jogl/native/windows-amd64/jogl_desktop.dll
index 2b27820..c3568c5 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-amd64/jogl_desktop.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-amd64/jogl_desktop.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_awt.dll b/ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_awt.dll
index bf67563..2198ea1 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_awt.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_awt.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_win32.dll b/ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_win32.dll
index 044d080..03e6fe1 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_win32.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-amd64/nativewindow_win32.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-amd64/newt.dll b/ardor3d-jogl/lib/jogl/native/windows-amd64/newt.dll
index aa7e2f9..696c626 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-amd64/newt.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-amd64/newt.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-i586/gluegen-rt.dll b/ardor3d-jogl/lib/jogl/native/windows-i586/gluegen-rt.dll
index 409fd66..897efe7 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-i586/gluegen-rt.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-i586/gluegen-rt.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-i586/jogl_desktop.dll b/ardor3d-jogl/lib/jogl/native/windows-i586/jogl_desktop.dll
index 415602e..6476d60 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-i586/jogl_desktop.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-i586/jogl_desktop.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_awt.dll b/ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_awt.dll
index d3868c7..85e04e6 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_awt.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_awt.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_win32.dll b/ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_win32.dll
index a9c0174..a4ba377 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_win32.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-i586/nativewindow_win32.dll
Binary files differ
diff --git a/ardor3d-jogl/lib/jogl/native/windows-i586/newt.dll b/ardor3d-jogl/lib/jogl/native/windows-i586/newt.dll
index 46f5f8e..adf30e0 100644
--- a/ardor3d-jogl/lib/jogl/native/windows-i586/newt.dll
+++ b/ardor3d-jogl/lib/jogl/native/windows-i586/newt.dll
Binary files differ
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java b/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java
index 6ecf6bb..182e769 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java
@@ -10,9 +10,12 @@
package com.ardor3d.input.jogl;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.LinkedList;
+
import com.ardor3d.annotation.GuardedBy;
import com.ardor3d.framework.jogl.NewtWindowContainer;
import com.ardor3d.input.ButtonState;
@@ -32,9 +35,6 @@ import com.jogamp.newt.event.MouseEvent;
import com.jogamp.newt.event.MouseListener;
import com.jogamp.newt.opengl.GLWindow;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-
public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
@GuardedBy("this")
@@ -47,11 +47,11 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
protected MouseState _lastState = null;
protected final GLWindow _newtWindow;
-
+
protected final MouseManager _manager;
-
+
protected boolean _consumeEvents = false;
-
+
protected final Multiset<MouseButton> _clicks = EnumMultiset.create(MouseButton.class);
protected final EnumMap<MouseButton, Long> _lastClickTime = Maps.newEnumMap(MouseButton.class);
protected final EnumSet<MouseButton> _clickArmed = EnumSet.noneOf(MouseButton.class);
@@ -82,7 +82,7 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
return _currentIterator;
}
-
+
private void expireClickEvents() {
if (!_clicks.isEmpty()) {
for (final MouseButton mb : MouseButton.values()) {
@@ -92,9 +92,9 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
}
}
}
-
+
@Override
- public synchronized void mousePressed(MouseEvent me) {
+ public synchronized void mousePressed(final MouseEvent me) {
final MouseButton b = getButtonForEvent(me);
if (_clickArmed.contains(b)) {
_clicks.setCount(b, 0);
@@ -115,7 +115,7 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
}
@Override
- public synchronized void mouseReleased(MouseEvent me) {
+ public synchronized void mouseReleased(final MouseEvent me) {
initState(me);
if (_consumeEvents) {
me.setAttachment(InputEvent.consumedTag);
@@ -137,14 +137,14 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
addNewState(me, buttons, null);
}
-
+
@Override
- public synchronized void mouseDragged(MouseEvent me) {
- mouseMoved(me);
+ public synchronized void mouseDragged(final MouseEvent me) {
+ mouseMoved(me);
}
-
+
@Override
- public synchronized void mouseMoved(MouseEvent me) {
+ public synchronized void mouseMoved(final MouseEvent me) {
_clickArmed.clear();
_clicks.clear();
@@ -159,7 +159,7 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
// check the state against the "ignore next" values
if (_ignoreX != Integer.MAX_VALUE // shortcut to prevent dx/dy calculations
- && (_ignoreX == getDX(me) && _ignoreY == getDY(me))) {
+ && (_ignoreX == getDX(me) && _ignoreY == getDY(me))) {
// we matched, so we'll consider this a "mouse pointer reset move"
// so reset ignore to let the next move event through.
@@ -197,11 +197,11 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
_ignoreX = Integer.MAX_VALUE;
_ignoreY = Integer.MAX_VALUE;
}
- }
+ }
}
@Override
- public void mouseWheelMoved(MouseEvent me) {
+ public void mouseWheelMoved(final MouseEvent me) {
initState(me);
addNewState(me, _lastState.getButtonStates(), null);
@@ -209,24 +209,24 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
me.setAttachment(InputEvent.consumedTag);
}
}
-
+
private void initState(final MouseEvent mouseEvent) {
if (_lastState == null) {
_lastState = new MouseState(mouseEvent.getX(), getArdor3DY(mouseEvent), 0, 0, 0, null, null);
}
}
-
+
private void addNewState(final MouseEvent mouseEvent, final EnumMap<MouseButton, ButtonState> enumMap,
final Multiset<MouseButton> clicks) {
final MouseState newState = new MouseState(mouseEvent.getX(), getArdor3DY(mouseEvent), getDX(mouseEvent),
- getDY(mouseEvent), mouseEvent.getWheelRotation(), enumMap, clicks);
+ getDY(mouseEvent), (int) mouseEvent.getWheelRotation(), enumMap, clicks);
synchronized (JoglNewtMouseWrapper.this) {
_upcomingEvents.add(newState);
}
_lastState = newState;
- }
-
+ }
+
private int getDX(final MouseEvent me) {
return me.getX() - _lastState.getX();
}
@@ -234,7 +234,7 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
private int getDY(final MouseEvent me) {
return getArdor3DY(me) - _lastState.getY();
}
-
+
/**
* @param e
* our mouseEvent
@@ -244,16 +244,16 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
private int getArdor3DY(final MouseEvent me) {
return _newtWindow.getHeight() - me.getY();
}
-
+
private void setStateForButton(final MouseEvent e, final EnumMap<MouseButton, ButtonState> buttons,
final ButtonState buttonState) {
final MouseButton button = getButtonForEvent(e);
buttons.put(button, buttonState);
}
-
+
private MouseButton getButtonForEvent(final MouseEvent me) {
MouseButton button;
- switch(me.getButton()) {
+ switch (me.getButton()) {
case MouseEvent.BUTTON1:
button = MouseButton.LEFT;
break;
@@ -268,9 +268,9 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
}
return button;
}
-
+
private class JoglNewtMouseIterator extends AbstractIterator<MouseState> implements PeekingIterator<MouseState> {
-
+
@Override
protected MouseState computeNext() {
synchronized (JoglNewtMouseWrapper.this) {
@@ -281,25 +281,25 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
}
}
}
-
+
@Override
- public synchronized void mouseClicked(MouseEvent me) {
+ public synchronized void mouseClicked(final MouseEvent me) {
// Yes, we could use the click count here, but in the interests of this working the same way as SWT and Native,
// we
// will do it the same way they do it.
-
+
}
@Override
- public synchronized void mouseEntered(MouseEvent me) {
- // ignore this
+ public synchronized void mouseEntered(final MouseEvent me) {
+ // ignore this
}
@Override
- public synchronized void mouseExited(MouseEvent me) {
- // ignore this
- }
-
+ public synchronized void mouseExited(final MouseEvent me) {
+ // ignore this
+ }
+
public boolean isConsumeEvents() {
return _consumeEvents;
}