Another tab.

Normand Briere

2019-07-30 7a77e39423398b7ad8bf7e80cf45fac6817000c2

 BoundaryRep.java
..
..
@@ -1997,7 +1997,10 @@
1997
1997
                 if (v.vertexlinks == null)
1998
1998
                     continue;
1999
1999
                 
2000
-                if (v.weights != null && v.weights[j] < 0.001 * v.totalweight) // == 0)
2000
+                // Warning: a bit faster but dangerous
2001
+                if (v.weights != null && v.weights[j]
2002
+                        // == 0)
2003
+                        < 0.001 * v.totalweight)
2001
2004
                 {
2002
2005
                     //testweight += v.weights[j-1];
2003
2006
                     continue;
..
..
@@ -3857,6 +3860,28 @@
3857
3860
         Trim(true/*wastrim*/,true,crease,wasstrip,false);
3858
3861
     }
3859
3862
     
3863
+    void GenerateNormalsMesh()
3864
+    {
3865
+        if (stripified)
3866
+        {
3867
+            Unstripify();
3868
+        }
3869
+        
3870
+        if (trimmed)
3871
+        {
3872
+            normals = null;
3873
+        }
3874
+        else
3875
+        {
3876
+            for (int i=VertexCount(); --i>=0;)
3877
+            {
3878
+                Vertex v = GetVertex(i);
3879
+
3880
+                v.norm = null;
3881
+            }
3882
+        }
3883
+    }
3884
+    
3860
3885
     void GenNormalsJME()
3861
3886
     {
3862
3887
         assert(false);
..
..
@@ -3979,7 +4004,7 @@
3979
4004
             NormalGenerator ng;
3980
4005
             
3981
4006
             if (crease)
3982
-                ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
4007
+                ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
3983
4008
             else
3984
4009
                 ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
3985
4010
             
..
..
@@ -4013,8 +4038,9 @@
4013
4038
                     triangles[i] = i;
4014
4039
                 }
4015
4040
                 
4016
-                Untrim();
4017
-                MergeNormals();
4041
+//                Untrim();
4042
+                if (!trimmed)
4043
+                    MergeNormals();
4018
4044
             }
4019
4045
         }
4020
4046
 
..
..
@@ -4076,8 +4102,9 @@
4076
4102
                 triangles[0] = 3;
4077
4103
             }
4078
4104
             
4079
-            Untrim();
4080
-            MergeNormals();
4105
+            //Untrim();
4106
+            if (!trimmed)
4107
+                MergeNormals();
4081
4108
         }
4082
4109
 
4083
4110
     /*
..
..
@@ -4131,6 +4158,8 @@
4131
4158
     
4132
4159
     void MergeNormals()
4133
4160
     {
4161
+        assert(!trimmed);
4162
+        
4134
4163
         boolean smooth = Grafreed.smoothmode;
4135
4164
         boolean link = Grafreed.linkUV;
4136
4165
         Grafreed.smoothmode = true;
..
..
@@ -4942,9 +4971,18 @@
4942
4971
             v./*pos.*/y = positions[i3 + 1];
4943
4972
             v./*pos.*/z = positions[i3 + 2];
4944
4973
 
4945
-            v.norm.x = normals[i3];
4946
-            v.norm.y = normals[i3 + 1];
4947
-            v.norm.z = normals[i3 + 2];
4974
+            if (normals == null)
4975
+            {
4976
+                v.norm.x = 0;
4977
+                v.norm.y = 0;
4978
+                v.norm.z = 0;
4979
+            }
4980
+            else
4981
+            {
4982
+                v.norm.x = normals[i3];
4983
+                v.norm.y = normals[i3 + 1];
4984
+                v.norm.z = normals[i3 + 2];
4985
+            }
4948
4986
 
4949
4987
             v.s = uvmap[i2];
4950
4988
             v.t = uvmap[i2 + 1];