blame | history | patch | commit | commitdiff
Normand Briere
2019-06-16 372b7fd481a476cd659713a4a01bf28bf6760cbe 
 CameraPane.java
....@@ -56,8 +56,6 @@
5656     static int CURRENTANTIALIAS = 0; // 1;
5757 	/*static*/ boolean RENDERSHADOW = true;
5858     /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
-    static boolean ANIMATION = false;
60
-    static String filename;
6159     
6260     boolean DISPLAYTEXT = false;
6361     //boolean REDUCETEXTURE = true;
....@@ -92,6 +90,8 @@
9290 
9391 static    int tickcount = 0; // slow pose issue
9492 
93
+static    boolean BUTTONLESSWHEEL = false;
94
+static    boolean ZOOMBOXMODE = false;
9595 static    boolean BOXMODE = false;
9696 static    boolean IMAGEFLIP = false;
9797 static    boolean SMOOTHFOCUS = false;
....@@ -106,7 +106,7 @@
106106 static    boolean OEIL = true;
107107 static    boolean OEILONCE = false; // do oeilon then oeiloff
108108 static    boolean LOOKAT = true;
109
-static    boolean RANDOM = true; // false;
109
+static    boolean SWITCH = true; // false;
110110 static    boolean HANDLES = false; // selection doesn't work!!
111111 static  boolean PAINTMODE = false;
112112 
....@@ -150,6 +150,8 @@
150150         defaultcaps.setAccumAlphaBits(16);
151151     }
152152     
153
+    private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154
+    
153155     void SetAsGLRenderer(boolean b)
154156     {
155157         isRenderer = b;
....@@ -191,9 +193,43 @@
191193     
192194     /// INTERFACE
193195     
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
+    
194225     public boolean IsBoxMode()
195226     {
196227             return BOXMODE;
228
+    }
229
+    
230
+    public boolean IsZoomBoxMode()
231
+    {
232
+            return ZOOMBOXMODE;
197233     }
198234     
199235     public void ClearDepth()
....@@ -428,7 +464,7 @@
428464         if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
429465         {
430466             //gl.glBegin(gl.GL_TRIANGLES);
431
-            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);
432468             if (!hasnorm)
433469             {
434470            //     System.out.println("FUCK!!");
....@@ -1059,7 +1095,336 @@
10591095         gl.glMatrixMode(gl.GL_MODELVIEW);
10601096     }
10611097     
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
+    
10621400     /// 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
+    }
10631428     
10641429     void SetColor(Object3D obj, Vertex p0)
10651430     {
....@@ -1254,18 +1619,18 @@
12541619         //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
12551620         if (!material.multiply)
12561621         {
1257
-            display.color = color;
1622
+            display.color = material.color;
12581623             display.saturation = material.modulation;
12591624         }
12601625         else
12611626         {
1262
-            display.color *= color*2;
1627
+            display.color *= material.color*2;
12631628             display.saturation *= material.modulation*2;
12641629         }
12651630             
12661631         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
12671632 
1268
-        float[] colorV = GrafreeD.colorV;
1633
+        float[] colorV = Grafreed.colorV;
12691634 
12701635         /**/
12711636         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1525,7 +1890,7 @@
15251890     void PushMatrix(double[][] matrix)
15261891     {
15271892     //    GrafreeD.tracein(matrix);
1528
-        PushMatrix(matrix,1);
1893
+        PushMatrix(matrix, 1);
15291894     }
15301895     
15311896     void PushMatrix()
....@@ -1777,7 +2142,7 @@
17772142         System.err.println("LIVE = " + Globals.isLIVE());
17782143         
17792144         if (!Globals.isLIVE()) // save sound
1780
-            GrafreeD.savesound = true; // wav.save();
2145
+            Grafreed.savesound = true; // wav.save();
17812146      //   else
17822147             repaint(); // start loop // may 2013
17832148     }
....@@ -1810,6 +2175,11 @@
18102175     public void ToggleBoxMode()
18112176     {
18122177         BOXMODE ^= true;
2178
+    }
2179
+
2180
+    public void ToggleZoomBoxMode()
2181
+    {
2182
+        ZOOMBOXMODE ^= true;
18132183     }
18142184 
18152185     public void ToggleSmoothFocus()
....@@ -1897,9 +2267,9 @@
18972267         LOOKAT ^= true;
18982268     }
18992269 
1900
-    void ToggleRandom()
2270
+    void ToggleSwitch()
19012271     {
1902
-        RANDOM ^= true;
2272
+        SWITCH ^= true;
19032273     }
19042274 
19052275     void ToggleHandles()
....@@ -2006,7 +2376,7 @@
20062376     {
20072377         return currentGL;
20082378     }
2009
-    
2379
+
20102380     /**/
20112381     class CacheTexture
20122382     {
....@@ -3838,6 +4208,7 @@
38384208     
38394209     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
38404210     {
4211
+                new Exception().printStackTrace();
38414212         System.exit(0);
38424213         com.sun.opengl.util.texture.Texture texture = null;
38434214 
....@@ -7653,7 +8024,7 @@
76538024         }
76548025     }
76558026 
7656
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8027
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
76578028     {
76588029         if (// DrawMode() != 0 || /*tex == null ||*/
76598030                 ambientOcclusion ) // || !textureon)
....@@ -7698,7 +8069,27 @@
76988069         return; // true;
76998070     }
77008071     
7701
-    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
77028093     {
77038094         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
77048095         
....@@ -7706,12 +8097,18 @@
77068097         {
77078098             String texname = tex;
77088099             
7709
-            String[] split = tex.split("Textures");
7710
-            if (split.length > 1)
7711
-                texname = "/Users/nbriere/Textures" + split[split.length-1];
7712
-            else
7713
-                if (!texname.startsWith("/"))
7714
-                    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
+            }
77158112             
77168113             if (CACHETEXTURE)
77178114                 texture = textures.get(texname); // TEXTURE CACHE
....@@ -7780,7 +8177,7 @@
77808177                                     }
77818178                                 
77828179                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783
-                                    if (!new File(cachename).exists())
8180
+                                    if (!FileExists(cachename))
77848181                                         cachename = texname;
77858182                                     else
77868183                                         processbump = false; // don't process bump map again
....@@ -7802,7 +8199,7 @@
78028199                                     }
78038200                                 
78048201                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805
-                                    if (!new File(cachename).exists())
8202
+                                    if (!FileExists(cachename))
78068203                                         cachename = texname;
78078204                                     else
78088205                                         processbump = false; // don't process bump map again
....@@ -7811,7 +8208,9 @@
78118208                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
78128209                                 
78138210                                 
7814
-                                if (texturedata != null)
8211
+                                if (texturedata == null)
8212
+                                    throw new Exception();
8213
+                                    
78158214                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
78168215         //texture = GetTexture(tex, bump);
78178216                             }
....@@ -7933,7 +8332,7 @@
79338332         return texture;
79348333     }
79358334     
7936
-    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
79378336     {
79388337         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
79398338                 
....@@ -7951,14 +8350,14 @@
79518350         return texture!=null?texture.texture:null;
79528351     }
79538352     
7954
-    public 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
79558354     {
79568355         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
79578356                 
79588357         return texture!=null?texture.texturedata:null;
79598358     }
79608359     
7961
-    boolean BindTexture(String tex, boolean bump, int resolution)
8360
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
79628361     {
79638362         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
79648363         {
....@@ -8935,8 +9334,8 @@
89359334         assert (parentcam != renderCamera);
89369335         
89379336         if (renderCamera != lightCamera)
8938
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
8939
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9337
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9338
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
89409339         
89419340 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
89429341             
....@@ -8951,8 +9350,8 @@
89519350             LA.matCopy(renderCamera.fromScreen, matrix);
89529351             
89539352         if (renderCamera != lightCamera)
8954
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
8955
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9353
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9354
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
89569355 
89579356 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
89589357             
....@@ -9024,7 +9423,7 @@
90249423             //gl.glFlush();
90259424             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
90269425 
9027
-            if (ANIMATION && ABORTED)
9426
+            if (Globals.ANIMATION && ABORTED)
90289427             {
90299428     System.err.println("    ABORTED FRAME");
90309429                 break;
....@@ -9054,7 +9453,7 @@
90549453         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
90559454 
90569455         // save image
9057
-        if (ANIMATION && !ABORTED)
9456
+        if (Globals.ANIMATION && !ABORTED)
90589457         {
90599458             VPwidth = viewport[2];
90609459             VPheight = viewport[3];
....@@ -9165,11 +9564,11 @@
91659564             
91669565 //            imagecount++;
91679566             
9168
-            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;
91699568             
91709569             if (!BOXMODE)
91719570             {
9172
-                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) + ")");
91739572             }
91749573     
91759574             if (!BOXMODE)
....@@ -9207,7 +9606,7 @@
92079606             ABORTED = false;
92089607         }
92099608         else
9210
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9609
+            Grafreed.wav.cursor += 735 * ACSIZE;
92119610         
92129611         if (false)
92139612         {
....@@ -9870,11 +10269,11 @@
987010269 
987110270     public void display(GLAutoDrawable drawable)
987210271     {
9873
-        if (GrafreeD.savesound && GrafreeD.hassound)
10272
+        if (Grafreed.savesound && Grafreed.hassound)
987410273         {
9875
-            GrafreeD.wav.save();
9876
-            GrafreeD.savesound = false;
9877
-            GrafreeD.hassound = false;
10274
+            Grafreed.wav.save();
10275
+            Grafreed.savesound = false;
10276
+            Grafreed.hassound = false;
987810277         }
987910278 //        if (DEBUG_SELECTION)
988010279 //        {
....@@ -10004,7 +10403,7 @@
1000410403             Object3D theobject = object;
1000510404             Object3D theparent = object.parent;
1000610405             object.parent = null;
10007
-            object = (Object3D)GrafreeD.clone(object);
10406
+            object = (Object3D)Grafreed.clone(object);
1000810407             object.Stripify();
1000910408             if (theobject.selection == null || theobject.selection.Size() == 0)
1001010409                 theobject.PreprocessOcclusion(this);
....@@ -10017,13 +10416,13 @@
1001710416             ambientOcclusion = false;
1001810417         }
1001910418 
10020
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10419
+        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1002110420         {
1002210421             //if (RENDERSHADOW) // ?
1002310422             if (!IsFrozen())
1002410423             {
1002510424                 // dec 2012
10026
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10425
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1002710426                 {
1002810427             Globals.framecount++;
1002910428                     shadowbuffer.display();
....@@ -10150,8 +10549,8 @@
1015010549             
1015110550 //        if (parentcam != renderCamera) // not a light
1015210551         if (cam != lightCamera)
10153
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10154
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10552
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10553
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1015510554             
1015610555             for (int j = 0; j < 4; j++)
1015710556             {
....@@ -10165,8 +10564,8 @@
1016510564             
1016610565 //        if (parentcam != renderCamera) // not a light
1016710566         if (cam != lightCamera)
10168
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10169
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10567
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10568
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1017010569         
1017110570             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1017210571             
....@@ -10425,7 +10824,16 @@
1042510824             // Bump noise
1042610825             gl.glActiveTexture(GL.GL_TEXTURE6);
1042710826             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428
-            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
+           
1042910837 
1043010838             gl.glActiveTexture(GL.GL_TEXTURE0);
1043110839             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10550,8 +10958,8 @@
1055010958                 System.err.println("parentcam != renderCamera");
1055110959 
1055210960 //            if (cam != lightCamera)
10553
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10554
-                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
1055510963         }
1055610964         
1055710965         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10572,8 +10980,8 @@
1057210980             if (true) // TODO
1057310981             {
1057410982                 if (cam != lightCamera)
10575
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10576
-                   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
1057710985             }
1057810986             
1057910987             LA.xformPos(light0, cam.toScreen, light0);
....@@ -10889,8 +11297,14 @@
1088911297     {
1089011298             renderpass++;
1089111299 //        System.out.println("Draw object... ");
11300
+        STEP = 1;
1089211301         if (FAST) // in case there is no script
10893
-            STEP = 16;
11302
+            STEP = 8;
11303
+            
11304
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11305
+        {
11306
+            STEP *= 4;
11307
+        }
1089411308             
1089511309         //object.FullInvariants();
1089611310         
....@@ -10904,8 +11318,8 @@
1090411318             e.printStackTrace();
1090511319         }
1090611320         
10907
-        if (GrafreeD.RENDERME > 0)
10908
-            GrafreeD.RENDERME--; // mechante magouille
11321
+        if (Grafreed.RENDERME > 0)
11322
+            Grafreed.RENDERME--; // mechante magouille
1090911323         
1091011324         Globals.ONESTEP = false;
1091111325     }
....@@ -10975,7 +11389,14 @@
1097511389 
1097611390                 usedtextures.clear();
1097711391             
10978
-                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
+    }
1097911400             }
1098011401             //System.out.println("--> " + stackdepth);
1098111402 //            GrafreeD.traceon();
....@@ -11066,7 +11487,14 @@
1106611487             if (checker != null && DrawMode() == DEFAULT)
1106711488             {
1106811489                 //BindTexture(IMMORTAL_TEXTURE);
11069
-                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
+    }
1107011498                 // NEAREST
1107111499                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1107211500                 DrawChecker(gl);
....@@ -11148,7 +11576,7 @@
1114811576             return;
1114911577         }
1115011578 
11151
-        String string = obj.GetToolTip();
11579
+        String string = obj.toString(); //.GetToolTip();
1115211580         
1115311581         GL gl = GetGL();
1115411582         
....@@ -11465,8 +11893,8 @@
1146511893             //obj.TransformToWorld(light, light);
1146611894             for (int i = tp.size(); --i >= 0;)
1146711895             {
11468
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469
-                    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);
1147011898             }
1147111899 
1147211900 
....@@ -11483,8 +11911,8 @@
1148311911                 parentcam = cameras[0];
1148411912             }
1148511913             
11486
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11487
-            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
1148811916 
1148911917             LA.xformPos(light, renderCamera.toScreen, light);
1149011918             
....@@ -12098,8 +12526,8 @@
1209812526 
1209912527            // display shadow only (bump == 0)
1210012528          "SUB temp.x, half.x, shadow.x;" +
12101
-         "MOV temp.y, -params6.x;" +
12102
-         "SLT temp.z, temp.y, zero.x;" +
12529
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12530
+         "SLT temp.z, temp.y, -one2048th.x;" +
1210312531          "SUB temp.y, one.x, temp.z;" +
1210412532          "MUL temp.x, temp.x, temp.y;" +
1210512533          "KIL temp.x;" +
....@@ -12228,8 +12656,10 @@
1222812656             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1222912657                 
1223012658                 "SUB temp.x, one.x, ndotl.x;" +
12231
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12232
-                "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
1223312663                 "MUL temp.x, temp.x, temp.y;" +
1223412664                                 
1223512665                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12428,7 +12858,7 @@
1242812858             //once = true;
1242912859         }
1243012860 
12431
-        System.out.print("Program #" + mode + "; length = " + program.length());
12861
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1243212862         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1243312863         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1243412864 
....@@ -12561,12 +12991,16 @@
1256112991 
1256212992                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1256312993                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
12994
+                
12995
+                // Compare fragment depth in light space with shadowmap.
1256412996                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1256512997                 "SGE temp.y, temp.x, zero.x;" +
12566
-                "SUB " + shadow + ".y, one.x, temp.y;" +
12998
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
12999
+                
13000
+                // Reverse comparison
1256713001                 "SUB temp.x, one.x, temp.x;" +
1256813002                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12569
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13003
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1257013004                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1257113005 
1257213006                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12580,6 +13014,10 @@
1258013014                 // No shadow for backface
1258113015                 "DP3 temp.x, normal, lightd;" +
1258213016                 "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;" +
1258313021                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1258413022                 "";
1258513023     }
....@@ -13138,7 +13576,7 @@
1313813576     public void mousePressed(MouseEvent e)
1313913577     {
1314013578         //System.out.println("mousePressed: " + e);
13141
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13579
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1314213580     }
1314313581 
1314413582     static long prevtime = 0;
....@@ -13165,6 +13603,7 @@
1316513603 	
1316613604         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
1316713605             
13606
+        if (BUTTONLESSWHEEL)
1316813607 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
1316913608 	{
1317013609             return;
....@@ -13173,7 +13612,7 @@
1317313612         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
1317413613         
1317513614         // TIMER
13176
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13615
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
1317713616         {
1317813617             keepboxmode = BOXMODE;
1317913618             keepsupport = SUPPORT;
....@@ -13213,8 +13652,8 @@
1321313652       //      mode |= META;
1321413653         //}
1321513654         
13216
-        SetMouseMode(WHEEL | e.getModifiersEx());
13217
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13655
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13656
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1321813657         anchorX = ax;
1321913658         anchorY = ay;
1322013659         prevX = px;
....@@ -13274,6 +13713,10 @@
1327413713 //            wasliveok = true;
1327513714 //            waslive = false;
1327613715             
13716
+            // May 2019 Forget it:
13717
+            if (true)
13718
+                    return;
13719
+            
1327713720             // source == timer
1327813721             if (mouseDown)
1327913722             {
....@@ -13312,7 +13755,7 @@
1331213755     
1331313756     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1331413757 
13315
-    void clickStart(int x, int y, int modifiers)
13758
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1331613759     {
1331713760         if (!wasliveok)
1331813761             return;
....@@ -13329,7 +13772,7 @@
1332913772 //        touched = true; // main DL
1333013773         if (isRenderer)
1333113774         {
13332
-            SetMouseMode(modifiers);
13775
+            SetMouseMode(modifiers, modifiersex);
1333313776         }
1333413777 
1333513778         selectX = anchorX = x;
....@@ -13342,7 +13785,7 @@
1334213785         clicked = true;
1334313786         hold = false;
1334413787 
13345
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13788
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1334613789         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1334713790         {
1334813791       //  System.out.println("RESTART II " + modifiers);
....@@ -13373,7 +13816,7 @@
1337313816             info.camera = renderCamera;
1337413817             info.x = x;
1337513818             info.y = y;
13376
-            info.modifiers = modifiers;
13819
+            info.modifiers = modifiersex;
1337713820             editObj = object.doEditClick(info, 0);
1337813821             if (!editObj)
1337913822             {
....@@ -13390,11 +13833,14 @@
1339013833     
1339113834     public void mouseDragged(MouseEvent e)
1339213835     {
13836
+        Globals.MOUSEDRAGGED = true;
13837
+        
13838
+        //System.out.println("mouseDragged: " + e);
1339313839         if (isRenderer)
1339413840             movingcamera = true;
13841
+        
1339513842         //if (drawing)
1339613843         //return;
13397
-        //System.out.println("mouseDragged: " + e);
1339813844         if ((e.getModifiersEx() & CTRL) != 0
1339913845             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1340013846         {
....@@ -13402,7 +13848,7 @@
1340213848             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1340313849         }
1340413850         else
13405
-            drag(e.getX(), e.getY(), e.getModifiersEx());
13851
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1340613852         
1340713853     //try { Thread.sleep(1); } catch (Exception ex) {}
1340813854     }
....@@ -13575,6 +14021,7 @@
1357514021         
1357614022         public void run()
1357714023         {
14024
+                new Exception().printStackTrace();
1357814025             System.exit(0);
1357914026             for (;;)
1358014027             {
....@@ -13638,7 +14085,7 @@
1363814085                     {
1363914086                         Globals.lighttouched = true;
1364014087                     }
13641
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14088
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1364214089                 }
1364314090             //else
1364414091             }
....@@ -13738,7 +14185,7 @@
1373814185     int X, Y;
1373914186     boolean SX, SY;
1374014187 
13741
-    void drag(int x, int y, int modifiers)
14188
+    void drag(int x, int y, int modifiers, int modifiersex)
1374214189     {
1374314190         if (IsFrozen())
1374414191         {
....@@ -13747,17 +14194,17 @@
1374714194 
1374814195         drag = true; // NEW
1374914196         
13750
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14197
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1375114198 
1375214199         X = x;
1375314200         Y = y;
1375414201         // floating state for animation
13755
-        MODIFIERS = modifiers;
13756
-        modifiers &= ~1024;
14202
+        MODIFIERS = modifiersex;
14203
+        modifiersex &= ~1024;
1375714204         if (false) // modifiers != 0)
1375814205         {
1375914206             //new Exception().printStackTrace();
13760
-            System.out.println("mouseDragged: " + modifiers);
14207
+            System.out.println("mouseDragged: " + modifiersex);
1376114208             System.out.println("SHIFT = " + SHIFT);
1376214209             System.out.println("CONTROL = " + COMMAND);
1376314210             System.out.println("META = " + META);
....@@ -13777,7 +14224,7 @@
1377714224                 info.camera = renderCamera;
1377814225                 info.x = x;
1377914226                 info.y = y;
13780
-                object.editWindow.copy.doEditDrag(info);
14227
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1378114228             } else
1378214229             {
1378314230                 if (x < startX)
....@@ -13929,7 +14376,6 @@
1392914376     public void mouseMoved(MouseEvent e)
1393014377     {
1393114378         //System.out.println("mouseMoved: " + e);
13932
-
1393314379         if (isRenderer)
1393414380             return;
1393514381         
....@@ -13954,7 +14400,10 @@
1395414400 
1395514401     public void mouseReleased(MouseEvent e)
1395614402     {
14403
+        Globals.MOUSEDRAGGED = false;
14404
+        
1395714405         movingcamera = false;
14406
+        X = Y = 0;
1395814407         //System.out.println("mouseReleased: " + e);
1395914408         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1396014409     }
....@@ -13977,9 +14426,9 @@
1397714426         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1397814427         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1397914428         
13980
-        if (control || command || IsFrozen())
14429
+// No delay        if (control || command || IsFrozen())
1398114430             timeout = true;
13982
-        else
14431
+// ?? May 2019        else
1398314432        // timer.setDelay((modifiers & 128) != 0?0:350);
1398414433         mouseDown = false;
1398514434     if (!control && !command) // june 2013
....@@ -14089,7 +14538,7 @@
1408914538         System.out.println("keyReleased: " + e);
1409014539     }
1409114540 
14092
-    void SetMouseMode(int modifiers)
14541
+    void SetMouseMode(int modifiers, int modifiersex)
1409314542     {
1409414543         //System.out.println("SetMouseMode = " + modifiers);
1409514544         //modifiers &= ~1024;
....@@ -14101,25 +14550,25 @@
1410114550         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1410214551         //	return;
1410314552         //System.out.println("SetMode = " + modifiers);
14104
-        if ((modifiers & WHEEL) == WHEEL)
14553
+        if ((modifiersex & WHEEL) == WHEEL)
1410514554         {
1410614555             mouseMode |= ZOOM;
1410714556         }
1410814557         
1410914558         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110
-        if (capsLocked || (modifiers & META) == META)
14559
+        if (capsLocked) // || (modifiers & META) == META)
1411114560         {
1411214561             mouseMode |= VR; // BACKFORTH;
1411314562         }
14114
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14563
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1411514564         {
1411614565             mouseMode |= SELECT;
1411714566         }
14118
-        if ((modifiers & COMMAND) == COMMAND)
14567
+        if ((modifiersex & COMMAND) == COMMAND)
1411914568         {
1412014569             mouseMode |= SELECT;
1412114570         }
14122
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14571
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1412314572         {
1412414573             mouseMode &= ~VR;
1412514574             mouseMode |= TRANSLATE;
....@@ -14148,7 +14597,7 @@
1414814597 
1414914598         if (isRenderer) //
1415014599         {
14151
-            SetMouseMode(modifiers);
14600
+            SetMouseMode(0, modifiers);
1415214601         }
1415314602 
1415414603         Globals.theRenderer.keyPressed(key);
....@@ -14484,7 +14933,7 @@
1448414933                 //RESIZETEXTURE ^= true;
1448514934                 //break;
1448614935             case 'z':
14487
-                RENDERSHADOW ^= true;
14936
+                Globals.RENDERSHADOW ^= true;
1448814937                 Globals.lighttouched = true;
1448914938                 repaint();
1449014939                 break;
....@@ -14608,7 +15057,7 @@
1460815057         //mode = ROTATE;
1460915058         if ((MODIFIERS & COMMAND) == 0) // VR??
1461015059         {
14611
-            SetMouseMode(modifiers);
15060
+            SetMouseMode(0, modifiers);
1461215061         }
1461315062     }
1461415063 
....@@ -14742,8 +15191,9 @@
1474215191 
1474315192     protected void processMouseMotionEvent(MouseEvent e)
1474415193     {
14745
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
14746
-        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)
1474715197         {
1474815198             mouseMoved(e);
1474915199         } else
....@@ -14773,6 +15223,7 @@
1477315223 
1477415224     void SelectParent()
1477515225     {
15226
+                new Exception().printStackTrace();
1477615227         System.exit(0);
1477715228         Composite group = (Composite) object;
1477815229         java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -14796,6 +15247,7 @@
1479615247 
1479715248     void SelectChildren()
1479815249     {
15250
+                new Exception().printStackTrace();
1479915251         System.exit(0);
1480015252         /*
1480115253         Composite group = (Composite) object;
....@@ -14960,7 +15412,9 @@
1496015412         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1496115413         //Image img = CreateImage(width, height);
1496215414         //System.out.println("width = " + width + "; height = " + height + "\n");
15415
+        
1496315416         Graphics gr = g; // img.getGraphics();
15417
+        
1496415418         if (!hasMarquee)
1496515419         {
1496615420             if (Xmin < Xmax) // !locked)
....@@ -15058,14 +15512,33 @@
1505815512             if (!isRenderer)
1505915513             {
1506015514                 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
+                }
1506115532             }
1506215533         }
15534
+        
1506315535         if (isRenderer)
1506415536         {
1506515537         //gr.setColor(Color.black);
1506615538         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1506715539         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1506815540         }
15541
+        
1506915542         if (hasMarquee)
1507015543         {
1507115544             gr.setXORMode(Color.white);
....@@ -15178,6 +15651,7 @@
1517815651     public boolean mouseDown(Event evt, int x, int y)
1517915652     {
1518015653         System.out.println("mouseDown: " + evt);
15654
+        System.exit(0);
1518115655         /*
1518215656         locked = true;
1518315657         drag = false;
....@@ -15221,7 +15695,7 @@
1522115695         {
1522215696             keyPressed(0, modifiers);
1522315697         }
15224
-        clickStart(x, y, modifiers);
15698
+ //       clickStart(x, y, modifiers);
1522515699         return true;
1522615700     }
1522715701 
....@@ -15339,7 +15813,7 @@
1533915813         {
1534015814             keyReleased(0, 0);
1534115815         }
15342
-        drag(x, y, modifiers);
15816
+        drag(x, y, 0, modifiers);
1534315817         return true;
1534415818     }
1534515819 
....@@ -15471,7 +15945,7 @@
1547115945     Object3D object;
1547215946     static Object3D trackedobject;
1547315947     Camera renderCamera; // Light or Eye (or Occlusion)
15474
-    /*static*/ Camera manipCamera; // Light or Eye
15948
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1547515949 	/*static*/ Camera eyeCamera;
1547615950     /*static*/ Camera lightCamera;
1547715951     int cameracount;
....@@ -15909,6 +16383,7 @@
1590916383         {
1591016384             if (!selection)
1591116385             {
16386
+                new Exception().printStackTrace();
1591216387                 System.exit(0);
1591316388                 return;
1591416389             }
....@@ -16036,16 +16511,16 @@
1603616511                             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]));
1603716512                         }
1603816513                         
16039
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16514
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1604016515                     }
1604116516                 }
1604216517                 
1604316518                 if (!movingcamera && !PAINTMODE)
1604416519                     object.editWindow.ScreenFitPoint(); // fev 2014
1604516520                 
16046
-                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)
1604716522                 {
16048
-                    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);
1604916524                     
1605016525                     Object3D group = new Object3D("inst" + paintcount++);
1605116526                     
....@@ -16201,7 +16676,7 @@
1620116676                 gl.glDisable(gl.GL_CULL_FACE);
1620216677             }
1620316678 
16204
-            if (!RENDERSHADOW)
16679
+            if (!Globals.RENDERSHADOW)
1620516680                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1620616681 
1620716682             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16211,7 +16686,7 @@
1621116686             //gl.glColorMask(false, false, false, false);
1621216687 
1621316688             //render_scene_from_light_view(gl, drawable, 0, 0);
16214
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16689
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1621516690             {
1621616691                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1621716692 
....@@ -16695,10 +17170,11 @@
1669517170     static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH*8*8 * TEXT_HEIGHT);
1669617171     // Depth buffer format
1669717172     //private int depth_format;
16698
-    static public void NextIndex(Object3D o, GL gl)
17173
+    
17174
+    public void NextIndex()
1669917175     {
1670017176         indexcount+=16;
16701
-        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);
1670217178     //objects[indexcount] = o;
1670317179     //System.out.println("indexcount = " + indexcount);
1670417180     }