Color/parallax

Normand Briere

2019-10-15 8f471ab58f8676229d29cde03aba3597d096cf84

Color/parallax

 ObjEditor.java
..
..
@@ -729,7 +729,7 @@
729
729
                 si.SendInfo("#children = " + sel.Size(), "regular");
730
730
             }
731
731
             si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
732
-            si.SendInfo((debug ? "    Complete path: " : "    ") + sel.GetPath(), "regular");
732
+            si.SendInfo((debug ? "    Path: " : "    ") + sel.GetPath(), "regular");
733
733
             si.SendInfo((debug ? "    Texture: " : "    ") + sel.GetTextures(), "bold");
734
734
             if (sel.GetTextures().pigmentdata != null)
735
735
                 si.SendInfo(" EMBEDDED ", "regular");
..
..
@@ -5457,7 +5457,7 @@
5457
5457
             if (!cNumberSlider.frozen)
5458
5458
             {
5459
5459
                 //System.out.println("Propagate = " + propagate);
5460
-                copy.UpdateMaterial(anchor, current, propagate);
5460
+                copy.UpdateMaterial(anchor, current, propagate, true);
5461
5461
                 
5462
5462
                 if (copy.material != null)
5463
5463
                 {
 Object3D.java
..
..
@@ -1428,7 +1428,7 @@
1428
1428
         
1429
1429
         blockloop = true;
1430
1430
         
1431
-        other.parent = parent;
1431
+        // other.parent = parent;
1432
1432
         
1433
1433
         //System.out.println("COPY " + this + " to " + other);
1434
1434
         //new Exception().printStackTrace();
..
..
@@ -1464,7 +1464,7 @@
1464
1464
             Object3D obj = (Object3D)Children().get(i);
1465
1465
             if (IsContainedIn(obj))
1466
1466
             {
1467
-//            assert(false); // ?!?!?!?!?!
1467
+            assert(false); // ?!?!?!?!?!
1468
1468
                 c.Children().setElementAt(c, i);
1469
1469
             }
1470
1470
             else
..
..
@@ -2562,7 +2562,7 @@
2562
2562
         return b;
2563
2563
     }
2564
2564
 
2565
-    void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate)
2565
+    void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate, boolean colorparallax)
2566
2566
     {
2567
2567
         if (blockloop)
2568
2568
         {
..
..
@@ -2572,7 +2572,7 @@
2572
2572
 //        super.UpdateMaterial(anchor, current, false);
2573
2573
         if (material != null)
2574
2574
         {
2575
-            material.UpdateMaterial(anchor, current);
2575
+            material.UpdateMaterial(anchor, current, colorparallax);
2576
2576
         }
2577
2577
 
2578
2578
         if (!propagate)
..
..
@@ -2586,7 +2586,7 @@
2586
2586
             if (child == null)
2587
2587
                 continue;
2588
2588
             blockloop = true;
2589
-            child.UpdateMaterial(anchor, current, propagate);
2589
+            child.UpdateMaterial(anchor, current, propagate, false);
2590
2590
             blockloop = false;
2591
2591
             Children().release(i);
2592
2592
         }
..
..
@@ -2600,7 +2600,7 @@
2600
2600
             if (child == null)
2601
2601
                 continue;
2602
2602
             blockloop = true;
2603
-            child.UpdateMaterial(anchor, current, propagate);
2603
+            child.UpdateMaterial(anchor, current, propagate, false);
2604
2604
             blockloop = false;
2605
2605
             Children().release(i);
2606
2606
         }
 Torus.java
..
..
@@ -2,7 +2,8 @@
2
2
 
3
3
 class Torus extends Biparam implements java.io.Serializable
4
4
 {
5
-        static final long serialVersionUID = -7637054329820073252L; // Old
5
+        static final long serialVersionUID = 331691015398062098L; // new
6
+                                            // -7637054329820073252L; // Old
6
7
 
7
8
     Torus()
8
9
     {
 cMaterial.java
..
..
@@ -78,10 +78,11 @@
78
78
     //Invariants();
79
79
     }
80
80
 
81
-    void UpdateMaterial(cMaterial anchor, cMaterial current)
81
+    void UpdateMaterial(cMaterial anchor, cMaterial current, boolean colorparallax)
82
82
     {
83
83
         //color *= Factor(anchor.color, current.color);
84
-        color = current.color;
84
+        if (colorparallax)
85
+            color = current.color;
85
86
         //if (anchor.saturation == 0)
86
87
         //    anchor.saturation = 0.001f;
87
88
         if (anchor.modulation == 0)
..
..
@@ -109,7 +110,8 @@
109
110
 //        if (anchor.parallax == 0)
110
111
 //            anchor.parallax = 0.001f;
111
112
         //parallax *= Factor(anchor.parallax, current.parallax);
112
-        parallax = current.parallax;
113
+        if (colorparallax)
114
+            parallax = current.parallax;
113
115
         fakedepth *= Factor(anchor.fakedepth, current.fakedepth);
114
116
         shadowbias *= Factor(anchor.shadowbias, current.shadowbias);
115
117
     }