Improved interaction in ExaminerViewer to match Maya's camera

controls. Added optional up vector. Simplified logic by using
MouseEvent.getModifiersEx(). MouseButtonHelper is no longer necessary
and has been removed. Updated demos.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@357 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

6 files changed, 12 insertions, 12 deletions

diff --git a/src/demos/hdr/HDR.java b/src/demos/hdr/HDR.java
index 2f71c3c..bd3f7d6 100755
--- a/src/demos/hdr/HDR.java
+++ b/src/demos/hdr/HDR.java
@@ -13,7 +13,6 @@ import gleem.BSphereProvider;
 import gleem.CameraParameters;
 import gleem.ExaminerViewer;
 import gleem.ManipManager;
-import gleem.MouseButtonHelper;
 import gleem.linalg.Mat4f;
 import gleem.linalg.Rotf;
 import gleem.linalg.Vec3f;
@@ -365,7 +364,8 @@ public class HDR extends Demo {
     manager.registerWindow((AWTGLAutoDrawable) drawable);
     this.drawable = drawable;
 
-    viewer = new ExaminerViewer(MouseButtonHelper.numMouseButtons());
+    viewer = new ExaminerViewer();
+    viewer.setUpVector(Vec3f.Y_AXIS);
     viewer.setAutoRedrawMode(false);
     viewer.setNoAltKeyMode(true);
     viewer.attach((AWTGLAutoDrawable) drawable, new BSphereProvider() {
diff --git a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
index 1c7effe..3190778 100644
--- a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
+++ b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
@@ -44,7 +44,6 @@ import gleem.CameraParameters;
 import gleem.ExaminerViewer;
 import gleem.HandleBoxManip;
 import gleem.ManipManager;
-import gleem.MouseButtonHelper;
 import gleem.linalg.Mat4f;
 import gleem.linalg.Rotf;
 import gleem.linalg.Vec3f;
@@ -301,7 +300,8 @@ public class HWShadowmapsSimple extends Demo {
     spotlight.setRotation(new Rotf(Vec3f.X_AXIS, (float) Math.toRadians(-30.0f)));
     manager.showManipInWindow(spotlight, (AWTGLAutoDrawable) drawable);
 
-    viewer = new ExaminerViewer(MouseButtonHelper.numMouseButtons());
+    viewer = new ExaminerViewer();
+    viewer.setUpVector(Vec3f.Y_AXIS);
     viewer.attach((AWTGLAutoDrawable) drawable, new BSphereProvider() {
         public BSphere getBoundingSphere() {
           return new BSphere(object.getTranslation(), 2.0f);
diff --git a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
index dde5135..c0feeb1 100644
--- a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
+++ b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
@@ -43,7 +43,6 @@ import gleem.CameraParameters;
 import gleem.ExaminerViewer;
 import gleem.HandleBoxManip;
 import gleem.ManipManager;
-import gleem.MouseButtonHelper;
 import gleem.linalg.Mat4f;
 import gleem.linalg.Rotf;
 import gleem.linalg.Vec3f;
@@ -260,7 +259,8 @@ public class InfiniteShadowVolumes extends Demo {
     lightManip.setTranslation(new Vec3f(0.5f, 0.5f, -1));
     lightManip.setGeometryScale(new Vec3f(0.1f, 0.1f, 0.1f));
 
-    viewer = new ExaminerViewer(MouseButtonHelper.numMouseButtons());
+    viewer = new ExaminerViewer();
+    viewer.setUpVector(Vec3f.Y_AXIS);
     viewer.attach((AWTGLAutoDrawable) drawable, new BSphereProvider() {
         public BSphere getBoundingSphere() {
           return new BSphere(objectManip.getTranslation(), 1.0f);
diff --git a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
index 427d645..a813906 100644
--- a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
+++ b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
@@ -40,7 +40,6 @@ import gleem.BSphereProvider;
 import gleem.CameraParameters;
 import gleem.ExaminerViewer;
 import gleem.ManipManager;
-import gleem.MouseButtonHelper;
 import gleem.linalg.Vec3f;
 import java.awt.BorderLayout;
 import java.awt.Frame;
@@ -195,7 +194,8 @@ public class ProceduralTexturePhysics extends Demo {
             manager.registerWindow((AWTGLAutoDrawable) drawable);
             this.drawable = drawable;
 
-            viewer = new ExaminerViewer(MouseButtonHelper.numMouseButtons());
+            viewer = new ExaminerViewer();
+            viewer.setUpVector(Vec3f.Y_AXIS);
             viewer.setAutoRedrawMode(false);
             viewer.attach((AWTGLAutoDrawable) drawable, new BSphereProvider() {
 
diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java
index edbef87..fa71f0c 100644
--- a/src/demos/vertexProgRefract/VertexProgRefract.java
+++ b/src/demos/vertexProgRefract/VertexProgRefract.java
@@ -45,7 +45,6 @@ import gleem.BSphere;
 import gleem.BSphereProvider;
 import gleem.ExaminerViewer;
 import gleem.ManipManager;
-import gleem.MouseButtonHelper;
 import gleem.linalg.Rotf;
 import gleem.linalg.Vec3f;
 import java.awt.BorderLayout;
@@ -332,7 +331,8 @@ public class VertexProgRefract extends Demo {
       manager.registerWindow((AWTGLAutoDrawable) drawable);
       this.drawable = drawable;
 
-      viewer = new ExaminerViewer(MouseButtonHelper.numMouseButtons());
+      viewer = new ExaminerViewer();
+      viewer.setUpVector(Vec3f.Y_AXIS);
       viewer.setNoAltKeyMode(true);
       viewer.setAutoRedrawMode(false);
       viewer.attach((AWTGLAutoDrawable) drawable, new BSphereProvider() {
diff --git a/src/demos/vertexProgWarp/VertexProgWarp.java b/src/demos/vertexProgWarp/VertexProgWarp.java
index e6dbca7..8ab7166 100644
--- a/src/demos/vertexProgWarp/VertexProgWarp.java
+++ b/src/demos/vertexProgWarp/VertexProgWarp.java
@@ -43,7 +43,6 @@ import gleem.BSphere;
 import gleem.BSphereProvider;
 import gleem.ExaminerViewer;
 import gleem.ManipManager;
-import gleem.MouseButtonHelper;
 import gleem.linalg.Vec3f;
 import java.awt.BorderLayout;
 import java.awt.Frame;
@@ -231,7 +230,8 @@ public class VertexProgWarp extends Demo {
     manager.registerWindow((AWTGLAutoDrawable) drawable);
     this.drawable = drawable;
 
-    viewer = new ExaminerViewer(MouseButtonHelper.numMouseButtons());
+    viewer = new ExaminerViewer();
+    viewer.setUpVector(Vec3f.Y_AXIS);
     viewer.setNoAltKeyMode(true);
     viewer.setAutoRedrawMode(false);
     viewer.attach((AWTGLAutoDrawable) drawable, new BSphereProvider() {