Normand Briere
2019-08-04 0c85af6e46f48b7425d59fc776b193c06a4a1f52
Object3D.java
....@@ -22,6 +22,7 @@
2222 //static final long serialVersionUID = -607422624994562685L;
2323 static final long serialVersionUID = 5022536242724664900L;
2424
25
+ // Use GetUUID for backward compatibility with null.
2526 private UUID uuid = UUID.randomUUID();
2627
2728 // TEMPORARY for mocap undo. No need to be transient.
....@@ -29,7 +30,10 @@
2930 Object3D saveskeleton;
3031 //
3132
32
- byte[] versions[];
33
+ String skyboxname;
34
+ String skyboxext;
35
+
36
+ Object3D versionlist[];
3337 int versionindex = -1;
3438
3539 ScriptNode scriptnode;
....@@ -219,7 +223,7 @@
219223 // o.bRep.support = null;
220224 // }
221225 o.selection = this.selection;
222
- o.versions = this.versions;
226
+ o.versionlist = this.versionlist;
223227 o.versionindex = this.versionindex;
224228
225229 if (this.support != null)
....@@ -242,6 +246,29 @@
242246 // this.support = null;
243247 // this.fileparent = null;
244248 }
249
+
250
+// Object3D GetObject(java.util.UUID uuid)
251
+// {
252
+// if (this.uuid.equals(uuid))
253
+// return this;
254
+//
255
+// if (blockloop)
256
+// return null;
257
+//
258
+// blockloop = true;
259
+//
260
+// for (int i=0; i<Size(); i++)
261
+// {
262
+// Object3D o = get(i).GetObject(uuid);
263
+//
264
+// if (o != null)
265
+// return o;
266
+// }
267
+//
268
+// blockloop = false;
269
+//
270
+// return null;
271
+// }
245272
246273 void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
247274 {
....@@ -277,7 +304,7 @@
277304
278305 this.selection = o.selection;
279306
280
- this.versions = o.versions;
307
+ this.versionlist = o.versionlist;
281308 this.versionindex = o.versionindex;
282309 // July 2019 if (this.bRep != null)
283310 // this.bRep.support = o.transientrep;
....@@ -1011,6 +1038,9 @@
10111038
10121039 if (material == null || material.multiply)
10131040 return true;
1041
+
1042
+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1043
+ return false;
10141044
10151045 // Transparent objects are dynamic because we have to sort the triangles.
10161046 return material.opacity > 0.99;
....@@ -2567,7 +2597,8 @@
25672597 private static final int editSelf = 1;
25682598 private static final int editChild = 2;
25692599
2570
- void drawEditHandles(ClickInfo info, int level)
2600
+ void drawEditHandles(//ClickInfo info,
2601
+ int level)
25712602 {
25722603 if (level == 0)
25732604 {
....@@ -2575,7 +2606,8 @@
25752606 return;
25762607
25772608 Object3D selectee;
2578
- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
2609
+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
2610
+ level + 1))
25792611 {
25802612 selectee = (Object3D) e.nextElement();
25812613 }
....@@ -2583,19 +2615,22 @@
25832615 } else
25842616 {
25852617 //super.
2586
- drawEditHandles0(info, level + 1);
2618
+ drawEditHandles0(//info,
2619
+ level + 1);
25872620 }
25882621 }
25892622
2590
- boolean doEditClick(ClickInfo info, int level)
2623
+ boolean doEditClick(//ClickInfo info,
2624
+ int level)
25912625 {
25922626 doSomething = 0;
25932627 if (level == 0)
25942628 {
2595
- return doParentClick(info);
2629
+ return doParentClick(); //info);
25962630 }
25972631 if (//super.
2598
- doEditClick0(info, level))
2632
+ doEditClick0(//info,
2633
+ level))
25992634 {
26002635 doSomething = 1;
26012636 return true;
....@@ -2605,7 +2640,7 @@
26052640 }
26062641 }
26072642
2608
- boolean doParentClick(ClickInfo info)
2643
+ boolean doParentClick() //ClickInfo info)
26092644 {
26102645 if (selection == null)
26112646 {
....@@ -2618,7 +2653,8 @@
26182653 for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
26192654 {
26202655 Object3D selectee = (Object3D) e.nextElement();
2621
- if (selectee.doEditClick(info, 1))
2656
+ if (selectee.doEditClick(//info,
2657
+ 1))
26222658 {
26232659 childToDrag = selectee;
26242660 doSomething = 2;
....@@ -2630,13 +2666,15 @@
26302666 return retval;
26312667 }
26322668
2633
- void doEditDrag(ClickInfo info, boolean opposite)
2669
+ void doEditDrag(//ClickInfo clickInfo,
2670
+ boolean opposite)
26342671 {
26352672 switch (doSomething)
26362673 {
26372674 case 1: // '\001'
26382675 //super.
2639
- doEditDrag0(info, opposite);
2676
+ doEditDrag0(//clickInfo,
2677
+ opposite);
26402678 break;
26412679
26422680 case 2: // '\002'
....@@ -2649,11 +2687,13 @@
26492687 {
26502688 //sel.hitSomething = childToDrag.hitSomething;
26512689 //childToDrag.doEditDrag(info);
2652
- sel.doEditDrag(info, opposite);
2690
+ sel.doEditDrag(//clickInfo,
2691
+ opposite);
26532692 } else
26542693 {
26552694 //super.
2656
- doEditDrag0(info, opposite);
2695
+ doEditDrag0(//clickInfo,
2696
+ opposite);
26572697 }
26582698 }
26592699 break;
....@@ -2671,6 +2711,9 @@
26712711 {
26722712 deselectAll();
26732713 }
2714
+
2715
+ new Exception().printStackTrace();
2716
+
26742717 ClickInfo newInfo = new ClickInfo();
26752718 newInfo.flags = info.flags;
26762719 newInfo.bounds = info.bounds;
....@@ -5893,8 +5936,10 @@
58935936 if (support != null)
58945937 support = support;
58955938
5896
- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5897
- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5939
+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5940
+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5941
+
5942
+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
58985943
58995944 if (!usecalllists && bRep != null && bRep.displaylist > 0)
59005945 {
....@@ -5904,8 +5949,9 @@
59045949 // usecalllists &= !(parent instanceof RandomNode);
59055950 // usecalllists = false;
59065951
5907
- if (GetBRep() != null)
5908
- usecalllists = usecalllists;
5952
+ if (display.DrawMode() == display.SHADOW)
5953
+ //GetBRep() != null)
5954
+ usecalllists = !!usecalllists;
59095955 //System.out.println("draw " + this);
59105956 //new Exception().printStackTrace();
59115957
....@@ -5927,7 +5973,7 @@
59275973 if (!(this instanceof Composite))
59285974 touched = false;
59295975 //if (displaylist == -1 && usecalllists)
5930
- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5976
+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
59315977 {
59325978 bRep.displaylist = display.GenList();
59335979 assert(bRep.displaylist != 0);
....@@ -5938,7 +5984,7 @@
59385984
59395985 //System.out.println("\tnew list " + list);
59405986 //gl.glDrawBuffer(gl.GL_NONE);
5941
- if (usecalllists)
5987
+ if (usecalllists && bRep.displaylist > 0)
59425988 {
59435989 // System.err.println("new list " + bRep.displaylist + " for " + this);
59445990 display.NewList(bRep.displaylist);
....@@ -5947,7 +5993,7 @@
59475993 CallList(display, root, selected, blocked);
59485994
59495995 // compiled = true;
5950
- if (usecalllists)
5996
+ if (usecalllists && bRep.displaylist > 0)
59515997 {
59525998 // System.err.println("end list " + bRep.displaylist + " for " + this);
59535999 display.EndList();
....@@ -7298,20 +7344,23 @@
72987344 }
72997345 }
73007346
7301
- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7347
+ static ClickInfo clickInfo = new ClickInfo();
7348
+
7349
+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7350
+ Point outPt, Rectangle outRec)
73027351 {
7303
- int hc = info.bounds.x + info.bounds.width / 2;
7304
- int vc = info.bounds.y + info.bounds.height / 2;
7305
- double[][] toscreen = info.toScreen;
7352
+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7353
+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7354
+ double[][] toscreen = clickInfo.toScreen;
73067355 if (toscreen == null)
73077356 {
7308
- toscreen = new Camera(info.camera.viewCode).toScreen;
7357
+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
73097358 }
73107359 cVector vec = in;
73117360 LA.xformPos(in, toscreen, in);
73127361 //System.out.println("Distance = " + info.camera.Distance());
7313
- vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
7314
- vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
7362
+ vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7363
+ vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
73157364 outPt.x = hc + (int) vec.x;
73167365 outPt.y = vc - (int) vec.y;
73177366 outRec.x = outPt.x - 3;
....@@ -7319,15 +7368,18 @@
73197368 outRec.width = outRec.height = 6;
73207369 }
73217370
7322
- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7371
+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7372
+ )
73237373 {
73247374 Point pt = new Point(0, 0);
73257375 Rectangle rec = new Rectangle();
7326
- calcHotSpot(in, info, pt, rec);
7376
+ calcHotSpot(in, //clickInfo,
7377
+ pt, rec);
73277378 return rec;
73287379 }
73297380
7330
- void drawEditHandles0(ClickInfo info, int level)
7381
+ void drawEditHandles0(//ClickInfo clickInfo,
7382
+ int level)
73317383 {
73327384 if (level == 0)
73337385 {
....@@ -7336,16 +7388,19 @@
73367388 {
73377389 cVector origin = new cVector();
73387390 //LA.xformPos(origin, toParent, origin);
7339
- Rectangle spot = calcHotSpot(origin, info);
7391
+ if (this.clickInfo == null)
7392
+ this.clickInfo = new ClickInfo();
7393
+
7394
+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
73407395 Rectangle boundary = new Rectangle();
73417396 boundary.x = spot.x - 30;
73427397 boundary.y = spot.y - 30;
73437398 boundary.width = spot.width + 60;
73447399 boundary.height = spot.height + 60;
7345
- info.g.setColor(Color.red);
7400
+ clickInfo.g.setColor(Color.red);
73467401 int spotw = spot.x + spot.width;
73477402 int spoth = spot.y + spot.height;
7348
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7403
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73497404 // if (CameraPane.Xmin > spot.x)
73507405 // {
73517406 // CameraPane.Xmin = spot.x;
....@@ -7365,8 +7420,8 @@
73657420 spot.translate(32, 32);
73667421 spotw = spot.x + spot.width;
73677422 spoth = spot.y + spot.height;
7368
- info.g.setColor(Color.cyan);
7369
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7423
+ clickInfo.g.setColor(Color.cyan);
7424
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73707425 // if (CameraPane.Xmin > spot.x)
73717426 // {
73727427 // CameraPane.Xmin = spot.x;
....@@ -7386,9 +7441,9 @@
73867441 // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
73877442 //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
73887443 spot.translate(0, -32);
7389
- info.g.setColor(Color.yellow);
7390
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7391
- info.g.setColor(Color.green);
7444
+ clickInfo.g.setColor(Color.yellow);
7445
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7446
+ clickInfo.g.setColor(Color.green);
73927447 // if (CameraPane.Xmin > spot.x)
73937448 // {
73947449 // CameraPane.Xmin = spot.x;
....@@ -7405,8 +7460,8 @@
74057460 // {
74067461 // CameraPane.Ymax = spoth;
74077462 // }
7408
- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7409
- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7463
+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7464
+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
74107465 //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
74117466 // if (CameraPane.Xmin > boundary.x)
74127467 // {
....@@ -7428,7 +7483,8 @@
74287483 }
74297484 }
74307485
7431
- boolean doEditClick0(ClickInfo info, int level)
7486
+ boolean doEditClick0(//ClickInfo clickInfo,
7487
+ int level)
74327488 {
74337489 if (level == 0)
74347490 {
....@@ -7437,8 +7493,8 @@
74377493
74387494 boolean retval = false;
74397495
7440
- startX = info.x;
7441
- startY = info.y;
7496
+ startX = clickInfo.x;
7497
+ startY = clickInfo.y;
74427498
74437499 hitSomething = -1;
74447500 cVector origin = new cVector();
....@@ -7448,22 +7504,51 @@
74487504 {
74497505 centerPt = new Point(0, 0);
74507506 }
7451
- calcHotSpot(origin, info, centerPt, spot);
7452
- if (spot.contains(info.x, info.y))
7507
+ calcHotSpot(origin, //info,
7508
+ centerPt, spot);
7509
+ if (spot.contains(clickInfo.x, clickInfo.y))
74537510 {
74547511 hitSomething = hitCenter;
74557512 retval = true;
74567513 }
74577514 spot.translate(32, 0);
7458
- if (spot.contains(info.x, info.y))
7515
+ if (spot.contains(clickInfo.x, clickInfo.y))
74597516 {
74607517 hitSomething = hitRotate;
74617518 retval = true;
74627519 }
74637520 spot.translate(0, 32);
7464
- if (spot.contains(info.x, info.y))
7521
+ if (spot.contains(clickInfo.x, clickInfo.y))
74657522 {
74667523 hitSomething = hitScale;
7524
+
7525
+ double scale = 0.005f * clickInfo.camera.Distance();
7526
+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7527
+ double sign = 1;
7528
+ if (hScale < 0)
7529
+ {
7530
+ sign = -1;
7531
+ }
7532
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
7533
+ if (hScale < 0.01)
7534
+ {
7535
+ //hScale = 0.01;
7536
+ }
7537
+
7538
+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7539
+ sign = 1;
7540
+ if (vScale < 0)
7541
+ {
7542
+ sign = -1;
7543
+ }
7544
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
7545
+ if (vScale < 0.01)
7546
+ {
7547
+ //vScale = 0.01;
7548
+ }
7549
+
7550
+ clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7551
+
74677552 retval = true;
74687553 }
74697554
....@@ -7473,7 +7558,7 @@
74737558 }
74747559
74757560 //System.out.println("info.modifiers = " + info.modifiers);
7476
- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7561
+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
74777562 //System.out.println("modified = " + modified);
74787563 //new Exception().printStackTrace();
74797564 //viewCode = info.pane.renderCamera.viewCode;
....@@ -7501,7 +7586,8 @@
75017586 return true;
75027587 }
75037588
7504
- void doEditDrag0(ClickInfo info, boolean opposite)
7589
+ void doEditDrag0(//ClickInfo info,
7590
+ boolean opposite)
75057591 {
75067592 if (hitSomething == 0)
75077593 {
....@@ -7515,7 +7601,7 @@
75157601
75167602 //System.out.println("hitSomething = " + hitSomething);
75177603
7518
- double scale = 0.005f * info.camera.Distance();
7604
+ double scale = 0.005f * clickInfo.camera.Distance();
75197605
75207606 cVector xlate = new cVector();
75217607 //cVector xlate2 = new cVector();
....@@ -7549,8 +7635,8 @@
75497635 toParent[3][i] = xlate.get(i);
75507636 LA.matInvert(toParent, fromParent);
75517637 */
7552
- cVector delta = LA.newVector(0, 0, startY - info.y);
7553
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7638
+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
7639
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
75547640
75557641 LA.matCopy(startMat, toParent);
75567642 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7559,7 +7645,7 @@
75597645 } else
75607646 {
75617647 //LA.xformDir(delta, info.camera.fromScreen, delta);
7562
- cVector up = new cVector(info.camera.up);
7648
+ cVector up = new cVector(clickInfo.camera.up);
75637649 cVector away = new cVector();
75647650 //cVector right2 = new cVector();
75657651 //LA.vecCross(up, cVector.Z, right);
....@@ -7576,19 +7662,19 @@
75767662 LA.xformDir(up, ClickInfo.matbuffer, up);
75777663 // if (!CameraPane.LOCALTRANSFORM)
75787664 LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7579
- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7665
+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
75807666 // if (!CameraPane.LOCALTRANSFORM)
75817667 LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
75827668 //LA.vecCross(up, cVector.Z, right2);
75837669
7584
- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7670
+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
75857671
75867672 //System.out.println("DELTA0 = " + delta);
75877673 //System.out.println("AWAY = " + info.camera.away);
75887674 //System.out.println("UP = " + info.camera.up);
75897675 if (away.z > 0)
75907676 {
7591
- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7677
+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
75927678 {
75937679 delta.x = -delta.x;
75947680 } else
....@@ -7603,7 +7689,7 @@
76037689 //System.out.println("DELTA1 = " + delta);
76047690 LA.xformDir(delta, ClickInfo.matbuffer, delta);
76057691 //System.out.println("DELTA2 = " + delta);
7606
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7692
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
76077693 LA.matCopy(startMat, toParent);
76087694 //System.out.println("DELTA3 = " + delta);
76097695 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7613,8 +7699,8 @@
76137699 break;
76147700
76157701 case hitRotate: // rotate
7616
- int dx = info.x - centerPt.x;
7617
- int dy = -(info.y - centerPt.y);
7702
+ int dx = clickInfo.x - centerPt.x;
7703
+ int dy = -(clickInfo.y - centerPt.y);
76187704 double angle = (double) Math.atan2(dx, dy);
76197705 angle = -(1.570796 - angle);
76207706
....@@ -7637,7 +7723,7 @@
76377723 }
76387724 /**/
76397725
7640
- switch (info.pane.RenderCamera().viewCode)
7726
+ switch (clickInfo.pane.RenderCamera().viewCode)
76417727 {
76427728 case 1: // '\001'
76437729 LA.matZRotate(toParent, angle);
....@@ -7664,7 +7750,7 @@
76647750 break;
76657751
76667752 case hitScale: // scale
7667
- double hScale = (double) (info.x - centerPt.x) / 32;
7753
+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
76687754 double sign = 1;
76697755 if (hScale < 0)
76707756 {
....@@ -7676,7 +7762,7 @@
76767762 //hScale = 0.01;
76777763 }
76787764
7679
- double vScale = (double) (info.y - centerPt.y) / 32;
7765
+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
76807766 sign = 1;
76817767 if (vScale < 0)
76827768 {
....@@ -7687,6 +7773,7 @@
76877773 {
76887774 //vScale = 0.01;
76897775 }
7776
+
76907777 LA.matCopy(startMat, toParent);
76917778 /**/
76927779 for (int i = 0; i < 3; i++)
....@@ -7696,14 +7783,14 @@
76967783 }
76977784 /**/
76987785
7699
- double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7786
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
77007787
77017788 if (totalScale < 0.01)
77027789 {
77037790 totalScale = 0.01;
77047791 }
77057792
7706
- switch (info.pane.RenderCamera().viewCode)
7793
+ switch (clickInfo.pane.RenderCamera().viewCode)
77077794 {
77087795 case 3: // '\001'
77097796 if (modified || opposite)
....@@ -7770,7 +7857,7 @@
77707857 } // NEW ...
77717858
77727859
7773
- info.pane.repaint();
7860
+ clickInfo.pane.repaint();
77747861 }
77757862
77767863 boolean overflow = false;