Fix refresh info.

Normand Briere

2019-06-17 13e9febe94aaeebad9c97f6d3e2aa4d73b2495c8

 CameraPane.java
..
..
@@ -56,8 +56,6 @@
56
56
     static int CURRENTANTIALIAS = 0; // 1;
57
57
 	/*static*/ boolean RENDERSHADOW = true;
58
58
     /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
-    static boolean ANIMATION = false;
60
-    static String filename;
61
59
     
62
60
     boolean DISPLAYTEXT = false;
63
61
     //boolean REDUCETEXTURE = true;
..
..
@@ -92,6 +90,8 @@
92
90
 
93
91
 static    int tickcount = 0; // slow pose issue
94
92
 
93
+static    boolean BUTTONLESSWHEEL = false;
94
+static    boolean ZOOMBOXMODE = false;
95
95
 static    boolean BOXMODE = false;
96
96
 static    boolean IMAGEFLIP = false;
97
97
 static    boolean SMOOTHFOCUS = false;
..
..
@@ -106,7 +106,7 @@
106
106
 static    boolean OEIL = true;
107
107
 static    boolean OEILONCE = false; // do oeilon then oeiloff
108
108
 static    boolean LOOKAT = true;
109
-static    boolean RANDOM = true; // false;
109
+static    boolean SWITCH = true; // false;
110
110
 static    boolean HANDLES = false; // selection doesn't work!!
111
111
 static  boolean PAINTMODE = false;
112
112
 
..
..
@@ -150,12 +150,12 @@
150
150
         defaultcaps.setAccumAlphaBits(16);
151
151
     }
152
152
     
153
-    static CameraPane theRenderer;
153
+    private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154
154
     
155
155
     void SetAsGLRenderer(boolean b)
156
156
     {
157
157
         isRenderer = b;
158
-        theRenderer = this;
158
+        Globals.theRenderer = this;
159
159
     }
160
160
 
161
161
     CameraPane(Object3D o, Camera cam, boolean withcontext)
..
..
@@ -193,9 +193,43 @@
193
193
     
194
194
     /// INTERFACE
195
195
     
196
+    public javax.media.opengl.GL GetGL0()
197
+    {
198
+            return null;
199
+    }
200
+    
201
+    public int GenList()
202
+    {
203
+            javax.media.opengl.GL gl = GetGL();
204
+        return gl.glGenLists(1);
205
+    }
206
+    
207
+    public void NewList(int id)
208
+    {
209
+            javax.media.opengl.GL gl = GetGL();
210
+        gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
211
+    }
212
+    
213
+    public void CallList(int id)
214
+    {
215
+        javax.media.opengl.GL gl = GetGL();
216
+        gl.glCallList(id);
217
+    }
218
+    
219
+    public void EndList()
220
+    {
221
+            javax.media.opengl.GL gl = GetGL();
222
+        gl.glEndList();
223
+    }
224
+    
196
225
     public boolean IsBoxMode()
197
226
     {
198
227
             return BOXMODE;
228
+    }
229
+    
230
+    public boolean IsZoomBoxMode()
231
+    {
232
+            return ZOOMBOXMODE;
199
233
     }
200
234
     
201
235
     public void ClearDepth()
..
..
@@ -430,7 +464,7 @@
430
464
         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431
