Rewind all.

Normand Briere

2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e

 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,10 +464,12 @@
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)
468
+                    // TEST LIVE NORMALS && !obj.dontselect
469
+                    ;
434
470
             if (!hasnorm)
435
471
             {
436
-           //     System.out.println("FUCK!!");
472
+           //     System.out.println("Mesh normal");
437
473
                 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
438
474
                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
439
475
                 LA.vecCross(obj.v0, obj.v1, obj.v2);
..
..
@@ -816,7 +852,7 @@
816
852
 
817
853
                         if ((i % 100) == 0 && i != 0)
818
854
                         {
819
-                    CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
855
+                    Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820
856
                             //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821
857
                                 System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822
858
                         }
..
..
@@ -848,7 +884,7 @@
848
884
 
849
885
                         if ((i % 100) == 0 && i != 0)
850
886
                         {
851
-                    CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
887
+                    Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852
888
                             //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853
889
                                 System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854
890
                         }
..
..
@@ -1061,7 +1097,342 @@
1061
1097
         gl.glMatrixMode(gl.GL_MODELVIEW);
1062
1098
     }
1063
1099
     
1100
+        public void DrawBox(cVector min, cVector max)
1101
+        {
1102
+            javax.media.opengl.GL gl = GetGL();
1103
+                gl.glBegin(gl.GL_LINES);
1104
+                
1105
+                gl.glVertex3d(min.x, min.y, min.z);
1106
+                gl.glVertex3d(min.x, min.y, max.z);
1107
+                gl.glVertex3d(min.x, min.y, min.z);
1108
+                gl.glVertex3d(min.x, max.y, min.z);
1109
+                gl.glVertex3d(min.x, min.y, min.z);
1110
+                gl.glVertex3d(max.x, min.y, min.z);
1111
+                
1112
+                gl.glVertex3d(max.x, max.y, max.z);
1113
+                gl.glVertex3d(min.x, max.y, max.z);
1114
+                gl.glVertex3d(max.x, max.y, max.z);
1115
+                gl.glVertex3d(max.x, min.y, max.z);
1116
+                gl.glVertex3d(max.x, max.y, max.z);
1117
+                gl.glVertex3d(max.x, max.y, min.z);
1118
+                
1119
+                gl.glEnd();
1120
+        }
1121
+
1122
+        public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
1123
+        {
1124
+            int[] strips = bRep.getRawIndices();
1125
+            
1126
+            javax.media.opengl.GL gl = GetGL();
1127
+        
1128
+                // TRIANGLE STRIP ARRAY
1129
+                if (bRep.trimmed)
1130
+                {
1131
+                    float[] v = bRep.getRawVertices();
1132
+                    float[] n = bRep.getRawNormals();
1133
+                    float[] c = bRep.getRawColors();
1134
+                    float[] uv = bRep.getRawUVMap();
1135
+
1136
+                    int count2 = 0;
1137
+                    int count3 = 0;
1138
+
1139
+                    if (n.length > 0)
1140
+                    {
1141
+                        for (int i = 0; i < strips.length; i++)
1142
+                        {
1143
+                            gl.glBegin(gl.GL_TRIANGLE_STRIP);
1144
+
1145
+                            /*
1146
+                    boolean locked = false;
1147
+                    float eps = 0.1f;
1148
+                    boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
1149
+
1150
+                    int dot = 0;
1151
+
1152
+                    if ((dot&1) == 0)
1153
+                        dot |= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
1154
+
1155
+                    if (wrap || (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
1156
+                        gl.glTexCoord2f((float) qv.s, (float) qv.t);
1157
+                    else
1158
+                    {
1159
+                        locked = true;
1160
+                        gl.glTexCoord2f((float) pv.s, (float) pv.t);
1161
+                    }
1162
+                    //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
1163
+                    gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
1164
+                    if (hasnorm)
1165
+                    {
1166
+                        //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
1167
+                        gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
1168
+                    }
1169
+
1170
+                    if ((dot&4) == 0)
1171
+                        dot |= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
1172
+
1173
+                    if (wrap || !locked && (dot&8) != 0)
1174
+                        gl.glTexCoord2f((float) rv.s, (float) rv.t);
1175
+                    else
1176
+                        gl.glTexCoord2f((float) pv.s, (float) pv.t);
1177
+
1178
+                    f.dot = dot;
1179
+                    */
1180
+
1181
+                            if (!selectmode)
1182
+                            {
1183
+                                if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1184
+                                {
1185
+                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1186
+                                } else
1187
+                                {
1188
+                                    gl.glNormal3f(0, 0, 1);
1189
+                                }
1190
+
1191
+                                if (c != null)
1192
+                                //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
1193
+                                {
1194
+                                    gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1195
+                                }
1196
+                            }
1197
+                            
1198
+                            if (flipV)
1199
+                                gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1200
+                            else
1201
+                                gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1202
+                            
1203
+                            //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1204
+                            gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1205
+
1206
+                            count2 += 2;
1207
+                            count3 += 3;
1208
+                            if (!selectmode)
1209
+                            {
1210
+                                if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1211
+                                {
1212
+                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1213
+                                } else
1214
+                                {
1215
+                                    gl.glNormal3f(0, 0, 1);
1216
+                                }
1217
+                                if (c != null)
1218
+                                {
1219
+                                    gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1220
+                                }
1221
+                            }
1222
+                            
1223
+                            if (flipV)
1224
+                                gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1225
+                            else
1226
+                                gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1227
+                            
1228
+                            //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1229
+                            gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1230
+
1231
+                            count2 += 2;
1232
+                            count3 += 3;
1233
+                            for (int j = 0; j < strips[i] - 2; j++)
1234
+                            {
1235
+                                //gl.glTexCoord2d(...);
1236
+                                if (!selectmode)
1237
+                                {
1238
+                                    if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1239
+                                    {
1240
+                                        gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1241
+                                    } else
1242
+                                    {
1243
+                                        gl.glNormal3f(0, 0, 1);
1244
+                                    }
1245
+                                    if (c != null)
1246
+                                    {
1247
+                                        gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1248
+                                    }
1249
+                                }
1250
+
1251
+                                if (flipV)
1252
+                                    gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1253
+                                else
1254
+                                    gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1255
+                                
1256
+                                //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1257
+                                gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1258
+                                
1259
+                                count2 += 2;
1260
+                                count3 += 3;
1261
+                            }
1262
+
1263
+                            gl.glEnd();
1264
+                        }
1265
+                    }
1266
+
1267
+                    assert count3 == v.length;
1268
+                }
1269
+                else // !trimmed
1270
+                {
1271
+                    int count = 0;
1272
+                    for (int i = 0; i < strips.length; i++)
1273
+                    {
1274
+                        gl.glBegin(gl.GL_TRIANGLE_STRIP);
1275
+                        
1276
+                        Vertex p = bRep.GetVertex(bRep.indices[count++]);
1277
+                        Vertex q = bRep.GetVertex(bRep.indices[count++]);
1278
+                        
1279
+                        drawVertex(gl, p, flipV, selectmode);
1280
+                        drawVertex(gl, q, flipV, selectmode);
1281
+                        
1282
+                        for (int j = 0; j < strips[i] - 2; j++)
1283
+                        {
1284
+                            Vertex r = bRep.GetVertex(bRep.indices[count++]);
1285
+
1286
+    //                        if (j%2 == 0)
1287
+    //                            drawFace(p, q, r, display, null);
1288
+    //                        else
1289
+    //                            drawFace(p, r, q, display, null);
1290
+                            
1291
+    //                        p = q;
1292
+    //                        q = r;
1293
+                            drawVertex(gl, r, flipV, selectmode);
1294
+                        }
1295
+
1296
+                        gl.glEnd();
1297
+                    }
1298
+                }
1299
+        }
1300
+
1301
+    static cSpring.Point3D temp = new cSpring.Point3D();
1302
+    static cSpring.Point3D temp2 = new cSpring.Point3D();
1303
+    static cSpring.Point3D temp3 = new cSpring.Point3D();
1304
+    
1305
+        public void DrawDynamicMesh(cMesh mesh)
1306
+        {
1307
+                GL gl = GetGL(); // getGL();
1308
+
1309
+                cSpring.PhysicsController3D Phys = mesh.Phys;
1310
+                
1311
+                gl.glDisable(gl.GL_LIGHTING);
1312
+                
1313
+                gl.glLineWidth(1);
1314
+                gl.glColor3f(1,1,1);
1315
+                gl.glBegin(gl.GL_LINES);
1316
+                double scale = 0;
1317
+                int count = 0;
1318
+                for (int s=0; s<Phys.allSprings.size(); s++)
1319
+                {
1320
+                    cSpring.Spring spring = Phys.allSprings.get(s);
1321
+                        if(s == 0)
1322
+                        {
1323
+                            //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
1324
+                        }
1325
+                if (mesh.showsprings)
1326
+                {
1327
+                    temp.set(spring.a.position);
1328
+                    temp.add(spring.b.position);
1329
+                    temp.mul(0.5);
1330
+                    temp2.set(spring.a.position);
1331
+                    temp2.sub(spring.b.position);
1332
+                    temp2.mul(spring.restLength/2);
1333
+                    temp.sub(temp2);
1334
+                    gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1335
+                    temp.add(temp2);
1336
+                    temp.add(temp2);
1337
+                    gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1338
+                }
1339
+
1340
+                    if (spring.isHandle)
1341
+                        continue;
1342
+                    
1343
+                    //if (scale < spring.restLength)
1344
+                        scale += spring.restLength;
1345
+                        count++;
1346
+                }
1347
+                gl.glEnd();
1348
+
1349
+                if (count == 0)
1350
+                    scale = 0.01;
1351
+                else
1352
+                    scale /= count * 3;
1353
+                
1354
+                //scale = 0.25;
1355
+                
1356
+                if (mesh.ShowInfo())
1357
+                {
1358
+                    gl.glLineWidth(4);
1359
+                    for (int s=0; s<Phys.allNodes.size(); s++)
1360
+                    {
1361
+                        cSpring.DynamicNode node = Phys.allNodes.get(s);
1362
+                        if (node.mass == 0)
1363
+                            continue;
1364
+                        
1365
+                        int i = node.springs==null?-1:node.springs.size();
1366
+                        gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
1367
+                        //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
1368
+                        //temp.normalize();
1369
+                        //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
1370
+                        gl.glBegin(gl.GL_LINES);
1371
+                        gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1372
+                        //gl.glVertex3d(node.position.x + node.normal.x*scale, node.position.y + node.normal.y*scale, node.position.z + node.normal.z*scale);
1373
+                        gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
1374
+                                node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
1375
+                                node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
1376
+                        gl.glEnd();
1377
+                    }
1378
+
1379
+                    gl.glLineWidth(8);
1380
+                    for (int s=0; s<Phys.allNodes.size(); s++)
1381
+                    {
1382
+                        cSpring.DynamicNode node = Phys.allNodes.get(s);
1383
+
1384
+                        if (node.springs != null)
1385
+                        {
1386
+                            for (int i=0; i<node.springs.size(); i+=1)
1387
+                            {
1388
+                                cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
1389
+                                
1390
+                                int c = i+1;
1391
+                           //     c = node.springs.get(i).nbcopies;
1392
+
1393
+                                gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
1394
+                                gl.glBegin(gl.GL_LINES);
1395
+                                    gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1396
+                                    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);
1397
+                                gl.glEnd();
1398
+                            }
1399
+                        }
1400
+                    }
1401
+
1402
+                    gl.glLineWidth(1);
1403
+                }
1404
+                
1405
+                gl.glEnable(gl.GL_LIGHTING);
1406
+        }
1407
+    
1064
1408
     /// INTERFACE
