Compute shadow when live option.

Normand Briere

2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253

 Object3D.java
..
..
@@ -881,7 +881,7 @@
881
881
         
882
882
         if (marked && Globals.isLIVE() && live &&
883
883
                 //TEMP21aug2018
884
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
884
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
885
885
                 currentframe != Globals.framecount)
886
886
         {
887
887
             currentframe = Globals.framecount;
..
..
@@ -893,7 +893,8 @@
893
893
             
894
894
             boolean changedir = random && Math.random() < 0.01; // && !link2master;
895
895
 
896
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
896
+            if (transformcount*factor >= maxcount && (rewind || random) ||
897
+                    (step == 1 && changedir))
897
898
             {
898
899
                 countdown = 1;
899
900
                 delay = speedup?8:1;
..
..
@@ -965,6 +966,7 @@
965
966
         if (material == null || material.multiply)
966
967
             return true;
967
968
         
969
+        // Transparent objects are dynamic because we have to sort the triangles.
968
970
         return material.opacity > 0.99;
969
971
     }
970
972
     
..
..
@@ -2386,6 +2388,10 @@
2386
2388
         }
2387
2389
          */
2388
2390
         }
2391
+        else
2392
+        {
2393
+            //((ObjEditor)editWindow).SetupUI2(null);
2394
+        }
2389
2395
     }
2390
2396
 
2391
2397
     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..
..
@@ -3503,7 +3509,8 @@
3503
3509
         if (blockloop)
3504
3510
             return;
3505
3511
         
3506
-        if (marked || (bRep != null && material != null)) // borderline...
3512
+        if (//marked || // does not make sense
3513
+                (bRep != null || material != null)) // borderline...
3507
3514
             live = h;
3508
3515
         
3509
3516
         for (int i = 0; i < Size(); i++)
..
..
@@ -3524,7 +3531,8 @@
3524
3531
             return;
3525
3532
         
3526
3533
         //if (bRep != null)
3527
-        if (marked || (bRep != null && material != null)) // borderline...
3534
+        if (//marked || // does not make sense
3535
+                (bRep != null || material != null)) // borderline...
3528
3536
             link2master = h;
3529
3537
         
3530
3538
         for (int i = 0; i < Size(); i++)
..
..
@@ -3544,7 +3552,8 @@
3544
3552
         if (blockloop)
3545
3553
             return;
3546
3554
         
3547
-        if (marked || (bRep != null && material != null)) // borderline...
3555
+        if (//marked || // does not make sense
3556
+                (bRep != null || material != null)) // borderline...
3548
3557
             hide = h;
3549
3558
         
3550
3559
         for (int i = 0; i < Size(); i++)
..
..
@@ -3564,7 +3573,7 @@
3564
3573
         if (blockloop)
3565
3574
             return;
3566
3575
         
3567
-        if (bRep != null && material != null) // borderline...
3576
+        if (bRep != null || material != null) // borderline...
3568
3577
             marked = h;
3569
3578
         
3570
3579
         for (int i = 0; i < Size(); i++)
..
..
@@ -3574,6 +3583,46 @@
3574
3583
                 continue;
3575
3584
             blockloop = true;
3576
3585
             child.MarkLeaves(h);
3586
+            blockloop = false;
3587
+         //   release(i);
3588
+        }
3589
+    }
3590
+    
3591
+    void RewindLeaves(boolean h)
3592
+    {
3593
+        if (blockloop)
3594
+            return;
3595
+        
3596
+        if (bRep != null || material != null) // borderline...
3597
+            rewind = h;
3598
+        
3599
+        for (int i = 0; i < Size(); i++)
3600
+        {
3601
+            Object3D child = (Object3D) get(i); // reserve(i);
3602
+            if (child == null)
3603
+                continue;
3604
+            blockloop = true;
3605
+            child.RewindLeaves(h);
3606
+            blockloop = false;
3607
+         //   release(i);
3608
+        }
3609
+    }
3610
+    
3611
+    void RandomLeaves(boolean h)
3612
+    {
3613
+        if (blockloop)
3614
+            return;
3615
+        
3616
+        if (bRep != null || material != null) // borderline...
3617
+            random = h;
3618
+        
3619
+        for (int i = 0; i < Size(); i++)
3620
+        {
3621
+            Object3D child = (Object3D) get(i); // reserve(i);
3622
+            if (child == null)
3623
+                continue;
3624
+            blockloop = true;
3625
+            child.RandomLeaves(h);
3577
3626
             blockloop = false;
3578
3627
          //   release(i);
3579
3628
         }
..
..
@@ -4347,6 +4396,55 @@
4347
4396
         {               
4348
4397
                 blockloop = true;
4349
4398
             get(i).RepairShadow();
4399
+                blockloop = false;
4400
+        }
4401
+    }
4402
+    
4403
+    void RepairSOV()
4404
+    {
4405
+        if (blockloop)
4406
+            return;
4407
+
4408
+        String texname = this.GetPigmentTexture();
4409
+        
4410
+        if (texname.startsWith("sov"))
4411
+        {
4412
+            String[] s = texname.split("/");
4413
+
4414
+            String[] sname = s[1].split("Color.pn");
4415
+            
4416
+            texname = sname[0];
4417
+            
4418
+            if (sname.length > 1)
4419
+            {
4420
+                texname += "Color.jpg";
4421
+            }
4422
+            
4423
+            this.SetPigmentTexture("sov/" + texname);
4424
+        }
4425
+                
4426
+        texname = this.GetBumpTexture();
4427
+        
4428
+        if (texname.startsWith("sov"))
4429
+        {
4430
+            String[] s = texname.split("/");
4431
+
4432
+            String[] sname = s[1].split("Bump.pn");
4433
+            
4434
+            texname = sname[0];
4435
+            
4436
+            if (sname.length > 1)
4437
+            {
4438
+                texname += "Bump.jpg";
4439
+            }
4440
+            
4441
+            this.SetBumpTexture("sov/" + texname);
4442
+        }
4443
+                
4444
+        for (int i=0; i<Size(); i++)
4445
+        {               
4446
+                blockloop = true;
4447
+            get(i).RepairSOV();
4350
4448
                 blockloop = false;
4351
4449
         }
4352
4450
     }