465
         {
432
466
             //gl.glBegin(gl.GL_TRIANGLES);
433
-            boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
467
+            boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
434
468
             if (!hasnorm)
435
469
             {
436
470
            //     System.out.println("FUCK!!");
..
..
@@ -816,7 +850,7 @@
816
850
 
817
851
                         if ((i % 100) == 0 && i != 0)
818
852
                         {
819
-                    CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
853
+                    Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820
854
                             //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821
855
                                 System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822
856
                         }
..
..
@@ -848,7 +882,7 @@
848
882
 
849
883
                         if ((i % 100) == 0 && i != 0)
850
884
                         {
851
-                    CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
885
+                    Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852
886
                             //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853
887
                                 System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854
888
                         }
..
..
@@ -1061,7 +1095,336 @@
1061
1095
         gl.glMatrixMode(gl.GL_MODELVIEW);
1062
1096
     }
1063
1097
     
1098
+        public void DrawBox(cVector min, cVector max)
1099
+        {
1100
+            javax.media.opengl.GL gl = GetGL();
1101
+                gl.glBegin(gl.GL_LINES);
1102
+                
1103
+                gl.glVertex3d(min.x, min.y, min.z);
1104
+                gl.glVertex3d(min.x, min.y, max.z);
1105
+                gl.glVertex3d(min.x, min.y, min.z);
1106
+                gl.glVertex3d(min.x, max.y, min.z);
1107
+                gl.glVertex3d(min.x, min.y, min.z);
1108
+                gl.glVertex3d(max.x, min.y, min.z);
1109
+                
1110
+                gl.glVertex3d(max.x, max.y, max.z);
1111
+                gl.glVertex3d(min.x, max.y, max.z);
1112
+                gl.glVertex3d(max.x, max.y, max.z);
1113
+                gl.glVertex3d(max.x, min.y, max.z);
1114
+                gl.glVertex3d(max.x, max.y, max.z);
1115
+                gl.glVertex3d(max.x, max.y, min.z);
1116
+                
1117
+                gl.glEnd();
1118
+        }
1119
+
1120
+        public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
1121
+        {
1122
+            int[] strips = bRep.getRawIndices();
1123
+            
1124
+            javax.media.opengl.GL gl = GetGL();
1125
+        
1126
+                // TRIANGLE STRIP ARRAY
1127
+                if (bRep.trimmed)
1128
+                {
1129
+                    float[] v = bRep.getRawVertices();
1130
+                    float[] n = bRep.getRawNormals();
1131
+                    float[] c = bRep.getRawColors();
1132
+                    float[] uv = bRep.getRawUVMap();
1133
+
1134
+                    int count2 = 0;
1135
+                    int count3 = 0;
1136
+
1137
+                    if (n.length > 0)
1138
+                    {
1139
+                        for (int i = 0; i < strips.length; i++)
1140
+                        {
1141
+                            gl.glBegin(gl.GL_TRIANGLE_STRIP);
1142
+
1143
+                            /*
1144
+                    boolean locked = false;
1145
+                    float eps = 0.1f;
1146
+                    boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
1147
+
1148
+                    int dot = 0;
1149
+
1150
+                    if ((dot&1) == 0)
1151
+                        dot |= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
1152
+
1153
+                    if (wrap || (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
1154
+                        gl.glTexCoord2f((float) qv.s, (float) qv.t);
1155
+                    else
1156
+                    {
1157
+                        locked = true;
1158
+                        gl.glTexCoord2f((float) pv.s, (float) pv.t);
1159
+                    }
1160
+                    //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
1161
+                    gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
1162
+                    if (hasnorm)
1163
+                    {
1164
+                        //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
1165
+                        gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
1166
+                    }
1167
+
1168
+                    if ((dot&4) == 0)
1169
+                        dot |= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
1170
+
1171
+                    if (wrap || !locked && (dot&8) != 0)
1172
+                        gl.glTexCoord2f((float) rv.s, (float) rv.t);
1173
+                    else
1174
+                        gl.glTexCoord2f((float) pv.s, (float) pv.t);
1175
+
1176
+                    f.dot = dot;
1177
+                    */
1178
+
1179
+                            if (!selectmode)
1180
+                            {
1181
+                                if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1182
+                                {
1183
+                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1184
+                                } else
1185
+                                {
1186
+                                    gl.glNormal3f(0, 0, 1);
1187
+                                }
1188
+
1189
+                                if (c != null)
1190
+                                //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
1191
+                                {
1192
+                                    gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1193
+                                }
1194
+                            }
1195
+                            if (flipV)
1196
+                                gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197
+                            else
1198
+                                gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1199
+                            //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200
+                            gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201
+
1202
+                            count2 += 2;
1203
+                            count3 += 3;
1204
+                            if (!selectmode)
1205
+                            {
1206
+                                if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1207
+                                {
1208
+                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1209
+                                } else
1210
+                                {
1211
+                                    gl.glNormal3f(0, 0, 1);
1212
+                                }
1213
+                                if (c != null)
1214
+                                {
1215
+                                    gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1216
+                                }
1217
+                            }
1218
+                            if (flipV)
1219
+                                gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220
+                            else
1221
+                                gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1222
+                            //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223
+                            gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224
+
1225
+                            count2 += 2;
1226
+                            count3 += 3;
1227
+                            for (int j = 0; j < strips[i] - 2; j++)
1228
+                            {
1229
+                                //gl.glTexCoord2d(...);
1230
+                                if (!selectmode)
1231
+                                {
1232
+                                    if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1233
+                                    {
1234
+                                        gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1235
+                                    } else
1236
+                                    {
1237
+                                        gl.glNormal3f(0, 0, 1);
1238
+                                    }
1239
+                                    if (c != null)
1240
+                                    {
1241
+                                        gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1242
+                                    }
1243
+                                }
1244
+
1245
+                                if (flipV)
1246
+                                    gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247
+                                else
1248
+                                    gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1249
+                                //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250
+                                gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1251
+                                count2 += 2;
1252
+                                count3 += 3;
1253
+                            }
1254
+
1255
+                            gl.glEnd();
1256
+                        }
1257
+                    }
1258
+
1259
+                    assert count3 == v.length;
1260
+                }
1261
+                else // !trimmed
1262
+                {
1263
+                    int count = 0;
1264
+                    for (int i = 0; i < strips.length; i++)
1265
+                    {
1266
+                        gl.glBegin(gl.GL_TRIANGLE_STRIP);
1267
+                        
1268
+                        Vertex p = bRep.GetVertex(bRep.indices[count++]);
1269
+                        Vertex q = bRep.GetVertex(bRep.indices[count++]);
1270
+                        
1271
+                        drawVertex(gl, p, flipV, selectmode);
1272
+                        drawVertex(gl, q, flipV, selectmode);
1273
+                        
1274
+                        for (int j = 0; j < strips[i] - 2; j++)
1275
+                        {
1276
+                            Vertex r = bRep.GetVertex(bRep.indices[count++]);
1277
+
1278
+    //                        if (j%2 == 0)
1279
+    //                            drawFace(p, q, r, display, null);
1280
+    //                        else
1281
+    //                            drawFace(p, r, q, display, null);
1282
+                            
1283
+    //                        p = q;
1284
+    //                        q = r;
1285
+                            drawVertex(gl, r, flipV, selectmode);
1286
+                        }
1287
+
1288
+                        gl.glEnd();
1289
+                    }
1290
+                }
1291
+        }
1292
+
1293
+    static cSpring.Point3D temp = new cSpring.Point3D();
1294
+    static cSpring.Point3D temp2 = new cSpring.Point3D();
1295
+    static cSpring.Point3D temp3 = new cSpring.Point3D();
1296
+    
1297
+        public void DrawDynamicMesh(cMesh mesh)
1298
+        {
1299
+                GL gl = GetGL(); // getGL();
1300
+
1301
+                cSpring.PhysicsController3D Phys = mesh.Phys;
1302
+                
1303
+                gl.glDisable(gl.GL_LIGHTING);
1304
+                
1305
+                gl.glLineWidth(1);
1306
+                gl.glColor3f(1,1,1);
1307
+                gl.glBegin(gl.GL_LINES);
1308
+                double scale = 0;
1309
+                int count = 0;
1310
+                for (int s=0; s<Phys.allSprings.size(); s++)
1311
+                {
1312
+                    cSpring.Spring spring = Phys.allSprings.get(s);
1313
+                        if(s == 0)
1314
+                        {
1315
+                            //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
1316
+                        }
1317
+                if (mesh.showsprings)
1318
+                {
1319
+                    temp.set(spring.a.position);
1320
+                    temp.add(spring.b.position);
1321
+                    temp.mul(0.5);
1322
+                    temp2.set(spring.a.position);
1323
+                    temp2.sub(spring.b.position);
1324
+                    temp2.mul(spring.restLength/2);
1325
+                    temp.sub(temp2);
1326
+                    gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1327
+                    temp.add(temp2);
1328
+                    temp.add(temp2);
1329
+                    gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1330
+                }
1331
+
1332
+                    if (spring.isHandle)
1333
+                        continue;
1334
+                    
1335
+                    //if (scale < spring.restLength)
1336
+                        scale += spring.restLength;
1337
+                        count++;
1338
+                }
1339
+                gl.glEnd();
1340
+
1341
+                if (count == 0)
1342
+                    scale = 0.01;
1343
+                else
1344
+                    scale /= count * 3;
1345
+                
1346
+                //scale = 0.25;
1347
+                
1348
+                if (mesh.ShowInfo())
1349
+                {
1350
+                    gl.glLineWidth(4);
1351
+                    for (int s=0; s<Phys.allNodes.size(); s++)
1352
+                    {
1353
+                        cSpring.DynamicNode node = Phys.allNodes.get(s);
1354
+                        if (node.mass == 0)
1355
+                            continue;
1356
+                        
1357
+                        int i = node.springs==null?-1:node.springs.size();
1358
+                        gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
1359
+                        //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
1360
+                        //temp.normalize();
1361
+                        //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
1362
+                        gl.glBegin(gl.GL_LINES);
1363
+                        gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1364
+                        //gl.glVertex3d(node.position.x + node.normal.x*scale, node.position.y + node.normal.y*scale, node.position.z + node.normal.z*scale);
1365
+                        gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
1366
+                                node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
1367
+                                node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
1368
+                        gl.glEnd();
1369
+                    }
1370
+
1371
+                    gl.glLineWidth(8);
1372
+                    for (int s=0; s<Phys.allNodes.size(); s++)
1373
+                    {
1374
+                        cSpring.DynamicNode node = Phys.allNodes.get(s);
1375
+
1376
+                        if (node.springs != null)
1377
+                        {
1378
+                            for (int i=0; i<node.springs.size(); i+=1)
1379
+                            {
1380
+                                cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
1381
+                                
1382
+                                int c = i+1;
1383
+                           //     c = node.springs.get(i).nbcopies;
1384
+
1385
+                                gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
1386
+                                gl.glBegin(gl.GL_LINES);
1387
+                                    gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1388
+                                    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);
1389
+                                gl.glEnd();
1390
+                            }
1391
+                        }
1392
+                    }
1393
+
1394
+                    gl.glLineWidth(1);
1395
+                }
1396
+                
1397
+                gl.glEnable(gl.GL_LIGHTING);
1398
+        }
1399
+    
1064
1400
     /// INTERFACE