1409
+    
1410
+    public void StartTriangles()
1411
+    {
1412
+         javax.media.opengl.GL gl = GetGL();
1413
+         gl.glBegin(gl.GL_TRIANGLES);
1414
+    }
1415
+    
1416
+    public void EndTriangles()
1417
+    {
1418
+         GetGL().glEnd();
1419
+    }
1420
+    
1421
+    void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
1422
+    {
1423
+        if (!selectmode)
1424
+        {
1425
+            gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1426
+            gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1427
+            
1428
+            if (flipV)
1429
+                gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
1430
+            else
1431
+                gl.glTexCoord2f((float) pv.s, (float) pv.t);
1432
+        }
1433
+
1434
+        gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1435
+    }
1065
1436
     
1066
1437
     void SetColor(Object3D obj, Vertex p0)
1067
1438
     {
..
..
@@ -1256,18 +1627,18 @@
1256
1627
         //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257
1628
         if (!material.multiply)
1258
1629
         {
1259
-            display.color = color;
1630
+            display.color = material.color;
1260
1631
             display.saturation = material.modulation;
1261
1632
         }
1262
1633
         else
1263
1634
         {
1264
-            display.color *= color*2;
1635
+            display.color *= material.color*2;
1265
1636
             display.saturation *= material.modulation*2;
1266
1637
         }
1267
1638
             
1268
1639
         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269
1640
 
1270
-        float[] colorV = GrafreeD.colorV;
1641
+        float[] colorV = Grafreed.colorV;
1271
1642
 
1272
1643
         /**/
1273
1644
         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..
..
@@ -1527,7 +1898,7 @@
1527
1898
     void PushMatrix(double[][] matrix)
1528
1899
     {
1529
1900
     //    GrafreeD.tracein(matrix);
1530
-        PushMatrix(matrix,1);
1901
+        PushMatrix(matrix, 1);
1531
1902
     }
1532
1903
     
1533
1904
     void PushMatrix()
..
..
@@ -1624,7 +1995,7 @@
1624
1995
     
1625
1996
     static int camerachangeframe;
1626
1997
     
1627
-    boolean SetCamera(Camera cam)
1998
+    public boolean SetCamera(Camera cam)
1628
1999
     {
1629
2000
         // may 2014 if (cam == cameras[0] || cam == cameras[1])
1630
2001
         //    return false;
..
..
@@ -1752,33 +2123,6 @@
1752
2123
         mainDL ^= true;
1753
2124
     }
1754
2125
 
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
2126
     void ToggleFullScreen()
1783
2127
     {
1784
2128
         FULLSCREEN ^= true;
..
..
@@ -1789,72 +2133,94 @@
1789
2133
         Globals.CROWD ^= true;
1790
2134
     }
1791
2135
 
1792
-    void ToggleInertia()
1793
-    {
1794
-        INERTIA ^= true;
1795
-    }
1796
-
1797
2136
     void ToggleLocal()
1798
2137
     {
1799
2138
         LOCALTRANSFORM ^= true;
1800
2139
     }
1801
2140
 
1802
-    void ToggleFast()
2141
+    public void ToggleTexture()
2142
+    {
2143
+        textureon ^= true;
2144
+    }
2145
+
2146
+    public void ToggleLive()
2147
+    {
2148
+        Globals.setLIVE(Globals.isLIVE() ^ true);
2149
+        
2150
+        System.err.println("LIVE = " + Globals.isLIVE());
2151
+        
2152
+        if (!Globals.isLIVE()) // save sound
2153
+            Grafreed.savesound = true; // wav.save();
2154
+     //   else
2155
+            repaint(); // start loop // may 2013
2156
+    }
2157
+
2158
+    public void ToggleSupport()
2159
+    {
2160
+        SUPPORT ^= true;
2161
+    }
2162
+
2163
+    public void ToggleAbort()
2164
+    {
2165
+        ABORTMODE ^= true;
2166
+    }
2167
+
2168
+    public void ToggleInertia()
2169
+    {
2170
+        INERTIA ^= true;
2171
+    }
2172
+
2173
+    public void ToggleFast()
1803
2174
     {
1804
2175
         FAST ^= true;
1805
2176
     }
1806
2177
 
1807
-    void ToggleSlowPose()
2178
+    public void ToggleSlowPose()
1808
2179
     {
1809
2180
         SLOWPOSE ^= true;
1810
2181
     }
1811
2182
 
1812
-    void ToggleFootContact()
1813
-    {
1814
-        FOOTCONTACT ^= true;
1815
-    }
1816
-    
1817
-    void ToggleBoxMode()
2183
+    public void ToggleBoxMode()
1818
2184
     {
1819
2185
         BOXMODE ^= true;
1820
2186
     }
1821
2187
 
1822
-    void ToggleSmoothFocus()
2188
+    public void ToggleZoomBoxMode()
2189
+    {
2190
+        ZOOMBOXMODE ^= true;
2191
+    }
2192
+
2193
+    public void ToggleSmoothFocus()
1823
2194
     {
1824
2195
         SMOOTHFOCUS ^= true;
1825
2196
     }
1826
2197
 
1827
-    void ToggleImageFlip()
2198
+    public void ToggleImageFlip()
1828
2199
     {
1829
2200
         IMAGEFLIP ^= true;
1830
2201
     }
1831
2202
 
1832
-    void ToggleSpeakerMocap()
2203
+    public void ToggleSpeakerMocap()
1833
2204
     {
1834
2205
         SPEAKERMOCAP ^= true;
1835
2206
     }
1836
2207
 
1837
-    void ToggleSpeakerCamera()
2208
+    public void ToggleSpeakerCamera()
1838
2209
     {
1839
2210
         SPEAKERCAMERA ^= true;
1840
2211
     }
1841
2212
 
1842
-    void ToggleSpeakerFocus()
2213
+    public void ToggleSpeakerFocus()
1843
2214
     {
1844
2215
         SPEAKERFOCUS ^= true;
1845
2216
     }
1846
2217
 
1847
-    void ToggleDebug()
1848
-    {
1849
-        DEBUG ^= true;
1850
-    }
1851
-
1852
-    void ToggleFrustum()
2218
+    public void ToggleFrustum()
1853
2219
     {
1854
2220
         FRUSTUM ^= true;
1855
2221
     }
1856
2222
 
1857
-    void ToggleTrack()
2223
+    public void ToggleTrack()
1858
2224
     {
1859
2225
         TRACK ^= true;
1860
2226
         if (TRACK)
..
..
@@ -1873,25 +2239,35 @@
1873
2239
         repaint();
1874
2240
     }
1875
2241
 
1876
-    void ToggleTrackOnce()
2242
+    public void ToggleTrackOnce()
1877
2243
     {
1878
2244
         TRACKONCE ^= true;
1879
2245
     }
1880
2246
 
1881
-    void ToggleShadowTrack()
2247
+    public void ToggleShadowTrack()
1882
2248
     {
1883
2249
         SHADOWTRACK ^= true;
1884
2250
         repaint();
1885
2251
     }
1886
2252
 
1887
-    void ToggleOeil()
2253
+    public void ToggleOeil()
1888
2254
     {
1889
2255
         OEIL ^= true;
1890
2256
     }
1891
2257
 
1892
-    void ToggleOeilOnce()
2258
+    public void ToggleOeilOnce()
1893
2259
     {
1894
2260
         OEILONCE ^= true;
2261
+    }
2262
+
2263
+    void ToggleFootContact()
2264
+    {
2265
+        FOOTCONTACT ^= true;
2266
+    }
2267
+    
2268
+    void ToggleDebug()
2269
+    {
2270
+        DEBUG ^= true;
1895
2271
     }
1896
2272
 
1897
2273
     void ToggleLookAt()
..
..
@@ -1899,9 +2275,9 @@
1899
2275
         LOOKAT ^= true;
1900
2276
     }
