Full-screen mode.

Normand Briere

2019-06-23 8088590686a45e71278f9a52bb9cc37943dc0c37

 Object3D.java
..
..
@@ -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;
..
..
@@ -2386,6 +2387,10 @@
2386
2387
         }
2387
2388
          */
2388
2389
         }
2390
+        else
2391
+        {
2392
+            //((ObjEditor)editWindow).SetupUI2(null);
2393
+        }
2389
2394
     }
2390
2395
 
2391
2396
     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..
..
@@ -3503,7 +3508,8 @@
3503
3508
         if (blockloop)
3504
3509
             return;
3505
3510
         
3506
-        if (marked || (bRep != null && material != null)) // borderline...
3511
+        if (//marked || // does not make sense
3512
+                (bRep != null || material != null)) // borderline...
3507
3513
             live = h;
3508
3514
         
3509
3515
         for (int i = 0; i < Size(); i++)
..
..
@@ -3524,7 +3530,8 @@
3524
3530
             return;
3525
3531
         
3526
3532
         //if (bRep != null)
3527
-        if (marked || (bRep != null && material != null)) // borderline...
3533
+        if (//marked || // does not make sense
3534
+                (bRep != null || material != null)) // borderline...
3528
3535
             link2master = h;
3529
3536
         
3530
3537
         for (int i = 0; i < Size(); i++)
..
..
@@ -3544,7 +3551,8 @@
3544
3551
         if (blockloop)
3545
3552
             return;
3546
3553
         
3547
-        if (marked || (bRep != null && material != null)) // borderline...
3554
+        if (//marked || // does not make sense
3555
+                (bRep != null || material != null)) // borderline...
3548
3556
             hide = h;
3549
3557
         
3550
3558
         for (int i = 0; i < Size(); i++)
..
..
@@ -3564,7 +3572,7 @@
3564
3572
         if (blockloop)
3565
3573
             return;
3566
3574
         
3567
-        if (bRep != null && material != null) // borderline...
3575
+        if (bRep != null || material != null) // borderline...
3568
3576
             marked = h;
3569
3577
         
3570
3578
         for (int i = 0; i < Size(); i++)
..
..
@@ -3574,6 +3582,46 @@
3574
3582
                 continue;
3575
3583
             blockloop = true;
3576
3584
             child.MarkLeaves(h);
3585
+            blockloop = false;
3586
+         //   release(i);
3587
+        }
3588
+    }
3589
+    
3590
+    void RewindLeaves(boolean h)
3591
+    {
3592
+        if (blockloop)
3593
+            return;
3594
+        
3595
+        if (bRep != null || material != null) // borderline...
3596
+            rewind = h;
3597
+        
3598
+        for (int i = 0; i < Size(); i++)
3599
+        {
3600
+            Object3D child = (Object3D) get(i); // reserve(i);
3601
+            if (child == null)
3602
+                continue;
3603
+            blockloop = true;
3604
+            child.RewindLeaves(h);
3605
+            blockloop = false;
3606
+         //   release(i);
3607
+        }
3608
+    }
3609
+    
3610
+    void RandomLeaves(boolean h)
3611
+    {
3612
+        if (blockloop)
3613
+            return;
3614
+        
3615
+        if (bRep != null || material != null) // borderline...
3616
+            random = h;
3617
+        
3618
+        for (int i = 0; i < Size(); i++)
3619
+        {
3620
+            Object3D child = (Object3D) get(i); // reserve(i);
3621
+            if (child == null)
3622
+                continue;
3623
+            blockloop = true;
3624
+            child.RandomLeaves(h);
3577
3625
             blockloop = false;
3578
3626
          //   release(i);
3579
3627
         }
..
..
@@ -6317,6 +6365,11 @@
6317
6365
                 return;
6318
6366
             }
6319
6367
             
6368
+            if (dontselect)
6369
+            {
6370
+                //bRep.GenerateNormalsMINE();
6371
+            }
6372
+            
6320
6373
             display.DrawGeometry(bRep, flipV, selectmode);
6321
6374
         } else // catch (Error e)
6322
6375
         {
..
..
@@ -7752,6 +7805,10 @@
7752
7805
             editWindow = null;
7753
7806
         } // ?
7754
7807
         }
7808
+        else
7809
+        {
7810
+            //editWindow.closeUI();
7811
+        }
7755
7812
     }
7756
7813
     
7757
7814
     boolean root; // patch for edit windows