From 7b6b5ba546450e71ecc812356952b594acc5add5 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 16 Jun 2019 12:44:54 -0400
Subject: [PATCH] Fix shadow touched.

---
 Object3D.java |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/Object3D.java b/Object3D.java
index d7a346f..23e2d98 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -174,7 +174,7 @@
         {
             Object3D o = hashtable.get(GetUUID());
 
-            assert(this.bRep == o.bRep);
+            Grafreed.Assert(this.bRep == o.bRep);
             if (this.bRep != null)
                 assert(this.bRep.support == o.transientrep);
 
@@ -563,12 +563,14 @@
             toParent = LA.newMatrix();
             fromParent = LA.newMatrix();
         }
+        
         if (toParentMarked == null)
         {
             if (maxcount != 1)
             {
                 new Exception().printStackTrace();
             }
+            
             toParentMarked = LA.newMatrix();
             fromParentMarked = LA.newMatrix();
         }
@@ -5572,12 +5574,23 @@
     boolean NeedSupport()
     {
         return
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
                  // PROBLEM with CROWD!!
                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
     }
     
     static boolean DEBUG_SELECTION = false;
+    
+    boolean IsLive()
+    {
+        if (live)
+            return true;
+        
+        if (parent == null)
+            return false;
+        
+        return parent.IsLive();
+    }
     
     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
     {
@@ -5640,7 +5653,7 @@
             support = support;
         
         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
-        boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
+        boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
         
         if (!usecalllists && bRep != null && bRep.displaylist > 0)
         {
@@ -5660,10 +5673,12 @@
         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
         
         if (!selectmode && //display.DrawMode() != display.SELECTION &&
-                (touched || (bRep != null && bRep.displaylist <= 0)))
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
+                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
         {
             Globals.lighttouched = true;
         } // all panes...
+        
         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
                 (touched || (bRep != null && bRep.displaylist <= 0)))
@@ -7089,7 +7104,7 @@
             spot.translate(32, 32);
             spotw = spot.x + spot.width;
             spoth = spot.y + spot.height;
-            info.g.setColor(Color.blue);
+            info.g.setColor(Color.cyan);
             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
 //            if (CameraPane.Xmin > spot.x)
 //            {
@@ -7107,11 +7122,12 @@
 //            {
 //                CameraPane.Ymax = spoth;
 //            }
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
             spot.translate(0, -32);
-            info.g.setColor(Color.green);
+            info.g.setColor(Color.yellow);
             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
+            info.g.setColor(Color.green);
 //            if (CameraPane.Xmin > spot.x)
 //            {
 //                CameraPane.Xmin = spot.x;
@@ -7429,19 +7445,19 @@
                 switch (info.pane.RenderCamera().viewCode)
                 {
                     case 3: // '\001'
-                        if (modified)
+                        if (modified || opposite)
                         {
                             //LA.matScale(toParent, 1, hScale, vScale);
                             LA.matScale(toParent, totalScale, 1, 1);
                         } // vScale, 1);
                         else
                         {
-                            LA.matScale(toParent, totalScale, totalScale, totalScale);
+                            LA.matScale(toParent, 1, totalScale, totalScale);
                         } // vScale, 1);
                         break;
 
                     case 2: // '\002'
-                        if (modified)
+                        if (modified || opposite)
                         {
                             //LA.matScale(toParent, hScale, 1, vScale);
                             LA.matScale(toParent, 1, totalScale, 1);
@@ -7452,7 +7468,7 @@
                         break;
 
                     case 1: // '\003'
-                        if (modified)
+                        if (modified || opposite)
                         {
                             //LA.matScale(toParent, hScale, vScale, 1);
                             LA.matScale(toParent, 1, 1, totalScale);

--
Gitblit v1.6.2