Timeline activated

Normand Briere

2018-07-08 f4160780a4d8278920b99ada1050f320d6e30a73

 Object3D.java
..
..
@@ -285,6 +285,7 @@
285
285
             return parent.GetName() + "#";
286
286
         }
287
287
         
288
+    boolean timeline = false;
288
289
     boolean live = false;
289
290
     boolean hide = false;
290
291
     boolean link2master = false; // performs reset support/master at each frame
..
..
@@ -355,7 +356,7 @@
355
356
     
356
357
     int MemorySize()
357
358
     {
358
-        if (memorysize == 0)
359
+        if (true) // memorysize == 0)
359
360
         {
360
361
             try
361
362
             {
..
..
@@ -1446,7 +1447,16 @@
1446
1447
     //    if (other == null)
1447
1448
     //        return;
1448
1449
         
1449
-        System.out.println("Link support this = " + this + "; other = " + other);
1450
+        if (other != null)
1451
+        {
1452
+            BoundaryRep.SEUIL = other.material.cameralight;
1453
+
1454
+            // Set default to 0.1
1455
+            BoundaryRep.SEUIL /= 2;
1456
+            System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457
+        }
1458
+        
1459
+        System.out.println("Link this = " + this + "; support = " + other);
1450
1460
         
1451
1461
         //if (bRep != null)
1452
1462
         //    bRep.linkVerticesThis(other.bRep);
..
..
@@ -1816,8 +1826,9 @@
1816
1826
             if (obj.name == null)
1817
1827
                 continue; // can't be a null one
1818
1828
             
1819
-            //if (n.contains(obj.name)) // dec 2013  name.split(":")[0])) // Poser generates a count
1820
-            if (n.startsWith(obj.name))
1829
+            String name = obj.name.split(":")[0]; // Poser generates a count
1830
+            //if (n.startsWith(obj.name))
1831
+            if (n.contains(name))
1821
1832
             {
1822
1833
                 theobj = obj;
1823
1834
                 count++;
..
..
@@ -2732,6 +2743,24 @@
2732
2743
         blockloop = false;
2733
2744
     }
2734
2745
 
2746
+    void GenNormalsMINE()
2747
+    {
2748
+        if (blockloop)
2749
+            return;
2750
+        
2751
+        blockloop = true;
2752
+        GenNormalsMINE0();
2753
+        for (int i = 0; i < Children().Size(); i++)
2754
+        {
2755
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2756
+            if (child == null)
2757
+                continue;
2758
+            child.GenNormalsMINE();
2759
+//            Children().release(i);
2760
+        }
2761
+        blockloop = false;
2762
+    }
2763
+
2735
2764
     void ClearColors()
2736
2765
     {
2737
2766
         if (blockloop)
..
..
@@ -2876,6 +2905,15 @@
2876
2905
         if (bRep != null)
2877
2906
         {
2878
2907
             bRep.GenerateNormals(crease);
2908
+            Touch();
2909
+        }
2910
+    }
2911
+
2912
+    void GenNormalsMINE0()
2913
+    {
2914
+        if (bRep != null)
2915
+        {
2916
+            bRep.GenerateNormalsMINE();
2879
2917
             Touch();
2880
2918
         }
2881
2919
     }
..
..
@@ -4111,7 +4149,7 @@
4111
4149
         if (blockloop)
4112
4150
             return;
4113
4151
         
4114
-        for (int i=0; i<size(); i++)
4152
+        for (int i=0; i<Size(); i++)
4115
4153
         {
4116
4154
             if (get(i).parent != this)
4117
4155
             {
..
..
@@ -5519,7 +5557,9 @@
5519
5557
                     display.options2[2] = material.factor;
5520
5558
 
5521
5559
                     cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522
-                    display.options3[3] = material.cameralight/0.2f;
5560
+                    display.options4[0] = material.cameralight/0.2f;
5561
+                    display.options4[1] = material.subsurface;
5562
+                    display.options4[2] = material.sheen;
5523
5563
                     
5524
5564
                  //   if (display.CURRENTANTIALIAS > 0)
5525
5565
                  //       display.options3[3] /= 4;
..
..
@@ -7731,7 +7771,7 @@
7731
7771
         if (parent == null)
7732
7772
         {
7733
7773
             System.out.println("NULL PARENT");
7734
-            new Exception().printStackTrace();
7774
+            //new Exception().printStackTrace();
7735
7775
         } else
7736
7776
         {
7737
7777
             if (parent instanceof BezierPatch)