Fix normal for mesh

Normand Briere

2019-06-11 5e6a6f3319f0c4c687fe71952ac9ecc17792b83a

 CameraPane.java
..
..
@@ -56,8 +56,6 @@
56
56
     static int CURRENTANTIALIAS = 0; // 1;
57
57
 	/*static*/ boolean RENDERSHADOW = true;
58
58
     /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
-    static boolean ANIMATION = false;
60
-    static String filename;
61
59
     
62
60
     boolean DISPLAYTEXT = false;
63
61
     //boolean REDUCETEXTURE = true;
..
..
@@ -92,6 +90,8 @@
92
90
 
93
91
 static    int tickcount = 0; // slow pose issue
94
92
 
93
+static    boolean BUTTONLESSWHEEL = false;
94
+static    boolean ZOOMBOXMODE = false;
95
95
 static    boolean BOXMODE = false;
96
96
 static    boolean IMAGEFLIP = false;
97
97
 static    boolean SMOOTHFOCUS = false;
..
..
@@ -106,7 +106,7 @@
106
106
 static    boolean OEIL = true;
107
107
 static    boolean OEILONCE = false; // do oeilon then oeiloff
108
108
 static    boolean LOOKAT = true;
109
-static    boolean RANDOM = true; // false;
109
+static    boolean SWITCH = true; // false;
110
110
 static    boolean HANDLES = false; // selection doesn't work!!
111
111
 static  boolean PAINTMODE = false;
112
112
 
..
..
@@ -191,9 +191,43 @@
191
191
     
192
192
     /// INTERFACE
193
193
     
194
+    public javax.media.opengl.GL GetGL0()
195
+    {
196
+            return null;
197
+    }
198
+    
199
+    public int GenList()
200
+    {
201
+            javax.media.opengl.GL gl = GetGL();
202
+        return gl.glGenLists(1);
203
+    }
204
+    
205
+    public void NewList(int id)
206
+    {
207
+            javax.media.opengl.GL gl = GetGL();
208
+        gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
209
+    }
210
+    
211
+    public void CallList(int id)
212
+    {
213
+        javax.media.opengl.GL gl = GetGL();
214
+        gl.glCallList(id);
215
+    }
216
+    
217
+    public void EndList()
218
+    {
219
+            javax.media.opengl.GL gl = GetGL();
220
+        gl.glEndList();
221
+    }
222
+    
194
223
     public boolean IsBoxMode()
195
224
     {
196
225
             return BOXMODE;
226
+    }
227
+    
228
+    public boolean IsZoomBoxMode()
229
+    {
230
+            return ZOOMBOXMODE;
197
231
     }
198
232
     
199
233
     public void ClearDepth()
..
..
@@ -1059,7 +1093,336 @@
1059
1093
         gl.glMatrixMode(gl.GL_MODELVIEW);
1060
1094
     }
1061
1095
     
