Skin shader

Normand Briere

2017-05-07 314b34423070cf127464da79a53cddf6b1c38587

 Object3D.java
..
..
@@ -935,7 +935,7 @@
935
935
 
936
936
     public Object clone()
937
937
     {
938
-        return GraphreeD.clone(this);
938
+        return GrafreeD.clone(this);
939
939
     }
940
940
 
941
941
     Object3D copyExpand()
..
..
@@ -1701,7 +1701,7 @@
1701
1701
             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702
1702
             o.bRep = transientrep;
1703
1703
             if (clone)
1704
-                o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
1704
+                o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1705
1705
             o.CreateMaterial();
1706
1706
             o.SetAttributes(this, -1);
1707
1707
             //parent
..
..
@@ -1714,7 +1714,7 @@
1714
1714
             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715
1715
             o.bRep = bRep;
1716
1716
             if (clone)
1717
-                o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
1717
+                o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1718
1718
             o.CreateMaterial();
1719
1719
             //o.overwriteThis(this, -1);
1720
1720
             o.SetAttributes(this, -1);
..
..
@@ -1756,7 +1756,7 @@
1756
1756
 //        {
1757
1757
 //            assert(bRep == null);
1758
1758
 //            Object3D o = new Object3D("Geometry:" + this.name);
1759
-//            o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
1759
+//            o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1760
1760
 //            o.CreateMaterial();
1761
1761
 //            parent.addChild(o);
1762
1762
 //        }
..
..
@@ -1765,7 +1765,7 @@
1765
1765
 //        {
1766
1766
 //            assert(transientrep == null);
1767
1767
 //            Object3D o = new Object3D("Geometry:" + this.name);
1768
-//            o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
1768
+//            o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1769
1769
 //            o.CreateMaterial();
1770
1770
 //            parent.addChild(o);
1771
1771
 //        }
..
..
@@ -3153,7 +3153,7 @@
3153
3153
         
3154
3154
         BoundaryRep sup = bRep.support;
3155
3155
         bRep.support = null;
3156
-        BoundaryRep temprep = (BoundaryRep) GraphreeD.clone(bRep);
3156
+        BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3157
3157
 //            bRep.SplitInTwo(onlyone); // thread...
3158
3158
             temprep.SplitInTwo(reduction34, onlyone);
3159
3159
             bRep = temprep;
..
..
@@ -3677,7 +3677,7 @@
3677
3677
             if (child == null)
3678
3678
                 continue;
3679
3679
             
3680
-            if (GraphreeD.RENDERME > 0)
3680
+            if (GrafreeD.RENDERME > 0)
3681
3681
             {
3682
3682
                 if (child instanceof Merge)
3683
3683
                     ((Merge)child).renderme();
..
..
@@ -3828,7 +3828,7 @@
3828
3828
                 if (child == null)
3829
3829
                     continue;
3830
3830
                 
3831
-                if (GraphreeD.RENDERME > 0)
3831
+                if (GrafreeD.RENDERME > 0)
3832
3832
                 {
3833
3833
                     if (child instanceof Merge)
3834
3834
                         ((Merge)child).renderme();
..
..
@@ -4023,7 +4023,7 @@
4023
4023
                 if (child == null)
4024
4024
                     continue;
4025
4025
                 
4026
-                if (GraphreeD.RENDERME > 0)
4026
+                if (GrafreeD.RENDERME > 0)
4027
4027
                 {
4028
4028
                     if (child instanceof Merge)
4029
4029
                         ((Merge)child).renderme();
..
..
@@ -5519,7 +5519,9 @@
5519
5519
                     display.options2[2] = material.factor;
5520
5520
 
5521
5521
                     cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522
-                    display.options3[3] = material.cameralight/0.2f;
5522
+                    display.options4[0] = material.cameralight/0.2f;
5523
+                    display.options4[1] = material.subsurface;
5524
+                    display.options4[2] = material.sheen;
5523
5525
                     
5524
5526
                  //   if (display.CURRENTANTIALIAS > 0)
5525
5527
                  //       display.options3[3] /= 4;
..
..
@@ -5819,12 +5821,12 @@
5819
5821
             if (!child.HasTransparency())
5820
5822
             {
5821
5823
                 sel = root != null && root.selection != null && root.selection.indexOf(child) != -1;
5822
-           //     GraphreeD.tracein("draw ", child);
5824
+           //     GrafreeD.tracein("draw ", child);
5823
5825
                 boolean wasblocked = blockdraw;
5824
5826
                 blockdraw = true;
5825
5827
                 child.draw(display, root, selected || sel, wasblocked || blocked); //  || child.IsSelected());
5826
5828
                 blockdraw = false;
5827
-           // GraphreeD.traceout("draw ", child);
5829
+           // GrafreeD.traceout("draw ", child);
5828
5830
             }
5829
5831
 
5830
5832
             release(i);
..
..
@@ -8041,7 +8043,7 @@
8041
8043
         {
8042
8044
             assert(bRep != null);
8043
8045
             if (!(support instanceof GenericJoint)) // support.bRep != null)
8044
-                GraphreeD.Assert(support.bRep == bRep.support);
8046
+                GrafreeD.Assert(support.bRep == bRep.support);
8045
8047
         }
8046
8048
         else
8047
8049
         {