Fix info panel.

Normand Briere

2019-06-16 372b7fd481a476cd659713a4a01bf28bf6760cbe

 Object3D.java
..
..
@@ -174,7 +174,7 @@
174
174
         {
175
175
             Object3D o = hashtable.get(GetUUID());
176
176
 
177
-            assert(this.bRep == o.bRep);
177
+            Grafreed.Assert(this.bRep == o.bRep);
178
178
             if (this.bRep != null)
179
179
                 assert(this.bRep.support == o.transientrep);
180
180
 
..
..
@@ -563,12 +563,14 @@
563
563
             toParent = LA.newMatrix();
564
564
             fromParent = LA.newMatrix();
565
565
         }
566
+        
566
567
         if (toParentMarked == null)
567
568
         {
568
569
             if (maxcount != 1)
569
570
             {
570
571
                 new Exception().printStackTrace();
571
572
             }
573
+            
572
574
             toParentMarked = LA.newMatrix();
573
575
             fromParentMarked = LA.newMatrix();
574
576
         }
..
..
@@ -5572,12 +5574,23 @@
5572
5574
     boolean NeedSupport()
5573
5575
     {
5574
5576
         return
5575
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5577
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
5576
5578
                  // PROBLEM with CROWD!!
5577
5579
                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
5578
5580
     }
5579
5581
     
5580
5582
     static boolean DEBUG_SELECTION = false;
5583
+    
5584
+    boolean IsLive()
5585
+    {
5586
+        if (live)
5587
+            return true;
5588
+        
5589
+        if (parent == null)
5590
+            return false;
5591
+        
5592
+        return parent.IsLive();
5593
+    }
5581
5594
     
5582
5595
     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5583
5596
     {
..
..
@@ -5640,7 +5653,7 @@
5640
5653
             support = support;
5641
5654
         
5642
5655
         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5643
-        boolean usecalllists = false; // 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);
5644
5657
         
5645
5658
         if (!usecalllists && bRep != null && bRep.displaylist > 0)
5646
5659
         {
..
..
@@ -7089,7 +7102,7 @@
7089
7102
             spot.translate(32, 32);
7090
7103
             spotw = spot.x + spot.width;
7091
7104
             spoth = spot.y + spot.height;
7092
-            info.g.setColor(Color.blue);
7105
+            info.g.setColor(Color.cyan);
7093
7106
             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7094
7107
 //            if (CameraPane.Xmin > spot.x)
7095
7108
 //            {
..
..
@@ -7107,11 +7120,12 @@
7107
7120
 //            {
7108
7121
 //                CameraPane.Ymax = spoth;
7109
7122
 //            }
7110
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7123
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7124
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7112
7125
             spot.translate(0, -32);
7113
-            info.g.setColor(Color.green);
7126
+            info.g.setColor(Color.yellow);
7114
7127
             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7128
+            info.g.setColor(Color.green);
7115
7129
 //            if (CameraPane.Xmin > spot.x)
7116
7130
 //            {
7117
7131
 //                CameraPane.Xmin = spot.x;
..
..
@@ -7429,19 +7443,19 @@
7429
7443
                 switch (info.pane.RenderCamera().viewCode)
7430
7444
                 {
7431
7445
                     case 3: // '\001'
7432
-                        if (modified)
7446
+                        if (modified || opposite)
7433
7447
                         {
7434
7448
                             //LA.matScale(toParent, 1, hScale, vScale);
7435
7449
                             LA.matScale(toParent, totalScale, 1, 1);
7436
7450
                         } // vScale, 1);
7437
7451
                         else
7438
7452
                         {
7439
-                            LA.matScale(toParent, totalScale, totalScale, totalScale);
7453
+                            LA.matScale(toParent, 1, totalScale, totalScale);
7440
7454
                         } // vScale, 1);
7441
7455
                         break;
7442
7456
 
7443
7457
                     case 2: // '\002'
7444
-                        if (modified)
7458
+                        if (modified || opposite)
7445
7459
                         {
7446
7460
                             //LA.matScale(toParent, hScale, 1, vScale);
7447
7461
                             LA.matScale(toParent, 1, totalScale, 1);
..
..
@@ -7452,7 +7466,7 @@
7452
7466
                         break;
7453
7467
 
7454
7468
                     case 1: // '\003'
7455
-                        if (modified)
7469
+                        if (modified || opposite)
7456
7470
                         {
7457
7471
                             //LA.matScale(toParent, hScale, vScale, 1);
7458
7472
                             LA.matScale(toParent, 1, 1, totalScale);