Figure panel.

Normand Briere

2019-09-02 21ac57b36a9e3b909853c7d64ac29b7ad72490a3

 BoundaryRep.java
..
..
@@ -686,6 +686,7 @@
686
686
     
687
687
     void RecomputeBasis(BoundaryRep other, double[][] toRoot, Vertex v)
688
688
     {
689
+        CameraPane.CreateSelectedPoint();
689
690
         CameraPane.selectedpoint.
690
691
             getAverage(cStatic.point1, true);
691
692
 
..
..
@@ -1003,6 +1004,7 @@
1003
1004
             
1004
1005
             v.closestsupport = -1;
1005
1006
             
1007
+        CameraPane.CreateSelectedPoint();
1006
1008
         CameraPane.selectedpoint.
1007
1009
             getAverage(cStatic.point1, true);
1008
1010
 
..
..
@@ -1261,6 +1263,7 @@
1261
1263
         for (int wi = v0.weights.length; --wi>=0;)
1262
1264
             v[wi] = 0;
1263
1265
             
1266
+        CameraPane.CreateSelectedPoint();
1264
1267
         CameraPane.selectedpoint.
1265
1268
             getAverage(cStatic.point1, true);
1266
1269
 
..
..
@@ -1398,6 +1401,7 @@
1398
1401
         v0.x = v0.y = v0.z = 0;
1399
1402
         v0.norm.x = v0.norm.y = v0.norm.z = 0;
1400
1403
             
1404
+        CameraPane.CreateSelectedPoint();
1401
1405
         CameraPane.selectedpoint.
1402
1406
             getAverage(cStatic.point1, true);
1403
1407
 
..
..
@@ -1997,7 +2001,10 @@
1997
2001
                 if (v.vertexlinks == null)
1998
2002
                     continue;
1999
2003
                 
2000
-                if (v.weights != null && v.weights[j] < 0.001 * v.totalweight) // == 0)
2004
+                // Warning: faster but dangerous
2005
+                if (v.weights != null && v.weights[j]
2006
+                        // == 0)
2007
+                        < 0.0001 * v.totalweight)
2001
2008
                 {
2002
2009
                     //testweight += v.weights[j-1];
2003
2010
                     continue;
..
..
@@ -4001,7 +4008,7 @@
4001
4008
             NormalGenerator ng;
4002
4009
             
4003
4010
             if (crease)
4004
-                ng = new NormalGenerator(Math.PI/6); // default is 44 degrees (or Math.PI/3); // /4);
4011
+                ng = new NormalGenerator(Math.PI/4); // default is 44 degrees (or Math.PI/3); // /4);
4005
4012
             else
4006
4013
                 ng = new NormalGenerator(Math.PI); // (Math.PI / 3); // /4);
4007
4014
             
..
..
@@ -4019,8 +4026,6 @@
4019
4026
                 //System.out.println("NEW = " + positions.length);
4020
4027
                 uvmap = new float[ta.getVertexCount() * 2];
4021
4028
                 
4022
-                colors = new float[ta.getVertexCount()]; // * 3];
4023
-
4024
4029
                 ta.getCoordinates(0, positions);
4025
4030
                 ta.getNormals(0, normals);
4026
4031
 //                ta.getColors(0, colors);
..
..
@@ -4028,6 +4033,14 @@
4028
4033
 
4029
4034
                 System.out.println("UV = " + uvmap[2] + ", " + uvmap[3] + ";");
4030
4035
 
4036
+                colors = null;
4037
+//                colors = new float[ta.getVertexCount()]; // * 3];
4038
+//
4039
+//                for (int i=colors.length; --i>=0;)
4040
+//                {
4041
+//                        colors[i] = 1;
4042
+//                }
4043
+                
4031
4044
                 triangles = new int[ta.getVertexCount()];
4032
4045
 
4033
4046
                 for (int i = 0; i < triangles.length; i++)
..
..
@@ -4065,17 +4078,18 @@
4065
4078
                 positions = new float[3 * ga.getVertexCount()];
4066
4079
                 normals = new float[3 * ga.getVertexCount()];
4067
4080
                 uvmap = new float[2 * ga.getVertexCount()];
4068
-                colors = new float[1 * ga.getVertexCount()];
4069
4081
 
4070
4082
                 tsa.getCoordinates(0, positions);
4071
4083
                 tsa.getNormals(0, normals);
4072
4084
                 tsa.getTextureCoordinates(0, 0, uvmap);
4073
4085
            //     tsa.getColors(0, colors);
4074
-                
4075
-                for (int i=colors.length; --i>=0;)
4076
-                {
4077
-                        colors[i] = 1;
4078
-                }
4086
+
4087
+                colors = null;
4088
+//                colors = new float[1 * ga.getVertexCount()];
4089
+//                for (int i=colors.length; --i>=0;)
4090
+//                {
4091
+//                        colors[i] = 1;
4092
+//                }
4079
4093
 
4080
4094
                 int stripcount = tsa.getNumStrips();
4081
4095
                 triangles = new int[stripcount];
..
..
@@ -4084,6 +4098,7 @@
4084
4098
                 stripified = true;
4085
4099
             } catch (ClassCastException e)
4086
4100
             {
4101
+                // ??? aug 2019
4087
4102
                 TriangleArray ta = (TriangleArray) ga;
4088
4103
 
4089
4104
                 positions = new float[3 * ga.getVertexCount()];