1096
+        public void DrawBox(cVector min, cVector max)
1097
+        {
1098
+            javax.media.opengl.GL gl = GetGL();
1099
+                gl.glBegin(gl.GL_LINES);
1100
+                
1101
+                gl.glVertex3d(min.x, min.y, min.z);
1102
+                gl.glVertex3d(min.x, min.y, max.z);
1103
+                gl.glVertex3d(min.x, min.y, min.z);
1104
+                gl.glVertex3d(min.x, max.y, min.z);
1105
+                gl.glVertex3d(min.x, min.y, min.z);
1106
+                gl.glVertex3d(max.x, min.y, min.z);
1107
+                
1108
+                gl.glVertex3d(max.x, max.y, max.z);
1109
+                gl.glVertex3d(min.x, max.y, max.z);
1110
+                gl.glVertex3d(max.x, max.y, max.z);
1111
+                gl.glVertex3d(max.x, min.y, max.z);
1112
+                gl.glVertex3d(max.x, max.y, max.z);
1113
+                gl.glVertex3d(max.x, max.y, min.z);
1114
+                
1115
+                gl.glEnd();
1116
+        }
1117
+
1118
+        public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
1119
+        {
1120
+            int[] strips = bRep.getRawIndices();
1121
+            
1122
+            javax.media.opengl.GL gl = GetGL();
1123
+        
1124
+                // TRIANGLE STRIP ARRAY
1125
+                if (bRep.trimmed)
1126
+                {
1127
+                    float[] v = bRep.getRawVertices();
1128
+                    float[] n = bRep.getRawNormals();
1129
+                    float[] c = bRep.getRawColors();
1130
+                    float[] uv = bRep.getRawUVMap();
1131
+
1132
+                    int count2 = 0;
1133
+                    int count3 = 0;
1134
+
1135
+                    if (n.length > 0)
1136
+                    {
1137
+                        for (int i = 0; i < strips.length; i++)
1138
+                        {
1139
+                            gl.glBegin(gl.GL_TRIANGLE_STRIP);
1140
+
1141
+                            /*
1142
+                    boolean locked = false;
1143
+                    float eps = 0.1f;
1144
+                    boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
1145
+
1146
+                    int dot = 0;
1147
+
1148
+                    if ((dot&1) == 0)
1149
+                        dot |= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
1150
+
1151
+                    if (wrap || (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
1152
+                        gl.glTexCoord2f((float) qv.s, (float) qv.t);
1153
+                    else
1154
+                    {
1155
+                        locked = true;
1156
+                        gl.glTexCoord2f((float) pv.s, (float) pv.t);
1157
+                    }
1158
+                    //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
1159
+                    gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
1160
+                    if (hasnorm)
1161
+                    {
1162
+                        //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
1163
+                        gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
1164
+                    }
1165
+
1166
+                    if ((dot&4) == 0)
1167
+                        dot |= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
1168
+
1169
+                    if (wrap || !locked && (dot&8) != 0)
1170
+                        gl.glTexCoord2f((float) rv.s, (float) rv.t);
1171
+                    else
1172
+                        gl.glTexCoord2f((float) pv.s, (float) pv.t);
1173
+
1174
+                    f.dot = dot;
1175
+                    */
1176
+
1177
+                            if (!selectmode)
1178
+                            {
1179
+                                if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1180
+                                {
1181
+                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1182
+                                } else
1183
+                                {
1184
+                                    gl.glNormal3f(0, 0, 1);
1185
+                                }
1186
+
1187
+                                if (c != null)
1188
+                                //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
1189
+                                {
1190
+                                    gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1191
+                                }
1192
+                            }
1193
+                            if (flipV)
1194
+                                gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195
+                            else
1196
+                                gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1197
+                            //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198
+                            gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199
+
1200
+                            count2 += 2;
1201
+                            count3 += 3;
1202
+                            if (!selectmode)
1203
+                            {
1204
+                                if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1205
+                                {
1206
+                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1207
+                                } else
1208
+                                {
1209
+                                    gl.glNormal3f(0, 0, 1);
1210
+                                }
1211
+                                if (c != null)
1212
+                                {
1213
+                                    gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1214
+                                }
1215
+                            }
1216
+                            if (flipV)
1217
+                                gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218
+                            else
1219
+                                gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1220
+                            //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221
+                            gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222
+
1223
+                            count2 += 2;
1224
+                            count3 += 3;
1225
+                            for (int j = 0; j < strips[i] - 2; j++)
1226
+                            {
1227
+                                //gl.glTexCoord2d(...);
1228
+                                if (!selectmode)
1229
+                                {
1230
+                                    if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1231
+                                    {
1232
+                                        gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1233
+                                    } else
1234
+                                    {
1235
+                                        gl.glNormal3f(0, 0, 1);
1236
+                                    }
1237
+                                    if (c != null)
1238
+                                    {
1239
+                                        gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1240
+                                    }
1241
+                                }
1242
+
1243
+                                if (flipV)
1244
+                                    gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245
+                                else
1246
+                                    gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1247
+                                //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248
+                                gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1249
+                                count2 += 2;
1250
+                                count3 += 3;
1251
+                            }
1252
+
1253
+                            gl.glEnd();
1254
+                        }
1255
+                    }
1256
+
1257
+                    assert count3 == v.length;
1258
+                }
1259
+                else // !trimmed
1260
+                {
1261
+                    int count = 0;
1262
+                    for (int i = 0; i < strips.length; i++)
1263
+                    {
1264
+                        gl.glBegin(gl.GL_TRIANGLE_STRIP);
1265
+                        
1266
+                        Vertex p = bRep.GetVertex(bRep.indices[count++]);
1267
+                        Vertex q = bRep.GetVertex(bRep.indices[count++]);
1268
+                        
1269
+                        drawVertex(gl, p, flipV, selectmode);
1270
+                        drawVertex(gl, q, flipV, selectmode);
1271
+                        
1272
+                        for (int j = 0; j < strips[i] - 2; j++)
1273
+                        {
1274
+                            Vertex r = bRep.GetVertex(bRep.indices[count++]);
1275
+
1276
+    //                        if (j%2 == 0)
1277
+    //                            drawFace(p, q, r, display, null);
1278
+    //                        else
1279
+    //                            drawFace(p, r, q, display, null);
1280
+                            
1281
+    //                        p = q;
1282
+    //                        q = r;
1283
+                            drawVertex(gl, r, flipV, selectmode);
1284
+                        }
1285
+
1286
+                        gl.glEnd();
1287
+                    }
1288
+                }
1289
+        }
1290
+
1291
+    static cSpring.Point3D temp = new cSpring.Point3D();
1292
+    static cSpring.Point3D temp2 = new cSpring.Point3D();
1293
+    static cSpring.Point3D temp3 = new cSpring.Point3D();
1294
+    
1295
+        public void DrawDynamicMesh(cMesh mesh)
1296
+        {
1297
+                GL gl = GetGL(); // getGL();
1298
+
1299
+                cSpring.PhysicsController3D Phys = mesh.Phys;
1300
+                
1301
+                gl.glDisable(gl.GL_LIGHTING);
1302
+                
1303
+                gl.glLineWidth(1);
1304
+                gl.glColor3f(1,1,1);
1305
+                gl.glBegin(gl.GL_LINES);
1306
+                double scale = 0;
1307
+                int count = 0;
1308
+                for (int s=0; s<Phys.allSprings.size(); s++)
1309
+                {
1310
+                    cSpring.Spring spring = Phys.allSprings.get(s);
1311
+                        if(s == 0)
1312
+                        {
1313
+                            //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
1314
+                        }
1315
+                if (mesh.showsprings)
1316
+                {
1317
+                    temp.set(spring.a.position);
1318
+                    temp.add(spring.b.position);
1319
+                    temp.mul(0.5);
1320
+                    temp2.set(spring.a.position);
1321
+                    temp2.sub(spring.b.position);
1322
+                    temp2.mul(spring.restLength/2);
1323
+                    temp.sub(temp2);
1324
+                    gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1325
+                    temp.add(temp2);
1326
+                    temp.add(temp2);
1327
+                    gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1328
+                }
1329
+
1330
+                    if (spring.isHandle)
1331
+                        continue;
1332
+                    
1333
+                    //if (scale < spring.restLength)
1334
+                        scale += spring.restLength;
1335
+                        count++;
1336
+                }
1337
+                gl.glEnd();
1338
+
1339
+                if (count == 0)
1340
+                    scale = 0.01;
1341
+                else
1342
+                    scale /= count * 3;
1343
+                
1344
+                //scale = 0.25;
1345
+                
1346
+                if (mesh.ShowInfo())
1347
+                {
1348
+                    gl.glLineWidth(4);
1349
+                    for (int s=0; s<Phys.allNodes.size(); s++)
1350
+                    {
1351
+                        cSpring.DynamicNode node = Phys.allNodes.get(s);
1352
+                        if (node.mass == 0)
1353
+                            continue;
1354
+                        
1355
+                        int i = node.springs==null?-1:node.springs.size();
1356
+                        gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
1357
+                        //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
1358
+                        //temp.normalize();
1359
+                        //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
1360
+                        gl.glBegin(gl.GL_LINES);
1361
+                        gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1362
+                        //gl.glVertex3d(node.position.x + node.normal.x*scale, node.position.y + node.normal.y*scale, node.position.z + node.normal.z*scale);
1363
+                        gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
1364
+                                node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
1365
+                                node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
1366
+                        gl.glEnd();
1367
+                    }
1368
+
1369
+                    gl.glLineWidth(8);
1370
+                    for (int s=0; s<Phys.allNodes.size(); s++)
1371
+                    {
1372
+                        cSpring.DynamicNode node = Phys.allNodes.get(s);
1373
+
1374
+                        if (node.springs != null)
1375
+                        {
1376
+                            for (int i=0; i<node.springs.size(); i+=1)
1377
+                            {
1378
+                                cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
1379
+                                
1380
+                                int c = i+1;
1381
+                           //     c = node.springs.get(i).nbcopies;
1382
+
1383
+                                gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
1384
+                                gl.glBegin(gl.GL_LINES);
1385
+                                    gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1386
+                                    gl.glVertex3d(f.position.x/3+node.position.x*2/3, f.position.y/3+node.position.y*2/3, f.position.z/3+node.position.z*2/3);
1387
+                                gl.glEnd();
1388
+                            }
1389
+                        }
1390
+                    }
1391
+
1392
+                    gl.glLineWidth(1);
1393
+                }
1394
+                
1395
+                gl.glEnable(gl.GL_LIGHTING);
1396
+        }
1397
+    
1062
1398
     /// INTERFACE
