blame | history | patch | commit | commitdiff
Normand Briere
2019-06-17 e36047725ce3217618d4e5807ac7c8769b9e3598 
 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 
....@@ -7550,6 +7921,64 @@
75507921         ReleaseTexture(pigment, false);
75517922     }
75527923     
7924
+    public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7925
+    {
7926
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7927
+        {
7928
+            return;
7929
+        }
7930
+
7931
+        if (tex == null)
7932
+        {
7933
+            ReleaseTexture(null, false);
7934
+            return;
7935
+        }
7936
+        
7937
+        String pigment = Object3D.GetPigment(tex);
7938
+
7939
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7940
+        {
7941
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7942
+        //    System.out.println("; bump = " + bump);
7943
+        }
7944
+        
7945
+        if (pigment.equals(""))
7946
+        {
7947
+            pigment = null;
7948
+        }
7949
+        
7950
+        ReleaseTexture(pigment, false);
7951
+    }
7952
+    
7953
+    public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7954
+    {
7955
+        if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7956
+        {
7957
+            return;
7958
+        }
7959
+
7960
+        if (tex == null)
7961
+        {
7962
+            ReleaseTexture(null, true);
7963
+            return;
7964
+        }
7965
+        
7966
+        String bump = Object3D.GetBump(tex);
7967
+
7968
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7969
+        {
7970
+        //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7971
+        //    System.out.println("; bump = " + bump);
7972
+        }
7973
+        
7974
+        if (bump.equals(""))
7975
+        {
7976
+            bump = null;
7977
+        }
7978
+        
7979
+        ReleaseTexture(bump, true);
7980
+    }
7981
+    
75537982     void ReleaseTexture(String tex, boolean bump)
75547983     {
75557984         if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -7653,7 +8082,7 @@
76538082         }
76548083     }
76558084 
7656
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8085
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
76578086     {
76588087         if (// DrawMode() != 0 || /*tex == null ||*/
76598088                 ambientOcclusion ) // || !textureon)
....@@ -7698,7 +8127,94 @@
76988127         return; // true;
76998128     }
77008129     
7701
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8130
+    /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8131
+    {
8132
+        if (// DrawMode() != 0 || /*tex == null ||*/
8133
+                ambientOcclusion ) // || !textureon)
8134
+        {
8135
+            return; // false;
8136
+        }
8137
+
8138
+        if (tex == null)
8139
+        {
8140
+            BindTexture(null,false,resolution);
8141
+            return;
8142
+        }
8143
+        
8144
+        String pigment = Object3D.GetPigment(tex);
8145
+
8146
+        usedtextures.put(pigment, pigment);
8147
+        
8148
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8149
+        {
8150
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8151
+        //    System.out.println("; bump = " + bump);
8152
+        }
8153
+        
8154
+        if (pigment.equals(""))
8155
+        {
8156
+            pigment = null;
8157
+        }
8158
+        
8159
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8160
+        BindTexture(pigment, false, resolution);
8161
+    }
8162
+    
8163
+    /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8164
+    {
8165
+        if (// DrawMode() != 0 || /*tex == null ||*/
8166
+                ambientOcclusion ) // || !textureon)
8167
+        {
8168
+            return; // false;
8169
+        }
8170
+
8171
+        if (tex == null)
8172
+        {
8173
+            BindTexture(null,true,resolution);
8174
+            return;
8175
+        }
8176
+        
8177
+        String bump = Object3D.GetBump(tex);
8178
+
8179
+        usedtextures.put(bump, bump);
8180
+        
8181
+        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8182
+        {
8183
+        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8184
+        //    System.out.println("; bump = " + bump);
8185
+        }
8186
+        
8187
+        if (bump.equals(""))
8188
+        {
8189
+            bump = null;
8190
+        }
8191
+        
8192
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8193
+        BindTexture(bump, true, resolution);
8194
+        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8195
+    }
8196
+    
8197
+    java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8198
+    
8199
+    private boolean FileExists(String tex)
8200
+    {
8201
+        if (missingTextures.contains(tex))
8202
+        {
8203
+            return false;
8204
+        }
8205
+        
8206
+        boolean fileExists = new File(tex).exists();
8207
+        
8208
+        if (!fileExists)
8209
+        {
8210
+            // If file exists, the "new File()" is not executed sgain
8211
+            missingTextures.add(tex);
8212
+        }
8213
+        
8214
+        return fileExists;
8215
+    }
8216
+    
8217
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
77028218     {
77038219         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
77048220         
....@@ -7706,12 +8222,18 @@
77068222         {
77078223             String texname = tex;
77088224             
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;
8225
+            String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8226
+                
8227
+//            String[] split = tex.split("Textures");
8228
+//            if (split.length > 1)
8229
+//                texname = "/Users/nbriere/Textures" + split[split.length-1];
8230
+//            else
8231
+//                if (!texname.startsWith("/"))
8232
+//                    texname = "/Users/nbriere/Textures/" + texname;
8233
+            if (!FileExists(tex))
8234
+            {
8235
+                    texname = fallbackTextureName;
8236
+            }
77158237             
77168238             if (CACHETEXTURE)
77178239                 texture = textures.get(texname); // TEXTURE CACHE
....@@ -7780,7 +8302,7 @@
77808302                                     }
77818303                                 
77828304                                     cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783
-                                    if (!new File(cachename).exists())
8305
+                                    if (!FileExists(cachename))
77848306                                         cachename = texname;
77858307                                     else
77868308                                         processbump = false; // don't process bump map again
....@@ -7802,7 +8324,7 @@
78028324                                     }
78038325                                 
78048326                                     cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805
-                                    if (!new File(cachename).exists())
8327
+                                    if (!FileExists(cachename))
78068328                                         cachename = texname;
78078329                                     else
78088330                                         processbump = false; // don't process bump map again
....@@ -7811,7 +8333,9 @@
78118333                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
78128334                                 
78138335                                 
7814
-                                if (texturedata != null)
8336
+                                if (texturedata == null)
8337
+                                    throw new Exception();
8338
+                                    
78158339                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
78168340         //texture = GetTexture(tex, bump);
78178341                             }
....@@ -7933,7 +8457,7 @@
79338457         return texture;
79348458     }
79358459     
7936
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8460
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
79378461     {
79388462         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
79398463                 
....@@ -7951,14 +8475,14 @@
79518475         return texture!=null?texture.texture:null;
79528476     }
79538477     
7954
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8478
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
79558479     {
79568480         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
79578481                 
79588482         return texture!=null?texture.texturedata:null;
79598483     }
79608484     
7961
-    boolean BindTexture(String tex, boolean bump, int resolution)
8485
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
79628486     {
79638487         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
79648488         {
....@@ -8935,8 +9459,8 @@
89359459         assert (parentcam != renderCamera);
89369460         
89379461         if (renderCamera != lightCamera)
8938
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
8939
-            LA.matConcat(matrix, parentcam.toParent, matrix);
9462
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9463
+            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
89409464         
89419465 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
89429466             
....@@ -8951,8 +9475,8 @@
89519475             LA.matCopy(renderCamera.fromScreen, matrix);
89529476             
89539477         if (renderCamera != lightCamera)
8954
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
8955
-            LA.matConcat(parentcam.fromParent, matrix, matrix);
9478
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
9479
+            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
89569480 
89579481 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
89589482             
....@@ -9024,7 +9548,7 @@
90249548             //gl.glFlush();
90259549             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
90269550 
9027
-            if (ANIMATION && ABORTED)
9551
+            if (Globals.ANIMATION && ABORTED)
90289552             {
90299553     System.err.println("    ABORTED FRAME");
90309554                 break;
....@@ -9054,7 +9578,7 @@
90549578         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
90559579 
90569580         // save image
9057
-        if (ANIMATION && !ABORTED)
9581
+        if (Globals.ANIMATION && !ABORTED)
90589582         {
90599583             VPwidth = viewport[2];
90609584             VPheight = viewport[3];
....@@ -9165,11 +9689,11 @@
91659689             
91669690 //            imagecount++;
91679691             
9168
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9692
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
91699693             
91709694             if (!BOXMODE)
91719695             {
9172
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9696
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
91739697             }
91749698     
91759699             if (!BOXMODE)
....@@ -9207,7 +9731,7 @@
92079731             ABORTED = false;
92089732         }
92099733         else
9210
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9734
+            Grafreed.wav.cursor += 735 * ACSIZE;
92119735         
92129736         if (false)
92139737         {
....@@ -9870,11 +10394,11 @@
987010394 
987110395     public void display(GLAutoDrawable drawable)
987210396     {
9873
-        if (GrafreeD.savesound && GrafreeD.hassound)
10397
+        if (Grafreed.savesound && Grafreed.hassound)
987410398         {
9875
-            GrafreeD.wav.save();
9876
-            GrafreeD.savesound = false;
9877
-            GrafreeD.hassound = false;
10399
+            Grafreed.wav.save();
10400
+            Grafreed.savesound = false;
10401
+            Grafreed.hassound = false;
987810402         }
987910403 //        if (DEBUG_SELECTION)
988010404 //        {
....@@ -10004,7 +10528,7 @@
1000410528             Object3D theobject = object;
1000510529             Object3D theparent = object.parent;
1000610530             object.parent = null;
10007
-            object = (Object3D)GrafreeD.clone(object);
10531
+            object = (Object3D)Grafreed.clone(object);
1000810532             object.Stripify();
1000910533             if (theobject.selection == null || theobject.selection.Size() == 0)
1001010534                 theobject.PreprocessOcclusion(this);
....@@ -10017,13 +10541,13 @@
1001710541             ambientOcclusion = false;
1001810542         }
1001910543 
10020
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10544
+        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1002110545         {
1002210546             //if (RENDERSHADOW) // ?
1002310547             if (!IsFrozen())
1002410548             {
1002510549                 // dec 2012
10026
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10550
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1002710551                 {
1002810552             Globals.framecount++;
1002910553                     shadowbuffer.display();
....@@ -10150,8 +10674,8 @@
1015010674             
1015110675 //        if (parentcam != renderCamera) // not a light
1015210676         if (cam != lightCamera)
10153
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10154
-                LA.matConcat(matrix, parentcam.toParent, matrix);
10677
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10678
+                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1015510679             
1015610680             for (int j = 0; j < 4; j++)
1015710681             {
....@@ -10165,8 +10689,8 @@
1016510689             
1016610690 //        if (parentcam != renderCamera) // not a light
1016710691         if (cam != lightCamera)
10168
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10169
-                LA.matConcat(parentcam.fromParent, matrix, matrix);
10692
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
10693
+                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1017010694         
1017110695             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1017210696             
....@@ -10425,7 +10949,16 @@
1042510949             // Bump noise
1042610950             gl.glActiveTexture(GL.GL_TEXTURE6);
1042710951             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428
-            BindTexture(NOISE_TEXTURE, false, 2);
10952
+            
10953
+    try
10954
+    {
10955
+        BindTexture(NOISE_TEXTURE, false, 2);
10956
+    }
10957
+    catch (Exception e)
10958
+    {
10959
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10960
+    }
10961
+           
1042910962 
1043010963             gl.glActiveTexture(GL.GL_TEXTURE0);
1043110964             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10550,8 +11083,8 @@
1055011083                 System.err.println("parentcam != renderCamera");
1055111084 
1055211085 //            if (cam != lightCamera)
10553
-            for (int count = parentcam.GetTransformCount(); --count>=0;)
10554
-                LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11086
+            //for (int count = parentcam.GetTransformCount(); --count>=0;)
11087
+                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1055511088         }
1055611089         
1055711090         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10572,8 +11105,8 @@
1057211105             if (true) // TODO
1057311106             {
1057411107                 if (cam != lightCamera)
10575
-                for (int count = parentcam.GetTransformCount(); --count>=0;)
10576
-                   LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11108
+                //for (int count = parentcam.GetTransformCount(); --count>=0;)
11109
+                   LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1057711110             }
1057811111             
1057911112             LA.xformPos(light0, cam.toScreen, light0);
....@@ -10889,8 +11422,14 @@
1088911422     {
1089011423             renderpass++;
1089111424 //        System.out.println("Draw object... ");
11425
+        STEP = 1;
1089211426         if (FAST) // in case there is no script
10893
-            STEP = 16;
11427
+            STEP = 8;
11428
+            
11429
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11430
+        {
11431
+            STEP *= 4;
11432
+        }
1089411433             
1089511434         //object.FullInvariants();
1089611435         
....@@ -10904,8 +11443,8 @@
1090411443             e.printStackTrace();
1090511444         }
1090611445         
10907
-        if (GrafreeD.RENDERME > 0)
10908
-            GrafreeD.RENDERME--; // mechante magouille
11446
+        if (Grafreed.RENDERME > 0)
11447
+            Grafreed.RENDERME--; // mechante magouille
1090911448         
1091011449         Globals.ONESTEP = false;
1091111450     }
....@@ -10975,7 +11514,14 @@
1097511514 
1097611515                 usedtextures.clear();
1097711516             
10978
-                BindTextures(DEFAULT_TEXTURES, 2);
11517
+    try
11518
+    {
11519
+        BindTextures(DEFAULT_TEXTURES, 2);
11520
+    }
11521
+    catch (Exception e)
11522
+    {
11523
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11524
+    }
1097911525             }
1098011526             //System.out.println("--> " + stackdepth);
1098111527 //            GrafreeD.traceon();
....@@ -11066,7 +11612,14 @@
1106611612             if (checker != null && DrawMode() == DEFAULT)
1106711613             {
1106811614                 //BindTexture(IMMORTAL_TEXTURE);
11069
-                BindTextures(checker.GetTextures(), checker.texres);
11615
+    try
11616
+    {
11617
+        BindTextures(checker.GetTextures(), checker.texres);
11618
+    }
11619
+    catch (Exception e)
11620
+    {
11621
+        System.err.println("FAILED: " + checker.GetTextures());
11622
+    }
1107011623                 // NEAREST
1107111624                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1107211625                 DrawChecker(gl);
....@@ -11148,7 +11701,7 @@
1114811701             return;
1114911702         }
1115011703 
11151
-        String string = obj.GetToolTip();
11704
+        String string = obj.toString(); //.GetToolTip();
1115211705         
1115311706         GL gl = GetGL();
1115411707         
....@@ -11465,8 +12018,8 @@
1146512018             //obj.TransformToWorld(light, light);
1146612019             for (int i = tp.size(); --i >= 0;)
1146712020             {
11468
-                for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469
-                    LA.xformPos(light, tp.get(i).toParent, light);
12021
+                //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022
+                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1147012023             }
1147112024 
1147212025 
....@@ -11483,8 +12036,8 @@
1148312036                 parentcam = cameras[0];
1148412037             }
1148512038             
11486
-        for (int count = parentcam.GetTransformCount(); --count>=0;)
11487
-            LA.xformPos(light, parentcam.toParent, light); // may 2013
12039
+        //for (int count = parentcam.GetTransformCount(); --count>=0;)
12040
+            LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1148812041 
1148912042             LA.xformPos(light, renderCamera.toScreen, light);
1149012043             
....@@ -12098,8 +12651,8 @@
1209812651 
1209912652            // display shadow only (bump == 0)
1210012653          "SUB temp.x, half.x, shadow.x;" +
12101
-         "MOV temp.y, -params6.x;" +
12102
-         "SLT temp.z, temp.y, zero.x;" +
12654
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12655
+         "SLT temp.z, temp.y, -one2048th.x;" +
1210312656          "SUB temp.y, one.x, temp.z;" +
1210412657          "MUL temp.x, temp.x, temp.y;" +
1210512658          "KIL temp.x;" +
....@@ -12228,8 +12781,10 @@
1222812781             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1222912782                 
1223012783                 "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
12784
+                // Tuning for default skin
12785
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12786
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12787
+                "ADD temp.y, one.y, options2.y;" + // subsurface
1223312788                 "MUL temp.x, temp.x, temp.y;" +
1223412789                                 
1223512790                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12428,7 +12983,7 @@
1242812983             //once = true;
1242912984         }
1243012985 
12431
-        System.out.print("Program #" + mode + "; length = " + program.length());
12986
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1243212987         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1243312988         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1243412989 
....@@ -12561,12 +13116,16 @@
1256113116 
1256213117                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1256313118                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13119
+                
13120
+                // Compare fragment depth in light space with shadowmap.
1256413121                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1256513122                 "SGE temp.y, temp.x, zero.x;" +
12566
-                "SUB " + shadow + ".y, one.x, temp.y;" +
13123
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13124
+                
13125
+                // Reverse comparison
1256713126                 "SUB temp.x, one.x, temp.x;" +
1256813127                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12569
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13128
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1257013129                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1257113130 
1257213131                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12580,6 +13139,10 @@
1258013139                 // No shadow for backface
1258113140                 "DP3 temp.x, normal, lightd;" +
1258213141                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13142
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13143
+
13144
+                // No shadow when out of frustrum
13145
+                "SGE temp.x, " + depth + ".z, one.z;" +
1258313146                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1258413147                 "";
1258513148     }
....@@ -13138,7 +13701,7 @@
1313813701     public void mousePressed(MouseEvent e)
1313913702     {
1314013703         //System.out.println("mousePressed: " + e);
13141
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13704
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1314213705     }
1314313706 
1314413707     static long prevtime = 0;
....@@ -13165,6 +13728,7 @@
1316513728 	
1316613729         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
1316713730             
13731
+        if (BUTTONLESSWHEEL)
1316813732 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
1316913733 	{
1317013734             return;
....@@ -13173,7 +13737,7 @@
1317313737         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
1317413738         
1317513739         // TIMER
13176
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13740
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
1317713741         {
1317813742             keepboxmode = BOXMODE;
1317913743             keepsupport = SUPPORT;
....@@ -13213,8 +13777,8 @@
1321313777       //      mode |= META;
1321413778         //}
1321513779         
13216
-        SetMouseMode(WHEEL | e.getModifiersEx());
13217
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13780
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13781
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1321813782         anchorX = ax;
1321913783         anchorY = ay;
1322013784         prevX = px;
....@@ -13274,6 +13838,10 @@
1327413838 //            wasliveok = true;
1327513839 //            waslive = false;
1327613840             
13841
+            // May 2019 Forget it:
13842
+            if (true)
13843
+                    return;
13844
+            
1327713845             // source == timer
1327813846             if (mouseDown)
1327913847             {
....@@ -13312,7 +13880,7 @@
1331213880     
1331313881     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1331413882 
13315
-    void clickStart(int x, int y, int modifiers)
13883
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1331613884     {
1331713885         if (!wasliveok)
1331813886             return;
....@@ -13329,7 +13897,7 @@
1332913897 //        touched = true; // main DL
1333013898         if (isRenderer)
1333113899         {
13332
-            SetMouseMode(modifiers);
13900
+            SetMouseMode(modifiers, modifiersex);
1333313901         }
1333413902 
1333513903         selectX = anchorX = x;
....@@ -13342,7 +13910,7 @@
1334213910         clicked = true;
1334313911         hold = false;
1334413912 
13345
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13913
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1334613914         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1334713915         {
1334813916       //  System.out.println("RESTART II " + modifiers);
....@@ -13373,7 +13941,7 @@
1337313941             info.camera = renderCamera;
1337413942             info.x = x;
1337513943             info.y = y;
13376
-            info.modifiers = modifiers;
13944
+            info.modifiers = modifiersex;
1337713945             editObj = object.doEditClick(info, 0);
1337813946             if (!editObj)
1337913947             {
....@@ -13390,11 +13958,14 @@
1339013958     
1339113959     public void mouseDragged(MouseEvent e)
1339213960     {
13961
+        Globals.MOUSEDRAGGED = true;
13962
+        
13963
+        //System.out.println("mouseDragged: " + e);
1339313964         if (isRenderer)
1339413965             movingcamera = true;
13966
+        
1339513967         //if (drawing)
1339613968         //return;
13397
-        //System.out.println("mouseDragged: " + e);
1339813969         if ((e.getModifiersEx() & CTRL) != 0
1339913970             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1340013971         {
....@@ -13402,7 +13973,7 @@
1340213973             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1340313974         }
1340413975         else
13405
-            drag(e.getX(), e.getY(), e.getModifiersEx());
13976
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1340613977         
1340713978     //try { Thread.sleep(1); } catch (Exception ex) {}
1340813979     }
....@@ -13575,6 +14146,7 @@
1357514146         
1357614147         public void run()
1357714148         {
14149
+                new Exception().printStackTrace();
1357814150             System.exit(0);
1357914151             for (;;)
1358014152             {
....@@ -13638,7 +14210,7 @@
1363814210                     {
1363914211                         Globals.lighttouched = true;
1364014212                     }
13641
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14213
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1364214214                 }
1364314215             //else
1364414216             }
....@@ -13738,7 +14310,7 @@
1373814310     int X, Y;
1373914311     boolean SX, SY;
1374014312 
13741
-    void drag(int x, int y, int modifiers)
14313
+    void drag(int x, int y, int modifiers, int modifiersex)
1374214314     {
1374314315         if (IsFrozen())
1374414316         {
....@@ -13747,17 +14319,17 @@
1374714319 
1374814320         drag = true; // NEW
1374914321         
13750
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14322
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1375114323 
1375214324         X = x;
1375314325         Y = y;
1375414326         // floating state for animation
13755
-        MODIFIERS = modifiers;
13756
-        modifiers &= ~1024;
14327
+        MODIFIERS = modifiersex;
14328
+        modifiersex &= ~1024;
1375714329         if (false) // modifiers != 0)
1375814330         {
1375914331             //new Exception().printStackTrace();
13760
-            System.out.println("mouseDragged: " + modifiers);
14332
+            System.out.println("mouseDragged: " + modifiersex);
1376114333             System.out.println("SHIFT = " + SHIFT);
1376214334             System.out.println("CONTROL = " + COMMAND);
1376314335             System.out.println("META = " + META);
....@@ -13777,7 +14349,7 @@
1377714349                 info.camera = renderCamera;
1377814350                 info.x = x;
1377914351                 info.y = y;
13780
-                object.editWindow.copy.doEditDrag(info);
14352
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1378114353             } else
1378214354             {
1378314355                 if (x < startX)
....@@ -13929,7 +14501,6 @@
1392914501     public void mouseMoved(MouseEvent e)
1393014502     {
1393114503         //System.out.println("mouseMoved: " + e);
13932
-
1393314504         if (isRenderer)
1393414505             return;
1393514506         
....@@ -13954,7 +14525,10 @@
1395414525 
1395514526     public void mouseReleased(MouseEvent e)
1395614527     {
14528
+        Globals.MOUSEDRAGGED = false;
14529
+        
1395714530         movingcamera = false;
14531
+        X = Y = 0;
1395814532         //System.out.println("mouseReleased: " + e);
1395914533         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1396014534     }
....@@ -13977,9 +14551,9 @@
1397714551         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1397814552         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1397914553         
13980
-        if (control || command || IsFrozen())
14554
+// No delay        if (control || command || IsFrozen())
1398114555             timeout = true;
13982
-        else
14556
+// ?? May 2019        else
1398314557        // timer.setDelay((modifiers & 128) != 0?0:350);
1398414558         mouseDown = false;
1398514559     if (!control && !command) // june 2013
....@@ -14089,7 +14663,7 @@
1408914663         System.out.println("keyReleased: " + e);
1409014664     }
1409114665 
14092
-    void SetMouseMode(int modifiers)
14666
+    void SetMouseMode(int modifiers, int modifiersex)
1409314667     {
1409414668         //System.out.println("SetMouseMode = " + modifiers);
1409514669         //modifiers &= ~1024;
....@@ -14101,25 +14675,25 @@
1410114675         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1410214676         //	return;
1410314677         //System.out.println("SetMode = " + modifiers);
14104
-        if ((modifiers & WHEEL) == WHEEL)
14678
+        if ((modifiersex & WHEEL) == WHEEL)
1410514679         {
1410614680             mouseMode |= ZOOM;
1410714681         }
1410814682         
1410914683         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110
-        if (capsLocked || (modifiers & META) == META)
14684
+        if (capsLocked) // || (modifiers & META) == META)
1411114685         {
1411214686             mouseMode |= VR; // BACKFORTH;
1411314687         }
14114
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14688
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1411514689         {
1411614690             mouseMode |= SELECT;
1411714691         }
14118
-        if ((modifiers & COMMAND) == COMMAND)
14692
+        if ((modifiersex & COMMAND) == COMMAND)
1411914693         {
1412014694             mouseMode |= SELECT;
1412114695         }
14122
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14696
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1412314697         {
1412414698             mouseMode &= ~VR;
1412514699             mouseMode |= TRANSLATE;
....@@ -14148,7 +14722,7 @@
1414814722 
1414914723         if (isRenderer) //
1415014724         {
14151
-            SetMouseMode(modifiers);
14725
+            SetMouseMode(0, modifiers);
1415214726         }
1415314727 
1415414728         Globals.theRenderer.keyPressed(key);
....@@ -14484,7 +15058,7 @@
1448415058                 //RESIZETEXTURE ^= true;
1448515059                 //break;
1448615060             case 'z':
14487
-                RENDERSHADOW ^= true;
15061
+                Globals.RENDERSHADOW ^= true;
1448815062                 Globals.lighttouched = true;
1448915063                 repaint();
1449015064                 break;
....@@ -14608,7 +15182,7 @@
1460815182         //mode = ROTATE;
1460915183         if ((MODIFIERS & COMMAND) == 0) // VR??
1461015184         {
14611
-            SetMouseMode(modifiers);
15185
+            SetMouseMode(0, modifiers);
1461215186         }
1461315187     }
1461415188 
....@@ -14742,8 +15316,9 @@
1474215316 
1474315317     protected void processMouseMotionEvent(MouseEvent e)
1474415318     {
14745
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
14746
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15319
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15320
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15321
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1474715322         {
1474815323             mouseMoved(e);
1474915324         } else
....@@ -14773,6 +15348,7 @@
1477315348 
1477415349     void SelectParent()
1477515350     {
15351
+                new Exception().printStackTrace();
1477615352         System.exit(0);
1477715353         Composite group = (Composite) object;
1477815354         java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -14796,6 +15372,7 @@
1479615372 
1479715373     void SelectChildren()
1479815374     {
15375
+                new Exception().printStackTrace();
1479915376         System.exit(0);
1480015377         /*
1480115378         Composite group = (Composite) object;
....@@ -14960,7 +15537,9 @@
1496015537         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1496115538         //Image img = CreateImage(width, height);
1496215539         //System.out.println("width = " + width + "; height = " + height + "\n");
15540
+        
1496315541         Graphics gr = g; // img.getGraphics();
15542
+        
1496415543         if (!hasMarquee)
1496515544         {
1496615545             if (Xmin < Xmax) // !locked)
....@@ -15058,14 +15637,33 @@
1505815637             if (!isRenderer)
1505915638             {
1506015639                 object.drawEditHandles(info, 0);
15640
+                
15641
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15642
+                {
15643
+                    switch (object.selection.get(0).hitSomething)
15644
+                    {
15645
+                        case Object3D.hitCenter: gr.setColor(Color.pink);
15646
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15647
+                            break;
15648
+                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15649
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15650
+                        break;
15651
+                        case Object3D.hitScale: gr.setColor(Color.cyan);
15652
+                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15653
+                        break;
15654
+                    }
15655
+                    
15656
+                }
1506115657             }
1506215658         }
15659
+        
1506315660         if (isRenderer)
1506415661         {
1506515662         //gr.setColor(Color.black);
1506615663         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1506715664         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1506815665         }
15666
+        
1506915667         if (hasMarquee)
1507015668         {
1507115669             gr.setXORMode(Color.white);
....@@ -15178,6 +15776,7 @@
1517815776     public boolean mouseDown(Event evt, int x, int y)
1517915777     {
1518015778         System.out.println("mouseDown: " + evt);
15779
+        System.exit(0);
1518115780         /*
1518215781         locked = true;
1518315782         drag = false;
....@@ -15221,7 +15820,7 @@
1522115820         {
1522215821             keyPressed(0, modifiers);
1522315822         }
15224
-        clickStart(x, y, modifiers);
15823
+ //       clickStart(x, y, modifiers);
1522515824         return true;
1522615825     }
1522715826 
....@@ -15339,7 +15938,7 @@
1533915938         {
1534015939             keyReleased(0, 0);
1534115940         }
15342
-        drag(x, y, modifiers);
15941
+        drag(x, y, 0, modifiers);
1534315942         return true;
1534415943     }
1534515944 
....@@ -15471,7 +16070,7 @@
1547116070     Object3D object;
1547216071     static Object3D trackedobject;
1547316072     Camera renderCamera; // Light or Eye (or Occlusion)
15474
-    /*static*/ Camera manipCamera; // Light or Eye
16073
+    /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1547516074 	/*static*/ Camera eyeCamera;
1547616075     /*static*/ Camera lightCamera;
1547716076     int cameracount;
....@@ -15909,6 +16508,7 @@
1590916508         {
1591016509             if (!selection)
1591116510             {
16511
+                new Exception().printStackTrace();
1591216512                 System.exit(0);
1591316513                 return;
1591416514             }
....@@ -16036,16 +16636,16 @@
1603616636                             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]));
1603716637                         }
1603816638                         
16039
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16639
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1604016640                     }
1604116641                 }
1604216642                 
1604316643                 if (!movingcamera && !PAINTMODE)
1604416644                     object.editWindow.ScreenFitPoint(); // fev 2014
1604516645                 
16046
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16646
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1604716647                 {
16048
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16648
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1604916649                     
1605016650                     Object3D group = new Object3D("inst" + paintcount++);
1605116651                     
....@@ -16201,7 +16801,7 @@
1620116801                 gl.glDisable(gl.GL_CULL_FACE);
1620216802             }
1620316803 
16204
-            if (!RENDERSHADOW)
16804
+            if (!Globals.RENDERSHADOW)
1620516805                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1620616806 
1620716807             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16211,7 +16811,7 @@
1621116811             //gl.glColorMask(false, false, false, false);
1621216812 
1621316813             //render_scene_from_light_view(gl, drawable, 0, 0);
16214
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16814
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1621516815             {
1621616816                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1621716817 
....@@ -16695,10 +17295,11 @@
1669517295     static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH*8*8 * TEXT_HEIGHT);
1669617296     // Depth buffer format
1669717297     //private int depth_format;
16698
-    static public void NextIndex(Object3D o, GL gl)
17298
+    
17299
+    public void NextIndex()
1669917300     {
1670017301         indexcount+=16;
16701
-        gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
17302
+        GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
1670217303     //objects[indexcount] = o;
1670317304     //System.out.println("indexcount = " + indexcount);
1670417305     }