1901
2277
 
1902
-    void ToggleRandom()
2278
+    void ToggleSwitch()
1903
2279
     {
1904
-        RANDOM ^= true;
2280
+        SWITCH ^= true;
1905
2281
     }
1906
2282
 
1907
2283
     void ToggleHandles()
..
..
@@ -2008,7 +2384,7 @@
2008
2384
     {
2009
2385
         return currentGL;
2010
2386
     }
2011
-    
2387
+
2012
2388
     /**/
2013
2389
     class CacheTexture
2014
2390
     {
..
..
@@ -3840,6 +4216,7 @@
3840
4216
     
3841
4217
     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842
4218
     {
4219
+                new Exception().printStackTrace();
3843
4220
         System.exit(0);
3844
4221
         com.sun.opengl.util.texture.Texture texture = null;
3845
4222
 
..
..
@@ -7552,6 +7929,64 @@
7552
7929
         ReleaseTexture(pigment, false);
7553
7930
     }
7554
7931
     
7932
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7933
+    {
7934
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7935
+        {
7936
+            return;
7937
+        }
7938
+
7939
+        if (tex == null)
7940
+        {
7941
+            ReleaseTexture(null, false);
7942
+            return;
7943
+        }
7944
+        
7945
+        String pigment = Object3D.GetPigment(tex);
7946
+
7947
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7948
+        {
7949
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7950
+        //    System.out.println("; bump = " + bump);
7951
+        }
7952
+        
7953
+        if (pigment.equals(""))
7954
+        {
7955
+            pigment = null;
7956
+        }
7957
+        
7958
+        ReleaseTexture(pigment, false);
7959
+    }
7960
+    
7961
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7962
+    {
7963
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7964
+        {
7965
+            return;
7966
+        }
7967
+
7968
+        if (tex == null)
7969
+        {
7970
+            ReleaseTexture(null, true);
7971
+            return;
7972
+        }
7973
+        
7974
+        String bump = Object3D.GetBump(tex);
7975
+
7976
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7977
+        {
7978
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7979
+        //    System.out.println("; bump = " + bump);
7980
+        }
7981
+        
7982
+        if (bump.equals(""))
7983
+        {
7984
+            bump = null;
7985
+        }
7986
+        
7987
+        ReleaseTexture(bump, true);
7988
+    }
7989
+    
7555
7990
     void ReleaseTexture(String tex, boolean bump)
7556
7991
     {
7557
7992
         if (// DrawMode() != 0 || /*tex == null ||*/
..
..
@@ -7655,7 +8090,7 @@
7655
8090
         }
7656
8091
     }
7657
8092
 
7658
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8093
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7659
8094
     {
7660
8095
         if (// DrawMode() != 0 || /*tex == null ||*/
7661
8096
                 ambientOcclusion ) // || !textureon)
..
..
@@ -7700,7 +8135,94 @@
7700
8135
         return; // true;
7701
8136
     }
7702
8137
     
7703
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8138
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8139
+    {
8140
+        if (// DrawMode() != 0 || /*tex == null ||*/
8141
+                ambientOcclusion ) // || !textureon)
8142
+        {
8143
+            return; // false;
8144
+        }
8145
+
8146
+        if (tex == null)
8147
+        {
8148
+            BindTexture(null,false,resolution);
8149
+            return;
8150
+        }
8151
+        
8152
+        String pigment = Object3D.GetPigment(tex);
8153
+
8154
+        usedtextures.put(pigment, pigment);
8155
+        
8156
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8157
+        {
8158
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8159
+        //    System.out.println("; bump = " + bump);
8160
+        }
8161
+        
8162
+        if (pigment.equals(""))
8163
+        {
8164
+            pigment = null;
8165
+        }
8166
+        
8167
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8168
+        BindTexture(pigment, false, resolution);
8169
+    }
8170
+    
8171
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8172
+    {
8173
+        if (// DrawMode() != 0 || /*tex == null ||*/
8174
+                ambientOcclusion ) // || !textureon)
8175
+        {
8176
+            return; // false;
8177
+        }
8178
+
8179
+        if (tex == null)
8180
+        {
8181
+            BindTexture(null,true,resolution);
8182
+            return;
8183
+        }
8184
+        
8185
+        String bump = Object3D.GetBump(tex);
8186
+
8187
+        usedtextures.put(bump, bump);
8188
+        
8189
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8190
+        {
8191
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8192
+        //    System.out.println("; bump = " + bump);
8193
+        }
8194
+        
8195
+        if (bump.equals(""))
8196
+        {
8197
+            bump = null;
8198
+        }
8199
+        
8200
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8201
+        BindTexture(bump, true, resolution);
8202
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8203
+    }
8204
+    
8205
+    java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8206
+    
8207
+    private boolean FileExists(String tex)
8208
+    {
8209
+        if (missingTextures.contains(tex))
8210
+        {
8211
+            return false;
8212
+        }
8213
+        
8214
+        boolean fileExists = new File(tex).exists();
8215
+        
8216
+        if (!fileExists)
8217
+        {
8218
+            // If file exists, the "new File()" is not executed sgain
8219
+            missingTextures.add(tex);
8220
+        }
8221
+        
8222
+        return fileExists;
8223
+    }
8224
+    
8225
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7704
8226
     {
7705
8227
         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
7706
8228
         
..
..
@@ -7708,12 +8230,18 @@
7708
8230
         {
7709
8231
             String texname = tex;
7710
8232
             
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;
8233
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8234
+                
8235
+//            String[] split = tex.split("Textures");
8236
+//            if (split.length > 1)
8237
+//                texname = "/Users/nbriere/Textures" + split[split.length-1];
8238
+//            else
8239
+//                if (!texname.startsWith("/"))
8240
+//                    texname = "/Users/nbriere/Textures/" + texname;
8241
+            if (!FileExists(tex))
8242
+            {
8243
+                    texname = fallbackTextureName;
8244
+            }
7717
8245
             
7718
8246
             if (CACHETEXTURE)
7719
8247
                 texture = textures.get(texname); // TEXTURE CACHE
..
..
@@ -7782,7 +8310,7 @@
7782
8310
                                     }
7783
8311
                                 
7784
8312
                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785
-                                    if (!new File(cachename).exists())
8313
+                                    if (!FileExists(cachename))
7786
8314
                                         cachename = texname;
7787
8315
                                     else
7788
8316
                                         processbump = false; // don't process bump map again
..
..
@@ -7804,7 +8332,7 @@
7804
8332
                                     }
7805
8333
                                 
7806
8334
                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807
-                                    if (!new File(cachename).exists())
8335
+                                    if (!FileExists(cachename))
7808
8336
                                         cachename = texname;
7809
8337
                                     else
7810
8338
                                         processbump = false; // don't process bump map again
..
..
@@ -7813,7 +8341,9 @@
7813
8341
                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
7814
8342
                                 
7815
8343
                                 
7816
-                                if (texturedata != null)
8344
+                                if (texturedata == null)
8345
+                                    throw new Exception();
8346
+                                    
7817
8347
                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7818
8348
         //texture = GetTexture(tex, bump);
7819
8349
                             }
