new torus code and VR

Normand Briere

2018-05-22 42107f9a01652cb2f47228d20c1148a2a22f6a63

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