blame | history | patch | commit | commitdiff
Normand Briere
2019-09-25 51e45bf615e1e2b4aca2edf9f7333b687c7d015e 
 CameraPane.java
....@@ -1,4 +1,5 @@
11 
2
+import com.bulletphysics.dynamics.RigidBody;
23 import java.awt.*;
34 import java.awt.event.*;
45 import java.awt.image.*;
....@@ -134,7 +135,7 @@
134135 static    boolean ZOOMBOXMODE = false;
135136 static    boolean BOXMODE = false;
136137 static    boolean IMAGEFLIP = false;
137
-static    boolean SMOOTHFOCUS = false;
138
+static    boolean SMOOTHFOCUS = true; // false;
138139 static    boolean SPEAKERMOCAP = true; // jan 2014 false;
139140 static    boolean SPEAKERCAMERA = false;
140141 static    boolean SPEAKERFOCUS = false;
....@@ -221,7 +222,7 @@
221222         cameras = new Camera[2];
222223         targetLookAts = new cVector[2];
223224 
224
-        SetCamera(cam);
225
+        SetCamera(cam, true);
225226 
226227         // Warning: not used.
227228         //SetLight(new Camera(new cVector(15, 10, -20)));
....@@ -2064,7 +2065,7 @@
20642065     
20652066     static int camerachangeframe;
20662067     
2067
-    public boolean SetCamera(Camera cam)
2068
+    public boolean SetCamera(Camera cam, boolean set)
20682069     {
20692070         // may 2014 if (cam == cameras[0] || cam == cameras[1])
20702071         //    return false;
....@@ -2092,7 +2093,10 @@
20922093             if (cameras[i] == null)
20932094             {
20942095                 cameras[i] = new Camera(cam.viewCode);
2095
-                
2096
+            }
2097
+            
2098
+            if (set)
2099
+            {
20962100                 cameras[i].setAim(cam.location, cam.lookAt);
20972101                 cameras[i].shaper_fovy = cam.shaper_fovy;
20982102                 cameras[i].UP.set(cam.UP);
....@@ -2106,7 +2110,7 @@
21062110         // Start with free camera
21072111         SwitchCameras(true);
21082112         
2109
-        pingthread.jump = true; // optional?
2113
+//        pingthread.jump = true; // optional?
21102114         
21112115         if (TRACKONCE)
21122116         {
....@@ -2293,18 +2297,6 @@
22932297     public void ToggleTrack()
22942298     {
22952299         TRACK ^= true;
2296
-        if (TRACK)
2297
-        {
2298
-            if (object.selection != null &&
2299
-                object.selection.size() > 0 &&
2300
-                object.selection.elementAt(0) != null &&
2301
-                !(object.selection.elementAt(0) instanceof Camera) &&
2302
-                !(object.selection.elementAt(0) instanceof ScriptNode))
2303
-            {
2304
-                trackedobject = object.selection.elementAt(0);
2305
-                repaint();
2306
-            }
2307
-        }
23082300         
23092301         repaint();
23102302     }
....@@ -3598,6 +3590,8 @@
35983590            };
35993591      /**/
36003592         
3593
+        static Object3D lastObject;
3594
+        
36013595         //com.sun.opengl.util.texture.Texture
36023596         TextureData
36033597                 GetFileTexture(String name, boolean bump, int resolution)
....@@ -3634,6 +3628,8 @@
36343628                 //    return null;
36353629                     //if (i == 2)
36363630                     //    return null;
3631
+                    // TIFF issue sept 2019
3632
+                    System.err.println("lastObject = " + lastObject);
36373633                     e.printStackTrace();
36383634                     name = name.split("\\.tif")[0] + ".jpg";
36393635                 }
....@@ -6966,30 +6962,30 @@
69666962                     short residu = 0;
69676963 
69686964                 // wraparound workarounds
6969
-                    short fuck = (short) (buffer[i] & 0xFF);
6965
+                    short ww = (short) (buffer[i] & 0xFF);
69706966                     /*
6971
-                    residu += (fuck%2);
6972
-                    if(fuck/2 < 256-residu/2)
6967
+                    residu += (ww%2);
6968
+                    if(ww/2 < 256-residu/2)
69736969                     {
6974
-                    fuck = (short)((fuck/2) + residu/2);
6970
+                    ww = (short)((ww/2) + residu/2);
69756971                     if(residu == 2)
69766972                     residu = 0;
69776973                     }
69786974                     else
69796975                     {
69806976                     residu = 0;
6981
-                    fuck /= 2;
6977
+                    ww /= 2;
69826978                     }
69836979                      */
6984
-                    if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+                    if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
69856981                     {
6986
-                        fuck /= 2;
6982
+                        ww /= 2;
69876983                     } else
69886984                     {
6989
-                        fuck = (short) ((fuck / 2) + fuck % 2);
6985
+                        ww = (short) ((ww / 2) + ww % 2);
69906986                     }
69916987 
6992
-                    buffer[i] = (byte) fuck;
6988
+                    buffer[i] = (byte) ww;
69936989                 }
69946990             //System.out.print(bytes[i] + " ");
69956991             //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -9847,7 +9843,7 @@
98479843             
98489844             boolean vr = capsLocked && !lightMode;
98499845             
9850
-            accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 2 : 1),
9846
+            accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
98519847                     ratio,
98529848                     //near_plane, far_plane,
98539849                     renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
....@@ -10909,6 +10905,12 @@
1090910905                 else
1091010906                     speedkey[RIGHT_ARROW] = 0;
1091110907                 
10908
+                if (Globals.WALK && capsLocked)
10909
+                {
10910
+                    Walk();
10911
+                    keyon = true;
10912
+                }
10913
+                
1091210914                 if (keyon)
1091310915                 {
1091410916                     repaint();
....@@ -11506,7 +11508,8 @@
1150611508                 {
1150711509                     boolean vr = capsLocked && !lightMode;
1150811510                     
11509
-                    glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 2 : 1), ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11511
+                    glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
11512
+                            ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
1151011513                 }
1151111514             }
1151211515 
....@@ -11862,8 +11865,11 @@
1186211865             repaint();
1186311866         }
1186411867         
11865
-        if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
11868
+        if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
11869
+        {
11870
+            renderCamera.computeTransform();
1186611871             repaint();
11872
+        }
1186711873         
1186811874         displaydone = true;
1186911875     }
....@@ -11938,9 +11944,23 @@
1193811944         //GL gl = getGL();
1193911945         if ((TRACK || SHADOWTRACK) || zoomonce)
1194011946         {
11947
+        if (TRACK)
11948
+        {
11949
+            if (object.selection != null &&
11950
+                object.selection.size() > 0 &&
11951
+                object.selection.elementAt(0) != null &&
11952
+                !(object.selection.elementAt(0) instanceof Camera) &&
11953
+                !(object.selection.elementAt(0) instanceof ScriptNode))
11954
+            {
11955
+                trackedobject = object.selection.elementAt(0);
11956
+                //repaint();
11957
+            }
11958
+            else
11959
+                trackedobject = null;
11960
+        }
1194111961             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1194211962                 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11943
-            pingthread.StepToTarget(true); // true);
11963
+            pingthread.StepToTarget(); // true);
1194411964        //     zoomonce = false;
1194511965         }
1194611966 
....@@ -14321,10 +14341,13 @@
1432114341     public void mouseClicked(MouseEvent e)
1432214342     {
1432314343         System.out.println("mouseClicked: " + e);
14344
+        System.exit(0);
1432414345     }
1432514346 
1432614347     public void mousePressed(MouseEvent e)
1432714348     {
14349
+        RigidBody.justclicked = true;
14350
+        System.out.println("justclicked: " + e);
1432814351         //System.out.println("mousePressed: " + e);
1432914352         clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1433014353     }
....@@ -14405,7 +14428,7 @@
1440514428         //}
1440614429         
1440714430         SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
14408
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
14431
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
1440914432         anchorX = ax;
1441014433         anchorY = ay;
1441114434         prevX = px;
....@@ -14500,8 +14523,9 @@
1450014523 // fev 2014???
1450114524             if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
1450214525                 object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14503
-            pingthread.StepToTarget(true); // true);
14526
+            pingthread.StepToTarget(); // true);
1450414527         }
14528
+        
1450514529     //    if (!LIVE)
1450614530             super.repaint();
1450714531     }
....@@ -14596,8 +14620,8 @@
1459614620         
1459714621         //if (drawing)
1459814622         //return;
14599
-        if ((e.getModifiersEx() & CTRL) != 0
14600
-            || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14623
+        if ((e.getModifiersEx() & CTRL) != 0 ||
14624
+            (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1460114625         {
1460214626             //System.out.println("mouseDragged: " + e);
1460314627             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
....@@ -14621,9 +14645,15 @@
1462114645             return targetLookAt;
1462214646     }
1462314647 
14648
+        javax.vecmath.Point3d eye = new javax.vecmath.Point3d();
14649
+        javax.vecmath.Point3d eye2 = new javax.vecmath.Point3d();
14650
+        javax.vecmath.Vector3d dir = new javax.vecmath.Vector3d();
14651
+
14652
+                
1462414653     class PingThread extends Thread
1462514654     {
1462614655         boolean jump;
14656
+        boolean live;
1462714657         
1462814658         boolean mute;
1462914659         
....@@ -14641,8 +14671,87 @@
1464114671         // only one thread!? synchronized
1464214672                 void StepToTarget(boolean jump)
1464314673         {
14674
+            RigidBody.pos.x = 0;
14675
+            RigidBody.pos.y = 0;
14676
+            RigidBody.pos.z = 0;
14677
+            if (RigidBody.justclicked)
14678
+            {
14679
+                RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
+                RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
+                RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
+                RigidBody.wind.set(RigidBody.pos);
14683
+                RigidBody.wind.x -= (float)manipCamera.location.x;
14684
+                RigidBody.wind.y -= (float)manipCamera.location.y;
14685
+                RigidBody.wind.z -= (float)manipCamera.location.z;
14686
+                RigidBody.wind.normalize();
14687
+            }
14688
+                    
1464414689             if (mute)
1464514690                 return;
14691
+            
14692
+            if (capsLocked && manipCamera.viewCode == 0)
14693
+            {
14694
+                eye.x = manipCamera.location.x;
14695
+                eye.y = manipCamera.location.y + 0.25;
14696
+                eye.z = manipCamera.location.z;
14697
+
14698
+                dir.y = -1;
14699
+
14700
+                Ray ray = new Ray(eye, dir);
14701
+
14702
+                IntersectResult res = new IntersectResult();
14703
+                res.t = Double.POSITIVE_INFINITY;
14704
+
14705
+                tmp.set(targetLookAt);
14706
+                tmp.sub(manipCamera.location);
14707
+                
14708
+                double dist = tmp.length();
14709
+                
14710
+                tmp.normalize();
14711
+                    
14712
+                eye2.x = manipCamera.location.x + tmp.x * 0.25;
14713
+                eye2.y = manipCamera.location.y + 0.25;
14714
+                eye2.z = manipCamera.location.z + tmp.z * 0.25;
14715
+
14716
+                Ray ray2 = new Ray(eye2, dir);
14717
+
14718
+                IntersectResult res2 = new IntersectResult();
14719
+                res2.t = Double.POSITIVE_INFINITY;
14720
+
14721
+                if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
14722
+                {
14723
+                    //tmp.set(manipCamera.location);
14724
+
14725
+                    manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
14726
+                    manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
14727
+                    manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
14728
+
14729
+                    //tmp.sub(manipCamera.location);
14730
+
14731
+                    targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
14732
+                    targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
14733
+                    targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
14734
+                    
14735
+                    targetLookAt.sub(manipCamera.location);
14736
+                    targetLookAt.normalize();
14737
+                    targetLookAt.mul(dist);
14738
+                    targetLookAt.add(manipCamera.location);
14739
+                    
14740
+                    //if (tmp.dot(tmp) > 0.000001)
14741
+                    //    System.out.println("INTERSECTION " + manipCamera.location);
14742
+
14743
+                    manipCamera.lookAt.set(targetLookAt);
14744
+                    
14745
+                    tmp.x = res.n.x;
14746
+                    tmp.y = res.n.y;
14747
+                    tmp.z = res.n.z;
14748
+                    tmp.x += res2.n.x;
14749
+                    tmp.y += res2.n.y;
14750
+                    tmp.z += res2.n.z;
14751
+                    tmp.normalize();
14752
+                    manipCamera.UP.set(tmp);
14753
+                }
14754
+            }
1464614755             
1464714756             tmp.set(targetLookAt);
1464814757             tmp.sub(manipCamera.lookAt); // june 2014
....@@ -14681,7 +14790,7 @@
1468114790                 
1468214791                 if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
1468314792                 {
14684
-                    jump = true; // step = 1;
14793
+                    // sep 2019 jump = true; // step = 1;
1468514794                 }
1468614795                 
1468714796                 if (OEILONCE && OEIL)
....@@ -14716,7 +14825,10 @@
1471614825                 if (tmp.dot(tmp) < 0.00001)
1471714826                 {
1471814827                     zoomonce = false;
14828
+                    live = false;
1471914829                 }
14830
+                else
14831
+                    live = true;
1472014832                 
1472114833                 tmp.mul(step > step2 ? step : step2);
1472214834             }
....@@ -14743,7 +14855,7 @@
1474314855             {
1474414856                 if (LOOKAT)
1474514857                     manipCamera.lookAt.add(tmp);
14746
-                if (OEIL)
14858
+                if (OEIL && !capsLocked)
1474714859                     manipCamera.location.add(tmp);
1474814860                 
1474914861                 {
....@@ -14758,7 +14870,10 @@
1475814870                     lightCamera.computeTransform();
1475914871                     }
1476014872                 }
14761
-                manipCamera.computeTransform();
14873
+                if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14874
+                {
14875
+                    manipCamera.computeTransform();
14876
+                }
1476214877             }
1476314878 // ??????            mouseDown = true;
1476414879             //System.out.println("----------------   ----------      Paint " + tmp.length2());
....@@ -14855,8 +14970,28 @@
1485514970     PingThread pingthread = new PingThread();
1485614971     int delta = 1;
1485714972     int speed = 1;
14973
+    int walk = 8;
1485814974     boolean autorepeat = false;
1485914975 
14976
+    void Walk()
14977
+    {
14978
+        manipCamera.BackForth(0, walk, 1000);
14979
+        
14980
+        targetLookAt.set(manipCamera.lookAt);
14981
+    }
14982
+    
14983
+    void ViewAngle(float dy)
14984
+    {
14985
+        double factor = Math.exp(-dy/300.0); // (1 + dy/100);
14986
+                    
14987
+        if (manipCamera.shaper_fovy * factor > 1 &&
14988
+            manipCamera.shaper_fovy * factor < 150)
14989
+        {
14990
+            manipCamera.shaper_fovy *= factor;
14991
+            //System.out.println("fovy = " + shaper_fovy);
14992
+        }
14993
+    }
14994
+    
1486014995     void GoDown(int mod)
1486114996     {
1486214997         MODIFIERS |= COMMAND;
....@@ -14867,6 +15002,9 @@
1486715002 //            if (isVR)
1486815003 //                manipCamera.RotateInterest(0, speed);
1486915004 //            else
15005
+            if (isVR)
15006
+                ViewAngle(-speed*delta);
15007
+            else
1487015008                 manipCamera.Translate(0, -speed*delta, getWidth());
1487115009         }
1487215010         else
....@@ -14894,6 +15032,8 @@
1489415032 
1489515033     void GoUp(int mod)
1489615034     {
15035
+                RigidBody.justclicked = true;
15036
+        
1489715037         MODIFIERS |= COMMAND;
1489815038         /**/
1489915039         boolean isVR = (mouseMode&VR)!=0;
....@@ -14903,6 +15043,9 @@
1490315043 //            if (isVR)
1490415044 //                manipCamera.RotateInterest(0, -speed);
1490515045 //            else
15046
+            if (isVR)
15047
+                ViewAngle(speed*delta);
15048
+            else
1490615049                 manipCamera.Translate(0, speed*delta, getWidth());
1490715050         }
1490815051         else
....@@ -14933,13 +15076,13 @@
1493315076         MODIFIERS |= COMMAND;
1493415077         /**/
1493515078         if((mod&SHIFT) == SHIFT)
14936
-            manipCamera.Translate(speed*delta, 0, getWidth());
15079
+            manipCamera.Translate(speed, 0, getWidth());
1493715080         else
1493815081         {
1493915082             if ((mouseMode&VR)!=0)
14940
-                manipCamera.RotateInterest(-speed, 0);
15083
+                manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
1494115084             else
14942
-                manipCamera.RotatePosition(speed, 0);
15085
+                manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
1494315086         }
1494415087         
1494515088         /**/
....@@ -14965,13 +15108,13 @@
1496515108         MODIFIERS |= COMMAND;
1496615109         /**/
1496715110         if((mod&SHIFT) == SHIFT)
14968
-            manipCamera.Translate(-speed*delta, 0, getWidth());
15111
+            manipCamera.Translate(-speed, 0, getWidth());
1496915112         else
1497015113         {
1497115114             if ((mouseMode&VR)!=0)
14972
-                manipCamera.RotateInterest(speed, 0);
15115
+                manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
1497315116             else
14974
-                manipCamera.RotatePosition(-speed, 0);
15117
+                manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
1497515118         }
1497615119         
1497715120         /**/
....@@ -15118,6 +15261,11 @@
1511815261                 if ((mouseMode & ZOOM) != 0)
1511915262                 {
1512015263                     //if ((mouseMode & BACKFORTH) != 0)
15264
+                    if ((modifiersex & SHIFT) == SHIFT)
15265
+                    {
15266
+                        ViewAngle(dy);
15267
+                    }
15268
+                    else
1512115269                     if ((mouseMode & VR) != 0)
1512215270                         manipCamera.BackForth(dx, dy, getWidth());
1512315271                     else
....@@ -15188,6 +15336,9 @@
1518815336         
1518915337     public void mouseMoved(MouseEvent e)
1519015338     {
15339
+//object.editWindow.frame.
15340
+        setCursor(Cursor.getDefaultCursor());
15341
+
1519115342         //System.out.println("mouseMoved: " + e);
1519215343         if (isRenderer)
1519315344             return;
....@@ -15432,8 +15583,18 @@
1543215583     float SATPOW = 1; // 2; // 0.5f;
1543315584     float BRIPOW = 1; // 0.5f; // 0.5f;
1543415585     
15586
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
15587
+
15588
+// Create a new blank cursor.
15589
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
15590
+    cursorImg, new Point(0, 0), "blank cursor");
15591
+    
1543515592     public void keyPressed(int key)
1543615593     {
15594
+// Set the blank cursor to the JFrame.
15595
+//object.editWindow.frame.
15596
+        setCursor(blankCursor);
15597
+
1543715598         if (key >= '0' && key <= '5')
1543815599             clampbit = (key-'0');
1543915600         
....@@ -15750,6 +15911,16 @@
1575015911                 break;
1575115912             case 'l':
1575215913                 lightMode ^= true;
15914
+                if (lightMode)
15915
+                {
15916
+                    keepshadow = Globals.RENDERSHADOW;
15917
+                    Globals.RENDERSHADOW = false;
15918
+                }
15919
+                else
15920
+                {
15921
+                    Globals.RENDERSHADOW = keepshadow;
15922
+                }
15923
+        
1575315924                 Globals.lighttouched = true;
1575415925                 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
1575515926                 targetLookAt.set(manipCamera.lookAt);
....@@ -15799,6 +15970,10 @@
1579915970             case ENTER:
1580015971                 // object.editWindow.ScreenFit(); // Edit();
1580115972                 ToggleLive();
15973
+                if (capsLocked)
15974
+                {
15975
+                    Globals.WALK ^= true;
15976
+                }
1580215977                 break;
1580315978             case DELETE:
1580415979                 ClearSelection();
....@@ -15835,17 +16010,23 @@
1583516010                     object.GetWindow().refreshContents(true);
1583616011                 break;
1583716012             case '{':
15838
-                manipCamera.shaper_fovy /= 1.1;
16013
+                double factor = 1.1;
16014
+                if (manipCamera.shaper_fovy / factor > 0.1)
16015
+                    manipCamera.shaper_fovy /= factor;
1583916016                 System.out.println("FOV = " + manipCamera.shaper_fovy);
1584016017                 repaint();
1584116018                 break;
1584216019             case '}':
15843
-                manipCamera.shaper_fovy *= 1.1;
16020
+                factor = 1.1;
16021
+                if (manipCamera.shaper_fovy * factor < 150)
16022
+                    manipCamera.shaper_fovy *= factor;
1584416023                 System.out.println("FOV = " + manipCamera.shaper_fovy);
1584516024                 repaint();
1584616025                 break;
1584716026             case '[':
15848
-                manipCamera.shaper_fovy /= 1.01;
16027
+                factor = 1.01;
16028
+                if (manipCamera.shaper_fovy / factor > 0.1)
16029
+                    manipCamera.shaper_fovy /= factor;
1584916030                 if (false) //manipCamera.hAspect == 0)
1585016031                 {
1585116032                     double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -15861,7 +16042,9 @@
1586116042                 break;
1586216043             case ']':
1586316044                 //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15864
-                manipCamera.shaper_fovy *= 1.01;
16045
+                factor = 1.01;
16046
+                if (manipCamera.shaper_fovy * factor < 150)
16047
+                    manipCamera.shaper_fovy *= factor;
1586516048                 if (false) //manipCamera.hAspect == 0)
1586616049                 {
1586716050                     double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
....@@ -16581,7 +16764,8 @@
1658116764 
1658216765     public boolean mouseDrag(Event evt, int x, int y)
1658316766     {
16584
-        //System.out.println("mouseDrag: " + evt);
16767
+        System.out.println("mouseDrag: " + evt);
16768
+        System.exit(0);
1658516769 		/*
1658616770         drag = true;
1658716771         //System.out.println("Mouse DRAG");
....@@ -16700,6 +16884,7 @@
1670016884     public boolean mouseUp(Event evt, int x, int y)
1670116885     {
1670216886         System.out.println("mouseUp: " + evt);
16887
+        System.exit(0);
1670316888         /*
1670416889         locked = false;
1670516890         if (isRenderer)
....@@ -17407,7 +17592,7 @@
1740717592 
1740817593             float depth = depths[y * TEX_SIZE + x];
1740917594 
17410
-            if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
17595
+            if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
1741117596             {
1741217597                 pointselection = false;
1741317598                 
....@@ -18072,7 +18257,9 @@
1807218257     boolean OCCLUSION_CULLING = false; //true;
1807318258     public boolean lightMode = false;
1807418259     
18075
-    public boolean capsLocked = false; // VR
18260
+    private boolean keepshadow;
18261
+    
18262
+    static public boolean capsLocked = false; // VR
1807618263     
1807718264     static public int indexcount = 0;
1807818265     /*static*/ cColor vertexOcclusion = new cColor();