Fix weights vs speed issue.

Normand Briere

2019-07-24 ebd16116fc612bf14e2469ba27dd7ee54918eabb

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