Normand Briere
2019-06-25 ecff440ceef3ad352aa64cedbb913107ec4863a5
CameraPane.java
....@@ -37,7 +37,6 @@
3737 static boolean[] selectedstack = new boolean[65536];
3838 static int materialdepth = 0;
3939
40
- static boolean DEBUG = false;
4140 static boolean FRUSTUM = false; // still bogus true; // frustum culling
4241
4342 // camera change fix
....@@ -56,8 +55,6 @@
5655 static int CURRENTANTIALIAS = 0; // 1;
5756 /*static*/ boolean RENDERSHADOW = true;
5857 /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
- static boolean ANIMATION = false;
60
- static String filename;
6158
6259 boolean DISPLAYTEXT = false;
6360 //boolean REDUCETEXTURE = true;
....@@ -92,6 +89,8 @@
9289
9390 static int tickcount = 0; // slow pose issue
9491
92
+static boolean BUTTONLESSWHEEL = false;
93
+static boolean ZOOMBOXMODE = false;
9594 static boolean BOXMODE = false;
9695 static boolean IMAGEFLIP = false;
9796 static boolean SMOOTHFOCUS = false;
....@@ -106,7 +105,7 @@
106105 static boolean OEIL = true;
107106 static boolean OEILONCE = false; // do oeilon then oeiloff
108107 static boolean LOOKAT = true;
109
-static boolean RANDOM = true; // false;
108
+static boolean SWITCH = true; // false;
110109 static boolean HANDLES = false; // selection doesn't work!!
111110 static boolean PAINTMODE = false;
112111
....@@ -150,6 +149,8 @@
150149 defaultcaps.setAccumAlphaBits(16);
151150 }
152151
152
+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
153
+
153154 void SetAsGLRenderer(boolean b)
154155 {
155156 isRenderer = b;
....@@ -191,9 +192,43 @@
191192
192193 /// INTERFACE
193194
195
+ public javax.media.opengl.GL GetGL0()
196
+ {
197
+ return null;
198
+ }
199
+
200
+ public int GenList()
201
+ {
202
+ javax.media.opengl.GL gl = GetGL();
203
+ return gl.glGenLists(1);
204
+ }
205
+
206
+ public void NewList(int id)
207
+ {
208
+ javax.media.opengl.GL gl = GetGL();
209
+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
210
+ }
211
+
212
+ public void CallList(int id)
213
+ {
214
+ javax.media.opengl.GL gl = GetGL();
215
+ gl.glCallList(id);
216
+ }
217
+
218
+ public void EndList()
219
+ {
220
+ javax.media.opengl.GL gl = GetGL();
221
+ gl.glEndList();
222
+ }
223
+
194224 public boolean IsBoxMode()
195225 {
196226 return BOXMODE;
227
+ }
228
+
229
+ public boolean IsZoomBoxMode()
230
+ {
231
+ return ZOOMBOXMODE;
197232 }
198233
199234 public void ClearDepth()
....@@ -291,7 +326,7 @@
291326 cStatic.objectstack[materialdepth++] = obj;
292327 //System.out.println("material " + material);
293328 //Applet3D.tracein(this, selected);
294
- display.vector2buffer = obj.projectedVertices;
329
+ //display.vector2buffer = obj.projectedVertices;
295330 if (obj instanceof Camera)
296331 {
297332 display.options1[0] = material.shift;
....@@ -323,7 +358,7 @@
323358 /**/
324359 } else
325360 {
326
- DrawMaterial(material, selected);
361
+ DrawMaterial(material, selected, obj.projectedVertices);
327362 }
328363 } else
329364 {
....@@ -347,8 +382,8 @@
347382 cStatic.objectstack[materialdepth++] = obj;
348383 //System.out.println("material " + material);
349384 //Applet3D.tracein("selected ", selected);
350
- display.vector2buffer = obj.projectedVertices;
351
- display.DrawMaterial(material, selected);
385
+ //display.vector2buffer = obj.projectedVertices;
386
+ display.DrawMaterial(material, selected, obj.projectedVertices);
352387 }
353388 }
354389
....@@ -365,8 +400,8 @@
365400 materialdepth -= 1;
366401 if (materialdepth > 0)
367402 {
368
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
369
- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
403
+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
404
+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
370405 }
371406 //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
372407 } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
....@@ -386,8 +421,8 @@
386421 materialdepth -= 1;
387422 if (materialdepth > 0)
388423 {
389
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
390
- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
424
+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
425
+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
391426 }
392427 //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
393428 //else
....@@ -428,10 +463,12 @@
428463 if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
429464 {
430465 //gl.glBegin(gl.GL_TRIANGLES);
431
- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
466
+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0)
467
+ // TEST LIVE NORMALS && !obj.dontselect
468
+ ;
432469 if (!hasnorm)
433470 {
434
- // System.out.println("FUCK!!");
471
+ // System.out.println("Mesh normal");
435472 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
436473 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
437474 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1059,7 +1096,342 @@
10591096 gl.glMatrixMode(gl.GL_MODELVIEW);
10601097 }
10611098
1099
+ public void DrawBox(cVector min, cVector max)
1100
+ {
1101
+ javax.media.opengl.GL gl = GetGL();
1102
+ gl.glBegin(gl.GL_LINES);
1103
+
1104
+ gl.glVertex3d(min.x, min.y, min.z);
1105
+ gl.glVertex3d(min.x, min.y, max.z);
1106
+ gl.glVertex3d(min.x, min.y, min.z);
1107
+ gl.glVertex3d(min.x, max.y, min.z);
1108
+ gl.glVertex3d(min.x, min.y, min.z);
1109
+ gl.glVertex3d(max.x, min.y, min.z);
1110
+
1111
+ gl.glVertex3d(max.x, max.y, max.z);
1112
+ gl.glVertex3d(min.x, max.y, max.z);
1113
+ gl.glVertex3d(max.x, max.y, max.z);
1114
+ gl.glVertex3d(max.x, min.y, max.z);
1115
+ gl.glVertex3d(max.x, max.y, max.z);
1116
+ gl.glVertex3d(max.x, max.y, min.z);
1117
+
1118
+ gl.glEnd();
1119
+ }
1120
+
1121
+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
1122
+ {
1123
+ int[] strips = bRep.getRawIndices();
1124
+
1125
+ javax.media.opengl.GL gl = GetGL();
1126
+
1127
+ // TRIANGLE STRIP ARRAY
1128
+ if (bRep.trimmed)
1129
+ {
1130
+ float[] v = bRep.getRawVertices();
1131
+ float[] n = bRep.getRawNormals();
1132
+ float[] c = bRep.getRawColors();
1133
+ float[] uv = bRep.getRawUVMap();
1134
+
1135
+ int count2 = 0;
1136
+ int count3 = 0;
1137
+
1138
+ if (n.length > 0)
1139
+ {
1140
+ for (int i = 0; i < strips.length; i++)
1141
+ {
1142
+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
1143
+
1144
+ /*
1145
+ boolean locked = false;
1146
+ float eps = 0.1f;
1147
+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
1148
+
1149
+ int dot = 0;
1150
+
1151
+ if ((dot&1) == 0)
1152
+ dot |= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
1153
+
1154
+ if (wrap || (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
1155
+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
1156
+ else
1157
+ {
1158
+ locked = true;
1159
+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
1160
+ }
1161
+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
1162
+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
1163
+ if (hasnorm)
1164
+ {
1165
+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
1166
+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
1167
+ }
1168
+
1169
+ if ((dot&4) == 0)
1170
+ dot |= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
1171
+
1172
+ if (wrap || !locked && (dot&8) != 0)
1173
+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
1174
+ else
1175
+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
1176
+
1177
+ f.dot = dot;
1178
+ */
1179
+
1180
+ if (!selectmode)
1181
+ {
1182
+ if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1183
+ {
1184
+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1185
+ } else
1186
+ {
1187
+ gl.glNormal3f(0, 0, 1);
1188
+ }
1189
+
1190
+ if (c != null)
1191
+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
1192
+ {
1193
+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1194
+ }
1195
+ }
1196
+
1197
+ if (flipV)
1198
+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1199
+ else
1200
+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+
1202
+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1203
+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1204
+
1205
+ count2 += 2;
1206
+ count3 += 3;
1207
+ if (!selectmode)
1208
+ {
1209
+ if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1210
+ {
1211
+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1212
+ } else
1213
+ {
1214
+ gl.glNormal3f(0, 0, 1);
1215
+ }
1216
+ if (c != null)
1217
+ {
1218
+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1219
+ }
1220
+ }
1221
+
1222
+ if (flipV)
1223
+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1224
+ else
1225
+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+
1227
+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1228
+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1229
+
1230
+ count2 += 2;
1231
+ count3 += 3;
1232
+ for (int j = 0; j < strips[i] - 2; j++)
1233
+ {
1234
+ //gl.glTexCoord2d(...);
1235
+ if (!selectmode)
1236
+ {
1237
+ if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
1238
+ {
1239
+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1240
+ } else
1241
+ {
1242
+ gl.glNormal3f(0, 0, 1);
1243
+ }
1244
+ if (c != null)
1245
+ {
1246
+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
1247
+ }
1248
+ }
1249
+
1250
+ if (flipV)
1251
+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1252
+ else
1253
+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+
1255
+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1256
+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+
1258
+ count2 += 2;
1259
+ count3 += 3;
1260
+ }
1261
+
1262
+ gl.glEnd();
1263
+ }
1264
+ }
1265
+
1266
+ assert count3 == v.length;
1267
+ }
1268
+ else // !trimmed
1269
+ {
1270
+ int count = 0;
1271
+ for (int i = 0; i < strips.length; i++)
1272
+ {
1273
+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
1274
+
1275
+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
1276
+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
1277
+
1278
+ drawVertex(gl, p, flipV, selectmode);
1279
+ drawVertex(gl, q, flipV, selectmode);
1280
+
1281
+ for (int j = 0; j < strips[i] - 2; j++)
1282
+ {
1283
+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
1284
+
1285
+ // if (j%2 == 0)
1286
+ // drawFace(p, q, r, display, null);
1287
+ // else
1288
+ // drawFace(p, r, q, display, null);
1289
+
1290
+ // p = q;
1291
+ // q = r;
1292
+ drawVertex(gl, r, flipV, selectmode);
1293
+ }
1294
+
1295
+ gl.glEnd();
1296
+ }
1297
+ }
1298
+ }
1299
+
1300
+ static cSpring.Point3D temp = new cSpring.Point3D();
1301
+ static cSpring.Point3D temp2 = new cSpring.Point3D();
1302
+ static cSpring.Point3D temp3 = new cSpring.Point3D();
1303
+
1304
+ public void DrawDynamicMesh(cMesh mesh)
1305
+ {
1306
+ GL gl = GetGL(); // getGL();
1307
+
1308
+ cSpring.PhysicsController3D Phys = mesh.Phys;
1309
+
1310
+ gl.glDisable(gl.GL_LIGHTING);
1311
+
1312
+ gl.glLineWidth(1);
1313
+ gl.glColor3f(1,1,1);
1314
+ gl.glBegin(gl.GL_LINES);
1315
+ double scale = 0;
1316
+ int count = 0;
1317
+ for (int s=0; s<Phys.allSprings.size(); s++)
1318
+ {
1319
+ cSpring.Spring spring = Phys.allSprings.get(s);
1320
+ if(s == 0)
1321
+ {
1322
+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
1323
+ }
1324
+ if (mesh.showsprings)
1325
+ {
1326
+ temp.set(spring.a.position);
1327
+ temp.add(spring.b.position);
1328
+ temp.mul(0.5);
1329
+ temp2.set(spring.a.position);
1330
+ temp2.sub(spring.b.position);
1331
+ temp2.mul(spring.restLength/2);
1332
+ temp.sub(temp2);
1333
+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1334
+ temp.add(temp2);
1335
+ temp.add(temp2);
1336
+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
1337
+ }
1338
+
1339
+ if (spring.isHandle)
1340
+ continue;
1341
+
1342
+ //if (scale < spring.restLength)
1343
+ scale += spring.restLength;
1344
+ count++;
1345
+ }
1346
+ gl.glEnd();
1347
+
1348
+ if (count == 0)
1349
+ scale = 0.01;
1350
+ else
1351
+ scale /= count * 3;
1352
+
1353
+ //scale = 0.25;
1354
+
1355
+ if (mesh.ShowInfo())
1356
+ {
1357
+ gl.glLineWidth(4);
1358
+ for (int s=0; s<Phys.allNodes.size(); s++)
1359
+ {
1360
+ cSpring.DynamicNode node = Phys.allNodes.get(s);
1361
+ if (node.mass == 0)
1362
+ continue;
1363
+
1364
+ int i = node.springs==null?-1:node.springs.size();
1365
+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
1366
+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
1367
+ //temp.normalize();
1368
+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
1369
+ gl.glBegin(gl.GL_LINES);
1370
+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1371
+ //gl.glVertex3d(node.position.x + node.normal.x*scale, node.position.y + node.normal.y*scale, node.position.z + node.normal.z*scale);
1372
+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
1373
+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
1374
+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
1375
+ gl.glEnd();
1376
+ }
1377
+
1378
+ gl.glLineWidth(8);
1379
+ for (int s=0; s<Phys.allNodes.size(); s++)
1380
+ {
1381
+ cSpring.DynamicNode node = Phys.allNodes.get(s);
1382
+
1383
+ if (node.springs != null)
1384
+ {
1385
+ for (int i=0; i<node.springs.size(); i+=1)
1386
+ {
1387
+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
1388
+
1389
+ int c = i+1;
1390
+ // c = node.springs.get(i).nbcopies;
1391
+
1392
+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
1393
+ gl.glBegin(gl.GL_LINES);
1394
+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
1395
+ 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);
1396
+ gl.glEnd();
1397
+ }
1398
+ }
1399
+ }
1400
+
1401
+ gl.glLineWidth(1);
1402
+ }
1403
+
1404
+ gl.glEnable(gl.GL_LIGHTING);
1405
+ }
1406
+
10621407 /// INTERFACE
1408
+
1409
+ public void StartTriangles()
1410
+ {
1411
+ javax.media.opengl.GL gl = GetGL();
1412
+ gl.glBegin(gl.GL_TRIANGLES);
1413
+ }
1414
+
1415
+ public void EndTriangles()
1416
+ {
1417
+ GetGL().glEnd();
1418
+ }
1419
+
1420
+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
1421
+ {
1422
+ if (!selectmode)
1423
+ {
1424
+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1425
+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1426
+
1427
+ if (flipV)
1428
+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
1429
+ else
1430
+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
1431
+ }
1432
+
1433
+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1434
+ }
10631435
10641436 void SetColor(Object3D obj, Vertex p0)
10651437 {
....@@ -1238,7 +1610,7 @@
12381610 // gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
12391611 }
12401612
1241
- void DrawMaterial(cMaterial material, boolean selected)
1613
+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
12421614 {
12431615 CameraPane display = this;
12441616 //new Exception().printStackTrace();
....@@ -1254,18 +1626,18 @@
12541626 //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
12551627 if (!material.multiply)
12561628 {
1257
- display.color = color;
1629
+ display.color = material.color;
12581630 display.saturation = material.modulation;
12591631 }
12601632 else
12611633 {
1262
- display.color *= color*2;
1634
+ display.color *= material.color*2;
12631635 display.saturation *= material.modulation*2;
12641636 }
12651637
12661638 cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
12671639
1268
- float[] colorV = GrafreeD.colorV;
1640
+ float[] colorV = Grafreed.colorV;
12691641
12701642 /**/
12711643 if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1273,7 +1645,7 @@
12731645 colorV[0] = display.modelParams0[0] * material.diffuse;
12741646 colorV[1] = display.modelParams0[1] * material.diffuse;
12751647 colorV[2] = display.modelParams0[2] * material.diffuse;
1276
- colorV[3] = material.opacity;
1648
+ colorV[3] = 1; // material.opacity;
12771649
12781650 gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
12791651 //System.out.println("Opacity = " + opacity);
....@@ -1381,9 +1753,9 @@
13811753 display.modelParams7[2] = 0;
13821754 display.modelParams7[3] = 0;
13831755
1384
- display.modelParams6[0] = 100; // criss de bug de bump
1756
+ //display.modelParams6[0] = 100; // criss de bug de bump
13851757
1386
- Object3D.cVector2[] extparams = display.vector2buffer;
1758
+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
13871759 if (extparams != null && extparams.length > 0 && extparams[0] != null)
13881760 {
13891761 display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
....@@ -1525,7 +1897,7 @@
15251897 void PushMatrix(double[][] matrix)
15261898 {
15271899 // GrafreeD.tracein(matrix);
1528
- PushMatrix(matrix,1);
1900
+ PushMatrix(matrix, 1);
15291901 }
15301902
15311903 void PushMatrix()
....@@ -1777,7 +2149,7 @@
17772149 System.err.println("LIVE = " + Globals.isLIVE());
17782150
17792151 if (!Globals.isLIVE()) // save sound
1780
- GrafreeD.savesound = true; // wav.save();
2152
+ Grafreed.savesound = true; // wav.save();
17812153 // else
17822154 repaint(); // start loop // may 2013
17832155 }
....@@ -1810,6 +2182,11 @@
18102182 public void ToggleBoxMode()
18112183 {
18122184 BOXMODE ^= true;
2185
+ }
2186
+
2187
+ public void ToggleZoomBoxMode()
2188
+ {
2189
+ ZOOMBOXMODE ^= true;
18132190 }
18142191
18152192 public void ToggleSmoothFocus()
....@@ -1889,7 +2266,7 @@
18892266
18902267 void ToggleDebug()
18912268 {
1892
- DEBUG ^= true;
2269
+ Globals.DEBUG ^= true;
18932270 }
18942271
18952272 void ToggleLookAt()
....@@ -1897,9 +2274,9 @@
18972274 LOOKAT ^= true;
18982275 }
18992276
1900
- void ToggleRandom()
2277
+ void ToggleSwitch()
19012278 {
1902
- RANDOM ^= true;
2279
+ SWITCH ^= true;
19032280 }
19042281
19052282 void ToggleHandles()
....@@ -2006,7 +2383,7 @@
20062383 {
20072384 return currentGL;
20082385 }
2009
-
2386
+
20102387 /**/
20112388 class CacheTexture
20122389 {
....@@ -3838,6 +4215,7 @@
38384215
38394216 com.sun.opengl.util.texture.Texture CompressTexture2(String name)
38404217 {
4218
+ new Exception().printStackTrace();
38414219 System.exit(0);
38424220 com.sun.opengl.util.texture.Texture texture = null;
38434221
....@@ -7550,6 +7928,64 @@
75507928 ReleaseTexture(pigment, false);
75517929 }
75527930
7931
+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
7932
+ {
7933
+ if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7934
+ {
7935
+ return;
7936
+ }
7937
+
7938
+ if (tex == null)
7939
+ {
7940
+ ReleaseTexture(null, false);
7941
+ return;
7942
+ }
7943
+
7944
+ String pigment = Object3D.GetPigment(tex);
7945
+
7946
+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947
+ {
7948
+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7949
+ // System.out.println("; bump = " + bump);
7950
+ }
7951
+
7952
+ if (pigment.equals(""))
7953
+ {
7954
+ pigment = null;
7955
+ }
7956
+
7957
+ ReleaseTexture(pigment, false);
7958
+ }
7959
+
7960
+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
7961
+ {
7962
+ if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
7963
+ {
7964
+ return;
7965
+ }
7966
+
7967
+ if (tex == null)
7968
+ {
7969
+ ReleaseTexture(null, true);
7970
+ return;
7971
+ }
7972
+
7973
+ String bump = Object3D.GetBump(tex);
7974
+
7975
+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976
+ {
7977
+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7978
+ // System.out.println("; bump = " + bump);
7979
+ }
7980
+
7981
+ if (bump.equals(""))
7982
+ {
7983
+ bump = null;
7984
+ }
7985
+
7986
+ ReleaseTexture(bump, true);
7987
+ }
7988
+
75537989 void ReleaseTexture(String tex, boolean bump)
75547990 {
75557991 if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -7653,7 +8089,7 @@
76538089 }
76548090 }
76558091
7656
- /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8092
+ /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
76578093 {
76588094 if (// DrawMode() != 0 || /*tex == null ||*/
76598095 ambientOcclusion ) // || !textureon)
....@@ -7698,7 +8134,94 @@
76988134 return; // true;
76998135 }
77008136
7701
- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8137
+ /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8138
+ {
8139
+ if (// DrawMode() != 0 || /*tex == null ||*/
8140
+ ambientOcclusion ) // || !textureon)
8141
+ {
8142
+ return; // false;
8143
+ }
8144
+
8145
+ if (tex == null)
8146
+ {
8147
+ BindTexture(null,false,resolution);
8148
+ return;
8149
+ }
8150
+
8151
+ String pigment = Object3D.GetPigment(tex);
8152
+
8153
+ usedtextures.put(pigment, pigment);
8154
+
8155
+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156
+ {
8157
+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8158
+ // System.out.println("; bump = " + bump);
8159
+ }
8160
+
8161
+ if (pigment.equals(""))
8162
+ {
8163
+ pigment = null;
8164
+ }
8165
+
8166
+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167
+ BindTexture(pigment, false, resolution);
8168
+ }
8169
+
8170
+ /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8171
+ {
8172
+ if (// DrawMode() != 0 || /*tex == null ||*/
8173
+ ambientOcclusion ) // || !textureon)
8174
+ {
8175
+ return; // false;
8176
+ }
8177
+
8178
+ if (tex == null)
8179
+ {
8180
+ BindTexture(null,true,resolution);
8181
+ return;
8182
+ }
8183
+
8184
+ String bump = Object3D.GetBump(tex);
8185
+
8186
+ usedtextures.put(bump, bump);
8187
+
8188
+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189
+ {
8190
+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8191
+ // System.out.println("; bump = " + bump);
8192
+ }
8193
+
8194
+ if (bump.equals(""))
8195
+ {
8196
+ bump = null;
8197
+ }
8198
+
8199
+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200
+ BindTexture(bump, true, resolution);
8201
+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8202
+ }
8203
+
8204
+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8205
+
8206
+ private boolean FileExists(String tex)
8207
+ {
8208
+ if (missingTextures.contains(tex))
8209
+ {
8210
+ return false;
8211
+ }
8212
+
8213
+ boolean fileExists = new File(tex).exists();
8214
+
8215
+ if (!fileExists)
8216
+ {
8217
+ // If file exists, the "new File()" is not executed sgain
8218
+ missingTextures.add(tex);
8219
+ }
8220
+
8221
+ return fileExists;
8222
+ }
8223
+
8224
+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
77028225 {
77038226 CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
77048227
....@@ -7706,12 +8229,18 @@
77068229 {
77078230 String texname = tex;
77088231
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;
8232
+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233
+
8234
+// String[] split = tex.split("Textures");
8235
+// if (split.length > 1)
8236
+// texname = "/Users/nbriere/Textures" + split[split.length-1];
8237
+// else
8238
+// if (!texname.startsWith("/"))
8239
+// texname = "/Users/nbriere/Textures/" + texname;
8240
+ if (!FileExists(tex))
8241
+ {
8242
+ texname = fallbackTextureName;
8243
+ }
77158244
77168245 if (CACHETEXTURE)
77178246 texture = textures.get(texname); // TEXTURE CACHE
....@@ -7780,7 +8309,7 @@
77808309 }
77818310
77828311 cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783
- if (!new File(cachename).exists())
8312
+ if (!FileExists(cachename))
77848313 cachename = texname;
77858314 else
77868315 processbump = false; // don't process bump map again
....@@ -7802,7 +8331,7 @@
78028331 }
78038332
78048333 cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805
- if (!new File(cachename).exists())
8334
+ if (!FileExists(cachename))
78068335 cachename = texname;
78078336 else
78088337 processbump = false; // don't process bump map again
....@@ -7811,7 +8340,9 @@
78118340 texturedata = GetFileTexture(cachename, processbump, resolution);
78128341
78138342
7814
- if (texturedata != null)
8343
+ if (texturedata == null)
8344
+ throw new Exception();
8345
+
78158346 texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
78168347 //texture = GetTexture(tex, bump);
78178348 }
....@@ -7933,7 +8464,7 @@
79338464 return texture;
79348465 }
79358466
7936
- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8467
+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
79378468 {
79388469 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
79398470
....@@ -7951,14 +8482,14 @@
79518482 return texture!=null?texture.texture:null;
79528483 }
79538484
7954
- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8485
+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
79558486 {
79568487 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
79578488
79588489 return texture!=null?texture.texturedata:null;
79598490 }
79608491
7961
- boolean BindTexture(String tex, boolean bump, int resolution)
8492
+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
79628493 {
79638494 if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
79648495 {
....@@ -8835,11 +9366,35 @@
88359366 jy8[3] = 0.5f;
88369367 }
88379368
8838
- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9369
+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
88399370 float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
88409371 float[] options3 = new float[]{1, 1, 1, 0}; // fog color
88419372 float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
88429373
9374
+ void ResetOptions()
9375
+ {
9376
+ options1[0] = 100;
9377
+ options1[1] = 0.00001f;
9378
+ options1[2] = 20;
9379
+ options1[3] = 0;
9380
+ options1[4] = 0;
9381
+
9382
+ options2[0] = 0;
9383
+ options2[1] = 1;
9384
+ options2[2] = 0;
9385
+ options2[3] = 0;
9386
+
9387
+ options3[0] = 1;
9388
+ options3[1] = 1;
9389
+ options3[2] = 1;
9390
+ options3[3] = 0;
9391
+
9392
+ options4[0] = 1;
9393
+ options4[1] = 0;
9394
+ options4[2] = 1;
9395
+ options4[3] = 0;
9396
+ }
9397
+
88439398 static int imagecount = 0; // movie generation
88449399
88459400 static int jitter = 0;
....@@ -8935,8 +9490,8 @@
89359490 assert (parentcam != renderCamera);
89369491
89379492 if (renderCamera != lightCamera)
8938
- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939
- LA.matConcat(matrix, parentcam.toParent, matrix);
9493
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
9494
+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
89409495
89419496 // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
89429497
....@@ -8951,8 +9506,8 @@
89519506 LA.matCopy(renderCamera.fromScreen, matrix);
89529507
89539508 if (renderCamera != lightCamera)
8954
- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955
- LA.matConcat(parentcam.fromParent, matrix, matrix);
9509
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
9510
+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
89569511
89579512 // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
89589513
....@@ -9024,7 +9579,7 @@
90249579 //gl.glFlush();
90259580 gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
90269581
9027
- if (ANIMATION && ABORTED)
9582
+ if (Globals.ANIMATION && ABORTED)
90289583 {
90299584 System.err.println(" ABORTED FRAME");
90309585 break;
....@@ -9054,7 +9609,7 @@
90549609 setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
90559610
90569611 // save image
9057
- if (ANIMATION && !ABORTED)
9612
+ if (Globals.ANIMATION && !ABORTED)
90589613 {
90599614 VPwidth = viewport[2];
90609615 VPheight = viewport[3];
....@@ -9165,11 +9720,11 @@
91659720
91669721 // imagecount++;
91679722
9168
- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9723
+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
91699724
91709725 if (!BOXMODE)
91719726 {
9172
- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9727
+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
91739728 }
91749729
91759730 if (!BOXMODE)
....@@ -9207,7 +9762,7 @@
92079762 ABORTED = false;
92089763 }
92099764 else
9210
- GrafreeD.wav.cursor += 735 * ACSIZE;
9765
+ Grafreed.wav.cursor += 735 * ACSIZE;
92119766
92129767 if (false)
92139768 {
....@@ -9870,11 +10425,11 @@
987010425
987110426 public void display(GLAutoDrawable drawable)
987210427 {
9873
- if (GrafreeD.savesound && GrafreeD.hassound)
10428
+ if (Grafreed.savesound && Grafreed.hassound)
987410429 {
9875
- GrafreeD.wav.save();
9876
- GrafreeD.savesound = false;
9877
- GrafreeD.hassound = false;
10430
+ Grafreed.wav.save();
10431
+ Grafreed.savesound = false;
10432
+ Grafreed.hassound = false;
987810433 }
987910434 // if (DEBUG_SELECTION)
988010435 // {
....@@ -9950,6 +10505,7 @@
995010505 ANTIALIAS = 0;
995110506 //System.out.println("RESTART");
995210507 AAtimer.restart();
10508
+ Globals.TIMERRUNNING = true;
995310509 }
995410510 }
995510511 }
....@@ -10004,7 +10560,7 @@
1000410560 Object3D theobject = object;
1000510561 Object3D theparent = object.parent;
1000610562 object.parent = null;
10007
- object = (Object3D)GrafreeD.clone(object);
10563
+ object = (Object3D)Grafreed.clone(object);
1000810564 object.Stripify();
1000910565 if (theobject.selection == null || theobject.selection.Size() == 0)
1001010566 theobject.PreprocessOcclusion(this);
....@@ -10017,13 +10573,14 @@
1001710573 ambientOcclusion = false;
1001810574 }
1001910575
10020
- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10576
+ if (//Globals.lighttouched &&
10577
+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1002110578 {
1002210579 //if (RENDERSHADOW) // ?
1002310580 if (!IsFrozen())
1002410581 {
1002510582 // dec 2012
10026
- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10583
+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1002710584 {
1002810585 Globals.framecount++;
1002910586 shadowbuffer.display();
....@@ -10150,8 +10707,8 @@
1015010707
1015110708 // if (parentcam != renderCamera) // not a light
1015210709 if (cam != lightCamera)
10153
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154
- LA.matConcat(matrix, parentcam.toParent, matrix);
10710
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
10711
+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1015510712
1015610713 for (int j = 0; j < 4; j++)
1015710714 {
....@@ -10165,8 +10722,8 @@
1016510722
1016610723 // if (parentcam != renderCamera) // not a light
1016710724 if (cam != lightCamera)
10168
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169
- LA.matConcat(parentcam.fromParent, matrix, matrix);
10725
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
10726
+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1017010727
1017110728 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1017210729
....@@ -10425,7 +10982,16 @@
1042510982 // Bump noise
1042610983 gl.glActiveTexture(GL.GL_TEXTURE6);
1042710984 //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428
- BindTexture(NOISE_TEXTURE, false, 2);
10985
+
10986
+ try
10987
+ {
10988
+ BindTexture(NOISE_TEXTURE, false, 2);
10989
+ }
10990
+ catch (Exception e)
10991
+ {
10992
+ System.err.println("FAILED: " + NOISE_TEXTURE);
10993
+ }
10994
+
1042910995
1043010996 gl.glActiveTexture(GL.GL_TEXTURE0);
1043110997 gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10550,8 +11116,8 @@
1055011116 System.err.println("parentcam != renderCamera");
1055111117
1055211118 // if (cam != lightCamera)
10553
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554
- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11119
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11120
+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1055511121 }
1055611122
1055711123 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10572,8 +11138,8 @@
1057211138 if (true) // TODO
1057311139 {
1057411140 if (cam != lightCamera)
10575
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576
- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11141
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11142
+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1057711143 }
1057811144
1057911145 LA.xformPos(light0, cam.toScreen, light0);
....@@ -10889,8 +11455,14 @@
1088911455 {
1089011456 renderpass++;
1089111457 // System.out.println("Draw object... ");
11458
+ STEP = 1;
1089211459 if (FAST) // in case there is no script
10893
- STEP = 16;
11460
+ STEP = 8;
11461
+
11462
+ if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11463
+ {
11464
+ STEP *= 4;
11465
+ }
1089411466
1089511467 //object.FullInvariants();
1089611468
....@@ -10904,16 +11476,37 @@
1090411476 e.printStackTrace();
1090511477 }
1090611478
10907
- if (GrafreeD.RENDERME > 0)
10908
- GrafreeD.RENDERME--; // mechante magouille
11479
+ if (Grafreed.RENDERME > 0)
11480
+ Grafreed.RENDERME--; // mechante magouille
1090911481
1091011482 Globals.ONESTEP = false;
1091111483 }
1091211484
1091311485 static boolean zoomonce = false;
1091411486
11487
+ static void CreateSelectedPoint()
11488
+ {
11489
+ if (selectedpoint == null)
11490
+ {
11491
+ debugpointG = new Sphere();
11492
+ debugpointP = new Sphere();
11493
+ debugpointC = new Sphere();
11494
+ debugpointR = new Sphere();
11495
+
11496
+ selectedpoint = new Superellipsoid();
11497
+
11498
+ for (int i=0; i<8; i++)
11499
+ {
11500
+ debugpoints[i] = new Sphere();
11501
+ }
11502
+ }
11503
+ }
11504
+
1091511505 void DrawObject(GL gl, boolean draw)
1091611506 {
11507
+ // To clear camera values
11508
+ ResetOptions();
11509
+
1091711510 //System.out.println("DRAW OBJECT " + mouseDown);
1091811511 // DrawMode() = SELECTION;
1091911512 //GL gl = getGL();
....@@ -10975,7 +11568,14 @@
1097511568
1097611569 usedtextures.clear();
1097711570
10978
- BindTextures(DEFAULT_TEXTURES, 2);
11571
+ try
11572
+ {
11573
+ BindTextures(DEFAULT_TEXTURES, 2);
11574
+ }
11575
+ catch (Exception e)
11576
+ {
11577
+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
11578
+ }
1097911579 }
1098011580 //System.out.println("--> " + stackdepth);
1098111581 // GrafreeD.traceon();
....@@ -10985,8 +11585,9 @@
1098511585
1098611586 if (DrawMode() == DEFAULT)
1098711587 {
10988
- if (DEBUG)
11588
+ if (Globals.DEBUG)
1098911589 {
11590
+ CreateSelectedPoint();
1099011591 float radius = 0.05f;
1099111592 if (selectedpoint.radius != radius)
1099211593 {
....@@ -11066,7 +11667,14 @@
1106611667 if (checker != null && DrawMode() == DEFAULT)
1106711668 {
1106811669 //BindTexture(IMMORTAL_TEXTURE);
11069
- BindTextures(checker.GetTextures(), checker.texres);
11670
+ try
11671
+ {
11672
+ BindTextures(checker.GetTextures(), checker.texres);
11673
+ }
11674
+ catch (Exception e)
11675
+ {
11676
+ System.err.println("FAILED: " + checker.GetTextures());
11677
+ }
1107011678 // NEAREST
1107111679 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1107211680 DrawChecker(gl);
....@@ -11148,7 +11756,7 @@
1114811756 return;
1114911757 }
1115011758
11151
- String string = obj.GetToolTip();
11759
+ String string = obj.toString(); //.GetToolTip();
1115211760
1115311761 GL gl = GetGL();
1115411762
....@@ -11465,8 +12073,8 @@
1146512073 //obj.TransformToWorld(light, light);
1146612074 for (int i = tp.size(); --i >= 0;)
1146712075 {
11468
- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469
- LA.xformPos(light, tp.get(i).toParent, light);
12076
+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12077
+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1147012078 }
1147112079
1147212080
....@@ -11483,8 +12091,8 @@
1148312091 parentcam = cameras[0];
1148412092 }
1148512093
11486
- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487
- LA.xformPos(light, parentcam.toParent, light); // may 2013
12094
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
12095
+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1148812096
1148912097 LA.xformPos(light, renderCamera.toScreen, light);
1149012098
....@@ -12098,8 +12706,8 @@
1209812706
1209912707 // display shadow only (bump == 0)
1210012708 "SUB temp.x, half.x, shadow.x;" +
12101
- "MOV temp.y, -params6.x;" +
12102
- "SLT temp.z, temp.y, zero.x;" +
12709
+ "MOV temp.y, -params5.z;" + // params6.x;" +
12710
+ "SLT temp.z, temp.y, -one2048th.x;" +
1210312711 "SUB temp.y, one.x, temp.z;" +
1210412712 "MUL temp.x, temp.x, temp.y;" +
1210512713 "KIL temp.x;" +
....@@ -12228,8 +12836,10 @@
1222812836 "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1222912837
1223012838 "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
12839
+ // Tuning for default skin
12840
+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12841
+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12842
+ "ADD temp.y, one.y, options2.y;" + // subsurface
1223312843 "MUL temp.x, temp.x, temp.y;" +
1223412844
1223512845 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12428,7 +13038,7 @@
1242813038 //once = true;
1242913039 }
1243013040
12431
- System.out.print("Program #" + mode + "; length = " + program.length());
13041
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1243213042 System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1243313043 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1243413044
....@@ -12561,12 +13171,16 @@
1256113171
1256213172 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1256313173 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13174
+
13175
+ // Compare fragment depth in light space with shadowmap.
1256413176 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1256513177 "SGE temp.y, temp.x, zero.x;" +
12566
- "SUB " + shadow + ".y, one.x, temp.y;" +
13178
+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13179
+
13180
+ // Reverse comparison
1256713181 "SUB temp.x, one.x, temp.x;" +
1256813182 "MUL " + shadow + ".x, temp.x, temp.y;" +
12569
- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13183
+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1257013184 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1257113185
1257213186 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12580,6 +13194,10 @@
1258013194 // No shadow for backface
1258113195 "DP3 temp.x, normal, lightd;" +
1258213196 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13197
+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13198
+
13199
+ // No shadow when out of frustrum
13200
+ "SGE temp.x, " + depth + ".z, one.z;" +
1258313201 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1258413202 "";
1258513203 }
....@@ -12726,7 +13344,8 @@
1272613344 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1272713345 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
1272813346 /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729
- Object3D.cVector2[] vector2buffer;
13347
+
13348
+ //Object3D.cVector2[] vector2buffer;
1273013349
1273113350 // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
1273213351 // OUT : diff, spec
....@@ -13138,7 +13757,7 @@
1313813757 public void mousePressed(MouseEvent e)
1313913758 {
1314013759 //System.out.println("mousePressed: " + e);
13141
- clickStart(e.getX(), e.getY(), e.getModifiersEx());
13760
+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1314213761 }
1314313762
1314413763 static long prevtime = 0;
....@@ -13165,6 +13784,7 @@
1316513784
1316613785 //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
1316713786
13787
+ if (BUTTONLESSWHEEL)
1316813788 if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
1316913789 {
1317013790 return;
....@@ -13173,7 +13793,7 @@
1317313793 boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
1317413794
1317513795 // TIMER
13176
- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13796
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
1317713797 {
1317813798 keepboxmode = BOXMODE;
1317913799 keepsupport = SUPPORT;
....@@ -13213,8 +13833,8 @@
1321313833 // mode |= META;
1321413834 //}
1321513835
13216
- SetMouseMode(WHEEL | e.getModifiersEx());
13217
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13836
+ SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13837
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1321813838 anchorX = ax;
1321913839 anchorY = ay;
1322013840 prevX = px;
....@@ -13248,6 +13868,7 @@
1324813868 else
1324913869 if (evt.getSource() == AAtimer)
1325013870 {
13871
+ Globals.TIMERRUNNING = false;
1325113872 if (mouseDown)
1325213873 {
1325313874 //new Exception().printStackTrace();
....@@ -13273,6 +13894,10 @@
1327313894 // LIVE = waslive;
1327413895 // wasliveok = true;
1327513896 // waslive = false;
13897
+
13898
+ // May 2019 Forget it:
13899
+ if (true)
13900
+ return;
1327613901
1327713902 // source == timer
1327813903 if (mouseDown)
....@@ -13312,12 +13937,13 @@
1331213937
1331313938 javax.swing.Timer timer = new javax.swing.Timer(350, this);
1331413939
13315
- void clickStart(int x, int y, int modifiers)
13940
+ void clickStart(int x, int y, int modifiers, int modifiersex)
1331613941 {
1331713942 if (!wasliveok)
1331813943 return;
1331913944
1332013945 AAtimer.restart(); //
13946
+ Globals.TIMERRUNNING = true;
1332113947
1332213948 // waslive = LIVE;
1332313949 // LIVE = false;
....@@ -13329,7 +13955,7 @@
1332913955 // touched = true; // main DL
1333013956 if (isRenderer)
1333113957 {
13332
- SetMouseMode(modifiers);
13958
+ SetMouseMode(modifiers, modifiersex);
1333313959 }
1333413960
1333513961 selectX = anchorX = x;
....@@ -13342,7 +13968,7 @@
1334213968 clicked = true;
1334313969 hold = false;
1334413970
13345
- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13971
+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1334613972 // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1334713973 {
1334813974 // System.out.println("RESTART II " + modifiers);
....@@ -13373,7 +13999,7 @@
1337313999 info.camera = renderCamera;
1337414000 info.x = x;
1337514001 info.y = y;
13376
- info.modifiers = modifiers;
14002
+ info.modifiers = modifiersex;
1337714003 editObj = object.doEditClick(info, 0);
1337814004 if (!editObj)
1337914005 {
....@@ -13390,11 +14016,14 @@
1339014016
1339114017 public void mouseDragged(MouseEvent e)
1339214018 {
14019
+ Globals.MOUSEDRAGGED = true;
14020
+
14021
+ //System.out.println("mouseDragged: " + e);
1339314022 if (isRenderer)
1339414023 movingcamera = true;
14024
+
1339514025 //if (drawing)
1339614026 //return;
13397
- //System.out.println("mouseDragged: " + e);
1339814027 if ((e.getModifiersEx() & CTRL) != 0
1339914028 || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1340014029 {
....@@ -13402,7 +14031,7 @@
1340214031 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1340314032 }
1340414033 else
13405
- drag(e.getX(), e.getY(), e.getModifiersEx());
14034
+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1340614035
1340714036 //try { Thread.sleep(1); } catch (Exception ex) {}
1340814037 }
....@@ -13575,6 +14204,7 @@
1357514204
1357614205 public void run()
1357714206 {
14207
+ new Exception().printStackTrace();
1357814208 System.exit(0);
1357914209 for (;;)
1358014210 {
....@@ -13638,7 +14268,7 @@
1363814268 {
1363914269 Globals.lighttouched = true;
1364014270 }
13641
- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14271
+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1364214272 }
1364314273 //else
1364414274 }
....@@ -13738,7 +14368,7 @@
1373814368 int X, Y;
1373914369 boolean SX, SY;
1374014370
13741
- void drag(int x, int y, int modifiers)
14371
+ void drag(int x, int y, int modifiers, int modifiersex)
1374214372 {
1374314373 if (IsFrozen())
1374414374 {
....@@ -13747,17 +14377,17 @@
1374714377
1374814378 drag = true; // NEW
1374914379
13750
- boolean continuous = (modifiers & COMMAND) == COMMAND;
14380
+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
1375114381
1375214382 X = x;
1375314383 Y = y;
1375414384 // floating state for animation
13755
- MODIFIERS = modifiers;
13756
- modifiers &= ~1024;
14385
+ MODIFIERS = modifiersex;
14386
+ modifiersex &= ~1024;
1375714387 if (false) // modifiers != 0)
1375814388 {
1375914389 //new Exception().printStackTrace();
13760
- System.out.println("mouseDragged: " + modifiers);
14390
+ System.out.println("mouseDragged: " + modifiersex);
1376114391 System.out.println("SHIFT = " + SHIFT);
1376214392 System.out.println("CONTROL = " + COMMAND);
1376314393 System.out.println("META = " + META);
....@@ -13777,7 +14407,8 @@
1377714407 info.camera = renderCamera;
1377814408 info.x = x;
1377914409 info.y = y;
13780
- object.editWindow.copy.doEditDrag(info);
14410
+ object.GetWindow().copy
14411
+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1378114412 } else
1378214413 {
1378314414 if (x < startX)
....@@ -13929,7 +14560,6 @@
1392914560 public void mouseMoved(MouseEvent e)
1393014561 {
1393114562 //System.out.println("mouseMoved: " + e);
13932
-
1393314563 if (isRenderer)
1393414564 return;
1393514565
....@@ -13942,7 +14572,9 @@
1394214572 ci.camera = renderCamera;
1394314573 if (!isRenderer)
1394414574 {
13945
- if (object.editWindow.copy.doEditClick(ci, 0))
14575
+ //ObjEditor editWindow = object.editWindow;
14576
+ //Object3D copy = editWindow.copy;
14577
+ if (object.doEditClick(ci, 0))
1394614578 {
1394714579 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1394814580 } else
....@@ -13954,7 +14586,10 @@
1395414586
1395514587 public void mouseReleased(MouseEvent e)
1395614588 {
14589
+ Globals.MOUSEDRAGGED = false;
14590
+
1395714591 movingcamera = false;
14592
+ X = Y = 0;
1395814593 //System.out.println("mouseReleased: " + e);
1395914594 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1396014595 }
....@@ -13977,9 +14612,9 @@
1397714612 boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1397814613 boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1397914614
13980
- if (control || command || IsFrozen())
14615
+// No delay if (control || command || IsFrozen())
1398114616 timeout = true;
13982
- else
14617
+// ?? May 2019 else
1398314618 // timer.setDelay((modifiers & 128) != 0?0:350);
1398414619 mouseDown = false;
1398514620 if (!control && !command) // june 2013
....@@ -14089,7 +14724,7 @@
1408914724 System.out.println("keyReleased: " + e);
1409014725 }
1409114726
14092
- void SetMouseMode(int modifiers)
14727
+ void SetMouseMode(int modifiers, int modifiersex)
1409314728 {
1409414729 //System.out.println("SetMouseMode = " + modifiers);
1409514730 //modifiers &= ~1024;
....@@ -14101,25 +14736,25 @@
1410114736 //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1410214737 // return;
1410314738 //System.out.println("SetMode = " + modifiers);
14104
- if ((modifiers & WHEEL) == WHEEL)
14739
+ if ((modifiersex & WHEEL) == WHEEL)
1410514740 {
1410614741 mouseMode |= ZOOM;
1410714742 }
1410814743
1410914744 boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110
- if (capsLocked || (modifiers & META) == META)
14745
+ if (capsLocked) // || (modifiers & META) == META)
1411114746 {
1411214747 mouseMode |= VR; // BACKFORTH;
1411314748 }
14114
- if ((modifiers & CTRLCLICK) == CTRLCLICK)
14749
+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1411514750 {
1411614751 mouseMode |= SELECT;
1411714752 }
14118
- if ((modifiers & COMMAND) == COMMAND)
14753
+ if ((modifiersex & COMMAND) == COMMAND)
1411914754 {
1412014755 mouseMode |= SELECT;
1412114756 }
14122
- if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14757
+ if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1412314758 {
1412414759 mouseMode &= ~VR;
1412514760 mouseMode |= TRANSLATE;
....@@ -14148,7 +14783,7 @@
1414814783
1414914784 if (isRenderer) //
1415014785 {
14151
- SetMouseMode(modifiers);
14786
+ SetMouseMode(0, modifiers);
1415214787 }
1415314788
1415414789 Globals.theRenderer.keyPressed(key);
....@@ -14320,8 +14955,14 @@
1432014955 RevertCamera();
1432114956 repaint();
1432214957 break;
14323
- case 'L':
1432414958 case 'l':
14959
+ lightMode ^= true;
14960
+ Globals.lighttouched = true;
14961
+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14962
+ targetLookAt.set(manipCamera.lookAt);
14963
+ repaint();
14964
+ break;
14965
+ case 'L':
1432514966 if (lightMode)
1432614967 {
1432714968 lightMode = false;
....@@ -14468,23 +15109,21 @@
1446815109 kompactbit = 6;
1446915110 break;
1447015111 case ' ':
14471
- lightMode ^= true;
14472
- Globals.lighttouched = true;
14473
- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14474
- targetLookAt.set(manipCamera.lookAt);
15112
+ ObjEditor.theFrame.ToggleFullScreen();
1447515113 repaint();
1447615114 break;
1447715115 //case '`' :
1447815116 case ESC:
1447915117 RENDERPROGRAM += 1;
1448015118 RENDERPROGRAM %= 3;
15119
+
1448115120 repaint();
1448215121 break;
1448315122 case 'Z':
1448415123 //RESIZETEXTURE ^= true;
1448515124 //break;
1448615125 case 'z':
14487
- RENDERSHADOW ^= true;
15126
+ Globals.RENDERSHADOW ^= true;
1448815127 Globals.lighttouched = true;
1448915128 repaint();
1449015129 break;
....@@ -14608,7 +15247,7 @@
1460815247 //mode = ROTATE;
1460915248 if ((MODIFIERS & COMMAND) == 0) // VR??
1461015249 {
14611
- SetMouseMode(modifiers);
15250
+ SetMouseMode(0, modifiers);
1461215251 }
1461315252 }
1461415253
....@@ -14742,8 +15381,9 @@
1474215381
1474315382 protected void processMouseMotionEvent(MouseEvent e)
1474415383 {
14745
- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746
- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15384
+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15385
+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15386
+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1474715387 {
1474815388 mouseMoved(e);
1474915389 } else
....@@ -14768,11 +15408,12 @@
1476815408 }
1476915409 */
1477015410
14771
- object.editWindow.EditSelection();
15411
+ object.editWindow.EditSelection(false);
1477215412 }
1477315413
1477415414 void SelectParent()
1477515415 {
15416
+ new Exception().printStackTrace();
1477615417 System.exit(0);
1477715418 Composite group = (Composite) object;
1477815419 java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -14796,6 +15437,7 @@
1479615437
1479715438 void SelectChildren()
1479815439 {
15440
+ new Exception().printStackTrace();
1479915441 System.exit(0);
1480015442 /*
1480115443 Composite group = (Composite) object;
....@@ -14960,7 +15602,9 @@
1496015602 info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1496115603 //Image img = CreateImage(width, height);
1496215604 //System.out.println("width = " + width + "; height = " + height + "\n");
15605
+
1496315606 Graphics gr = g; // img.getGraphics();
15607
+
1496415608 if (!hasMarquee)
1496515609 {
1496615610 if (Xmin < Xmax) // !locked)
....@@ -15058,14 +15702,33 @@
1505815702 if (!isRenderer)
1505915703 {
1506015704 object.drawEditHandles(info, 0);
15705
+
15706
+ if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15707
+ {
15708
+ switch (object.selection.get(0).hitSomething)
15709
+ {
15710
+ case Object3D.hitCenter: gr.setColor(Color.pink);
15711
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15712
+ break;
15713
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
15714
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15715
+ break;
15716
+ case Object3D.hitScale: gr.setColor(Color.cyan);
15717
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15718
+ break;
15719
+ }
15720
+
15721
+ }
1506115722 }
1506215723 }
15724
+
1506315725 if (isRenderer)
1506415726 {
1506515727 //gr.setColor(Color.black);
1506615728 //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1506715729 //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1506815730 }
15731
+
1506915732 if (hasMarquee)
1507015733 {
1507115734 gr.setXORMode(Color.white);
....@@ -15178,6 +15841,7 @@
1517815841 public boolean mouseDown(Event evt, int x, int y)
1517915842 {
1518015843 System.out.println("mouseDown: " + evt);
15844
+ System.exit(0);
1518115845 /*
1518215846 locked = true;
1518315847 drag = false;
....@@ -15221,7 +15885,7 @@
1522115885 {
1522215886 keyPressed(0, modifiers);
1522315887 }
15224
- clickStart(x, y, modifiers);
15888
+ // clickStart(x, y, modifiers);
1522515889 return true;
1522615890 }
1522715891
....@@ -15339,7 +16003,7 @@
1533916003 {
1534016004 keyReleased(0, 0);
1534116005 }
15342
- drag(x, y, modifiers);
16006
+ drag(x, y, 0, modifiers);
1534316007 return true;
1534416008 }
1534516009
....@@ -15471,7 +16135,7 @@
1547116135 Object3D object;
1547216136 static Object3D trackedobject;
1547316137 Camera renderCamera; // Light or Eye (or Occlusion)
15474
- /*static*/ Camera manipCamera; // Light or Eye
16138
+ /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1547516139 /*static*/ Camera eyeCamera;
1547616140 /*static*/ Camera lightCamera;
1547716141 int cameracount;
....@@ -15756,16 +16420,16 @@
1575616420 cStatic.objectstack[materialdepth++] = checker;
1575716421 //System.out.println("material " + material);
1575816422 //Applet3D.tracein(this, selected);
15759
- vector2buffer = checker.projectedVertices;
16423
+ //vector2buffer = checker.projectedVertices;
1576016424
1576116425 //checker.GetMaterial().Draw(this, false); // true);
15762
- DrawMaterial(checker.GetMaterial(), false); // true);
16426
+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
1576316427
1576416428 materialdepth -= 1;
1576516429 if (materialdepth > 0)
1576616430 {
15767
- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768
- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
16431
+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16432
+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
1576916433 }
1577016434 //checker.GetMaterial().opacity = 1f;
1577116435 ////checker.GetMaterial().ambient = 1f;
....@@ -15909,6 +16573,7 @@
1590916573 {
1591016574 if (!selection)
1591116575 {
16576
+ new Exception().printStackTrace();
1591216577 System.exit(0);
1591316578 return;
1591416579 }
....@@ -15988,6 +16653,8 @@
1598816653 // System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1598916654 // System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1599016655
16656
+ CreateSelectedPoint();
16657
+
1599116658 // Will fit the mesh !!!
1599216659 selectedpoint.toParent[0][0] = 0.0001;
1599316660 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16036,16 +16703,16 @@
1603616703 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]));
1603716704 }
1603816705
16039
- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16706
+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1604016707 }
1604116708 }
1604216709
1604316710 if (!movingcamera && !PAINTMODE)
1604416711 object.editWindow.ScreenFitPoint(); // fev 2014
1604516712
16046
- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16713
+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1604716714 {
16048
- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16715
+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1604916716
1605016717 Object3D group = new Object3D("inst" + paintcount++);
1605116718
....@@ -16201,7 +16868,7 @@
1620116868 gl.glDisable(gl.GL_CULL_FACE);
1620216869 }
1620316870
16204
- if (!RENDERSHADOW)
16871
+ if (!Globals.RENDERSHADOW)
1620516872 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1620616873
1620716874 // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16211,7 +16878,7 @@
1621116878 //gl.glColorMask(false, false, false, false);
1621216879
1621316880 //render_scene_from_light_view(gl, drawable, 0, 0);
16214
- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16881
+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1621516882 {
1621616883 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1621716884
....@@ -16627,23 +17294,15 @@
1662717294 int AAbuffersize = 0;
1662817295
1662917296 //double[] selectedpoint = new double[3];
16630
- static Superellipsoid selectedpoint = new Superellipsoid();
17297
+ static Superellipsoid selectedpoint;
1663117298 static Sphere previousselectedpoint = null;
16632
- static Sphere debugpointG = new Sphere();
16633
- static Sphere debugpointP = new Sphere();
16634
- static Sphere debugpointC = new Sphere();
16635
- static Sphere debugpointR = new Sphere();
17299
+ static Sphere debugpointG;
17300
+ static Sphere debugpointP;
17301
+ static Sphere debugpointC;
17302
+ static Sphere debugpointR;
1663617303
1663717304 static Sphere debugpoints[] = new Sphere[8];
1663817305
16639
- static
16640
- {
16641
- for (int i=0; i<8; i++)
16642
- {
16643
- debugpoints[i] = new Sphere();
16644
- }
16645
- }
16646
-
1664717306 static void InitPoints(float radius)
1664817307 {
1664917308 for (int i=0; i<8; i++)
....@@ -16695,10 +17354,11 @@
1669517354 static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH*8*8 * TEXT_HEIGHT);
1669617355 // Depth buffer format
1669717356 //private int depth_format;
16698
- static public void NextIndex(Object3D o, GL gl)
17357
+
17358
+ public void NextIndex()
1669917359 {
1670017360 indexcount+=16;
16701
- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
17361
+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
1670217362 //objects[indexcount] = o;
1670317363 //System.out.println("indexcount = " + indexcount);
1670417364 }