Rename link2master to link2support.

Normand Briere

2019-09-18 f9325048496d7cdbcad233f8a6b84c88e79adcc2

 BoundaryRep.java
..
..
@@ -7,7 +7,8 @@
7
7
 
8
8
 class BoundaryRep implements java.io.Serializable
9
9
 {
10
-    static final long serialVersionUID = -4852664309425035321L;
10
+    static final long serialVersionUID = // VERY old 2008 -5762968998168738314L;
11
+                                        -4852664309425035321L;
11
12
 
12
13
     transient int displaylist = 0;
13
14
     
..
..
@@ -530,7 +531,7 @@
530
531
     static Vertex vertextemp = new Vertex(true);
531
532
     static Vertex vertextemp2 = new Vertex(true);
532
533
     
533
-    static double SEUIL = 0.05f; // 0.1 for rag doll; 0.07;
534
+    static double SEUIL = 0.025f; // 0.1 for rag doll; 0.07;
534
535
         
535
536
     // Compute weight of point w/r to this
536
537
     float ComputeWeight(Vertex v, double[][] toRoot, int k)
..
..
@@ -686,6 +687,7 @@
686
687
     
687
688
     void RecomputeBasis(BoundaryRep other, double[][] toRoot, Vertex v)
688
689
     {
690
+        CameraPane.CreateSelectedPoint();
689
691
         CameraPane.selectedpoint.
690
692
             getAverage(cStatic.point1, true);
691
693
 
..
..
@@ -1003,6 +1005,7 @@
1003
1005
             
1004
1006
             v.closestsupport = -1;
1005
1007
             
1008
+        CameraPane.CreateSelectedPoint();
1006
1009
         CameraPane.selectedpoint.
1007
1010
             getAverage(cStatic.point1, true);
1008
1011
 
..
..
@@ -1261,6 +1264,7 @@
1261
1264
         for (int wi = v0.weights.length; --wi>=0;)
1262
1265
             v[wi] = 0;
1263
1266
             
1267
+        CameraPane.CreateSelectedPoint();
1264
1268
         CameraPane.selectedpoint.
1265
1269
             getAverage(cStatic.point1, true);
1266
1270
 
..
..
@@ -1398,6 +1402,7 @@
1398
1402
         v0.x = v0.y = v0.z = 0;
1399
1403
         v0.norm.x = v0.norm.y = v0.norm.z = 0;
1400
1404
             
1405
+        CameraPane.CreateSelectedPoint();
1401
1406
         CameraPane.selectedpoint.
1402
1407
             getAverage(cStatic.point1, true);
1403
1408
 
..
..
@@ -1997,9 +2002,10 @@
1997
2002
                 if (v.vertexlinks == null)
1998
2003
                     continue;
1999
2004
                 
2000
-                // Warning: a bit faster but dangerous
2001
-                if (v.weights != null && v.weights[j] == 0)
2002
-                        // < 0.001 * v.totalweight)
2005
+                // Warning: faster but dangerous
2006
+                if (v.weights != null && v.weights[j]
2007
+                         == 0)
2008
+                        //< 0.001 * v.totalweight)
2003
2009
                 {
2004
2010
                     //testweight += v.weights[j-1];
2005
2011
                     continue;
..
..
@@ -3769,7 +3775,7 @@
3769
3775
         
3770
3776
         //tempRep.Unstripify();
3771
3777
         
3772
-        tempRep.GenerateNormals2(crease);
3778
+        tempRep.GenerateNormals(crease);
3773
3779
         
3774
3780
         boolean keepnormal = Vertex.normalmode;
3775
3781
         boolean epsequal = Grafreed.epsequal;
..
..
@@ -3831,6 +3837,9 @@
3831
3837
             //if (n.dot(v.norm) < 0)
3832
3838
             if (n == null)
3833
3839
                 continue;
3840
+            
3841
+            if (v.norm == null)
3842
+                v.norm = new cVector();
3834
3843
             
3835
3844
             LA.vecCopy(n, v.norm);
3836
3845
             
..
..
@@ -4021,8 +4030,6 @@
4021
4030
                 //System.out.println("NEW = " + positions.length);
4022
4031
                 uvmap = new float[ta.getVertexCount() * 2];
4023
4032
                 
4024
-                colors = new float[ta.getVertexCount()]; // * 3];
4025
-
4026
4033
                 ta.getCoordinates(0, positions);
4027
4034
                 ta.getNormals(0, normals);
4028
4035
 //                ta.getColors(0, colors);
..
..
@@ -4030,6 +4037,14 @@
4030
4037
 
4031
4038
                 System.out.println("UV = " + uvmap[2] + ", " + uvmap[3] + ";");
4032
4039
 
4040
+                colors = null;
4041
+//                colors = new float[ta.getVertexCount()]; // * 3];
4042
+//
4043
+//                for (int i=colors.length; --i>=0;)
4044
+//                {
4045
+//                        colors[i] = 1;
4046
+//                }
4047
+                
4033
4048
                 triangles = new int[ta.getVertexCount()];
4034
4049
 
4035
4050
                 for (int i = 0; i < triangles.length; i++)
..
..
@@ -4067,17 +4082,18 @@
4067
4082
                 positions = new float[3 * ga.getVertexCount()];
4068
4083
                 normals = new float[3 * ga.getVertexCount()];
4069
4084
                 uvmap = new float[2 * ga.getVertexCount()];
4070
-                colors = new float[1 * ga.getVertexCount()];
4071
4085
 
4072
4086
                 tsa.getCoordinates(0, positions);
4073
4087
                 tsa.getNormals(0, normals);
4074
4088
                 tsa.getTextureCoordinates(0, 0, uvmap);
4075
4089
            //     tsa.getColors(0, colors);
4076
-                
4077
-                for (int i=colors.length; --i>=0;)
4078
-                {
4079
-                        colors[i] = 1;
4080
-                }
4090
+
4091
+                colors = null;
4092
+//                colors = new float[1 * ga.getVertexCount()];
4093
+//                for (int i=colors.length; --i>=0;)
4094
+//                {
4095
+//                        colors[i] = 1;
4096
+//                }
4081
4097
 
4082
4098
                 int stripcount = tsa.getNumStrips();
4083
4099
                 triangles = new int[stripcount];
..
..
@@ -4086,6 +4102,7 @@
4086
4102
                 stripified = true;
4087
4103
             } catch (ClassCastException e)
4088
4104
             {
4105
+                // ??? aug 2019
4089
4106
                 TriangleArray ta = (TriangleArray) ga;
4090
4107
 
4091
4108
                 positions = new float[3 * ga.getVertexCount()];