Fix camera values

Normand Briere

2019-06-25 21104baa536c6b3d3d0f9ecb7231222ed706f0e8

 CameraPane.java
..
..
@@ -9366,11 +9366,35 @@
9366
9366
         jy8[3] = 0.5f;
9367
9367
     }
9368
9368
     
9369
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9369
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9370
9370
     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9371
9371
     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9372
9372
     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9373
9373
 
9374
+    void ResetOptions()
9375
+    {
9376
+        options1[0] = 100;
9377
+        options1[1] = 0.00001f;
9378
+        options1[2] = 20;
9379
+        options1[3] = 0;
9380
+        options1[4] = 0;
9381
+        
9382
+        options2[0] = 0;
9383
+        options2[1] = 1;
9384
+        options2[2] = 0;
9385
+        options2[3] = 0;
9386
+        
9387
+        options3[0] = 1;
9388
+        options3[1] = 1;
9389
+        options3[2] = 1;
9390
+        options3[3] = 0;
9391
+        
9392
+        options4[0] = 1;
9393
+        options4[1] = 0;
9394
+        options4[2] = 1;
9395
+        options4[3] = 0;
9396
+    }
9397
+    
9374
9398
     static int imagecount = 0; // movie generation
9375
9399
     
9376
9400
     static int jitter = 0;
..
..
@@ -10481,6 +10505,7 @@
10481
10505
                     ANTIALIAS = 0;
10482
10506
                     //System.out.println("RESTART");
10483
10507
                     AAtimer.restart();
10508
+                    Globals.TIMERRUNNING = true;
10484
10509
                 }
10485
10510
             }
10486
10511
         }
..
..
@@ -11459,7 +11484,7 @@
11459
11484
 
11460
11485
     static boolean zoomonce = false;
11461
11486
     
11462
-    void CreateSelectedPoint()
11487
+    static void CreateSelectedPoint()
11463
11488
     {
11464
11489
         if (selectedpoint == null)
11465
11490
         {
..
..
@@ -11479,6 +11504,9 @@
11479
11504
     
11480
11505
     void DrawObject(GL gl, boolean draw)
11481
11506
     {
11507
+        // To clear camera values
11508
+        ResetOptions();
11509
+        
11482
11510
         //System.out.println("DRAW OBJECT " + mouseDown);
11483
11511
 //        DrawMode() = SELECTION;
11484
11512
         //GL gl = getGL();
..
..
@@ -12046,7 +12074,7 @@
12046
12074
             for (int i = tp.size(); --i >= 0;)
12047
12075
             {
12048
12076
                 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12049
-                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12077
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12050
12078
             }
12051
12079
 
12052
12080
 
..
..
@@ -13840,6 +13868,7 @@
13840
13868
         else
13841
13869
         if (evt.getSource() == AAtimer)
13842
13870
         {
13871
+                    Globals.TIMERRUNNING = false;
13843
13872
             if (mouseDown)
13844
13873
             {
13845
13874
             //new Exception().printStackTrace();
..
..
@@ -13914,6 +13943,7 @@
13914
13943
             return;
13915
13944
         
13916
13945
         AAtimer.restart(); // 
13946
+        Globals.TIMERRUNNING = true;
13917
13947
 
13918
13948
 //        waslive = LIVE;
13919
13949
 //        LIVE = false;
..
..
@@ -14377,7 +14407,8 @@
14377
14407
                 info.camera = renderCamera;
14378
14408
                 info.x = x;
14379
14409
                 info.y = y;
14380
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14410
+                object.GetWindow().copy
14411
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14381
14412
             } else
14382
14413
             {
14383
14414
                 if (x < startX)
..
..
@@ -14541,9 +14572,9 @@
14541
14572
         ci.camera = renderCamera;
14542
14573
         if (!isRenderer)
14543
14574
         {
14544
-            ObjEditor editWindow = object.editWindow;
14545
-            Object3D copy = editWindow.copy;
14546
-            if (copy.doEditClick(ci, 0))
14575
+            //ObjEditor editWindow = object.editWindow;
14576
+            //Object3D copy = editWindow.copy;
14577
+            if (object.doEditClick(ci, 0))
14547
14578
             {
14548
14579
                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14549
14580
             } else
..
..
@@ -15377,7 +15408,7 @@
15377
15408
         }
15378
15409
          */
15379
15410
 
15380
-        object.editWindow.EditSelection();
15411
+        object.editWindow.EditSelection(false);
15381
15412
     }
15382
15413
 
15383
15414
     void SelectParent()
..
..
@@ -16622,6 +16653,8 @@
16622
16653
 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16623
16654
 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
16624
16655
                 
16656
+                CreateSelectedPoint();
16657
+                
16625
16658
                 // Will fit the mesh !!!
16626
16659
                 selectedpoint.toParent[0][0] = 0.0001;
16627
16660
                 selectedpoint.toParent[1][1] = 0.0001;