1401
+    
1402
+    public void StartTriangles()
1403
+    {
1404
+         javax.media.opengl.GL gl = GetGL();
1405
+         gl.glBegin(gl.GL_TRIANGLES);
1406
+    }
1407
+    
1408
+    public void EndTriangles()
1409
+    {
1410
+         GetGL().glEnd();
1411
+    }
1412
+    
1413
+    void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
1414
+    {
1415
+        if (!selectmode)
1416
+        {
1417
+            gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1418
+            gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1419
+            
1420
+            if (flipV)
1421
+                gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
1422
+            else
1423
+                gl.glTexCoord2f((float) pv.s, (float) pv.t);
1424
+        }
1425
+
1426
+        gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427
+    }
1065
1428
     
1066
1429
     void SetColor(Object3D obj, Vertex p0)
1067
1430
     {
..
..
@@ -1256,18 +1619,18 @@
1256
1619
         //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257
1620
         if (!material.multiply)
1258
1621
         {
1259
-            display.color = color;
1622
+            display.color = material.color;
1260
1623
             display.saturation = material.modulation;
1261
1624
         }
1262
1625
         else
1263
1626
         {
1264
-            display.color *= color*2;
1627
+            display.color *= material.color*2;
1265
1628
             display.saturation *= material.modulation*2;
1266
1629
         }
1267
1630
             
1268
1631
         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269
1632
 
1270
-        float[] colorV = GrafreeD.colorV;
1633
+        float[] colorV = Grafreed.colorV;
1271
1634
 
1272
1635
         /**/
1273
1636
         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..
..
@@ -1527,7 +1890,7 @@
1527
1890
     void PushMatrix(double[][] matrix)
1528
1891
     {
1529
1892
     //    GrafreeD.tracein(matrix);
1530
-        PushMatrix(matrix,1);
1893
+        PushMatrix(matrix, 1);
1531
1894
     }
1532
1895
     
1533
1896
     void PushMatrix()
..
..
@@ -1624,7 +1987,7 @@
1624
1987
     
1625
1988
     static int camerachangeframe;
1626
1989
     
1627
-    boolean SetCamera(Camera cam)
1990
+    public boolean SetCamera(Camera cam)
1628
1991
     {
1629
1992
         // may 2014 if (cam == cameras[0] || cam == cameras[1])
1630
1993
         //    return false;
..
..
@@ -1752,33 +2115,6 @@
1752
2115
         mainDL ^= true;
1753
2116
     }
1754
2117
 
1755
-    void ToggleTexture()
1756
-    {
1757
-        textureon ^= true;
1758
-    }
1759
-
1760
-    void ToggleLive()
1761
-    {
1762
-        Globals.setLIVE(Globals.isLIVE() ^ true);
1763
-        
1764
-        System.err.println("LIVE = " + Globals.isLIVE());
1765
-        
1766
-        if (!Globals.isLIVE()) // save sound
1767
-            GrafreeD.savesound = true; // wav.save();
1768
-     //   else
1769
-            repaint(); // start loop // may 2013
1770
-    }
1771
-
1772
-    void ToggleSupport()
1773
-    {
1774
-        SUPPORT ^= true;
1775
-    }
1776
-
1777
-    void ToggleAbort()
1778
-    {
1779
-        ABORTMODE ^= true;
1780
-    }
1781
-
1782
2118
     void ToggleFullScreen()
1783
2119
     {
1784
2120
         FULLSCREEN ^= true;
..
..
@@ -1789,72 +2125,94 @@
1789
2125
         Globals.CROWD ^= true;
1790
2126
     }
1791
2127
 
1792
-    void ToggleInertia()
1793
-    {
1794
-        INERTIA ^= true;
1795
-    }
1796
-
1797
2128
     void ToggleLocal()
1798
2129
     {
1799
2130
         LOCALTRANSFORM ^= true;
1800
2131
     }
1801
2132
 
1802
-    void ToggleFast()
2133
+    public void ToggleTexture()
2134
+    {
2135
+        textureon ^= true;
2136
+    }
2137
+
2138
+    public void ToggleLive()
2139
+    {
2140
+        Globals.setLIVE(Globals.isLIVE() ^ true);
2141
+        
2142
+        System.err.println("LIVE = " + Globals.isLIVE());
2143
+        
2144
+        if (!Globals.isLIVE()) // save sound
2145
+            Grafreed.savesound = true; // wav.save();
2146
+     //   else
2147
+            repaint(); // start loop // may 2013
2148
+    }
2149
+
2150
+    public void ToggleSupport()
2151
+    {
2152
+        SUPPORT ^= true;
2153
+    }
2154
+
2155
+    public void ToggleAbort()
2156
+    {
2157
+        ABORTMODE ^= true;
2158
+    }
2159
+
2160
+    public void ToggleInertia()
2161
+    {
2162
+        INERTIA ^= true;
2163
+    }
2164
+
2165
+    public void ToggleFast()
1803
2166
     {
1804
2167
         FAST ^= true;
1805
2168
     }
1806
2169
 
1807
-    void ToggleSlowPose()
2170
+    public void ToggleSlowPose()
1808
2171
     {
1809
2172
         SLOWPOSE ^= true;
1810
2173
     }
1811
2174
 
1812
-    void ToggleFootContact()
1813
-    {
1814
-        FOOTCONTACT ^= true;
1815
-    }
1816
-    
1817
-    void ToggleBoxMode()
2175
+    public void ToggleBoxMode()
1818
2176
     {
1819
2177
         BOXMODE ^= true;
1820
2178
     }
1821
2179
 
1822
-    void ToggleSmoothFocus()
2180
+    public void ToggleZoomBoxMode()
2181
+    {
2182
+        ZOOMBOXMODE ^= true;
2183
+    }
2184
+
2185
+    public void ToggleSmoothFocus()
1823
2186
     {
1824
2187
         SMOOTHFOCUS ^= true;
1825
2188
     }
1826
2189
 
1827
-    void ToggleImageFlip()
2190
+    public void ToggleImageFlip()
1828
2191
     {
1829
2192
         IMAGEFLIP ^= true;
1830
2193
     }
1831
2194
 
1832
-    void ToggleSpeakerMocap()
2195
+    public void ToggleSpeakerMocap()
1833
2196
     {
1834
2197
         SPEAKERMOCAP ^= true;
1835
2198
     }
1836
2199
 
1837
-    void ToggleSpeakerCamera()
2200
+    public void ToggleSpeakerCamera()
1838
2201
     {
1839
2202
         SPEAKERCAMERA ^= true;
1840
2203
     }
1841
2204
 
1842
-    void ToggleSpeakerFocus()
2205
+    public void ToggleSpeakerFocus()
1843
2206
     {
1844
2207
         SPEAKERFOCUS ^= true;
1845
2208
     }
1846
2209
 
1847
-    void ToggleDebug()
1848
-    {
1849
-        DEBUG ^= true;
1850
-    }
1851
-
1852
-    void ToggleFrustum()
2210
+    public void ToggleFrustum()
1853
2211
     {
1854
2212
         FRUSTUM ^= true;
1855
2213
     }
1856
2214
 
1857
-    void ToggleTrack()
2215
+    public void ToggleTrack()
1858
2216
     {
1859
2217
         TRACK ^= true;
1860
2218
         if (TRACK)
..
..
@@ -1873,25 +2231,35 @@
1873
2231
         repaint();
1874
2232
     }
1875
2233
 
1876
-    void ToggleTrackOnce()
2234
+    public void ToggleTrackOnce()
1877
2235
     {
1878
2236
         TRACKONCE ^= true;
1879
2237
     }
1880
2238
 
1881
-    void ToggleShadowTrack()
2239
+    public void ToggleShadowTrack()
1882
2240
     {
1883
2241
         SHADOWTRACK ^= true;
1884
2242
         repaint();
1885
2243
     }
1886
2244
 
1887
-    void ToggleOeil()
2245
+    public void ToggleOeil()
1888
2246
     {
1889
2247
         OEIL ^= true;
1890
2248
     }
1891
2249
 
1892
-    void ToggleOeilOnce()
2250
+    public void ToggleOeilOnce()
1893
2251
     {
1894
2252
         OEILONCE ^= true;
2253
+    }
2254
+
2255
+    void ToggleFootContact()
2256
+    {
2257
+        FOOTCONTACT ^= true;
2258
+    }
2259
+    
2260
+    void ToggleDebug()
2261
+    {
2262
+        DEBUG ^= true;
1895
2263
     }
1896
2264
 
1897
2265
     void ToggleLookAt()
..
..
@@ -1899,9 +2267,9 @@
1899
2267
         LOOKAT ^= true;
1900
2268
     }
