Fix perfo Venice (shadow).

Normand Briere

2019-06-27 1807e7752960ac229cddd34b100e92cadbac9459

 CameraPane.java
..
..
@@ -335,14 +335,28 @@
335
335
                     display.options1[2] = material.shadowbias;
336
336
                     display.options1[3] = material.aniso;
337
337
                     display.options1[4] = material.anisoV;
338
+//                System.out.println("display.options1[0] " + display.options1[0]);
339
+//                System.out.println("display.options1[1] " + display.options1[1]);
340
+//                System.out.println("display.options1[2] " + display.options1[2]);
341
+//                System.out.println("display.options1[3] " + display.options1[3]);
342
+//                System.out.println("display.options1[4] " + display.options1[4]);
338
343
                     display.options2[0] = material.opacity;
339
344
                     display.options2[1] = material.diffuse;
340
345
                     display.options2[2] = material.factor;
346
+//                System.out.println("display.options2[0] " + display.options2[0]);
347
+//                System.out.println("display.options2[1] " + display.options2[1]);
348
+//                System.out.println("display.options2[2] " + display.options2[2]);
341
349
 
342
350
                     cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
351
+//                System.out.println("display.options3[0] " + display.options3[0]);
352
+//                System.out.println("display.options3[1] " + display.options3[1]);
353
+//                System.out.println("display.options3[2] " + display.options3[2]);
343
354
                     display.options4[0] = material.cameralight/0.2f;
344
355
                     display.options4[1] = material.subsurface;
345
356
                     display.options4[2] = material.sheen;
357
+//                System.out.println("display.options4[0] " + display.options4[0]);
358
+//                System.out.println("display.options4[1] " + display.options4[1]);
359
+//                System.out.println("display.options4[2] " + display.options4[2]);
346
360
                     
347
361
                  //   if (display.CURRENTANTIALIAS > 0)
348
362
                  //       display.options3[3] /= 4;
..
..
@@ -9366,11 +9380,35 @@
9366
9380
         jy8[3] = 0.5f;
9367
9381
     }
9368
9382
     
9369
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9383
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9370
9384
     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9371
9385
     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9372
9386
     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9373
9387
 
9388
+    void ResetOptions()
9389
+    {
9390
+        options1[0] = 100;
9391
+        options1[1] = 0.025f;
9392
+        options1[2] = 0.01f;
9393
+        options1[3] = 0;
9394
+        options1[4] = 0;
9395
+        
9396
+        options2[0] = 0;
9397
+        options2[1] = 0.75f;
9398
+        options2[2] = 0;
9399
+        options2[3] = 0;
9400
+        
9401
+        options3[0] = 1;
9402
+        options3[1] = 1;
9403
+        options3[2] = 1;
9404
+        options3[3] = 0;
9405
+        
9406
+        options4[0] = 1;
9407
+        options4[1] = 0;
9408
+        options4[2] = 1;
9409
+        options4[3] = 0;
9410
+    }
9411
+    
9374
9412
     static int imagecount = 0; // movie generation
9375
9413
     
9376
9414
     static int jitter = 0;
..
..
@@ -10481,6 +10519,7 @@
10481
10519
                     ANTIALIAS = 0;
10482
10520
                     //System.out.println("RESTART");
10483
10521
                     AAtimer.restart();
10522
+                    Globals.TIMERRUNNING = true;
10484
10523
                 }
10485
10524
             }
10486
10525
         }
..
..
@@ -11479,6 +11518,9 @@
11479
11518
     
11480
11519
     void DrawObject(GL gl, boolean draw)
11481
11520
     {
11521
+        // To clear camera values
11522
+        ResetOptions();
11523
+        
11482
11524
         //System.out.println("DRAW OBJECT " + mouseDown);
11483
11525
 //        DrawMode() = SELECTION;
11484
11526
         //GL gl = getGL();
..
..
@@ -12046,7 +12088,7 @@
12046
12088
             for (int i = tp.size(); --i >= 0;)
12047
12089
             {
12048
12090
                 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12049
-                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12091
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12050
12092
             }
12051
12093
 
12052
12094
 
..
..
@@ -13840,6 +13882,7 @@
13840
13882
         else
13841
13883
         if (evt.getSource() == AAtimer)
13842
13884
         {
13885
+                    Globals.TIMERRUNNING = false;
13843
13886
             if (mouseDown)
13844
13887
             {
13845
13888
             //new Exception().printStackTrace();
..
..
@@ -13914,6 +13957,7 @@
13914
13957
             return;
13915
13958
         
13916
13959
         AAtimer.restart(); // 
13960
+        Globals.TIMERRUNNING = true;
13917
13961
 
13918
13962
 //        waslive = LIVE;
13919
13963
 //        LIVE = false;
..
..
@@ -16739,6 +16783,11 @@
16739
16783
                 //System.out.println("objects[color] = " + objects[color]);
16740
16784
                 //objects[color].Select();
16741
16785
                 indexcount = 0;
16786
+                    ObjEditor window = object.GetWindow();
16787
+                    if (window != null && deselect)
16788
+                    {
16789
+                        window.Select(null, deselect, true);
16790
+                    }
16742
16791
                 object.Select(color, deselect);
16743
16792
             }
16744
16793