jump 2 target

Normand Briere

2019-10-06 819ec23837b9c864343786091f7ee91393931231

jump 2 target

 CameraPane.java
..
..
@@ -193,6 +193,18 @@
193
193
     
194
194
     private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
195
195
 
196
+    public void Jump2Target()
197
+    {
198
+        if (manipCamera.hAspect == 0)
199
+        {
200
+            tmp.set(targetLookAt);
201
+            tmp.sub(manipCamera.lookAt);
202
+            manipCamera.lookAt.add(tmp);
203
+            manipCamera.location.add(tmp);
204
+            manipCamera.computeTransform();
205
+        }
206
+    }
207
+
196
208
     public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
197
209
     {
198
210
         try
..
..
@@ -14415,14 +14427,9 @@
14415
14427
         int ay = anchorY;
14416
14428
         MODIFIERS &= ~COMMAND;
14417
14429
         mouseMode = 0; // autorepeat
14418
-        tmp.set(targetLookAt);
14419
-        tmp.sub(manipCamera.lookAt);
14420
-        if (manipCamera.hAspect == 0)
14421
-        {
14422
-            manipCamera.lookAt.add(tmp);
14423
-            manipCamera.location.add(tmp);
14424
-            manipCamera.computeTransform();
14425
-        }
14430
+        
14431
+        Jump2Target();
14432
+        
14426
14433
 //        int mode = WHEEL;
14427
14434
   //      if (e.metaDown())
14428
14435
     //    {
..
..
@@ -14538,6 +14545,8 @@
14538
14545
     {
14539
14546
         if (!wasliveok)
14540
14547
             return;
14548
+        
14549
+        Jump2Target();
14541
14550
         
14542
14551
         AAtimer.restart(); // 
14543
14552
         Globals.TIMERRUNNING = true;
..
..
@@ -15069,7 +15078,7 @@
15069
15078
             if (isVR)
15070
15079
                 manipCamera.BackForth(0, speed*delta*scale, isVR?1000:0); // getWidth());
15071
15080
             else
15072
-                manipCamera.RotatePosition(0, speed);
15081
+                manipCamera.RotatePosition(0, speed*scale);
15073
15082
         }
15074
15083
         
15075
15084
         /**/