1399
+    
1400
+    public void StartTriangles()
1401
+    {
1402
+         javax.media.opengl.GL gl = GetGL();
1403
+         gl.glBegin(gl.GL_TRIANGLES);
1404
+    }
1405
+    
1406
+    public void EndTriangles()
1407
+    {
1408
+         GetGL().glEnd();
1409
+    }
1410
+    
1411
+    void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
1412
+    {
1413
+        if (!selectmode)
1414
+        {
1415
+            gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1416
+            gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1417
+            
1418
+            if (flipV)
1419
+                gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
1420
+            else
1421
+                gl.glTexCoord2f((float) pv.s, (float) pv.t);
1422
+        }
1423
+
1424
+        gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1425
+    }
1063
1426
     
1064
1427
     void SetColor(Object3D obj, Vertex p0)
1065
1428
     {
..
..
@@ -1254,18 +1617,18 @@
1254
1617
         //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1255
1618
         if (!material.multiply)
1256
1619
         {
1257
-            display.color = color;
1620
+            display.color = material.color;
1258
1621
             display.saturation = material.modulation;
1259
1622
         }
1260
1623
         else
1261
1624
         {
1262
-            display.color *= color*2;
1625
+            display.color *= material.color*2;
1263
1626
             display.saturation *= material.modulation*2;
1264
1627
         }
1265
1628
             
1266
1629
         cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1267
1630
 
1268
-        float[] colorV = GrafreeD.colorV;
1631
+        float[] colorV = Grafreed.colorV;
1269
1632
 
1270
1633
         /**/
1271
1634
         if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..
..
@@ -1777,7 +2140,7 @@
1777
2140
         System.err.println("LIVE = " + Globals.isLIVE());
1778
2141
         
1779
2142
         if (!Globals.isLIVE()) // save sound
1780
-            GrafreeD.savesound = true; // wav.save();
2143
+            Grafreed.savesound = true; // wav.save();
1781
2144
      //   else
1782
2145
             repaint(); // start loop // may 2013
1783
2146
     }
..
..
@@ -1810,6 +2173,11 @@
1810
2173
     public void ToggleBoxMode()
1811
2174
     {
1812
2175
         BOXMODE ^= true;
2176
+    }
2177
+
2178
+    public void ToggleZoomBoxMode()
2179
+    {
2180
+        ZOOMBOXMODE ^= true;
1813
2181
     }
1814
2182
 
1815
2183
     public void ToggleSmoothFocus()
..
..
@@ -1899,7 +2267,7 @@
1899
2267
 
1900
2268
     void ToggleRandom()