1901
2269
 
1902
-    void ToggleRandom()
2270
+    void ToggleSwitch()
1903
2271
     {
1904
-        RANDOM ^= true;
2272
+        SWITCH ^= true;
1905
2273
     }
1906
2274
 
1907
2275
     void ToggleHandles()
..
..
@@ -2008,7 +2376,7 @@
2008
2376
     {
2009
2377
         return currentGL;
2010
2378
     }
2011
-    
2379
+
2012
2380
     /**/
2013
2381
     class CacheTexture
2014
2382
     {
..
..
@@ -3840,6 +4208,7 @@
3840
4208
     
3841
4209
     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842
4210
     {
4211
+                new Exception().printStackTrace();
3843
4212
         System.exit(0);
3844
4213
         com.sun.opengl.util.texture.Texture texture = null;
3845
4214
 
..
..
@@ -7655,7 +8024,7 @@
7655
8024
         }
7656
8025
     }
7657
8026
 
7658
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8027
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7659
8028
     {
7660
8029
         if (// DrawMode() != 0 || /*tex == null ||*/
7661
8030
                 ambientOcclusion ) // || !textureon)
..
..
@@ -7700,7 +8069,27 @@
7700
8069
         return; // true;
7701
8070
     }
7702
8071
     
7703
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8072
+    java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8073
+    
8074
+    private boolean FileExists(String tex)
8075
+    {
8076
+        if (missingTextures.contains(tex))
8077
+        {
8078
+            return false;
8079
+        }
8080
+        
8081
+        boolean fileExists = new File(tex).exists();
8082
+        
8083
+        if (!fileExists)
8084
+        {
8085
+            // If file exists, the "new File()" is not executed sgain
8086
+            missingTextures.add(tex);
8087
+        }
8088
+        
8089
+        return fileExists;
8090
+    }
8091
+    
8092
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7704
8093
     {
7705
8094
         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
7706
8095
         
..
..
@@ -7708,12 +8097,18 @@
7708
8097
         {
7709
8098
             String texname = tex;
7710
8099
             
7711
-            String[] split = tex.split("Textures");
7712
-            if (split.length > 1)
7713
-                texname = "/Users/nbriere/Textures" + split[split.length-1];
7714
-            else
7715
-                if (!texname.startsWith("/"))
7716
-                    texname = "/Users/nbriere/Textures/" + texname;
8100
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8101
+                
8102
+//            String[] split = tex.split("Textures");
8103
+//            if (split.length > 1)
8104
+//                texname = "/Users/nbriere/Textures" + split[split.length-1];
8105
+//            else
8106
+//                if (!texname.startsWith("/"))
8107
+//                    texname = "/Users/nbriere/Textures/" + texname;
8108
+            if (!FileExists(tex))
8109
+            {
8110
+                    texname = fallbackTextureName;
8111
+            }
7717
8112
             
7718
8113
             if (CACHETEXTURE)
7719
8114
                 texture = textures.get(texname); // TEXTURE CACHE
..
..
@@ -7782,7 +8177,7 @@
7782
8177
                                     }
7783
8178
                                 
7784
8179
                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785
-                                    if (!new File(cachename).exists())
8180
+                                    if (!FileExists(cachename))
7786
8181
                                         cachename = texname;
7787
8182
                                     else
7788
8183
                                         processbump = false; // don't process bump map again
..
..
@@ -7804,7 +8199,7 @@
7804
8199
                                     }
7805
8200
                                 
7806
8201
                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807
-                                    if (!new File(cachename).exists())
8202
+                                    if (!FileExists(cachename))
7808
8203
                                         cachename = texname;
7809
8204
                                     else
7810
8205
                                         processbump = false; // don't process bump map again
..
..
@@ -7813,7 +8208,9 @@
7813
8208
                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
7814
8209
                                 
7815
8210
                                 
7816
-                                if (texturedata != null)
8211
+                                if (texturedata == null)
8212
+                                    throw new Exception();
8213
+                                    
7817
8214
                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7818
8215
         //texture = GetTexture(tex, bump);
7819
8216
                             }
..
..
@@ -7935,7 +8332,7 @@
7935
8332
         return texture;
7936
8333
     }
7937
8334
     
7938
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8335
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7939
8336
     {
7940
8337
         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941
8338
                 
..
..
@@ -7953,14 +8350,14 @@
7953
8350
         return texture!=null?texture.texture:null;
7954
8351
     }
7955
8352
     
7956
-    com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8353
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7957
8354
     {
7958
8355
         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959
8356
                 
7960
8357
         return texture!=null?texture.texturedata:null;
7961
8358
     }
7962
8359
     