..
..
@@ -7935,7 +8465,7 @@
7935
8465
         return texture;
7936
8466
     }
7937
8467
     
7938
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8468
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7939
8469
     {
7940
8470
         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941
8471
                 
..
..
@@ -7953,14 +8483,14 @@
7953
8483
         return texture!=null?texture.texture:null;
7954
8484
     }
7955
8485
     
7956
-    com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8486
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7957
8487
     {
7958
8488
         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959
8489
                 
7960
8490
         return texture!=null?texture.texturedata:null;
7961
8491
     }
7962
8492
     
7963
-    boolean BindTexture(String tex, boolean bump, int resolution)
8493
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7964
8494
     {
7965
8495
         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7966
8496
         {
..
..
@@ -8937,8 +9467,8 @@
8937
9467
         assert (parentcam != renderCamera);
8938
9468
         
8939
9469
         if (renderCamera != lightCamera)
8940
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
8941
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9470
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9471
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8942
9472
         
8943
9473
 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944
9474
             
..
..
@@ -8953,8 +9483,8 @@
8953
9483
             LA.matCopy(renderCamera.fromScreen, matrix);
8954
9484
             
8955
9485
         if (renderCamera != lightCamera)
8956
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
8957
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9486
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9487
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8958
9488
 
8959
9489
 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960
9490
             
..
..
@@ -9026,7 +9556,7 @@
9026
9556
             //gl.glFlush();
9027
9557
             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028
9558
 
9029
-            if (ANIMATION && ABORTED)
9559
+            if (Globals.ANIMATION && ABORTED)
9030
9560
             {
9031
9561
     System.err.println("    ABORTED FRAME");
9032
9562
                 break;
..
..
@@ -9056,7 +9586,7 @@
9056
9586
         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057
9587
 
9058
9588
         // save image
9059
-        if (ANIMATION && !ABORTED)
9589
+        if (Globals.ANIMATION && !ABORTED)
9060
9590
         {
9061
9591
             VPwidth = viewport[2];
9062
9592
             VPheight = viewport[3];
..
..
@@ -9167,11 +9697,11 @@
9167
9697
             
9168
9698
 //            imagecount++;
9169
9699
             
9170
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9700
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171
9701
             
9172
9702
             if (!BOXMODE)
9173
9703
             {
9174
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9704
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175
9705
             }
9176
9706
     
9177
9707
             if (!BOXMODE)
..
..
@@ -9209,7 +9739,7 @@
9209
9739
             ABORTED = false;
9210
9740
         }
9211
9741
         else
9212
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9742
+            Grafreed.wav.cursor += 735 * ACSIZE;
9213
9743
         
9214
9744
         if (false)
9215
9745
         {
..
..
@@ -9872,11 +10402,11 @@
9872
10402
 
9873
10403
     public void display(GLAutoDrawable drawable)
9874
10404
     {
9875
-        if (GrafreeD.savesound && GrafreeD.hassound)
10405
+        if (Grafreed.savesound && Grafreed.hassound)
9876
10406
         {
9877
-            GrafreeD.wav.save();
9878
-            GrafreeD.savesound = false;
9879
-            GrafreeD.hassound = false;
10407
+            Grafreed.wav.save();
10408
+            Grafreed.savesound = false;
10409
+            Grafreed.hassound = false;
9880
10410
         }
9881
10411
 //        if (DEBUG_SELECTION)
9882
10412
 //        {
..
..
@@ -10006,7 +10536,7 @@
10006
10536
             Object3D theobject = object;
10007
10537
             Object3D theparent = object.parent;
10008
10538
             object.parent = null;
10009
-            object = (Object3D)GrafreeD.clone(object);
10539
+            object = (Object3D)Grafreed.clone(object);
10010
10540
             object.Stripify();
10011
10541
             if (theobject.selection == null || theobject.selection.Size() == 0)
10012
10542
                 theobject.PreprocessOcclusion(this);
..
..
@@ -10019,13 +10549,13 @@
10019
10549
             ambientOcclusion = false;
10020
10550
         }
10021
10551
 
10022
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10552
+        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023
10553
         {
10024
10554
             //if (RENDERSHADOW) // ?
10025
10555
             if (!IsFrozen())
10026
10556
             {
10027
10557
                 // dec 2012
10028
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10558
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029
10559
                 {
10030
10560
             Globals.framecount++;
10031
10561
                     shadowbuffer.display();
..
..
@@ -10152,8 +10682,8 @@
10152
10682
             
10153
10683
 //        if (parentcam != renderCamera) // not a light
10154
10684
         if (cam != lightCamera)
10155
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10156
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10685
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10686
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10157
10687
             
10158
10688
             for (int j = 0; j < 4; j++)
10159
10689
             {
..
..
@@ -10167,8 +10697,8 @@
10167
10697
             
10168
10698
 //        if (parentcam != renderCamera) // not a light
10169
10699
         if (cam != lightCamera)
10170
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10171
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10700
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10701
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10172
10702
         
10173
10703
             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174
10704
             
..
..
@@ -10427,7 +10957,16 @@
10427
10957
             // Bump noise
10428
10958
             gl.glActiveTexture(GL.GL_TEXTURE6);
10429
10959
             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430
-            BindTexture(NOISE_TEXTURE, false, 2);
10960
+            
10961
+    try
10962
+    {
10963
+        BindTexture(NOISE_TEXTURE, false, 2);
10964
+    }
10965
+    catch (Exception e)
10966
+    {
10967
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10968
+    }
10969
+           
10431
10970
 
10432
10971
             gl.glActiveTexture(GL.GL_TEXTURE0);
10433
10972
             gl.glEnable(GL.GL_TEXTURE_2D);
..
..
@@ -10552,8 +11091,8 @@
10552
11091
                 System.err.println("parentcam != renderCamera");
10553
11092
 
10554
11093
 //            if (cam != lightCamera)
10555
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10556
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11094
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11095
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10557
11096
         }
10558
11097
         
10559
11098
         LA.xformDir(lightposition, cam.toScreen, lightposition);
..
..
@@ -10574,8 +11113,8 @@
10574
11113
             if (true) // TODO
10575
11114
             {
10576
11115
                 if (cam != lightCamera)
10577
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10578
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11116
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11117
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579
11118
             }
10580
11119
             
10581
11120
             LA.xformPos(light0, cam.toScreen, light0);
..
..
@@ -10891,8 +11430,14 @@
10891
11430
     {
10892
11431
             renderpass++;
10893
11432
 //        System.out.println("Draw object... ");
11433
+        STEP = 1;
10894
11434
         if (FAST) // in case there is no script
10895
-            STEP = 16;
11435
+            STEP = 8;
11436
+            
11437
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11438
+        {
11439
+            STEP *= 4;
11440
+        }
10896
11441
             
10897
11442
         //object.FullInvariants();
10898
11443
         
..
..
@@ -10906,8 +11451,8 @@
10906
11451
             e.printStackTrace();
10907
11452
         }
10908
11453
         
10909
-        if (GrafreeD.RENDERME > 0)
10910
-            GrafreeD.RENDERME--; // mechante magouille
11454
+        if (Grafreed.RENDERME > 0)
11455
+            Grafreed.RENDERME--; // mechante magouille
10911
11456
         
10912
11457
         Globals.ONESTEP = false;
10913
11458
     }
..
..
@@ -10977,7 +11522,14 @@
10977
11522
 
10978
11523
                 usedtextures.clear();
10979
11524
             
10980
-                BindTextures(DEFAULT_TEXTURES, 2);
11525
+    try
11526
+    {
11527
+        BindTextures(DEFAULT_TEXTURES, 2);
11528
+    }
11529
+    catch (Exception e)
11530
+    {
11531
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11532
+    }
10981
11533
             }
10982
11534
             //System.out.println("--> " + stackdepth);
10983
11535
 //            GrafreeD.traceon();
..
..
@@ -11068,7 +11620,14 @@
11068
11620
             if (checker != null && DrawMode() == DEFAULT)
11069
11621
             {
11070
11622
                 //BindTexture(IMMORTAL_TEXTURE);
11071
-                BindTextures(checker.GetTextures(), checker.texres);
11623
+    try
11624
+    {
11625
+        BindTextures(checker.GetTextures(), checker.texres);
11626
+    }
11627
+    catch (Exception e)
11628
+    {
11629
+        System.err.println("FAILED: " + checker.GetTextures());
11630
+    }
11072
11631
                 // NEAREST
11073
11632
                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074
11633
                 DrawChecker(gl);
..
..
@@ -11150,7 +11709,7 @@
11150
11709
             return;
11151
11710
         }
11152
11711
 
11153
-        String string = obj.GetToolTip();
11712
+        String string = obj.toString(); //.GetToolTip();
11154
11713
         
11155
11714
         GL gl = GetGL();
11156
11715
         
..
..
@@ -11467,8 +12026,8 @@
11467
12026
             //obj.TransformToWorld(light, light);
11468
12027
             for (int i = tp.size(); --i >= 0;)
11469
12028
             {
11470
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471
-                    LA.xformPos(light, tp.get(i).toParent, light);
12029
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11472
12031
             }
11473
12032
 
11474
12033
 
..
..
@@ -11485,8 +12044,8 @@
11485
12044
                 parentcam = cameras[0];
11486
12045
             }
11487
12046
             
11488
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11489
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12047
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12048
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490
12049
 
11491
12050
             LA.xformPos(light, renderCamera.toScreen, light);
11492
12051
             
..
..
@@ -12100,8 +12659,8 @@
12100
12659
 
12101
12660
            // display shadow only (bump == 0)
12102
12661
          "SUB temp.x, half.x, shadow.x;" +
12103
-         "MOV temp.y, -params6.x;" +
12104
-         "SLT temp.z, temp.y, zero.x;" +
12662
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12663
+         "SLT temp.z, temp.y, -one2048th.x;" +
12105
12664
          "SUB temp.y, one.x, temp.z;" +
12106
12665
          "MUL temp.x, temp.x, temp.y;" +
12107
12666
          "KIL temp.x;" +
..
..
@@ -12230,8 +12789,10 @@
12230
12789
             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231
12790
                 
12232
12791
                 "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
12792
+                // Tuning for default skin
12793
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12794
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12795
+                "ADD temp.y, one.y, options2.y;" + // subsurface
12235
12796
                 "MUL temp.x, temp.x, temp.y;" +
12236
12797
                                 
12237
12798
                 "MUL saturation, saturation, temp.xxxx;" +
..
..
@@ -12430,7 +12991,7 @@
12430
12991
             //once = true;
12431
12992
         }
12432
12993
 
12433
-        System.out.print("Program #" + mode + "; length = " + program.length());
12994
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12434
12995
         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12435
12996
         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436
12997
 
..
..
@@ -12563,12 +13124,16 @@
12563
13124
 
12564
13125
                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565
13126
                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13127
+                
13128
+                // Compare fragment depth in light space with shadowmap.
12566
13129
                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567
13130
                 "SGE temp.y, temp.x, zero.x;" +
12568
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13131
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13132
+                
13133
+                // Reverse comparison
12569
13134
                 "SUB temp.x, one.x, temp.x;" +
12570
13135
                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12571
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13136
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572
13137
                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573
13138
 
12574
13139
                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..
..
@@ -12582,6 +13147,10 @@
12582
13147
                 // No shadow for backface
12583
13148
                 "DP3 temp.x, normal, lightd;" +
12584
13149
                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13150
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13151
+
13152
+                // No shadow when out of frustrum
13153
+                "SGE temp.x, " + depth + ".z, one.z;" +
12585
13154
                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586
13155
                 "";
12587
13156
     }
..
..
@@ -13140,7 +13709,7 @@
13140
13709
     public void mousePressed(MouseEvent e)
13141
13710
     {
13142
13711
         //System.out.println("mousePressed: " + e);
13143
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13712
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144
13713
     }
13145
13714
 
13146
13715
     static long prevtime = 0;
..
..
@@ -13167,6 +13736,7 @@
13167
13736
 	
13168
13737
         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169
13738
             
13739
+        if (BUTTONLESSWHEEL)
13170
13740
 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
13171
13741
 	{
13172
13742
             return;
..
..
@@ -13175,7 +13745,7 @@
13175
13745
         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176
13746
         
13177
13747
         // TIMER
13178
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13748
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179
13749
         {
13180
13750
             keepboxmode = BOXMODE;
13181
13751
             keepsupport = SUPPORT;
..
..
@@ -13215,8 +13785,8 @@
13215
13785
       //      mode |= META;
13216
13786
         //}
13217
13787
         
13218
-        SetMouseMode(WHEEL | e.getModifiersEx());
13219
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13788
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13789
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220
13790
         anchorX = ax;
13221
13791
         anchorY = ay;
13222
13792
         prevX = px;
..
..
@@ -13276,6 +13846,10 @@
13276
13846
 //            wasliveok = true;
13277
13847
 //            waslive = false;
13278
13848
             
13849
+            // May 2019 Forget it:
13850
+            if (true)
13851
+                    return;
13852
+            
13279
13853
             // source == timer
13280
13854
             if (mouseDown)
13281
13855
             {
..
..
@@ -13314,7 +13888,7 @@
13314
13888
     
13315
13889
     javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316
13890
 
13317
-    void clickStart(int x, int y, int modifiers)
13891
+    void clickStart(int x, int y, int modifiers, int modifiersex)
13318
13892
     {
13319
13893
         if (!wasliveok)
13320
13894
             return;
..
..
@@ -13331,7 +13905,7 @@
13331
13905
 //        touched = true; // main DL
13332
13906
         if (isRenderer)
13333
13907
         {
13334
-            SetMouseMode(modifiers);
13908
+            SetMouseMode(modifiers, modifiersex);
13335
13909
         }
13336
13910
 
13337
13911
         selectX = anchorX = x;
..
..
@@ -13344,7 +13918,7 @@
13344
13918
         clicked = true;
13345
13919
         hold = false;
13346
13920
 
13347
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13921
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348
13922
         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349
13923
         {
13350
13924
       //  System.out.println("RESTART II " + modifiers);
..
..
@@ -13375,7 +13949,7 @@
13375
13949
             info.camera = renderCamera;
13376
13950
             info.x = x;
13377
13951
             info.y = y;
13378
-            info.modifiers = modifiers;
13952
+            info.modifiers = modifiersex;
13379
13953
             editObj = object.doEditClick(info, 0);
13380
13954
             if (!editObj)
13381
13955
             {
..
..
@@ -13392,11 +13966,14 @@
13392
13966
     
13393
13967
     public void mouseDragged(MouseEvent e)
13394
13968
     {
13969
+        Globals.MOUSEDRAGGED = true;
13970
+        
13971
+        //System.out.println("mouseDragged: " + e);
13395
13972
         if (isRenderer)
13396
13973
             movingcamera = true;
13974
+        
13397
13975
         //if (drawing)
13398
13976
         //return;
13399
-        //System.out.println("mouseDragged: " + e);
13400
13977
         if ((e.getModifiersEx() & CTRL) != 0
13401
13978
             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
13402
13979
         {
..
..
@@ -13404,7 +13981,7 @@
13404
13981
             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405
13982
         }
13406
13983
         else
13407
-            drag(e.getX(), e.getY(), e.getModifiersEx());
13984
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408
13985
         
13409
13986
     //try { Thread.sleep(1); } catch (Exception ex) {}
13410
13987
     }
..
..
@@ -13577,6 +14154,7 @@
13577
14154
         
13578
14155
         public void run()
13579
14156
         {
14157
+                new Exception().printStackTrace();
13580
14158
             System.exit(0);
13581
14159
             for (;;)
13582
14160
             {
..
..
@@ -13640,7 +14218,7 @@
13640
14218
                     {
13641
14219
                         Globals.lighttouched = true;
13642
14220
                     }
13643
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14221
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644
14222
                 }
13645
14223
             //else
13646
14224
             }
..
..
@@ -13740,7 +14318,7 @@
13740
14318
     int X, Y;
13741
14319
     boolean SX, SY;
13742
14320
 
13743
-    void drag(int x, int y, int modifiers)
14321
+    void drag(int x, int y, int modifiers, int modifiersex)
13744
14322
     {
13745
14323
         if (IsFrozen())
13746
14324
         {
..
..
@@ -13749,17 +14327,17 @@
13749
14327
 
13750
14328
         drag = true; // NEW
13751
14329
         
13752
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14330
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753
14331
 
13754
14332
         X = x;
13755
14333
         Y = y;
13756
14334
         // floating state for animation
13757
-        MODIFIERS = modifiers;
13758
-        modifiers &= ~1024;
14335
+        MODIFIERS = modifiersex;
14336
+        modifiersex &= ~1024;
13759
14337
         if (false) // modifiers != 0)
13760
14338
         {
13761
14339
             //new Exception().printStackTrace();
13762
-            System.out.println("mouseDragged: " + modifiers);
14340
+            System.out.println("mouseDragged: " + modifiersex);
13763
14341
             System.out.println("SHIFT = " + SHIFT);
13764
14342
             System.out.println("CONTROL = " + COMMAND);
13765
14343
             System.out.println("META = " + META);
..
..
@@ -13779,7 +14357,7 @@
13779
14357
                 info.camera = renderCamera;
13780
14358
                 info.x = x;
13781
14359
                 info.y = y;
13782
-                object.editWindow.copy.doEditDrag(info);
14360
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783
14361
             } else
13784
14362
             {
13785
14363
                 if (x < startX)
..
..
@@ -13931,7 +14509,6 @@
13931
14509
     public void mouseMoved(MouseEvent e)
13932
14510
     {
13933
14511
         //System.out.println("mouseMoved: " + e);
13934
-
13935
14512
         if (isRenderer)
13936
14513
             return;
13937
14514
         
..
..
@@ -13956,7 +14533,10 @@
13956
14533
 
13957
14534
     public void mouseReleased(MouseEvent e)
13958
14535
     {
14536
+        Globals.MOUSEDRAGGED = false;
14537
+        
13959
14538
         movingcamera = false;
14539
+        X = Y = 0;
13960
14540
         //System.out.println("mouseReleased: " + e);
13961
14541
         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962
14542
     }
..
..
@@ -13979,9 +14559,9 @@
13979
14559
         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980
14560
         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981
14561
         
13982
-        if (control || command || IsFrozen())
14562
+// No delay        if (control || command || IsFrozen())
13983
14563
             timeout = true;
13984
-        else
14564
+// ?? May 2019        else
13985
14565
        // timer.setDelay((modifiers & 128) != 0?0:350);
13986
14566
         mouseDown = false;
13987
14567
     if (!control && !command) // june 2013
..
..
@@ -14091,7 +14671,7 @@
14091
14671
         System.out.println("keyReleased: " + e);
14092
14672
     }
14093
14673
 
14094
-    void SetMouseMode(int modifiers)
14674
+    void SetMouseMode(int modifiers, int modifiersex)
14095
14675
     {
14096
14676
         //System.out.println("SetMouseMode = " + modifiers);
14097
14677
         //modifiers &= ~1024;
..
..
@@ -14103,25 +14683,25 @@
14103
14683
         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
14104
14684
         //	return;
14105
14685
         //System.out.println("SetMode = " + modifiers);
14106
-        if ((modifiers & WHEEL) == WHEEL)
14686
+        if ((modifiersex & WHEEL) == WHEEL)
14107
14687
         {
14108
14688
             mouseMode |= ZOOM;
14109
14689
         }
14110
14690
         
14111
14691
         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112
-        if (capsLocked || (modifiers & META) == META)
14692
+        if (capsLocked) // || (modifiers & META) == META)
14113
14693
         {
14114
14694
             mouseMode |= VR; // BACKFORTH;
14115
14695
         }
14116
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14696
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117
14697
         {
14118
14698
             mouseMode |= SELECT;
14119
14699
         }
14120
-        if ((modifiers & COMMAND) == COMMAND)
14700
+        if ((modifiersex & COMMAND) == COMMAND)
14121
14701
         {
14122
14702
             mouseMode |= SELECT;
14123
14703
         }
14124
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14704
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125
14705
         {
14126
14706
             mouseMode &= ~VR;
14127
14707
             mouseMode |= TRANSLATE;
..
..
@@ -14150,10 +14730,10 @@
14150
14730
 
14151
14731
         if (isRenderer) //
14152
14732
         {
14153
-            SetMouseMode(modifiers);
14733
+            SetMouseMode(0, modifiers);
14154
14734
         }
14155
14735
 
14156
-        theRenderer.keyPressed(key);
14736
+        Globals.theRenderer.keyPressed(key);
14157
14737
     }
14158
14738
 
14159
14739
     int kompactbit = 4; // power bit
..
..
@@ -14165,7 +14745,7 @@
14165
14745
     float SATPOW = 1; // 2; // 0.5f;
14166
14746
     float BRIPOW = 1; // 0.5f; // 0.5f;
14167
14747
     
14168
-    void keyPressed(int key)
14748
+    public void keyPressed(int key)
14169
14749
     {
14170
14750
         if (key >= '0' && key <= '5')
14171
14751
             clampbit = (key-'0');
..
..
@@ -14486,7 +15066,7 @@
14486
15066
                 //RESIZETEXTURE ^= true;
14487
15067
                 //break;
14488
15068
             case 'z':
14489
-                RENDERSHADOW ^= true;
15069
+                Globals.RENDERSHADOW ^= true;
14490
15070
                 Globals.lighttouched = true;
14491
15071
                 repaint();
14492
15072
                 break;
..
..
@@ -14602,6 +15182,7 @@
14602
15182
         }
14603
15183
     //System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604
15184
     }
15185
+    
14605
15186
     static double OCCLUSIONBOOST = 1; // 0.5;
14606
15187
 
14607
15188
     void keyReleased(int key, int modifiers)
..
..
@@ -14609,11 +15190,11 @@
14609
15190
         //mode = ROTATE;
14610
15191
         if ((MODIFIERS & COMMAND) == 0) // VR??
14611
15192
         {
14612
-            SetMouseMode(modifiers);
15193
+            SetMouseMode(0, modifiers);
14613
15194
         }
14614
15195
     }
14615
15196
 
14616
-    protected void processKeyEvent(KeyEvent e)
15197
+    public void processKeyEvent(KeyEvent e)
14617
15198
     {
14618
15199
         switch (e.getID())
14619
15200
         {
..
..
@@ -14743,8 +15324,9 @@
14743
15324
 
14744
15325
     protected void processMouseMotionEvent(MouseEvent e)
14745
15326
     {
14746
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
14747
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15327
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15328
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15329
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748
15330
         {
14749
15331
             mouseMoved(e);
14750
15332
         } else
..
..
@@ -14774,6 +15356,7 @@
14774
15356
 
14775
15357
     void SelectParent()
14776
15358
     {
15359
+                new Exception().printStackTrace();
14777
15360
         System.exit(0);
14778
15361
         Composite group = (Composite) object;
14779
15362
         java.util.Vector selectees = new java.util.Vector(group.selection);
..
..
@@ -14797,6 +15380,7 @@
14797
15380
 
14798
15381
     void SelectChildren()
14799
15382
     {
15383
+                new Exception().printStackTrace();
14800
15384
         System.exit(0);
14801
15385
         /*
14802
15386
         Composite group = (Composite) object;
..
..
@@ -14961,7 +15545,9 @@
14961
15545
         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962
15546
         //Image img = CreateImage(width, height);
14963
15547
         //System.out.println("width = " + width + "; height = " + height + "\n");
15548
+        
14964
15549
         Graphics gr = g; // img.getGraphics();
15550
+        
14965
15551
         if (!hasMarquee)
14966
15552
         {
14967
15553
             if (Xmin < Xmax) // !locked)
..
..
@@ -15059,14 +15645,33 @@
15059
15645
             if (!isRenderer)
15060
15646
             {
15061
15647
                 object.drawEditHandles(info, 0);
15648
+                
15649
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15650
+                {
15651
+                    switch (object.selection.get(0).hitSomething)
15652
+                    {
15653
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15654
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15655
+                            break;
15656
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15657
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15658
+                        break;
15659
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15660
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15661
+                        break;
15662
+                    }
15663
+                    
15664
+                }
15062
15665
             }
15063
15666
         }
15667
+        
15064
15668
         if (isRenderer)
15065
15669
         {
15066
15670
         //gr.setColor(Color.black);
15067
15671
         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068
15672
         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069
15673
         }
15674
+        
15070
15675
         if (hasMarquee)
15071
15676
         {
15072
15677
             gr.setXORMode(Color.white);
..
..
@@ -15179,6 +15784,7 @@
15179
15784
     public boolean mouseDown(Event evt, int x, int y)
15180
15785
     {
15181
15786
         System.out.println("mouseDown: " + evt);
15787
+        System.exit(0);
15182
15788
         /*
15183
15789
         locked = true;
15184
15790
         drag = false;
..
..
@@ -15222,7 +15828,7 @@
15222
15828
         {
15223
15829
             keyPressed(0, modifiers);
15224
15830
         }
15225
-        clickStart(x, y, modifiers);
15831
+ //       clickStart(x, y, modifiers);
15226
15832
         return true;
15227
15833
     }
15228
15834
 
..
..
@@ -15340,7 +15946,7 @@
15340
15946
         {
15341
15947
             keyReleased(0, 0);
15342
15948
         }
15343
-        drag(x, y, modifiers);
15949
+        drag(x, y, 0, modifiers);
15344
15950
         return true;
15345
15951
     }
15346
15952
 
..
..
@@ -15472,7 +16078,7 @@
15472
16078
     Object3D object;
15473
16079
     static Object3D trackedobject;
15474
16080
     Camera renderCamera; // Light or Eye (or Occlusion)
15475
-    /*static*/ Camera manipCamera; // Light or Eye
16081
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476
16082
 	/*static*/ Camera eyeCamera;
15477
16083
     /*static*/ Camera lightCamera;
15478
16084
     int cameracount;
..
..
@@ -15910,6 +16516,7 @@
15910
16516
         {
15911
16517
             if (!selection)
15912
16518
             {
16519
+                new Exception().printStackTrace();
15913
16520
                 System.exit(0);
15914
16521
                 return;
15915
16522
             }
..
..
@@ -16037,16 +16644,16 @@
16037
16644
                             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
16645
                         }
16039
16646
                         
16040
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16647
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041
16648
                     }
16042
16649
                 }
16043
16650
                 
16044
16651
                 if (!movingcamera && !PAINTMODE)
16045
16652
                     object.editWindow.ScreenFitPoint(); // fev 2014
16046
16653
                 
16047
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16654
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048
16655
                 {
16049
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16656
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050
16657
                     
16051
16658
                     Object3D group = new Object3D("inst" + paintcount++);
16052
16659
                     
..
..
@@ -16202,7 +16809,7 @@
16202
16809
                 gl.glDisable(gl.GL_CULL_FACE);
16203
16810
             }
16204
16811
 
16205
-            if (!RENDERSHADOW)
16812
+            if (!Globals.RENDERSHADOW)
16206
16813
                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
16207
16814
 
16208
16815
             // SB gl.glPolygonOffset(2.5f, 10);
..
..
@@ -16212,7 +16819,7 @@
16212
16819
             //gl.glColorMask(false, false, false, false);
16213
16820
 
16214
16821
             //render_scene_from_light_view(gl, drawable, 0, 0);
16215
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16822
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216
16823
             {
16217
16824
                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
16218
16825
 
..
..
@@ -16696,10 +17303,11 @@
16696
17303
     static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH*8*8 * TEXT_HEIGHT);
16697
17304
     // Depth buffer format
16698
17305
     //private int depth_format;
16699
-    static public void NextIndex(Object3D o, GL gl)
17306
+    
17307
+    public void NextIndex()
16700
17308
     {
16701
17309
         indexcount+=16;
16702
-        gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
17310
+        GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703
17311
     //objects[indexcount] = o;
16704
17312
     //System.out.println("indexcount = " + indexcount);
16705
17313
     }