..
..
@@ -5653,7 +5751,7 @@
5653
5751
             support = support;
5654
5752
         
5655
5753
         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5656
-        boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5657
5755
         
5658
5756
         if (!usecalllists && bRep != null && bRep.displaylist > 0)
5659
5757
         {
..
..
@@ -5673,10 +5771,12 @@
5673
5771
         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
5674
5772
         
5675
5773
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5676
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5774
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5775
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && (bRep != null && bRep.displaylist <= 0)))
5677
5776
         {
5678
5777
             Globals.lighttouched = true;
5679
5778
         } // all panes...
5779
+        
5680
5780
         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5681
5781
         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5682
5782
                 (touched || (bRep != null && bRep.displaylist <= 0)))
..
..
@@ -5844,16 +5944,27 @@
5844
5944
         tex = GetTextures();
5845
5945
     }
5846
5946
 
5847
-    boolean failed = false;
5947
+    boolean failedPigment = false;
5948
+    boolean failedBump = false;
5848
5949
     
5849
5950
     try
5850
5951
     {
5851
-        display.BindTextures(tex, texres);
5952
+        display.BindPigmentTexture(tex, texres);
5852
5953
     }
5853
5954
     catch (Exception e)
5854
5955
     {
5855
5956
         System.err.println("FAILED: " + this);
5856
-        failed = true;
5957
+        failedPigment = true;
5958
+    }
5959
+           
5960
+    try
5961
+    {
5962
+        display.BindBumpTexture(tex, texres);
5963
+    }
5964
+    catch (Exception e)
5965
+    {
5966
+        //System.err.println("FAILED: " + this);
5967
+        failedBump = true;
5857
5968
     }
5858
5969
            
5859
5970
             if (!compiled)
..
..
@@ -5876,8 +5987,11 @@
5876
5987
                 }
5877
5988
             }
5878
5989
 
5879
-    if (!failed)
5880
-        display.ReleaseTextures(tex);
5990
+    if (!failedBump)
5991
+        display.ReleaseBumpTexture(tex);
5992
+
5993
+    if (!failedPigment)
5994
+        display.ReleasePigmentTexture(tex);
5881
5995
 
5882
5996
     display.PopMaterial(this, selected);
5883
5997
         }
..
..
@@ -6250,6 +6364,11 @@
6250
6364
                 // dec 2012
6251
6365
                 new Exception().printStackTrace();
6252
6366
                 return;
6367
+            }
6368
+            
6369
+            if (dontselect)
6370
+            {
6371
+                //bRep.GenerateNormalsMINE();
6253
6372
             }
6254
6373
             
6255
6374
             display.DrawGeometry(bRep, flipV, selectmode);
..
..
@@ -7450,7 +7569,8 @@
7450
7569
                         } // vScale, 1);
7451
7570
                         else
7452
7571
                         {
7453
-                            LA.matScale(toParent, 1, totalScale, totalScale);
7572
+                            // EXCEPTION!
7573
+                            LA.matScale(toParent, totalScale, totalScale, totalScale);
7454
7574
                         } // vScale, 1);
7455
7575
                         break;
7456
7576
 
..
..
@@ -7686,6 +7806,10 @@
7686
7806
             editWindow = null;
7687
7807
         } // ?
7688
7808
         }
7809
+        else
7810
+        {
7811
+            //editWindow.closeUI();
7812
+        }
7689
7813
     }
7690
7814
     
7691
7815
     boolean root; // patch for edit windows