7963
-    boolean BindTexture(String tex, boolean bump, int resolution)
8360
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7964
8361
     {
7965
8362
         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7966
8363
         {
..
..
@@ -8937,8 +9334,8 @@
8937
9334
         assert (parentcam != renderCamera);
8938
9335
         
8939
9336
         if (renderCamera != lightCamera)
8940
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
8941
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9337
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9338
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8942
9339
         
8943
9340
 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944
9341
             
..
..
@@ -8953,8 +9350,8 @@
8953
9350
             LA.matCopy(renderCamera.fromScreen, matrix);
8954
9351
             
8955
9352
         if (renderCamera != lightCamera)
8956
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
8957
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9353
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9354
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8958
9355
 
8959
9356
 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960
9357
             
..
..
@@ -9026,7 +9423,7 @@
9026
9423
             //gl.glFlush();
9027
9424
             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028
9425
 
9029
-            if (ANIMATION && ABORTED)
9426
+            if (Globals.ANIMATION && ABORTED)
9030
9427
             {
9031
9428
     System.err.println("    ABORTED FRAME");
9032
9429
                 break;
..
..
@@ -9056,7 +9453,7 @@
9056
9453
         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057
9454
 
9058
9455
         // save image
9059
-        if (ANIMATION && !ABORTED)
9456
+        if (Globals.ANIMATION && !ABORTED)
9060
9457
         {
9061
9458
             VPwidth = viewport[2];
9062
9459
             VPheight = viewport[3];
..
..
@@ -9167,11 +9564,11 @@
9167
9564
             
9168
9565
 //            imagecount++;
9169
9566
             
9170
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9567
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171
9568
             
9172
9569
             if (!BOXMODE)
9173
9570
             {
9174
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9571
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175
9572
             }
9176
9573
     
9177
9574
             if (!BOXMODE)
..
..
@@ -9209,7 +9606,7 @@
9209
9606
             ABORTED = false;
9210
9607
         }
9211
9608
         else
9212
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9609
+            Grafreed.wav.cursor += 735 * ACSIZE;
9213
9610
         
9214
9611
         if (false)
9215
9612
         {
..
..
@@ -9872,11 +10269,11 @@
9872
10269
 
9873
10270
     public void display(GLAutoDrawable drawable)
9874
10271
     {
9875
-        if (GrafreeD.savesound && GrafreeD.hassound)
10272
+        if (Grafreed.savesound && Grafreed.hassound)
9876
10273
         {
9877
-            GrafreeD.wav.save();
9878
-            GrafreeD.savesound = false;
9879
-            GrafreeD.hassound = false;
10274
+            Grafreed.wav.save();
10275
+            Grafreed.savesound = false;
10276
+            Grafreed.hassound = false;
9880
10277
         }
9881
10278
 //        if (DEBUG_SELECTION)
9882
10279
 //        {
..
..
@@ -10006,7 +10403,7 @@
10006
10403
             Object3D theobject = object;
10007
10404
             Object3D theparent = object.parent;
10008
10405
             object.parent = null;
10009
-            object = (Object3D)GrafreeD.clone(object);
10406
+            object = (Object3D)Grafreed.clone(object);
10010
10407
             object.Stripify();
10011
10408
             if (theobject.selection == null || theobject.selection.Size() == 0)
10012
10409
                 theobject.PreprocessOcclusion(this);
..
..
@@ -10019,13 +10416,13 @@
10019
10416
             ambientOcclusion = false;
10020
10417
         }
10021
10418
 
10022
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10419
+        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023
10420
         {
10024
10421
             //if (RENDERSHADOW) // ?
10025
10422
             if (!IsFrozen())
10026
10423
             {
10027
10424
                 // dec 2012
10028
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10425
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029
10426
                 {
10030
10427
             Globals.framecount++;
10031
10428
                     shadowbuffer.display();
..
..
@@ -10152,8 +10549,8 @@
10152
10549
             
10153
10550
 //        if (parentcam != renderCamera) // not a light
10154
10551
         if (cam != lightCamera)
10155
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10156
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10552
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10553
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10157
10554
             
10158
10555
             for (int j = 0; j < 4; j++)
10159
10556
             {
..
..
@@ -10167,8 +10564,8 @@
10167
10564
             
10168
10565
 //        if (parentcam != renderCamera) // not a light
10169
10566
         if (cam != lightCamera)
10170
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10171
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10567
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10568
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10172
10569
         
10173
10570
             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174
10571
             
..
..
@@ -10427,7 +10824,16 @@
10427
10824
             // Bump noise
10428
10825
             gl.glActiveTexture(GL.GL_TEXTURE6);
10429
10826
             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430
-            BindTexture(NOISE_TEXTURE, false, 2);
10827
+            
10828
+    try
10829
+    {
10830
+        BindTexture(NOISE_TEXTURE, false, 2);
10831
+    }
10832
+    catch (Exception e)
10833
+    {
10834
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10835
+    }
10836
+           
10431
10837
 
10432
10838
             gl.glActiveTexture(GL.GL_TEXTURE0);
10433
10839
             gl.glEnable(GL.GL_TEXTURE_2D);
..
..
@@ -10552,8 +10958,8 @@
10552
10958
                 System.err.println("parentcam != renderCamera");
10553
10959
 
10554
10960
 //            if (cam != lightCamera)
10555
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10556
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
10961
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10962
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10557
10963
         }
10558
10964
         
10559
10965
         LA.xformDir(lightposition, cam.toScreen, lightposition);
..
..
@@ -10574,8 +10980,8 @@
10574
10980
             if (true) // TODO
10575
10981
             {
10576
10982
                 if (cam != lightCamera)
10577
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10578
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
10983
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
10984
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579
10985
             }
10580
10986
             
10581
10987
             LA.xformPos(light0, cam.toScreen, light0);
..
..
@@ -10891,8 +11297,14 @@
10891
11297
     {
10892
11298
             renderpass++;
10893
11299
 //        System.out.println("Draw object... ");
11300
+        STEP = 1;
10894
11301
         if (FAST) // in case there is no script
10895
-            STEP = 16;
11302
+            STEP = 8;
11303
+            
11304
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11305
+        {
11306
+            STEP *= 4;
11307
+        }
10896
11308
             
10897
11309
         //object.FullInvariants();
10898
11310
         
..
..
@@ -10906,8 +11318,8 @@
10906
11318
             e.printStackTrace();
10907
11319
         }
10908
11320
         
10909
-        if (GrafreeD.RENDERME > 0)
10910
-            GrafreeD.RENDERME--; // mechante magouille
11321
+        if (Grafreed.RENDERME > 0)
11322
+            Grafreed.RENDERME--; // mechante magouille
10911
11323
         
10912
11324
         Globals.ONESTEP = false;
10913
11325
     }
..
..
@@ -10977,7 +11389,14 @@
10977
11389
 
10978
11390
                 usedtextures.clear();
10979
11391
             
10980
-                BindTextures(DEFAULT_TEXTURES, 2);
11392
+    try
11393
+    {
11394
+        BindTextures(DEFAULT_TEXTURES, 2);
11395
+    }
11396
+    catch (Exception e)
11397
+    {
11398
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11399
+    }
10981
11400
             }
10982
11401
             //System.out.println("--> " + stackdepth);
10983
11402
 //            GrafreeD.traceon();
..
..
@@ -11068,7 +11487,14 @@
11068
11487
             if (checker != null && DrawMode() == DEFAULT)
11069
11488
             {
11070
11489
                 //BindTexture(IMMORTAL_TEXTURE);
11071
-                BindTextures(checker.GetTextures(), checker.texres);
11490
+    try
11491
+    {
11492
+        BindTextures(checker.GetTextures(), checker.texres);
11493
+    }
11494
+    catch (Exception e)
11495
+    {
11496
+        System.err.println("FAILED: " + checker.GetTextures());
11497
+    }
11072
11498
                 // NEAREST
11073
11499
                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074
11500
                 DrawChecker(gl);
..
..
@@ -11150,7 +11576,7 @@
11150
11576
             return;
11151
11577
         }
11152
11578
 
11153
-        String string = obj.GetToolTip();
11579
+        String string = obj.toString(); //.GetToolTip();
11154
11580
         
11155
11581
         GL gl = GetGL();
11156
11582
         
..
..
@@ -11467,8 +11893,8 @@
11467
11893
             //obj.TransformToWorld(light, light);
11468
11894
             for (int i = tp.size(); --i >= 0;)
11469
11895
             {
11470
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471
-                    LA.xformPos(light, tp.get(i).toParent, light);
11896
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11897
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11472
11898
             }
11473
11899
 
11474
11900
 
..
..
@@ -11485,8 +11911,8 @@
11485
11911
                 parentcam = cameras[0];
11486
11912
             }
11487
11913
             
11488
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11489
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
11914
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
11915
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490
11916
 
11491
11917
             LA.xformPos(light, renderCamera.toScreen, light);
11492
11918
             
..
..
@@ -12100,8 +12526,8 @@
12100
12526
 
12101
12527
            // display shadow only (bump == 0)
12102
12528
          "SUB temp.x, half.x, shadow.x;" +
12103
-         "MOV temp.y, -params6.x;" +
12104
-         "SLT temp.z, temp.y, zero.x;" +
12529
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12530
+         "SLT temp.z, temp.y, -one2048th.x;" +
12105
12531
          "SUB temp.y, one.x, temp.z;" +
12106
12532
          "MUL temp.x, temp.x, temp.y;" +
12107
12533
          "KIL temp.x;" +
..
..
@@ -12230,8 +12656,10 @@
12230
12656
             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231
12657
                 
12232
12658
                 "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
12659
+                // Tuning for default skin
12660
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12661
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12662
+                "ADD temp.y, one.y, options2.y;" + // subsurface
12235
12663
                 "MUL temp.x, temp.x, temp.y;" +
12236
12664
                                 
12237
12665
                 "MUL saturation, saturation, temp.xxxx;" +
..
..
@@ -12430,7 +12858,7 @@
12430
12858
             //once = true;
12431
12859
         }
12432
12860
 
12433
-        System.out.print("Program #" + mode + "; length = " + program.length());
12861
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434
12862
         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435
12863
         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436
12864
 
..
..
@@ -12563,12 +12991,16 @@
12563
12991
 
12564
12992
                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565
12993
                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
12994
+                
12995
+                // Compare fragment depth in light space with shadowmap.
12566
12996
                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567
12997
                 "SGE temp.y, temp.x, zero.x;" +
12568
-                "SUB " + shadow + ".y, one.x, temp.y;" +
12998
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
12999
+                
13000
+                // Reverse comparison
12569
13001
                 "SUB temp.x, one.x, temp.x;" +
12570
13002
                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12571
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13003
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572
13004
                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573
13005
 
12574
13006
                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..
..
@@ -12582,6 +13014,10 @@
12582
13014
                 // No shadow for backface
12583
13015
                 "DP3 temp.x, normal, lightd;" +
12584
13016
                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13017
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13018
+
13019
+                // No shadow when out of frustrum
13020
+                "SGE temp.x, " + depth + ".z, one.z;" +
12585
13021
                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586
13022
                 "";
12587
13023
     }
..
..
@@ -13140,7 +13576,7 @@
13140
13576
     public void mousePressed(MouseEvent e)
13141
13577
     {
13142
13578
         //System.out.println("mousePressed: " + e);
13143
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13579
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144
13580
     }
13145
13581
 
13146
13582
     static long prevtime = 0;
..
..
@@ -13167,6 +13603,7 @@
13167
13603
 	
13168
13604
         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169
13605
             
13606
+        if (BUTTONLESSWHEEL)
13170
13607
 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
13171
13608
 	{
13172
13609
             return;
..
..
@@ -13175,7 +13612,7 @@
13175
13612
         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176
13613
         
13177
13614
         // TIMER
13178
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13615
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179
13616
         {
13180
13617
             keepboxmode = BOXMODE;
13181
13618
             keepsupport = SUPPORT;
..
..
@@ -13215,8 +13652,8 @@
13215
13652
       //      mode |= META;
13216
13653
         //}
13217
13654
         
13218
-        SetMouseMode(WHEEL | e.getModifiersEx());
13219
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13655
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13656
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220
13657
         anchorX = ax;
13221
13658
         anchorY = ay;
13222
13659
         prevX = px;
..
..
@@ -13276,6 +13713,10 @@
13276
13713
 //            wasliveok = true;
13277
13714
 //            waslive = false;
13278
13715
             
13716
+            // May 2019 Forget it:
13717
+            if (true)
13718
+                    return;
13719
+            
13279
13720
             // source == timer
13280
13721
             if (mouseDown)
13281
13722
             {
..
..
@@ -13314,7 +13755,7 @@
13314
13755
     
13315
13756
     javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316
13757
 
13317
-    void clickStart(int x, int y, int modifiers)
13758
+    void clickStart(int x, int y, int modifiers, int modifiersex)
13318
13759
     {
13319
13760
         if (!wasliveok)
13320
13761
             return;
..
..
@@ -13331,7 +13772,7 @@
13331
13772
 //        touched = true; // main DL
13332
13773
         if (isRenderer)
13333
13774
         {
13334
-            SetMouseMode(modifiers);
13775
+            SetMouseMode(modifiers, modifiersex);
13335
13776
         }
13336
13777
 
13337
13778
         selectX = anchorX = x;
..
..
@@ -13344,7 +13785,7 @@
13344
13785
         clicked = true;
13345
13786
         hold = false;
13346
13787
 
13347
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13788
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348
13789
         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349
13790
         {
13350
13791
       //  System.out.println("RESTART II " + modifiers);
..
..
@@ -13375,7 +13816,7 @@
13375
13816
             info.camera = renderCamera;
13376
13817
             info.x = x;
13377
13818
             info.y = y;
13378
-            info.modifiers = modifiers;
13819
+            info.modifiers = modifiersex;
13379
13820
             editObj = object.doEditClick(info, 0);
13380
13821
             if (!editObj)
13381
13822
             {
..
..
@@ -13392,11 +13833,14 @@
13392
13833
     
13393
13834
     public void mouseDragged(MouseEvent e)
13394
13835
     {
13836
+        Globals.MOUSEDRAGGED = true;
13837
+        
13838
+        //System.out.println("mouseDragged: " + e);
13395
13839
         if (isRenderer)
13396
13840
             movingcamera = true;
13841
+        
13397
13842
         //if (drawing)
13398
13843
         //return;
13399
-        //System.out.println("mouseDragged: " + e);
13400
13844
         if ((e.getModifiersEx() & CTRL) != 0
13401
13845
             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
13402
13846
         {
..
..
@@ -13404,7 +13848,7 @@
13404
13848
             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405
13849
         }
13406
13850
         else
13407
-            drag(e.getX(), e.getY(), e.getModifiersEx());
13851
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408
13852
         
13409
13853
     //try { Thread.sleep(1); } catch (Exception ex) {}
13410
13854
     }
..
..
@@ -13577,6 +14021,7 @@
13577
14021
         
13578
14022
         public void run()
13579
14023
         {
14024
+                new Exception().printStackTrace();
13580
14025
             System.exit(0);
13581
14026
             for (;;)
13582
14027
             {
..
..
@@ -13640,7 +14085,7 @@
13640
14085
                     {
13641
14086
                         Globals.lighttouched = true;
13642
14087
                     }
13643
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14088
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644
14089
                 }
13645
14090
             //else
13646
14091
             }
..
..
@@ -13740,7 +14185,7 @@
13740
14185
     int X, Y;
13741
14186
     boolean SX, SY;
13742
14187
 
13743
-    void drag(int x, int y, int modifiers)
14188
+    void drag(int x, int y, int modifiers, int modifiersex)
13744
14189
     {
13745
14190
         if (IsFrozen())
13746
14191
         {
..
..
@@ -13749,17 +14194,17 @@
13749
14194
 
13750
14195
         drag = true; // NEW
13751
14196
         
13752
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14197
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753
14198
 
13754
14199
         X = x;
13755
14200
         Y = y;
13756
14201
         // floating state for animation
13757
-        MODIFIERS = modifiers;
13758
-        modifiers &= ~1024;
14202
+        MODIFIERS = modifiersex;
14203
+        modifiersex &= ~1024;
13759
14204
         if (false) // modifiers != 0)
13760
14205
         {
13761
14206
             //new Exception().printStackTrace();
13762
-            System.out.println("mouseDragged: " + modifiers);
14207
+            System.out.println("mouseDragged: " + modifiersex);
13763
14208
             System.out.println("SHIFT = " + SHIFT);
13764
14209
             System.out.println("CONTROL = " + COMMAND);
13765
14210
             System.out.println("META = " + META);
..
..
@@ -13779,7 +14224,7 @@
13779
14224
                 info.camera = renderCamera;
13780
14225
                 info.x = x;
13781
14226
                 info.y = y;
13782
-                object.editWindow.copy.doEditDrag(info);
14227
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783
14228
             } else
13784
14229
             {
13785
14230
                 if (x < startX)
..
..
@@ -13931,7 +14376,6 @@
13931
14376
     public void mouseMoved(MouseEvent e)
13932
14377
     {
13933
14378
         //System.out.println("mouseMoved: " + e);
13934
-
13935
14379
         if (isRenderer)
13936
14380
             return;
13937
14381
         
..
..
@@ -13956,7 +14400,10 @@
13956
14400
 
13957
14401
     public void mouseReleased(MouseEvent e)
13958
14402
     {
14403
+        Globals.MOUSEDRAGGED = false;
14404
+        
13959
14405
         movingcamera = false;
14406
+        X = Y = 0;
13960
14407
         //System.out.println("mouseReleased: " + e);
13961
14408
         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962
14409
     }
..
..
@@ -13979,9 +14426,9 @@
13979
14426
         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980
14427
         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981
14428
         
13982
-        if (control || command || IsFrozen())
14429
+// No delay        if (control || command || IsFrozen())
13983
14430
             timeout = true;
13984
-        else
14431
+// ?? May 2019        else
13985
14432
        // timer.setDelay((modifiers & 128) != 0?0:350);
13986
14433
         mouseDown = false;
13987
14434
     if (!control && !command) // june 2013
..
..
@@ -14091,7 +14538,7 @@
14091
14538
         System.out.println("keyReleased: " + e);
14092
14539
     }
14093
14540
 
14094
-    void SetMouseMode(int modifiers)
14541
+    void SetMouseMode(int modifiers, int modifiersex)
14095
14542
     {
14096
14543
         //System.out.println("SetMouseMode = " + modifiers);
14097
14544
         //modifiers &= ~1024;
..
..
@@ -14103,25 +14550,25 @@
14103
14550
         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
14104
14551
         //	return;
14105
14552
         //System.out.println("SetMode = " + modifiers);
14106
-        if ((modifiers & WHEEL) == WHEEL)
14553
+        if ((modifiersex & WHEEL) == WHEEL)
14107
14554
         {
14108
14555
             mouseMode |= ZOOM;
14109
14556
         }
14110
14557
         
14111
14558
         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112
-        if (capsLocked || (modifiers & META) == META)
14559
+        if (capsLocked) // || (modifiers & META) == META)
14113
14560
         {
14114
14561
             mouseMode |= VR; // BACKFORTH;
14115
14562
         }
14116
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14563
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117
14564
         {
14118
14565
             mouseMode |= SELECT;
14119
14566
         }
14120
-        if ((modifiers & COMMAND) == COMMAND)
14567
+        if ((modifiersex & COMMAND) == COMMAND)
14121
14568
         {
14122
14569
             mouseMode |= SELECT;
14123
14570
         }
14124
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14571
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125
14572
         {
14126
14573
             mouseMode &= ~VR;
14127
14574
             mouseMode |= TRANSLATE;
..
..
@@ -14150,10 +14597,10 @@
14150
14597
 
14151
14598
         if (isRenderer) //
14152
14599
         {
14153
-            SetMouseMode(modifiers);
14600
+            SetMouseMode(0, modifiers);
14154
14601
         }
14155
14602
 
14156
-        theRenderer.keyPressed(key);
14603
+        Globals.theRenderer.keyPressed(key);
14157
14604
     }
14158
14605
 
14159
14606
     int kompactbit = 4; // power bit
..
..
@@ -14165,7 +14612,7 @@
14165
14612
     float SATPOW = 1; // 2; // 0.5f;
14166
14613
     float BRIPOW = 1; // 0.5f; // 0.5f;
14167
14614
     
14168
-    void keyPressed(int key)
14615
+    public void keyPressed(int key)
14169
14616
     {
14170
14617
         if (key >= '0' && key <= '5')
14171
14618
             clampbit = (key-'0');
..
..
@@ -14486,7 +14933,7 @@
14486
14933
                 //RESIZETEXTURE ^= true;
14487
14934
                 //break;
14488
14935
             case 'z':
14489
-                RENDERSHADOW ^= true;
14936
+                Globals.RENDERSHADOW ^= true;
14490
14937
                 Globals.lighttouched = true;
14491
14938
                 repaint();
14492
14939
                 break;
..
..
@@ -14602,6 +15049,7 @@
14602
15049
         }
14603
15050
     //System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604
15051
     }
15052
+    
14605
15053
     static double OCCLUSIONBOOST = 1; // 0.5;
14606
15054
 
14607
15055
     void keyReleased(int key, int modifiers)
..
..
@@ -14609,11 +15057,11 @@
14609
15057
         //mode = ROTATE;
14610
15058
         if ((MODIFIERS & COMMAND) == 0) // VR??
14611
15059
         {
14612
-            SetMouseMode(modifiers);
15060
+            SetMouseMode(0, modifiers);
14613
15061
         }
14614
15062
     }
14615
15063
 
14616
-    protected void processKeyEvent(KeyEvent e)
15064
+    public void processKeyEvent(KeyEvent e)
14617
15065
     {
14618
15066
         switch (e.getID())
14619
15067
         {
..
..
@@ -14743,8 +15191,9 @@
14743
15191
 
14744
15192
     protected void processMouseMotionEvent(MouseEvent e)
14745
15193
     {
14746
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
14747
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15194
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15195
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15196
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748
15197
         {
14749
15198
             mouseMoved(e);
14750
15199
         } else
..
..
@@ -14774,6 +15223,7 @@
14774
15223
 
14775
15224
     void SelectParent()
14776
15225
     {
15226
+                new Exception().printStackTrace();
14777
15227
         System.exit(0);
14778
15228
         Composite group = (Composite) object;
14779
15229
         java.util.Vector selectees = new java.util.Vector(group.selection);
..
..
@@ -14797,6 +15247,7 @@
14797
15247
 
14798
15248
     void SelectChildren()
14799
15249
     {
15250
+                new Exception().printStackTrace();
14800
15251
         System.exit(0);
14801
15252
         /*
14802
15253
         Composite group = (Composite) object;
..
..
@@ -14961,7 +15412,9 @@
14961
15412
         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962
15413
         //Image img = CreateImage(width, height);
14963
15414
         //System.out.println("width = " + width + "; height = " + height + "\n");
15415
+        
14964
15416
         Graphics gr = g; // img.getGraphics();
15417
+        
14965
15418
         if (!hasMarquee)
14966
15419
         {
14967
15420
             if (Xmin < Xmax) // !locked)
..
..
@@ -15059,14 +15512,33 @@
15059
15512
             if (!isRenderer)
15060
15513
             {
15061
15514
                 object.drawEditHandles(info, 0);
15515
+                
15516
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15517
+                {
15518
+                    switch (object.selection.get(0).hitSomething)
15519
+                    {
15520
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15521
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15522
+                            break;
15523
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15524
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15525
+                        break;
15526
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15527
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15528
+                        break;
15529
+                    }
15530
+                    
15531
+                }
15062
15532
             }
15063
15533
         }
15534
+        
15064
15535
         if (isRenderer)
15065
15536
         {
15066
15537
         //gr.setColor(Color.black);
15067
15538
         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068
15539
         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069
15540
         }
15541
+        
15070
15542
         if (hasMarquee)
15071
15543
         {
15072
15544
             gr.setXORMode(Color.white);
..
..
@@ -15179,6 +15651,7 @@
15179
15651
     public boolean mouseDown(Event evt, int x, int y)
15180
15652
     {
15181
15653
         System.out.println("mouseDown: " + evt);
15654
+        System.exit(0);
15182
15655
         /*
15183
15656
         locked = true;
15184
15657
         drag = false;
..
..
@@ -15222,7 +15695,7 @@
15222
15695
         {
15223
15696
             keyPressed(0, modifiers);
15224
15697
         }
15225
-        clickStart(x, y, modifiers);
15698
+ //       clickStart(x, y, modifiers);
15226
15699
         return true;
15227
15700
     }
15228
15701
 
..
..
@@ -15340,7 +15813,7 @@
15340
15813
         {
15341
15814
             keyReleased(0, 0);
15342
15815
         }
15343
-        drag(x, y, modifiers);
15816
+        drag(x, y, 0, modifiers);
15344
15817
         return true;
15345
15818
     }
15346
15819
 
..
..
@@ -15472,7 +15945,7 @@
15472
15945
     Object3D object;
15473
15946
     static Object3D trackedobject;
15474
15947
     Camera renderCamera; // Light or Eye (or Occlusion)
15475
-    /*static*/ Camera manipCamera; // Light or Eye
15948
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476
15949
 	/*static*/ Camera eyeCamera;
15477
15950
     /*static*/ Camera lightCamera;
15478
15951
     int cameracount;
..
..
@@ -15910,6 +16383,7 @@
15910
16383
         {
15911
16384
             if (!selection)
15912
16385
             {
16386
+                new Exception().printStackTrace();
15913
16387
                 System.exit(0);
15914
16388
                 return;
15915
16389
             }
..
..
@@ -16037,16 +16511,16 @@
16037
16511
                             System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16038
16512
                         }
16039
16513
                         
16040
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16514
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041
16515
                     }
16042
16516
                 }
16043
16517
                 
16044
16518
                 if (!movingcamera && !PAINTMODE)
16045
16519
                     object.editWindow.ScreenFitPoint(); // fev 2014
16046
16520
                 
16047
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16521
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048
16522
                 {
16049
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16523
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050
16524
                     
16051
16525
                     Object3D group = new Object3D("inst" + paintcount++);
16052
16526
                     
..
..
@@ -16202,7 +16676,7 @@
16202
16676
                 gl.glDisable(gl.GL_CULL_FACE);
16203
16677
             }
16204
16678
 
16205
-            if (!RENDERSHADOW)
16679
+            if (!Globals.RENDERSHADOW)
16206
16680
                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
16207
16681
 
16208
16682
             // SB gl.glPolygonOffset(2.5f, 10);
..
..
@@ -16212,7 +16686,7 @@
16212
16686
             //gl.glColorMask(false, false, false, false);
16213
16687
 
16214
16688
             //render_scene_from_light_view(gl, drawable, 0, 0);
16215
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16689
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216
16690
             {
16217
16691
                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
16218
16692
 
..
..
@@ -16696,10 +17170,11 @@
16696
17170
     static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH*8*8 * TEXT_HEIGHT);
16697
17171
     // Depth buffer format
16698
17172
     //private int depth_format;
16699
-    static public void NextIndex(Object3D o, GL gl)
17173
+    
17174
+    public void NextIndex()
16700
17175
     {
16701
17176
         indexcount+=16;
16702
-        gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
17177
+        GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703
17178
     //objects[indexcount] = o;
16704
17179
     //System.out.println("indexcount = " + indexcount);
16705
17180
     }