1901
2269
     {
1902
-        RANDOM ^= true;
2270
+        SWITCH ^= true;
1903
2271
     }
1904
2272
 
1905
2273
     void ToggleHandles()
..
..
@@ -3838,6 +4206,7 @@
3838
4206
     
3839
4207
     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840
4208
     {
4209
+                new Exception().printStackTrace();
3841
4210
         System.exit(0);
3842
4211
         com.sun.opengl.util.texture.Texture texture = null;
3843
4212
 
..
..
@@ -7653,7 +8022,7 @@
7653
8022
         }
7654
8023
     }
7655
8024
 
7656
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8025
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7657
8026
     {
7658
8027
         if (// DrawMode() != 0 || /*tex == null ||*/
7659
8028
                 ambientOcclusion ) // || !textureon)
..
..
@@ -7698,7 +8067,7 @@
7698
8067
         return; // true;
7699
8068
     }
7700
8069
     
7701
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8070
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7702
8071
     {
7703
8072
         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
7704
8073
         
..
..
@@ -7706,12 +8075,16 @@
7706
8075
         {
7707
8076
             String texname = tex;
7708
8077
             
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;
8078
+//            String[] split = tex.split("Textures");
8079
+//            if (split.length > 1)
8080
+//                texname = "/Users/nbriere/Textures" + split[split.length-1];
8081
+//            else
8082
+//                if (!texname.startsWith("/"))
8083
+//                    texname = "/Users/nbriere/Textures/" + texname;
8084
+            if (!new File(tex).exists())
8085
+            {
8086
+                    texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
8087
+            }
7715
8088
             
7716
8089
             if (CACHETEXTURE)
7717
8090
                 texture = textures.get(texname); // TEXTURE CACHE
..
..
@@ -7811,7 +8184,9 @@
7811
8184
                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
7812
8185
                                 
7813
8186
                                 
7814
-                                if (texturedata != null)
8187
+                                if (texturedata == null)
8188
+                                    throw new Exception();
8189
+                                    
7815
8190
                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7816
8191
         //texture = GetTexture(tex, bump);
7817
8192
                             }
..
..
@@ -7933,7 +8308,7 @@
7933
8308
         return texture;
7934
8309
     }
7935
8310
     
7936
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8311
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7937
8312
     {
7938
8313
         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7939
8314
                 
..
..
@@ -7951,14 +8326,14 @@
7951
8326
         return texture!=null?texture.texture:null;
7952
8327
     }
7953
8328
     
7954
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8329
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7955
8330
     {
7956
8331
         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7957
8332
                 
7958
8333
         return texture!=null?texture.texturedata:null;
7959
8334
     }
7960
8335
     
