blame | history | patch | commit | commitdiff
Normand Briere
2019-05-01 a742f6cebf1d471217d836e07934e5c02c22b6db 
 CameraPane.java
....@@ -56,8 +56,6 @@
5656     static int CURRENTANTIALIAS = 0; // 1;
5757 	/*static*/ boolean RENDERSHADOW = true;
5858     /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
-    static boolean ANIMATION = false;
60
-    static String filename;
6159     
6260     boolean DISPLAYTEXT = false;
6361     //boolean REDUCETEXTURE = true;
....@@ -92,6 +90,8 @@
9290 
9391 static    int tickcount = 0; // slow pose issue
9492 
93
+static    boolean BUTTONLESSWHEEL = false;
94
+static    boolean ZOOMBOXMODE = false;
9595 static    boolean BOXMODE = false;
9696 static    boolean IMAGEFLIP = false;
9797 static    boolean SMOOTHFOCUS = false;
....@@ -150,12 +150,10 @@
150150         defaultcaps.setAccumAlphaBits(16);
151151     }
152152     
153
-    static CameraPane theRenderer;
154
-    
155153     void SetAsGLRenderer(boolean b)
156154     {
157155         isRenderer = b;
158
-        theRenderer = this;
156
+        Globals.theRenderer = this;
159157     }
160158 
161159     CameraPane(Object3D o, Camera cam, boolean withcontext)
....@@ -193,9 +191,43 @@
193191     
194192     /// INTERFACE
195193     
194
+    public javax.media.opengl.GL GetGL0()
195
+    {
196
+            return null;
197
+    }
198
+    
199
+    public int GenList()
200
+    {
201
+            javax.media.opengl.GL gl = GetGL();
202
+        return gl.glGenLists(1);
203
+    }
204
+    
205
+    public void NewList(int id)
206
+    {
207
+            javax.media.opengl.GL gl = GetGL();
208
+        gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
209
+    }
210
+    
211
+    public void CallList(int id)
212
+    {
213
+        javax.media.opengl.GL gl = GetGL();
214
+        gl.glCallList(id);
215
+    }
216
+    
217
+    public void EndList()
218
+    {
219
+            javax.media.opengl.GL gl = GetGL();
220
+        gl.glEndList();
221
+    }
222
+    
196223     public boolean IsBoxMode()
197224     {
198225             return BOXMODE;
226
+    }
227
+    
228
+    public boolean IsZoomBoxMode()
229
+    {
230
+            return ZOOMBOXMODE;
199231     }
200232     
201233     public void ClearDepth()
....@@ -816,7 +848,7 @@
816848 
817849                         if ((i % 100) == 0 && i != 0)
818850                         {
819
-                    CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
851
+                    Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820852                             //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821853                                 System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822854                         }
....@@ -848,7 +880,7 @@
848880 
849881                         if ((i % 100) == 0 && i != 0)
850882                         {
851
-                    CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
883
+                    Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852884                             //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853885                                 System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854886                         }
....@@ -1061,7 +1093,336 @@
10611093         gl.glMatrixMode(gl.GL_MODELVIEW);
10621094     }
10631095     
1096
+        public void DrawBox(cVector min, cVector max)
1097
+        {
1098
+            javax.media.opengl.GL gl = GetGL();
1099
+                gl.glBegin(gl.GL_LINES);
1100
+                
1101
+                gl.glVertex3d(min.x, min.y, min.z);
1102
+                gl.glVertex3d(min.x, min.y, max.z);
1103
+                gl.glVertex3d(min.x, min.y, min.z);
1104
+                gl.glVertex3d(min.x, max.y, min.z);
1105
+                gl.glVertex3d(min.x, min.y, min.z);
1106
+                gl.glVertex3d(max.x, min.y, min.z);
1107
+                
1108
+                gl.glVertex3d(max.x, max.y, max.z);
1109
+                gl.glVertex3d(min.x, max.y, max.z);
1110
+                gl.glVertex3d(max.x, max.y, max.z);
1111
+                gl.glVertex3d(max.x, min.y, max.z);
1112
+                gl.glVertex3d(max.x, max.y, max.z);
1113
+                gl.glVertex3d(max.x, max.y, min.z);
1114
+                
1115
+                gl.glEnd();
1116
+        }
1117
+
1118
+        public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
1119
+        {
1120
+            int[] strips = bRep.getRawIndices();
1121
+            
1122
+            javax.media.opengl.GL gl = GetGL();
1123
+        
1124
+                // TRIANGLE STRIP ARRAY
1125
+                if (bRep.trimmed)
1126
+                {
1127
+                    float[] v = bRep.getRawVertices();
1128
+                    float[] n = bRep.getRawNormals();
1129
+                    float[] c = bRep.getRawColors();
1130
+                    float[] uv = bRep.getRawUVMap();
1131
+
1132
+                    int count2 = 0;
1133
+                    int count3 = 0;
1134
+
1135
+                    if (n.length > 0)
1136
+                    {
1137
+                        for (int i = 0; i < strips.length; i++)
1138
+                        {
1139
+                            gl.glBegin(gl.GL_TRIANGLE_STRIP);
1140
+
1141
+                            /*
1142
+                    boolean locked = false;
1143
+                    float eps = 0.1f;
1144
+                    boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
1145
+
1146
+                    int dot = 0;
1147
+
1148
+                    if ((dot&1) == 0)
1149
+                        dot |= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
1150
+
1151
+                    if (wrap || (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
1152
+                        gl.glTexCoord2f((float) qv.s, (float) qv.t);
1153
+                    else
1154
+                    {
1155
+                        locked = true;
1156
+                        gl.glTexCoord2f((float) pv.s, (float) pv.t);
1157
+                    }
1158
+                    //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
1159
+                    gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
1160
+                    if (hasnorm)
1161
+                    {
1162
+                        //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
1163
+                        gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
1164
+                    }
1165
+
1166
+                    if ((dot&4) == 0)
1167
+                        dot |= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
1168
+
1169
+                    if (wrap || !locked && (dot&8) != 0)
1170
+                        gl.glTexCoord2f((float) rv.s, (float) rv.t);
1171
+                    else
1172
+                        gl.glTexCoord2f((float) pv.s, (float) pv.t);
1173
+
1174
+                    f.dot = dot;
1175
+                    */
1176
+
1177
+                            if (!selectmode)
1178
+                            {
1179
+                                if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1180
+                                {
1181
+                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1182
+                                } else
1183
+                                {
1184
+                                    gl.glNormal3f(0, 0, 1);
1185
+                                }
1186
+
1187
+                                if (c != null)
1188
+                                //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
1189
+                                {
1190
+                                    gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1191
+                                }
1192
+                            }
1193
+                            if (flipV)
1194
+                                gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195
+                            else
1196
+                                gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1197
+                            //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198
+                            gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199
+
1200
+                            count2 += 2;
1201
+                            count3 += 3;
1202
+                            if (!selectmode)
1203
+                            {
1204
+                                if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1205
+                                {
1206
+                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1207
+                                } else
1208
+                                {
1209
+                                    gl.glNormal3f(0, 0, 1);
1210
+                                }
1211
+                                if (c != null)
1212
+                                {
1213
+                                    gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1214
+                                }
1215
+                            }
1216
+                            if (flipV)
1217
+                                gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218
+                            else
1219
+                                gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1220
+                            //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221
+                            gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222
+
1223
+                            count2 += 2;
1224
+                            count3 += 3;
1225
+                            for (int j = 0; j < strips[i] - 2; j++)
1226
+                            {
1227
+                                //gl.glTexCoord2d(...);
1228
+                                if (!selectmode)
1229
+                                {
1230
+                                    if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1231
+                                    {
1232
+                                        gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1233
+                                    } else
1234
+                                    {
1235
+                                        gl.glNormal3f(0, 0, 1);
1236
+                                    }
1237
+                                    if (c != null)
1238
+                                    {
1239
+                                        gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1240
+                                    }
1241
+                                }
1242
+
1243
+                                if (flipV)
1244
+                                    gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245
+                                else
1246
+                                    gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1247
+                                //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248
+                                gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1249
+                                count2 += 2;
1250
+                                count3 += 3;
1251
+                            }
1252
+
1253
+                            gl.glEnd();
1254
+                        }
1255
+                    }
1256
+
1257
+                    assert count3 == v.length;
1258
+                }
1259
+                else // !trimmed
1260
+                {
1261
+                    int count = 0;
1262
+                    for (int i = 0; i < strips.length; i++)
1263
+                    {
1264
+                        gl.glBegin(gl.GL_TRIANGLE_STRIP);
1265
+                        
1266
+                        Vertex p = bRep.GetVertex(bRep.indices[count++]);
1267
+                        Vertex q = bRep.GetVertex(bRep.indices[count++]);
1268
+                        
1269
+                        drawVertex(gl, p, flipV, selectmode);
1270
+                        drawVertex(gl, q, flipV, selectmode);
1271
+                        
1272
+                        for (int j = 0; j < strips[i] - 2; j++)
1273
+                        {
1274
+                            Vertex r = bRep.GetVertex(bRep.indices[count++]);
1275
+
1276
+    //                        if (j%2 == 0)
1277
+    //                            drawFace(p, q, r, display, null);
1278
+    //                        else
1279
+    //                            drawFace(p, r, q, display, null);
1280
+                            
1281
+    //                        p = q;
1282
+    //                        q = r;
1283
+                            drawVertex(gl, r, flipV, selectmode);
1284
+                        }
1285
+
1286
+                        gl.glEnd();
1287
+                    }
1288
+                }
1289
+        }
1290
+
1291
+    static cSpring.Point3D temp = new cSpring.Point3D();
1292
+    static cSpring.Point3D temp2 = new cSpring.Point3D();
1293
+    static cSpring.Point3D temp3 = new cSpring.Point3D();
1294
+    
1295
+        public void DrawDynamicMesh(cMesh mesh)
1296
+        {
1297
+                GL gl = GetGL(); // getGL();
1298
+
1299
+                cSpring.PhysicsController3D Phys = mesh.Phys;
1300
+                
1301
+                gl.glDisable(gl.GL_LIGHTING);
1302
+                
1303
+                gl.glLineWidth(1);
1304
+                gl.glColor3f(1,1,1);
1305
+                gl.glBegin(gl.GL_LINES);
1306
+                double scale = 0;
1307
+                int count = 0;
1308
+                for (int s=0; s<Phys.allSprings.size(); s++)
1309
+                {
1310
+                    cSpring.Spring spring = Phys.allSprings.get(s);
1311
+                        if(s == 0)
1312
+                        {
1313
+                            //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
1314
+                        }
1315
+                if (mesh.showsprings)
1316
+                {
1317
+                    temp.set(spring.a.position);
1318
+                    temp.add(spring.b.position);
1319
+                    temp.mul(0.5);
1320
+                    temp2.set(spring.a.position);
1321
+                    temp2.sub(spring.b.position);
1322
+                    temp2.mul(spring.restLength/2);
1323
+                    temp.sub(temp2);
1324
+                    gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1325
+                    temp.add(temp2);
1326
+                    temp.add(temp2);
1327
+                    gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1328
+                }
1329
+
1330
+                    if (spring.isHandle)
1331
+                        continue;
1332
+                    
1333
+                    //if (scale < spring.restLength)
1334
+                        scale += spring.restLength;
1335
+                        count++;
1336
+                }
1337
+                gl.glEnd();
1338
+
1339
+                if (count == 0)
1340
+                    scale = 0.01;
1341
+                else
1342
+                    scale /= count * 3;
1343
+                
1344
+                //scale = 0.25;
1345
+                
1346
+                if (mesh.ShowInfo())
1347
+                {
1348
+                    gl.glLineWidth(4);
1349
+                    for (int s=0; s<Phys.allNodes.size(); s++)
1350
+                    {
1351
+                        cSpring.DynamicNode node = Phys.allNodes.get(s);
1352
+                        if (node.mass == 0)
1353
+                            continue;
1354
+                        
1355
+                        int i = node.springs==null?-1:node.springs.size();
1356
+                        gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
1357
+                        //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
1358
+                        //temp.normalize();
1359
+                        //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
1360
+                        gl.glBegin(gl.GL_LINES);
1361
+                        gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1362
+                        //gl.glVertex3d(node.position.x + node.normal.x*scale, node.position.y + node.normal.y*scale, node.position.z + node.normal.z*scale);
1363
+                        gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
1364
+                                node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
1365
+                                node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
1366
+                        gl.glEnd();
1367
+                    }
1368
+
1369
+                    gl.glLineWidth(8);
1370
+                    for (int s=0; s<Phys.allNodes.size(); s++)
1371
+                    {
1372
+                        cSpring.DynamicNode node = Phys.allNodes.get(s);
1373
+
1374
+                        if (node.springs != null)
1375
+                        {
1376
+                            for (int i=0; i<node.springs.size(); i+=1)
1377
+                            {
1378
+                                cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
1379
+                                
1380
+                                int c = i+1;
1381
+                           //     c = node.springs.get(i).nbcopies;
1382
+
1383
+                                gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
1384
+                                gl.glBegin(gl.GL_LINES);
1385
+                                    gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1386
+                                    gl.glVertex3d(f.position.x/3+node.position.x*2/3, f.position.y/3+node.position.y*2/3, f.position.z/3+node.position.z*2/3);
1387
+                                gl.glEnd();
1388
+                            }
1389
+                        }
1390
+                    }
1391
+
1392
+                    gl.glLineWidth(1);
1393
+                }
1394
+                
1395
+                gl.glEnable(gl.GL_LIGHTING);
1396
+        }
1397
+    
10641398     /// INTERFACE
1399
+    
1400
+    public void StartTriangles()
1401
+    {
1402
+         javax.media.opengl.GL gl = GetGL();
1403
+         gl.glBegin(gl.GL_TRIANGLES);
1404
+    }
1405
+    
1406
+    public void EndTriangles()
1407
+    {
1408
+         GetGL().glEnd();
1409
+    }
1410
+    
1411
+    void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
1412
+    {
1413
+        if (!selectmode)
1414
+        {
1415
+            gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1416
+            gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1417
+            
1418
+            if (flipV)
1419
+                gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
1420
+            else
1421
+                gl.glTexCoord2f((float) pv.s, (float) pv.t);
1422
+        }
1423
+
1424
+        gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425
+    }
10651426     
10661427     void SetColor(Object3D obj, Vertex p0)
10671428     {
....@@ -1256,12 +1617,12 @@
12561617         //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
12571618         if (!material.multiply)
12581619         {
1259
-            display.color = color;
1620
+            display.color = material.color;
12601621             display.saturation = material.modulation;
12611622         }
12621623         else
12631624         {
1264
-            display.color *= color*2;
1625
+            display.color *= material.color*2;
12651626             display.saturation *= material.modulation*2;
12661627         }
12671628             
....@@ -1624,7 +1985,7 @@
16241985     
16251986     static int camerachangeframe;
16261987     
1627
-    boolean SetCamera(Camera cam)
1988
+    public boolean SetCamera(Camera cam)
16281989     {
16291990         // may 2014 if (cam == cameras[0] || cam == cameras[1])
16301991         //    return false;
....@@ -1752,12 +2113,27 @@
17522113         mainDL ^= true;
17532114     }
17542115 
1755
-    void ToggleTexture()
2116
+    void ToggleFullScreen()
2117
+    {
2118
+        FULLSCREEN ^= true;
2119
+    }
2120
+
2121
+    void ToggleCrowd()
2122
+    {
2123
+        Globals.CROWD ^= true;
2124
+    }
2125
+
2126
+    void ToggleLocal()
2127
+    {
2128
+        LOCALTRANSFORM ^= true;
2129
+    }
2130
+
2131
+    public void ToggleTexture()
17562132     {
17572133         textureon ^= true;
17582134     }
17592135 
1760
-    void ToggleLive()
2136
+    public void ToggleLive()
17612137     {
17622138         Globals.setLIVE(Globals.isLIVE() ^ true);
17632139         
....@@ -1769,92 +2145,72 @@
17692145             repaint(); // start loop // may 2013
17702146     }
17712147 
1772
-    void ToggleSupport()
2148
+    public void ToggleSupport()
17732149     {
17742150         SUPPORT ^= true;
17752151     }
17762152 
1777
-    void ToggleAbort()
2153
+    public void ToggleAbort()
17782154     {
17792155         ABORTMODE ^= true;
17802156     }
17812157 
1782
-    void ToggleFullScreen()
1783
-    {
1784
-        FULLSCREEN ^= true;
1785
-    }
1786
-
1787
-    void ToggleCrowd()
1788
-    {
1789
-        Globals.CROWD ^= true;
1790
-    }
1791
-
1792
-    void ToggleInertia()
2158
+    public void ToggleInertia()
17932159     {
17942160         INERTIA ^= true;
17952161     }
17962162 
1797
-    void ToggleLocal()
1798
-    {
1799
-        LOCALTRANSFORM ^= true;
1800
-    }
1801
-
1802
-    void ToggleFast()
2163
+    public void ToggleFast()
18032164     {
18042165         FAST ^= true;
18052166     }
18062167 
1807
-    void ToggleSlowPose()
2168
+    public void ToggleSlowPose()
18082169     {
18092170         SLOWPOSE ^= true;
18102171     }
18112172 
1812
-    void ToggleFootContact()
1813
-    {
1814
-        FOOTCONTACT ^= true;
1815
-    }
1816
-    
1817
-    void ToggleBoxMode()
2173
+    public void ToggleBoxMode()
18182174     {
18192175         BOXMODE ^= true;
18202176     }
18212177 
1822
-    void ToggleSmoothFocus()
2178
+    public void ToggleZoomBoxMode()
2179
+    {
2180
+        ZOOMBOXMODE ^= true;
2181
+    }
2182
+
2183
+    public void ToggleSmoothFocus()
18232184     {
18242185         SMOOTHFOCUS ^= true;
18252186     }
18262187 
1827
-    void ToggleImageFlip()
2188
+    public void ToggleImageFlip()
18282189     {
18292190         IMAGEFLIP ^= true;
18302191     }
18312192 
1832
-    void ToggleSpeakerMocap()
2193
+    public void ToggleSpeakerMocap()
18332194     {
18342195         SPEAKERMOCAP ^= true;
18352196     }
18362197 
1837
-    void ToggleSpeakerCamera()
2198
+    public void ToggleSpeakerCamera()
18382199     {
18392200         SPEAKERCAMERA ^= true;
18402201     }
18412202 
1842
-    void ToggleSpeakerFocus()
2203
+    public void ToggleSpeakerFocus()
18432204     {
18442205         SPEAKERFOCUS ^= true;
18452206     }
18462207 
1847
-    void ToggleDebug()
1848
-    {
1849
-        DEBUG ^= true;
1850
-    }
1851
-
1852
-    void ToggleFrustum()
2208
+    public void ToggleFrustum()
18532209     {
18542210         FRUSTUM ^= true;
18552211     }
18562212 
1857
-    void ToggleTrack()
2213
+    public void ToggleTrack()
18582214     {
18592215         TRACK ^= true;
18602216         if (TRACK)
....@@ -1873,25 +2229,35 @@
18732229         repaint();
18742230     }
18752231 
1876
-    void ToggleTrackOnce()
2232
+    public void ToggleTrackOnce()
18772233     {
18782234         TRACKONCE ^= true;
18792235     }
18802236 
1881
-    void ToggleShadowTrack()
2237
+    public void ToggleShadowTrack()
18822238     {
18832239         SHADOWTRACK ^= true;
18842240         repaint();
18852241     }
18862242 
1887
-    void ToggleOeil()
2243
+    public void ToggleOeil()
18882244     {
18892245         OEIL ^= true;
18902246     }
18912247 
1892
-    void ToggleOeilOnce()
2248
+    public void ToggleOeilOnce()
18932249     {
18942250         OEILONCE ^= true;
2251
+    }
2252
+
2253
+    void ToggleFootContact()
2254
+    {
2255
+        FOOTCONTACT ^= true;
2256
+    }
2257
+    
2258
+    void ToggleDebug()
2259
+    {
2260
+        DEBUG ^= true;
18952261     }
18962262 
18972263     void ToggleLookAt()
....@@ -3840,6 +4206,7 @@
38404206     
38414207     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
38424208     {
4209
+                new Exception().printStackTrace();
38434210         System.exit(0);
38444211         com.sun.opengl.util.texture.Texture texture = null;
38454212 
....@@ -7953,7 +8320,7 @@
79538320         return texture!=null?texture.texture:null;
79548321     }
79558322     
7956
-    com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8323
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
79578324     {
79588325         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
79598326                 
....@@ -9026,7 +9393,7 @@
90269393             //gl.glFlush();
90279394             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
90289395 
9029
-            if (ANIMATION && ABORTED)
9396
+            if (Globals.ANIMATION && ABORTED)
90309397             {
90319398     System.err.println("    ABORTED FRAME");
90329399                 break;
....@@ -9056,7 +9423,7 @@
90569423         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
90579424 
90589425         // save image
9059
-        if (ANIMATION && !ABORTED)
9426
+        if (Globals.ANIMATION && !ABORTED)
90609427         {
90619428             VPwidth = viewport[2];
90629429             VPheight = viewport[3];
....@@ -9167,7 +9534,7 @@
91679534             
91689535 //            imagecount++;
91699536             
9170
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9537
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
91719538             
91729539             if (!BOXMODE)
91739540             {
....@@ -10891,8 +11258,14 @@
1089111258     {
1089211259             renderpass++;
1089311260 //        System.out.println("Draw object... ");
11261
+        STEP = 1;
1089411262         if (FAST) // in case there is no script
10895
-            STEP = 16;
11263
+            STEP = 8;
11264
+            
11265
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11266
+        {
11267
+            STEP *= 4;
11268
+        }
1089611269             
1089711270         //object.FullInvariants();
1089811271         
....@@ -12230,8 +12603,10 @@
1223012603             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1223112604                 
1223212605                 "SUB temp.x, one.x, ndotl.x;" +
12233
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12234
-                "ADD temp.y, one.y, options2.y;" + // sursurface
12606
+                // Tuning for default skin
12607
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12608
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12609
+                "ADD temp.y, one.y, options2.y;" + // subsurface
1223512610                 "MUL temp.x, temp.x, temp.y;" +
1223612611                                 
1223712612                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12379,7 +12754,7 @@
1237912754               "MUL final.y, fragment.texcoord[0].x, c256;" +
1238012755               "FLR final.x, final.y;" +
1238112756               "SUB final.y, final.y, final.x;" +
12382
-              "MUL final.x, final.x, c256i;" +
12757
+              //"MUL final.x, final.x, c256i;" +
1238312758               "MOV final.z, zero.x;" +
1238412759               "MOV final.a, one.w;":""
1238512760               ) +
....@@ -12387,7 +12762,7 @@
1238712762               "MUL final.y, fragment.texcoord[0].y, c256;" +
1238812763               "FLR final.x, final.y;" +
1238912764               "SUB final.y, final.y, final.x;" +
12390
-              "MUL final.x, final.x, c256i;" +
12765
+              //"MUL final.x, final.x, c256i;" +
1239112766               "MOV final.z, zero.x;" +
1239212767               "MOV final.a, one.w;":""
1239312768               ) +
....@@ -13167,6 +13542,7 @@
1316713542 	
1316813543         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
1316913544             
13545
+        if (BUTTONLESSWHEEL)
1317013546 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
1317113547 	{
1317213548             return;
....@@ -13175,7 +13551,7 @@
1317513551         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
1317613552         
1317713553         // TIMER
13178
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13554
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
1317913555         {
1318013556             keepboxmode = BOXMODE;
1318113557             keepsupport = SUPPORT;
....@@ -13392,11 +13768,11 @@
1339213768     
1339313769     public void mouseDragged(MouseEvent e)
1339413770     {
13771
+        //System.out.println("mouseDragged: " + e);
1339513772         if (isRenderer)
1339613773             movingcamera = true;
1339713774         //if (drawing)
1339813775         //return;
13399
-        //System.out.println("mouseDragged: " + e);
1340013776         if ((e.getModifiersEx() & CTRL) != 0
1340113777             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1340213778         {
....@@ -13577,6 +13953,7 @@
1357713953         
1357813954         public void run()
1357913955         {
13956
+                new Exception().printStackTrace();
1358013957             System.exit(0);
1358113958             for (;;)
1358213959             {
....@@ -13931,7 +14308,6 @@
1393114308     public void mouseMoved(MouseEvent e)
1393214309     {
1393314310         //System.out.println("mouseMoved: " + e);
13934
-
1393514311         if (isRenderer)
1393614312             return;
1393714313         
....@@ -14153,7 +14529,7 @@
1415314529             SetMouseMode(modifiers);
1415414530         }
1415514531 
14156
-        theRenderer.keyPressed(key);
14532
+        Globals.theRenderer.keyPressed(key);
1415714533     }
1415814534 
1415914535     int kompactbit = 4; // power bit
....@@ -14165,7 +14541,7 @@
1416514541     float SATPOW = 1; // 2; // 0.5f;
1416614542     float BRIPOW = 1; // 0.5f; // 0.5f;
1416714543     
14168
-    void keyPressed(int key)
14544
+    public void keyPressed(int key)
1416914545     {
1417014546         if (key >= '0' && key <= '5')
1417114547             clampbit = (key-'0');
....@@ -14602,6 +14978,7 @@
1460214978         }
1460314979     //System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
1460414980     }
14981
+    
1460514982     static double OCCLUSIONBOOST = 1; // 0.5;
1460614983 
1460714984     void keyReleased(int key, int modifiers)
....@@ -14613,7 +14990,7 @@
1461314990         }
1461414991     }
1461514992 
14616
-    protected void processKeyEvent(KeyEvent e)
14993
+    public void processKeyEvent(KeyEvent e)
1461714994     {
1461814995         switch (e.getID())
1461914996         {
....@@ -14743,8 +15120,9 @@
1474315120 
1474415121     protected void processMouseMotionEvent(MouseEvent e)
1474515122     {
14746
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
14747
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15123
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15124
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15125
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
1474815126         {
1474915127             mouseMoved(e);
1475015128         } else
....@@ -14774,6 +15152,7 @@
1477415152 
1477515153     void SelectParent()
1477615154     {
15155
+                new Exception().printStackTrace();
1477715156         System.exit(0);
1477815157         Composite group = (Composite) object;
1477915158         java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -14797,6 +15176,7 @@
1479715176 
1479815177     void SelectChildren()
1479915178     {
15179
+                new Exception().printStackTrace();
1480015180         System.exit(0);
1480115181         /*
1480215182         Composite group = (Composite) object;
....@@ -15910,6 +16290,7 @@
1591016290         {
1591116291             if (!selection)
1591216292             {
16293
+                new Exception().printStackTrace();
1591316294                 System.exit(0);
1591416295                 return;
1591516296             }
....@@ -16696,10 +17077,11 @@
1669617077     static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH*8*8 * TEXT_HEIGHT);
1669717078     // Depth buffer format
1669817079     //private int depth_format;
16699
-    static public void NextIndex(Object3D o, GL gl)
17080
+    
17081
+    public void NextIndex()
1670017082     {
1670117083         indexcount+=16;
16702
-        gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
17084
+        GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
1670317085     //objects[indexcount] = o;
1670417086     //System.out.println("indexcount = " + indexcount);
1670517087     }