7961
-    boolean BindTexture(String tex, boolean bump, int resolution)
8336
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7962
8337
     {
7963
8338
         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7964
8339
         {
..
..
@@ -9024,7 +9399,7 @@
9024
9399
             //gl.glFlush();
9025
9400
             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026
9401
 
9027
-            if (ANIMATION && ABORTED)
9402
+            if (Globals.ANIMATION && ABORTED)
9028
9403
             {
9029
9404
     System.err.println("    ABORTED FRAME");
9030
9405
                 break;
..
..
@@ -9054,7 +9429,7 @@
9054
9429
         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055
9430
 
9056
9431
         // save image
9057
-        if (ANIMATION && !ABORTED)
9432
+        if (Globals.ANIMATION && !ABORTED)
9058
9433
         {
9059
9434
             VPwidth = viewport[2];
9060
9435
             VPheight = viewport[3];
..
..
@@ -9165,11 +9540,11 @@
9165
9540
             
9166
9541
 //            imagecount++;
9167
9542
             
9168
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9543
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9169
9544
             
9170
9545
             if (!BOXMODE)
9171
9546
             {
9172
-                System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9547
+                System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9173
9548
             }
9174
9549
     
9175
9550
             if (!BOXMODE)
..
..
@@ -9207,7 +9582,7 @@
9207
9582
             ABORTED = false;
9208
9583
         }
9209
9584
         else
9210
-            GrafreeD.wav.cursor += 735 * ACSIZE;
9585
+            Grafreed.wav.cursor += 735 * ACSIZE;
9211
9586
         
9212
9587
         if (false)
9213
9588
         {
..
..
@@ -9870,11 +10245,11 @@
9870
10245
 
9871
10246
     public void display(GLAutoDrawable drawable)
9872
10247
     {
9873
-        if (GrafreeD.savesound && GrafreeD.hassound)
10248
+        if (Grafreed.savesound && Grafreed.hassound)
9874
10249
         {
9875
-            GrafreeD.wav.save();
9876
-            GrafreeD.savesound = false;
9877
-            GrafreeD.hassound = false;
10250
+            Grafreed.wav.save();
10251
+            Grafreed.savesound = false;
10252
+            Grafreed.hassound = false;
9878
10253
         }
9879
10254
 //        if (DEBUG_SELECTION)
9880
10255
 //        {
..
..
@@ -10004,7 +10379,7 @@
10004
10379
             Object3D theobject = object;
10005
10380
             Object3D theparent = object.parent;
10006
10381
             object.parent = null;
10007
-            object = (Object3D)GrafreeD.clone(object);
10382
+            object = (Object3D)Grafreed.clone(object);
10008
10383
             object.Stripify();
10009
10384
             if (theobject.selection == null || theobject.selection.Size() == 0)
10010
10385
                 theobject.PreprocessOcclusion(this);
..
..
@@ -10017,13 +10392,13 @@
10017
10392
             ambientOcclusion = false;
10018
10393
         }
10019
10394
 
10020
-        if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10395
+        if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021
10396
         {
10022
10397
             //if (RENDERSHADOW) // ?
10023
10398
             if (!IsFrozen())
10024
10399
             {
10025
10400
                 // dec 2012
10026
-                if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10401
+                if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027
10402
                 {
10028
10403
             Globals.framecount++;
10029
10404
                     shadowbuffer.display();
..
..
@@ -10425,7 +10800,16 @@
10425
10800
             // Bump noise
10426
10801
             gl.glActiveTexture(GL.GL_TEXTURE6);
10427
10802
             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428
-            BindTexture(NOISE_TEXTURE, false, 2);
10803
+            
10804
+    try
10805
+    {
10806
+        BindTexture(NOISE_TEXTURE, false, 2);
10807
+    }
10808
+    catch (Exception e)
10809
+    {
10810
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10811
+    }
10812
+           
10429
10813
 
10430
10814
             gl.glActiveTexture(GL.GL_TEXTURE0);
10431
10815
             gl.glEnable(GL.GL_TEXTURE_2D);
..
..
@@ -10889,8 +11273,14 @@
10889
11273
     {
10890
11274
             renderpass++;
10891
11275
 //        System.out.println("Draw object... ");
11276
+        STEP = 1;
10892
11277
         if (FAST) // in case there is no script
10893
-            STEP = 16;
11278
+            STEP = 8;
11279
+            
11280
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11281
+        {
11282
+            STEP *= 4;
11283
+        }
10894
11284
             
10895
11285
         //object.FullInvariants();
10896
11286
         
..
..
@@ -10904,8 +11294,8 @@
10904
11294
             e.printStackTrace();
10905
11295
         }
10906
11296
         
10907
-        if (GrafreeD.RENDERME > 0)
10908
-            GrafreeD.RENDERME--; // mechante magouille
11297
+        if (Grafreed.RENDERME > 0)
11298
+            Grafreed.RENDERME--; // mechante magouille
10909
11299
         
10910
11300
         Globals.ONESTEP = false;
10911
11301
     }
..
..
@@ -10975,7 +11365,14 @@
10975
11365
 
10976
11366
                 usedtextures.clear();
10977
11367
             
10978
-                BindTextures(DEFAULT_TEXTURES, 2);
11368
+    try
11369
+    {
11370
+        BindTextures(DEFAULT_TEXTURES, 2);
11371
+    }
11372
+    catch (Exception e)
11373
+    {
11374
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11375
+    }
10979
11376
             }
10980
11377
             //System.out.println("--> " + stackdepth);
10981
11378
 //            GrafreeD.traceon();
..
..
@@ -11066,7 +11463,14 @@
11066
11463
             if (checker != null && DrawMode() == DEFAULT)
11067
11464
             {
11068
11465
                 //BindTexture(IMMORTAL_TEXTURE);
11069
-                BindTextures(checker.GetTextures(), checker.texres);
11466
+    try
11467
+    {
11468
+        BindTextures(checker.GetTextures(), checker.texres);
11469
+    }
11470
+    catch (Exception e)
11471
+    {
11472
+        System.err.println("FAILED: " + checker.GetTextures());
11473
+    }
11070
11474
                 // NEAREST
11071
11475
                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072
11476
                 DrawChecker(gl);
..
..
@@ -11148,7 +11552,7 @@
11148
11552
             return;
11149
11553
         }
11150
11554
 
11151
-        String string = obj.GetToolTip();
11555
+        String string = obj.toString(); //.GetToolTip();
11152
11556
         
11153
11557
         GL gl = GetGL();
11154
11558
         
..
..
@@ -12098,8 +12502,8 @@
12098
12502
 
12099
12503
            // display shadow only (bump == 0)
12100
12504
          "SUB temp.x, half.x, shadow.x;" +
12101
-         "MOV temp.y, -params6.x;" +
12102
-         "SLT temp.z, temp.y, zero.x;" +
12505
+         "MOV temp.y, -params5.z;" + // params6.x;" +
12506
+         "SLT temp.z, temp.y, -one2048th.x;" +
12103
12507
          "SUB temp.y, one.x, temp.z;" +
12104
12508
          "MUL temp.x, temp.x, temp.y;" +
12105
12509
          "KIL temp.x;" +
..
..
@@ -12228,8 +12632,10 @@
12228
12632
             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229
12633
                 
12230
12634
                 "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
12635
+                // Tuning for default skin
12636
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12637
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12638
+                "ADD temp.y, one.y, options2.y;" + // subsurface
12233
12639
                 "MUL temp.x, temp.x, temp.y;" +
12234
12640
                                 
12235
12641
                 "MUL saturation, saturation, temp.xxxx;" +
..
..
@@ -12428,7 +12834,7 @@
12428
12834
             //once = true;
12429
12835
         }
12430
12836
 
12431
-        System.out.print("Program #" + mode + "; length = " + program.length());
12837
+        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12432
12838
         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12433
12839
         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434
12840
 
..
..
@@ -12561,12 +12967,16 @@
12561
12967
 
12562
12968
                 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563
12969
                 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
12970
+                
12971
+                // Compare fragment depth in light space with shadowmap.
12564
12972
                 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565
12973
                 "SGE temp.y, temp.x, zero.x;" +
12566
-                "SUB " + shadow + ".y, one.x, temp.y;" +
12974
+                "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
12975
+                
12976
+                // Reverse comparison
12567
12977
                 "SUB temp.x, one.x, temp.x;" +
12568
12978
                 "MUL " + shadow + ".x, temp.x, temp.y;" +
12569
-                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
12979
+                "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570
12980
                 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571
12981
 
12572
12982
                 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..
..
@@ -12580,6 +12990,10 @@
12580
12990
                 // No shadow for backface
12581
12991
                 "DP3 temp.x, normal, lightd;" +
12582
12992
                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
12993
+                "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12994
+
12995
+                // No shadow when out of frustrum
12996
+                "SGE temp.x, " + depth + ".z, one.z;" +
12583
12997
                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584
12998
                 "";
12585
12999
     }
..
..
@@ -13138,7 +13552,7 @@
13138
13552
     public void mousePressed(MouseEvent e)
13139
13553
     {
13140
13554
         //System.out.println("mousePressed: " + e);
13141
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13555
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142
13556
     }
13143
13557
 
13144
13558
     static long prevtime = 0;
..
..
@@ -13165,6 +13579,7 @@
13165
13579
 	
13166
13580
         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167
13581
             
13582
+        if (BUTTONLESSWHEEL)
13168
13583
 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
13169
13584
 	{
13170
13585
             return;
..
..
@@ -13173,7 +13588,7 @@
13173
13588
         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13174
13589
         
13175
13590
         // TIMER
13176
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13591
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13177
13592
         {
13178
13593
             keepboxmode = BOXMODE;
13179
13594
             keepsupport = SUPPORT;
..
..
@@ -13213,8 +13628,8 @@
13213
13628
       //      mode |= META;
13214
13629
         //}
13215
13630
         
13216
-        SetMouseMode(WHEEL | e.getModifiersEx());
13217
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13631
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13632
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13218
13633
         anchorX = ax;
13219
13634
         anchorY = ay;
13220
13635
         prevX = px;
..
..
@@ -13274,6 +13689,10 @@
13274
13689
 //            wasliveok = true;
13275
13690
 //            waslive = false;
13276
13691
             
13692
+            // May 2019 Forget it:
13693
+            if (true)
13694
+                    return;
13695
+            
13277
13696
             // source == timer
13278
13697
             if (mouseDown)
13279
13698
             {
..
..
@@ -13312,7 +13731,7 @@
13312
13731
     
13313
13732
     javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314
13733
 
13315
-    void clickStart(int x, int y, int modifiers)
13734
+    void clickStart(int x, int y, int modifiers, int modifiersex)
13316
13735
     {
13317
13736
         if (!wasliveok)
13318
13737
             return;
..
..
@@ -13329,7 +13748,7 @@
13329
13748
 //        touched = true; // main DL
13330
13749
         if (isRenderer)
13331
13750
         {
13332
-            SetMouseMode(modifiers);
13751
+            SetMouseMode(modifiers, modifiersex);
13333
13752
         }
13334
13753
 
13335
13754
         selectX = anchorX = x;
..
..
@@ -13342,7 +13761,7 @@
13342
13761
         clicked = true;
13343
13762
         hold = false;
13344
13763
 
13345
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13764
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346
13765
         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347
13766
         {
13348
13767
       //  System.out.println("RESTART II " + modifiers);
..
..
@@ -13373,7 +13792,7 @@
13373
13792
             info.camera = renderCamera;
13374
13793
             info.x = x;
13375
13794
             info.y = y;
13376
-            info.modifiers = modifiers;
13795
+            info.modifiers = modifiersex;
13377
13796
             editObj = object.doEditClick(info, 0);
13378
13797
             if (!editObj)
13379
13798
             {
..
..
@@ -13390,11 +13809,11 @@
13390
13809
     
13391
13810
     public void mouseDragged(MouseEvent e)
13392
13811
     {
13812
+        //System.out.println("mouseDragged: " + e);
13393
13813
         if (isRenderer)
13394
13814
             movingcamera = true;
13395
13815
         //if (drawing)
13396
13816
         //return;
13397
-        //System.out.println("mouseDragged: " + e);
13398
13817
         if ((e.getModifiersEx() & CTRL) != 0
13399
13818
             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
13400
13819
         {
..
..
@@ -13402,7 +13821,7 @@
13402
13821
             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403
13822
         }
13404
13823
         else
13405
-            drag(e.getX(), e.getY(), e.getModifiersEx());
13824
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406
13825
         
13407
13826
     //try { Thread.sleep(1); } catch (Exception ex) {}
13408
13827
     }
..
..
@@ -13575,6 +13994,7 @@
13575
13994
         
13576
13995
         public void run()
13577
13996
         {
13997
+                new Exception().printStackTrace();
13578
13998
             System.exit(0);
13579
13999
             for (;;)
13580
14000
             {
..
..
@@ -13638,7 +14058,7 @@
13638
14058
                     {
13639
14059
                         Globals.lighttouched = true;
13640
14060
                     }
13641
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14061
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642
14062
                 }
13643
14063
             //else
13644
14064
             }
..
..
@@ -13738,7 +14158,7 @@
13738
14158
     int X, Y;
13739
14159
     boolean SX, SY;
13740
14160
 
13741
-    void drag(int x, int y, int modifiers)
14161
+    void drag(int x, int y, int modifiers, int modifiersex)
13742
14162
     {
13743
14163
         if (IsFrozen())
13744
14164
         {
..
..
@@ -13747,17 +14167,17 @@
13747
14167
 
13748
14168
         drag = true; // NEW
13749
14169
         
13750
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14170
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751
14171
 
13752
14172
         X = x;
13753
14173
         Y = y;
13754
14174
         // floating state for animation
13755
-        MODIFIERS = modifiers;
13756
-        modifiers &= ~1024;
14175
+        MODIFIERS = modifiersex;
14176
+        modifiersex &= ~1024;
13757
14177
         if (false) // modifiers != 0)
13758
14178
         {
13759
14179
             //new Exception().printStackTrace();
13760
-            System.out.println("mouseDragged: " + modifiers);
14180
+            System.out.println("mouseDragged: " + modifiersex);
13761
14181
             System.out.println("SHIFT = " + SHIFT);
13762
14182
             System.out.println("CONTROL = " + COMMAND);
13763
14183
             System.out.println("META = " + META);
..
..
@@ -13777,7 +14197,7 @@
13777
14197
                 info.camera = renderCamera;
13778
14198
                 info.x = x;
13779
14199
                 info.y = y;
13780
-                object.editWindow.copy.doEditDrag(info);
14200
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13781
14201
             } else
13782
14202
             {
13783
14203
                 if (x < startX)
..
..
@@ -13929,7 +14349,6 @@
13929
14349
     public void mouseMoved(MouseEvent e)
13930
14350
     {
13931
14351
         //System.out.println("mouseMoved: " + e);
13932
-
13933
14352
         if (isRenderer)
13934
14353
             return;
13935
14354
         
..
..
@@ -13955,6 +14374,7 @@
13955
14374
     public void mouseReleased(MouseEvent e)
13956
14375
     {
13957
14376
         movingcamera = false;
14377
+        X = Y = 0;
13958
14378
         //System.out.println("mouseReleased: " + e);
13959
14379
         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960
14380
     }
..
..
@@ -13977,9 +14397,9 @@
13977
14397
         boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978
14398
         boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979
14399
         
13980
-        if (control || command || IsFrozen())
14400
+// No delay        if (control || command || IsFrozen())
13981
14401
             timeout = true;
13982
-        else
14402
+// ?? May 2019        else
13983
14403
        // timer.setDelay((modifiers & 128) != 0?0:350);
13984
14404
         mouseDown = false;
13985
14405
     if (!control && !command) // june 2013
..
..
@@ -14089,7 +14509,7 @@
14089
14509
         System.out.println("keyReleased: " + e);
14090
14510
     }
14091
14511
 
14092
-    void SetMouseMode(int modifiers)
14512
+    void SetMouseMode(int modifiers, int modifiersex)
14093
14513
     {
14094
14514
         //System.out.println("SetMouseMode = " + modifiers);
14095
14515
         //modifiers &= ~1024;
..
..
@@ -14101,25 +14521,25 @@
14101
14521
         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
14102
14522
         //	return;
14103
14523
         //System.out.println("SetMode = " + modifiers);
14104
-        if ((modifiers & WHEEL) == WHEEL)
14524
+        if ((modifiersex & WHEEL) == WHEEL)
14105
14525
         {
14106
14526
             mouseMode |= ZOOM;
14107
14527
         }
14108
14528
         
14109
14529
         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110
-        if (capsLocked || (modifiers & META) == META)
14530
+        if (capsLocked) // || (modifiers & META) == META)
14111
14531
         {
14112
14532
             mouseMode |= VR; // BACKFORTH;
14113
14533
         }
14114
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14534
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115
14535
         {
14116
14536
             mouseMode |= SELECT;
14117
14537
         }
14118
-        if ((modifiers & COMMAND) == COMMAND)
14538
+        if ((modifiersex & COMMAND) == COMMAND)
14119
14539
         {
14120
14540
             mouseMode |= SELECT;
14121
14541
         }
14122
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14542
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123
14543
         {
14124
14544
             mouseMode &= ~VR;
14125
14545
             mouseMode |= TRANSLATE;
..
..
@@ -14148,7 +14568,7 @@
14148
14568
 
14149
14569
         if (isRenderer) //
14150
14570
         {
14151
-            SetMouseMode(modifiers);
14571
+            SetMouseMode(0, modifiers);
14152
14572
         }
14153
14573
 
14154
14574
         Globals.theRenderer.keyPressed(key);
..
..
@@ -14484,7 +14904,7 @@
14484
14904
                 //RESIZETEXTURE ^= true;
14485
14905
                 //break;
14486
14906
             case 'z':
14487
-                RENDERSHADOW ^= true;
14907
+                Globals.RENDERSHADOW ^= true;
14488
14908
                 Globals.lighttouched = true;
14489
14909
                 repaint();
14490
14910
                 break;
..
..
@@ -14608,7 +15028,7 @@
14608
15028
         //mode = ROTATE;
14609
15029
         if ((MODIFIERS & COMMAND) == 0) // VR??
14610
15030
         {
14611
-            SetMouseMode(modifiers);
15031
+            SetMouseMode(0, modifiers);
14612
15032
         }
14613
15033
     }
14614
15034
 
..
..
@@ -14742,8 +15162,9 @@
14742
15162
 
14743
15163
     protected void processMouseMotionEvent(MouseEvent e)
14744
15164
     {
14745
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
14746
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15165
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15166
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15167
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14747
15168
         {
14748
15169
             mouseMoved(e);
14749
15170
         } else
..
..
@@ -14773,6 +15194,7 @@
14773
15194
 
14774
15195
     void SelectParent()
14775
15196
     {
15197
+                new Exception().printStackTrace();
14776
15198
         System.exit(0);
14777
15199
         Composite group = (Composite) object;
14778
15200
         java.util.Vector selectees = new java.util.Vector(group.selection);
..
..
@@ -14796,6 +15218,7 @@
14796
15218
 
14797
15219
     void SelectChildren()
14798
15220
     {
15221
+                new Exception().printStackTrace();
14799
15222
         System.exit(0);
14800
15223
         /*
14801
15224
         Composite group = (Composite) object;
..
..
@@ -14960,7 +15383,9 @@
14960
15383
         info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961
15384
         //Image img = CreateImage(width, height);
14962
15385
         //System.out.println("width = " + width + "; height = " + height + "\n");
15386
+        
14963
15387
         Graphics gr = g; // img.getGraphics();
15388
+        
14964
15389
         if (!hasMarquee)
14965
15390
         {
14966
15391
             if (Xmin < Xmax) // !locked)
..
..
@@ -15058,14 +15483,28 @@
15058
15483
             if (!isRenderer)
15059
15484
             {
15060
15485
                 object.drawEditHandles(info, 0);
15486
+                
15487
+                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15488
+                {
15489
+                    switch (object.selection.get(0).hitSomething)
15490
+                    {
15491
+                        case Object3D.hitCenter: gr.setColor(Color.pink); break;
15492
+                        case Object3D.hitRotate: gr.setColor(Color.green); break;
15493
+                        case Object3D.hitScale: gr.setColor(Color.cyan); break;
15494
+                    }
15495
+                    
15496
+                    gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15497
+                }
15061
15498
             }
15062
15499
         }
15500
+        
15063
15501
         if (isRenderer)
15064
15502
         {
15065
15503
         //gr.setColor(Color.black);
15066
15504
         //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067
15505
         //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068
15506
         }
15507
+        
15069
15508
         if (hasMarquee)
15070
15509
         {
15071
15510
             gr.setXORMode(Color.white);
..
..
@@ -15178,6 +15617,7 @@
15178
15617
     public boolean mouseDown(Event evt, int x, int y)
15179
15618
     {
15180
15619
         System.out.println("mouseDown: " + evt);
15620
+        System.exit(0);
15181
15621
         /*
15182
15622
         locked = true;
15183
15623
         drag = false;
..
..
@@ -15221,7 +15661,7 @@
15221
15661
         {
15222
15662
             keyPressed(0, modifiers);
15223
15663
         }
15224
-        clickStart(x, y, modifiers);
15664
+ //       clickStart(x, y, modifiers);
15225
15665
         return true;
15226
15666
     }
15227
15667
 
..
..
@@ -15339,7 +15779,7 @@
15339
15779
         {
15340
15780
             keyReleased(0, 0);
15341
15781
         }
15342
-        drag(x, y, modifiers);
15782
+        drag(x, y, 0, modifiers);
15343
15783
         return true;
15344
15784
     }
15345
15785
 
..
..
@@ -15909,6 +16349,7 @@
15909
16349
         {
15910
16350
             if (!selection)
15911
16351
             {
16352
+                new Exception().printStackTrace();
15912
16353
                 System.exit(0);
15913
16354
                 return;
15914
16355
             }
..
..
@@ -16036,16 +16477,16 @@
16036
16477
                             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]));
16037
16478
                         }
16038
16479
                         
16039
-                        previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16480
+                        previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040
16481
                     }
16041
16482
                 }
16042
16483
                 
16043
16484
                 if (!movingcamera && !PAINTMODE)
16044
16485
                     object.editWindow.ScreenFitPoint(); // fev 2014
16045
16486
                 
16046
-                if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16487
+                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16047
16488
                 {
16048
-                    Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16489
+                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16049
16490
                     
16050
16491
                     Object3D group = new Object3D("inst" + paintcount++);
16051
16492
                     
..
..
@@ -16201,7 +16642,7 @@
16201
16642
                 gl.glDisable(gl.GL_CULL_FACE);
16202
16643
             }
16203
16644
 
16204
-            if (!RENDERSHADOW)
16645
+            if (!Globals.RENDERSHADOW)
16205
16646
                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
16206
16647
 
16207
16648
             // SB gl.glPolygonOffset(2.5f, 10);
..
..
@@ -16211,7 +16652,7 @@
16211
16652
             //gl.glColorMask(false, false, false, false);
16212
16653
 
16213
16654
             //render_scene_from_light_view(gl, drawable, 0, 0);
16214
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16655
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215
16656
             {
16216
16657
                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
16217
16658
 
..
..
@@ -16695,10 +17136,11 @@
16695
17136
     static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH*8*8 * TEXT_HEIGHT);
16696
17137
     // Depth buffer format
16697
17138
     //private int depth_format;
16698
-    static public void NextIndex(Object3D o, GL gl)
17139
+    
17140
+    public void NextIndex()
16699
17141
     {
16700
17142
         indexcount+=16;
16701
-        gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
17143
+        GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16702
17144
     //objects[indexcount] = o;
16703
17145
     //System.out.println("indexcount = " + indexcount);
16704
17146
     }