Normand Briere
2019-08-19 22e8ab6479334206f97b0093f6c5ffd14610cce3
Object3D.java
....@@ -22,12 +22,21 @@
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
27
- // TEMPORARY for mocap undo
28
- mocap.reader.BVHReader.BVHResult bvh;
29
- Object3D skeleton;
28
+ // TEMPORARY for mocap undo. No need to be transient.
29
+ mocap.reader.BVHReader.BVHResult savebvh;
30
+ Object3D saveskeleton;
3031 //
32
+
33
+ String skyboxname;
34
+ String skyboxext;
35
+
36
+ Object3D versionlist[];
37
+ int versionindex = -1;
38
+
39
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
3140
3241 ScriptNode scriptnode;
3342
....@@ -170,24 +179,35 @@
170179
171180 void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172181 {
182
+ Object3D o;
183
+
173184 if (hashtable.containsKey(GetUUID()))
174185 {
175
- Object3D o = hashtable.get(GetUUID());
186
+ o = hashtable.get(GetUUID());
176187
177188 Grafreed.Assert(this.bRep == o.bRep);
178
- if (this.bRep != null)
179
- assert(this.bRep.support == o.transientrep);
189
+ //if (this.bRep != null)
190
+ // assert(this.bRep.support == o.transientrep);
191
+ if (this.support != null)
192
+ assert(this.support.bRep == o.transientrep);
193
+ }
194
+ else
195
+ {
196
+ o = new Object3D("copy of " + this.name);
180197
181
- return;
198
+ hashtable.put(GetUUID(), o);
182199 }
183200
184
- Object3D o = new Object3D();
185
-
186
- hashtable.put(GetUUID(), o);
187
-
188
- for (int i=0; i<Size(); i++)
201
+ if (!blockloop)
189202 {
190
- get(i).ExtractBigData(hashtable);
203
+ blockloop = true;
204
+
205
+ for (int i=0; i<Size(); i++)
206
+ {
207
+ get(i).ExtractBigData(hashtable);
208
+ }
209
+
210
+ blockloop = false;
191211 }
192212
193213 ExtractBigData(o);
....@@ -195,11 +215,26 @@
195215
196216 void ExtractBigData(Object3D o)
197217 {
218
+ if (o.bRep != null)
219
+ Grafreed.Assert(o.bRep == this.bRep);
220
+
198221 o.bRep = this.bRep;
199
- if (this.bRep != null)
222
+// July 2019 if (this.bRep != null)
223
+// {
224
+// o.transientrep = this.bRep.support;
225
+// o.bRep.support = null;
226
+// }
227
+ o.selection = this.selection;
228
+ o.versionlist = this.versionlist;
229
+ o.versionindex = this.versionindex;
230
+
231
+ if (this.support != null)
200232 {
201
- o.transientrep = this.bRep.support;
202
- o.bRep.support = null;
233
+ if (o.transientrep != null)
234
+ Grafreed.Assert(o.transientrep == this.support.bRep);
235
+
236
+ o.transientrep = this.support.bRep;
237
+ this.support.bRep = null;
203238 }
204239
205240 // o.support = this.support;
....@@ -214,6 +249,73 @@
214249 // this.fileparent = null;
215250 }
216251
252
+// Object3D GetObject(java.util.UUID uuid)
253
+// {
254
+// if (this.uuid.equals(uuid))
255
+// return this;
256
+//
257
+// if (blockloop)
258
+// return null;
259
+//
260
+// blockloop = true;
261
+//
262
+// for (int i=0; i<Size(); i++)
263
+// {
264
+// Object3D o = get(i).GetObject(uuid);
265
+//
266
+// if (o != null)
267
+// return o;
268
+// }
269
+//
270
+// blockloop = false;
271
+//
272
+// return null;
273
+// }
274
+
275
+ transient boolean tag;
276
+
277
+ void TagObjects(Object3D o, boolean tag)
278
+ {
279
+ if (blockloop)
280
+ return;
281
+
282
+ o.tag = tag;
283
+
284
+ if (o == this)
285
+ return;
286
+
287
+ blockloop = true;
288
+
289
+ for (int i=0; i<Size(); i++)
290
+ {
291
+ get(i).TagObjects(o, tag);
292
+ }
293
+
294
+ blockloop = false;
295
+ }
296
+
297
+ boolean HasTags()
298
+ {
299
+ if (blockloop)
300
+ return false;
301
+
302
+ blockloop = true;
303
+
304
+ boolean hasTags = false;
305
+
306
+ for (int i=0; i<Size(); i++)
307
+ {
308
+ hasTags |= get(i).tag || get(i).HasTags();
309
+
310
+ if (hasTags)
311
+ break;
312
+ }
313
+
314
+ blockloop = false;
315
+
316
+ return hasTags;
317
+ }
318
+
217319 void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218320 {
219321 if (!hashtable.containsKey(GetUUID()))
....@@ -223,19 +325,35 @@
223325
224326 RestoreBigData(o);
225327
226
- hashtable.remove(GetUUID());
328
+ if (blockloop)
329
+ return;
330
+
331
+ blockloop = true;
332
+
333
+ //hashtable.remove(GetUUID());
227334
228335 for (int i=0; i<Size(); i++)
229336 {
230337 get(i).RestoreBigData(hashtable);
231338 }
339
+
340
+ blockloop = false;
232341 }
233342
234343 void RestoreBigData(Object3D o)
235344 {
236345 this.bRep = o.bRep;
237
- if (this.bRep != null)
238
- this.bRep.support = o.transientrep;
346
+ if (this.support != null && o.transientrep != null)
347
+ {
348
+ this.support.bRep = o.transientrep;
349
+ }
350
+
351
+ this.selection = o.selection;
352
+
353
+ this.versionlist = o.versionlist;
354
+ this.versionindex = o.versionindex;
355
+// July 2019 if (this.bRep != null)
356
+// this.bRep.support = o.transientrep;
239357 // this.support = o.support;
240358 // this.fileparent = o.fileparent;
241359 }
....@@ -381,6 +499,7 @@
381499 }
382500
383501 boolean live = false;
502
+ transient boolean keepdontselect;
384503 boolean dontselect = false;
385504 boolean hide = false;
386505 boolean link2master = false; // performs reset support/master at each frame
....@@ -881,7 +1000,7 @@
8811000
8821001 if (marked && Globals.isLIVE() && live &&
8831002 //TEMP21aug2018
884
- (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
1003
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
8851004 currentframe != Globals.framecount)
8861005 {
8871006 currentframe = Globals.framecount;
....@@ -893,7 +1012,8 @@
8931012
8941013 boolean changedir = random && Math.random() < 0.01; // && !link2master;
8951014
896
- if (transformcount*factor > maxcount || (step == 1 && changedir))
1015
+ if (transformcount*factor >= maxcount && (rewind || random) ||
1016
+ (step == 1 && changedir))
8971017 {
8981018 countdown = 1;
8991019 delay = speedup?8:1;
....@@ -965,6 +1085,10 @@
9651085 if (material == null || material.multiply)
9661086 return true;
9671087
1088
+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1089
+ return false;
1090
+
1091
+ // Transparent objects are dynamic because we have to sort the triangles.
9681092 return material.opacity > 0.99;
9691093 }
9701094
....@@ -1365,6 +1489,7 @@
13651489 toParent = LA.newMatrix();
13661490 fromParent = LA.newMatrix();
13671491 }
1492
+
13681493 LA.matCopy(other.toParent, toParent);
13691494 LA.matCopy(other.fromParent, fromParent);
13701495
....@@ -2386,6 +2511,15 @@
23862511 }
23872512 */
23882513 }
2514
+ else
2515
+ {
2516
+ //((ObjEditor)editWindow).SetupUI2(null);
2517
+ if (objectUI != null)
2518
+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
2519
+ else
2520
+ //new Exception().printStackTrace();
2521
+ System.err.println("objectUI is null");
2522
+ }
23892523 }
23902524
23912525 void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2427,6 +2561,14 @@
24272561 {
24282562 editWindow.refreshContents();
24292563 }
2564
+ else
2565
+ {
2566
+ if (manipWindow != null)
2567
+ {
2568
+ manipWindow.refreshContents();
2569
+ }
2570
+ }
2571
+
24302572 //if (parent != null)
24312573 //parent.refreshEditWindow();
24322574 }
....@@ -2506,7 +2648,8 @@
25062648 private static final int editSelf = 1;
25072649 private static final int editChild = 2;
25082650
2509
- void drawEditHandles(ClickInfo info, int level)
2651
+ void drawEditHandles(//ClickInfo info,
2652
+ int level)
25102653 {
25112654 if (level == 0)
25122655 {
....@@ -2514,7 +2657,8 @@
25142657 return;
25152658
25162659 Object3D selectee;
2517
- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
2660
+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
2661
+ level + 1))
25182662 {
25192663 selectee = (Object3D) e.nextElement();
25202664 }
....@@ -2522,19 +2666,22 @@
25222666 } else
25232667 {
25242668 //super.
2525
- drawEditHandles0(info, level + 1);
2669
+ drawEditHandles0(//info,
2670
+ level + 1);
25262671 }
25272672 }
25282673
2529
- boolean doEditClick(ClickInfo info, int level)
2674
+ boolean doEditClick(//ClickInfo info,
2675
+ int level)
25302676 {
25312677 doSomething = 0;
25322678 if (level == 0)
25332679 {
2534
- return doParentClick(info);
2680
+ return doParentClick(); //info);
25352681 }
25362682 if (//super.
2537
- doEditClick0(info, level))
2683
+ doEditClick0(//info,
2684
+ level))
25382685 {
25392686 doSomething = 1;
25402687 return true;
....@@ -2544,7 +2691,7 @@
25442691 }
25452692 }
25462693
2547
- boolean doParentClick(ClickInfo info)
2694
+ boolean doParentClick() //ClickInfo info)
25482695 {
25492696 if (selection == null)
25502697 {
....@@ -2557,7 +2704,8 @@
25572704 for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
25582705 {
25592706 Object3D selectee = (Object3D) e.nextElement();
2560
- if (selectee.doEditClick(info, 1))
2707
+ if (selectee.doEditClick(//info,
2708
+ 1))
25612709 {
25622710 childToDrag = selectee;
25632711 doSomething = 2;
....@@ -2569,13 +2717,15 @@
25692717 return retval;
25702718 }
25712719
2572
- void doEditDrag(ClickInfo info, boolean opposite)
2720
+ void doEditDrag(//ClickInfo clickInfo,
2721
+ boolean opposite)
25732722 {
25742723 switch (doSomething)
25752724 {
25762725 case 1: // '\001'
25772726 //super.
2578
- doEditDrag0(info, opposite);
2727
+ doEditDrag0(//clickInfo,
2728
+ opposite);
25792729 break;
25802730
25812731 case 2: // '\002'
....@@ -2588,11 +2738,13 @@
25882738 {
25892739 //sel.hitSomething = childToDrag.hitSomething;
25902740 //childToDrag.doEditDrag(info);
2591
- sel.doEditDrag(info, opposite);
2741
+ sel.doEditDrag(//clickInfo,
2742
+ opposite);
25922743 } else
25932744 {
25942745 //super.
2595
- doEditDrag0(info, opposite);
2746
+ doEditDrag0(//clickInfo,
2747
+ opposite);
25962748 }
25972749 }
25982750 break;
....@@ -2610,6 +2762,9 @@
26102762 {
26112763 deselectAll();
26122764 }
2765
+
2766
+ new Exception().printStackTrace();
2767
+
26132768 ClickInfo newInfo = new ClickInfo();
26142769 newInfo.flags = info.flags;
26152770 newInfo.bounds = info.bounds;
....@@ -3057,7 +3212,7 @@
30573212 {
30583213 if (bRep != null)
30593214 {
3060
- bRep.GenerateNormalsMINE();
3215
+ bRep.MergeNormals(); //.GenerateNormalsMINE();
30613216 Touch();
30623217 }
30633218 }
....@@ -3503,7 +3658,8 @@
35033658 if (blockloop)
35043659 return;
35053660
3506
- if (marked || (bRep != null && material != null)) // borderline...
3661
+ if (//marked || // does not make sense
3662
+ (bRep != null || material != null)) // borderline...
35073663 live = h;
35083664
35093665 for (int i = 0; i < Size(); i++)
....@@ -3524,7 +3680,8 @@
35243680 return;
35253681
35263682 //if (bRep != null)
3527
- if (marked || (bRep != null && material != null)) // borderline...
3683
+ if (//marked || // does not make sense
3684
+ (bRep != null || material != null)) // borderline...
35283685 link2master = h;
35293686
35303687 for (int i = 0; i < Size(); i++)
....@@ -3544,7 +3701,8 @@
35443701 if (blockloop)
35453702 return;
35463703
3547
- if (marked || (bRep != null && material != null)) // borderline...
3704
+ if (//marked || // does not make sense
3705
+ (bRep != null || material != null)) // borderline...
35483706 hide = h;
35493707
35503708 for (int i = 0; i < Size(); i++)
....@@ -3564,7 +3722,7 @@
35643722 if (blockloop)
35653723 return;
35663724
3567
- if (bRep != null && material != null) // borderline...
3725
+ if (bRep != null || material != null) // borderline...
35683726 marked = h;
35693727
35703728 for (int i = 0; i < Size(); i++)
....@@ -3574,6 +3732,46 @@
35743732 continue;
35753733 blockloop = true;
35763734 child.MarkLeaves(h);
3735
+ blockloop = false;
3736
+ // release(i);
3737
+ }
3738
+ }
3739
+
3740
+ void RewindLeaves(boolean h)
3741
+ {
3742
+ if (blockloop)
3743
+ return;
3744
+
3745
+ if (bRep != null || material != null) // borderline...
3746
+ rewind = h;
3747
+
3748
+ for (int i = 0; i < Size(); i++)
3749
+ {
3750
+ Object3D child = (Object3D) get(i); // reserve(i);
3751
+ if (child == null)
3752
+ continue;
3753
+ blockloop = true;
3754
+ child.RewindLeaves(h);
3755
+ blockloop = false;
3756
+ // release(i);
3757
+ }
3758
+ }
3759
+
3760
+ void RandomLeaves(boolean h)
3761
+ {
3762
+ if (blockloop)
3763
+ return;
3764
+
3765
+ if (bRep != null || material != null) // borderline...
3766
+ random = h;
3767
+
3768
+ for (int i = 0; i < Size(); i++)
3769
+ {
3770
+ Object3D child = (Object3D) get(i); // reserve(i);
3771
+ if (child == null)
3772
+ continue;
3773
+ blockloop = true;
3774
+ child.RandomLeaves(h);
35773775 blockloop = false;
35783776 // release(i);
35793777 }
....@@ -4914,6 +5112,14 @@
49145112 }
49155113 }
49165114
5115
+ ObjEditor GetWindow()
5116
+ {
5117
+ if (editWindow != null)
5118
+ return editWindow;
5119
+
5120
+ return manipWindow;
5121
+ }
5122
+
49175123 cTreePath Select(int indexcount, boolean deselect)
49185124 {
49195125 if (hide || dontselect)
....@@ -4950,10 +5156,11 @@
49505156 if (leaf != null)
49515157 {
49525158 cTreePath tp = new cTreePath(this, leaf);
4953
- if (editWindow != null)
5159
+ ObjEditor window = GetWindow();
5160
+ if (window != null)
49545161 {
49555162 //System.out.println("editWindow = " + editWindow + " vs " + this);
4956
- editWindow.Select(tp, deselect, true);
5163
+ window.Select(tp, deselect, true);
49575164 }
49585165
49595166 return tp;
....@@ -4970,6 +5177,7 @@
49705177
49715178 if (child == null)
49725179 continue;
5180
+
49735181 if (child.HasTransparency() && child.size() != 0)
49745182 {
49755183 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4979,9 +5187,10 @@
49795187 if (leaf != null)
49805188 {
49815189 cTreePath tp = new cTreePath(this, leaf);
4982
- if (editWindow != null)
5190
+ ObjEditor window = GetWindow();
5191
+ if (window != null)
49835192 {
4984
- editWindow.Select(tp, deselect, true);
5193
+ window.Select(tp, deselect, true);
49855194 }
49865195
49875196 return tp;
....@@ -5306,6 +5515,51 @@
53065515 blockloop = false;
53075516 }
53085517
5518
+ void ResetSelectable()
5519
+ {
5520
+ if (blockloop)
5521
+ return;
5522
+
5523
+ blockloop = true;
5524
+
5525
+ keepdontselect = dontselect;
5526
+ dontselect = true;
5527
+
5528
+ Object3D child;
5529
+ int nb = Size();
5530
+ for (int i = 0; i < nb; i++)
5531
+ {
5532
+ child = (Object3D) get(i);
5533
+ if (child == null)
5534
+ continue;
5535
+ child.ResetSelectable();
5536
+ }
5537
+
5538
+ blockloop = false;
5539
+ }
5540
+
5541
+ void RestoreSelectable()
5542
+ {
5543
+ if (blockloop)
5544
+ return;
5545
+
5546
+ blockloop = true;
5547
+
5548
+ dontselect = keepdontselect;
5549
+
5550
+ Object3D child;
5551
+ int nb = Size();
5552
+ for (int i = 0; i < nb; i++)
5553
+ {
5554
+ child = (Object3D) get(i);
5555
+ if (child == null)
5556
+ continue;
5557
+ child.RestoreSelectable();
5558
+ }
5559
+
5560
+ blockloop = false;
5561
+ }
5562
+
53095563 boolean IsSelected()
53105564 {
53115565 if (parent == null)
....@@ -5366,6 +5620,11 @@
53665620 if (fullname == null)
53675621 return "";
53685622
5623
+ if (fullname.pigment != null)
5624
+ {
5625
+ return fullname.pigment;
5626
+ }
5627
+
53695628 // System.out.println("Fullname = " + fullname);
53705629
53715630 // Does not work on Windows due to C:
....@@ -5378,7 +5637,7 @@
53785637
53795638 if (split.length == 0)
53805639 {
5381
- return "";
5640
+ return fullname.pigment = "";
53825641 }
53835642
53845643 if (split.length <= 2)
....@@ -5386,22 +5645,27 @@
53865645 if (fullname.name.endsWith(":"))
53875646 {
53885647 // Windows
5389
- return fullname.name.substring(0, fullname.name.length()-1);
5648
+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
53905649 }
53915650
5392
- return split[0];
5651
+ return fullname.pigment = split[0];
53935652 }
53945653
53955654 // Windows
53965655 assert(split.length == 4);
53975656
5398
- return split[0] + ":" + split[1];
5657
+ return fullname.pigment = split[0] + ":" + split[1];
53995658 }
54005659
54015660 static String GetBump(cTexture fullname)
54025661 {
54035662 if (fullname == null)
54045663 return "";
5664
+
5665
+ if (fullname.bump != null)
5666
+ {
5667
+ return fullname.bump;
5668
+ }
54055669
54065670 // System.out.println("Fullname = " + fullname);
54075671 // Does not work on Windows due to C:
....@@ -5413,12 +5677,12 @@
54135677
54145678 if (split.length == 0)
54155679 {
5416
- return "";
5680
+ return fullname.bump = "";
54175681 }
54185682
54195683 if (split.length == 1)
54205684 {
5421
- return "";
5685
+ return fullname.bump = "";
54225686 }
54235687
54245688 if (split.length == 2)
....@@ -5426,16 +5690,16 @@
54265690 if (fullname.name.endsWith(":"))
54275691 {
54285692 // Windows
5429
- return "";
5693
+ return fullname.bump = "";
54305694 }
54315695
5432
- return split[1];
5696
+ return fullname.bump = split[1];
54335697 }
54345698
54355699 // Windows
54365700 assert(split.length == 4);
54375701
5438
- return split[2] + ":" + split[3];
5702
+ return fullname.bump = split[2] + ":" + split[3];
54395703 }
54405704
54415705 String GetPigmentTexture()
....@@ -5518,6 +5782,9 @@
55185782 texname = "";
55195783
55205784 GetTextures().name = texname + ":" + GetBump(GetTextures());
5785
+
5786
+ GetTextures().pigment = null;
5787
+
55215788 Touch();
55225789 }
55235790
....@@ -5591,6 +5858,8 @@
55915858
55925859 GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
55935860
5861
+ GetTextures().bump = null;
5862
+
55945863 Touch();
55955864 }
55965865
....@@ -5611,6 +5880,38 @@
56115880
56125881 blockloop = true;
56135882 child.ResetBumpTexture();
5883
+ blockloop = false;
5884
+ }
5885
+ }
5886
+
5887
+ void EmbedTextures(boolean embed)
5888
+ {
5889
+ if (blockloop)
5890
+ return;
5891
+
5892
+ //if (GetTextures() != null)
5893
+ if (embed)
5894
+ CameraPane.EmbedTextures(GetTextures());
5895
+ else
5896
+ {
5897
+ GetTextures().pigmentdata = null;
5898
+ GetTextures().bumpdata = null;
5899
+ GetTextures().pw = 0;
5900
+ GetTextures().ph = 0;
5901
+ GetTextures().bw = 0;
5902
+ GetTextures().bh = 0;
5903
+ }
5904
+
5905
+ int nb = Size();
5906
+ for (int i = 0; i < nb; i++)
5907
+ {
5908
+ Object3D child = (Object3D) get(i);
5909
+
5910
+ if (child == null)
5911
+ continue;
5912
+
5913
+ blockloop = true;
5914
+ child.EmbedTextures(embed);
56145915 blockloop = false;
56155916 }
56165917 }
....@@ -5701,8 +6002,10 @@
57016002 if (support != null)
57026003 support = support;
57036004
5704
- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5705
- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6005
+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6006
+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6007
+
6008
+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
57066009
57076010 if (!usecalllists && bRep != null && bRep.displaylist > 0)
57086011 {
....@@ -5712,8 +6015,9 @@
57126015 // usecalllists &= !(parent instanceof RandomNode);
57136016 // usecalllists = false;
57146017
5715
- if (GetBRep() != null)
5716
- usecalllists = usecalllists;
6018
+ if (display.DrawMode() == display.SHADOW)
6019
+ //GetBRep() != null)
6020
+ usecalllists = !!usecalllists;
57176021 //System.out.println("draw " + this);
57186022 //new Exception().printStackTrace();
57196023
....@@ -5723,7 +6027,7 @@
57236027
57246028 if (!selectmode && //display.DrawMode() != display.SELECTION &&
57256029 //(touched || (bRep != null && bRep.displaylist <= 0)))
5726
- (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
6030
+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
57276031 {
57286032 Globals.lighttouched = true;
57296033 } // all panes...
....@@ -5735,7 +6039,7 @@
57356039 if (!(this instanceof Composite))
57366040 touched = false;
57376041 //if (displaylist == -1 && usecalllists)
5738
- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
6042
+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
57396043 {
57406044 bRep.displaylist = display.GenList();
57416045 assert(bRep.displaylist != 0);
....@@ -5746,7 +6050,7 @@
57466050
57476051 //System.out.println("\tnew list " + list);
57486052 //gl.glDrawBuffer(gl.GL_NONE);
5749
- if (usecalllists)
6053
+ if (usecalllists && bRep.displaylist > 0)
57506054 {
57516055 // System.err.println("new list " + bRep.displaylist + " for " + this);
57526056 display.NewList(bRep.displaylist);
....@@ -5755,7 +6059,7 @@
57556059 CallList(display, root, selected, blocked);
57566060
57576061 // compiled = true;
5758
- if (usecalllists)
6062
+ if (usecalllists && bRep.displaylist > 0)
57596063 {
57606064 // System.err.println("end list " + bRep.displaylist + " for " + this);
57616065 display.EndList();
....@@ -5855,6 +6159,7 @@
58556159 if (GetBRep() != null)
58566160 {
58576161 display.NextIndex();
6162
+
58586163 // vertex color conflict : gl.glCallList(list);
58596164 DrawNode(display, root, selected);
58606165 if (this instanceof BezierPatch)
....@@ -6315,6 +6620,11 @@
63156620 // dec 2012
63166621 new Exception().printStackTrace();
63176622 return;
6623
+ }
6624
+
6625
+ if (dontselect)
6626
+ {
6627
+ //bRep.GenerateNormalsMINE();
63186628 }
63196629
63206630 display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7100,20 +7410,23 @@
71007410 }
71017411 }
71027412
7103
- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7413
+ static ClickInfo clickInfo = new ClickInfo();
7414
+
7415
+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7416
+ Point outPt, Rectangle outRec)
71047417 {
7105
- int hc = info.bounds.x + info.bounds.width / 2;
7106
- int vc = info.bounds.y + info.bounds.height / 2;
7107
- double[][] toscreen = info.toScreen;
7418
+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7419
+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7420
+ double[][] toscreen = clickInfo.toScreen;
71087421 if (toscreen == null)
71097422 {
7110
- toscreen = new Camera(info.camera.viewCode).toScreen;
7423
+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
71117424 }
71127425 cVector vec = in;
71137426 LA.xformPos(in, toscreen, in);
71147427 //System.out.println("Distance = " + info.camera.Distance());
7115
- vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
7116
- vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
7428
+ vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7429
+ vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
71177430 outPt.x = hc + (int) vec.x;
71187431 outPt.y = vc - (int) vec.y;
71197432 outRec.x = outPt.x - 3;
....@@ -7121,15 +7434,18 @@
71217434 outRec.width = outRec.height = 6;
71227435 }
71237436
7124
- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7437
+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7438
+ )
71257439 {
71267440 Point pt = new Point(0, 0);
71277441 Rectangle rec = new Rectangle();
7128
- calcHotSpot(in, info, pt, rec);
7442
+ calcHotSpot(in, //clickInfo,
7443
+ pt, rec);
71297444 return rec;
71307445 }
71317446
7132
- void drawEditHandles0(ClickInfo info, int level)
7447
+ void drawEditHandles0(//ClickInfo clickInfo,
7448
+ int level)
71337449 {
71347450 if (level == 0)
71357451 {
....@@ -7138,16 +7454,19 @@
71387454 {
71397455 cVector origin = new cVector();
71407456 //LA.xformPos(origin, toParent, origin);
7141
- Rectangle spot = calcHotSpot(origin, info);
7457
+ if (this.clickInfo == null)
7458
+ this.clickInfo = new ClickInfo();
7459
+
7460
+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
71427461 Rectangle boundary = new Rectangle();
71437462 boundary.x = spot.x - 30;
71447463 boundary.y = spot.y - 30;
71457464 boundary.width = spot.width + 60;
71467465 boundary.height = spot.height + 60;
7147
- info.g.setColor(Color.red);
7466
+ clickInfo.g.setColor(Color.white);
71487467 int spotw = spot.x + spot.width;
71497468 int spoth = spot.y + spot.height;
7150
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7469
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
71517470 // if (CameraPane.Xmin > spot.x)
71527471 // {
71537472 // CameraPane.Xmin = spot.x;
....@@ -7164,11 +7483,6 @@
71647483 // {
71657484 // CameraPane.Ymax = spoth;
71667485 // }
7167
- spot.translate(32, 32);
7168
- spotw = spot.x + spot.width;
7169
- spoth = spot.y + spot.height;
7170
- info.g.setColor(Color.cyan);
7171
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
71727486 // if (CameraPane.Xmin > spot.x)
71737487 // {
71747488 // CameraPane.Xmin = spot.x;
....@@ -7187,10 +7501,15 @@
71877501 // }
71887502 // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
71897503 //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7190
- spot.translate(0, -32);
7191
- info.g.setColor(Color.yellow);
7192
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7193
- info.g.setColor(Color.green);
7504
+ spot.translate(32, 0);
7505
+ clickInfo.g.setColor(Color.yellow);
7506
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7507
+
7508
+ spot.translate(32, 64);
7509
+ spotw = spot.x + spot.width;
7510
+ spoth = spot.y + spot.height;
7511
+ clickInfo.g.setColor(Color.cyan);
7512
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
71947513 // if (CameraPane.Xmin > spot.x)
71957514 // {
71967515 // CameraPane.Xmin = spot.x;
....@@ -7207,8 +7526,9 @@
72077526 // {
72087527 // CameraPane.Ymax = spoth;
72097528 // }
7210
- info.g.drawArc(boundary.x, boundary.y,
7211
- boundary.width, boundary.height, 0, 360);
7529
+ clickInfo.g.setColor(Color.green);
7530
+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7531
+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
72127532 //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
72137533 // if (CameraPane.Xmin > boundary.x)
72147534 // {
....@@ -7230,7 +7550,8 @@
72307550 }
72317551 }
72327552
7233
- boolean doEditClick0(ClickInfo info, int level)
7553
+ boolean doEditClick0(//ClickInfo clickInfo,
7554
+ int level)
72347555 {
72357556 if (level == 0)
72367557 {
....@@ -7239,8 +7560,8 @@
72397560
72407561 boolean retval = false;
72417562
7242
- startX = info.x;
7243
- startY = info.y;
7563
+ startX = clickInfo.x;
7564
+ startY = clickInfo.y;
72447565
72457566 hitSomething = -1;
72467567 cVector origin = new cVector();
....@@ -7250,22 +7571,53 @@
72507571 {
72517572 centerPt = new Point(0, 0);
72527573 }
7253
- calcHotSpot(origin, info, centerPt, spot);
7254
- if (spot.contains(info.x, info.y))
7574
+ calcHotSpot(origin, //info,
7575
+ centerPt, spot);
7576
+ if (spot.contains(clickInfo.x, clickInfo.y))
72557577 {
72567578 hitSomething = hitCenter;
72577579 retval = true;
72587580 }
72597581 spot.translate(32, 0);
7260
- if (spot.contains(info.x, info.y))
7582
+ if (spot.contains(clickInfo.x, clickInfo.y))
72617583 {
72627584 hitSomething = hitRotate;
72637585 retval = true;
72647586 }
72657587 spot.translate(0, 32);
7266
- if (spot.contains(info.x, info.y))
7588
+ spot.translate(32, 0);
7589
+ spot.translate(0, 32);
7590
+ if (spot.contains(clickInfo.x, clickInfo.y))
72677591 {
72687592 hitSomething = hitScale;
7593
+
7594
+ double scale = 0.005f * clickInfo.camera.Distance();
7595
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7596
+ double sign = 1;
7597
+ if (hScale < 0)
7598
+ {
7599
+ sign = -1;
7600
+ }
7601
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
7602
+ if (hScale < 0.01)
7603
+ {
7604
+ //hScale = 0.01;
7605
+ }
7606
+
7607
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7608
+ sign = 1;
7609
+ if (vScale < 0)
7610
+ {
7611
+ sign = -1;
7612
+ }
7613
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
7614
+ if (vScale < 0.01)
7615
+ {
7616
+ //vScale = 0.01;
7617
+ }
7618
+
7619
+ clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7620
+
72697621 retval = true;
72707622 }
72717623
....@@ -7275,7 +7627,7 @@
72757627 }
72767628
72777629 //System.out.println("info.modifiers = " + info.modifiers);
7278
- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7630
+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
72797631 //System.out.println("modified = " + modified);
72807632 //new Exception().printStackTrace();
72817633 //viewCode = info.pane.renderCamera.viewCode;
....@@ -7303,7 +7655,8 @@
73037655 return true;
73047656 }
73057657
7306
- void doEditDrag0(ClickInfo info, boolean opposite)
7658
+ void doEditDrag0(//ClickInfo info,
7659
+ boolean opposite)
73077660 {
73087661 if (hitSomething == 0)
73097662 {
....@@ -7317,7 +7670,7 @@
73177670
73187671 //System.out.println("hitSomething = " + hitSomething);
73197672
7320
- double scale = 0.005f * info.camera.Distance();
7673
+ double scale = 0.005f * clickInfo.camera.Distance();
73217674
73227675 cVector xlate = new cVector();
73237676 //cVector xlate2 = new cVector();
....@@ -7351,8 +7704,8 @@
73517704 toParent[3][i] = xlate.get(i);
73527705 LA.matInvert(toParent, fromParent);
73537706 */
7354
- cVector delta = LA.newVector(0, 0, startY - info.y);
7355
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7707
+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
7708
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
73567709
73577710 LA.matCopy(startMat, toParent);
73587711 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7361,7 +7714,7 @@
73617714 } else
73627715 {
73637716 //LA.xformDir(delta, info.camera.fromScreen, delta);
7364
- cVector up = new cVector(info.camera.up);
7717
+ cVector up = new cVector(clickInfo.camera.up);
73657718 cVector away = new cVector();
73667719 //cVector right2 = new cVector();
73677720 //LA.vecCross(up, cVector.Z, right);
....@@ -7378,19 +7731,19 @@
73787731 LA.xformDir(up, ClickInfo.matbuffer, up);
73797732 // if (!CameraPane.LOCALTRANSFORM)
73807733 LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7381
- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7734
+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
73827735 // if (!CameraPane.LOCALTRANSFORM)
73837736 LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
73847737 //LA.vecCross(up, cVector.Z, right2);
73857738
7386
- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7739
+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
73877740
73887741 //System.out.println("DELTA0 = " + delta);
73897742 //System.out.println("AWAY = " + info.camera.away);
73907743 //System.out.println("UP = " + info.camera.up);
73917744 if (away.z > 0)
73927745 {
7393
- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7746
+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
73947747 {
73957748 delta.x = -delta.x;
73967749 } else
....@@ -7405,7 +7758,7 @@
74057758 //System.out.println("DELTA1 = " + delta);
74067759 LA.xformDir(delta, ClickInfo.matbuffer, delta);
74077760 //System.out.println("DELTA2 = " + delta);
7408
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7761
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
74097762 LA.matCopy(startMat, toParent);
74107763 //System.out.println("DELTA3 = " + delta);
74117764 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7415,8 +7768,8 @@
74157768 break;
74167769
74177770 case hitRotate: // rotate
7418
- int dx = info.x - centerPt.x;
7419
- int dy = -(info.y - centerPt.y);
7771
+ int dx = clickInfo.x - centerPt.x;
7772
+ int dy = -(clickInfo.y - centerPt.y);
74207773 double angle = (double) Math.atan2(dx, dy);
74217774 angle = -(1.570796 - angle);
74227775
....@@ -7439,7 +7792,7 @@
74397792 }
74407793 /**/
74417794
7442
- switch (info.pane.RenderCamera().viewCode)
7795
+ switch (clickInfo.pane.RenderCamera().viewCode)
74437796 {
74447797 case 1: // '\001'
74457798 LA.matZRotate(toParent, angle);
....@@ -7466,7 +7819,7 @@
74667819 break;
74677820
74687821 case hitScale: // scale
7469
- double hScale = (double) (info.x - centerPt.x) / 32;
7822
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
74707823 double sign = 1;
74717824 if (hScale < 0)
74727825 {
....@@ -7478,7 +7831,7 @@
74787831 //hScale = 0.01;
74797832 }
74807833
7481
- double vScale = (double) (info.y - centerPt.y) / 32;
7834
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
74827835 sign = 1;
74837836 if (vScale < 0)
74847837 {
....@@ -7489,6 +7842,7 @@
74897842 {
74907843 //vScale = 0.01;
74917844 }
7845
+
74927846 LA.matCopy(startMat, toParent);
74937847 /**/
74947848 for (int i = 0; i < 3; i++)
....@@ -7498,33 +7852,39 @@
74987852 }
74997853 /**/
75007854
7501
- double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7855
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
75027856
75037857 if (totalScale < 0.01)
75047858 {
75057859 totalScale = 0.01;
75067860 }
75077861
7508
- switch (info.pane.RenderCamera().viewCode)
7862
+ switch (clickInfo.pane.RenderCamera().viewCode)
75097863 {
75107864 case 3: // '\001'
75117865 if (modified || opposite)
75127866 {
7867
+ if (modified && opposite)
7868
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7869
+ else
75137870 //LA.matScale(toParent, 1, hScale, vScale);
7514
- LA.matScale(toParent, totalScale, 1, 1);
7871
+ LA.matScale(toParent, totalScale, 1, 1);
75157872 } // vScale, 1);
75167873 else
75177874 {
75187875 // EXCEPTION!
7519
- LA.matScale(toParent, totalScale, totalScale, totalScale);
7876
+ LA.matScale(toParent, 1, totalScale, totalScale);
75207877 } // vScale, 1);
75217878 break;
75227879
75237880 case 2: // '\002'
75247881 if (modified || opposite)
75257882 {
7526
- //LA.matScale(toParent, hScale, 1, vScale);
7527
- LA.matScale(toParent, 1, totalScale, 1);
7883
+ if (modified && opposite)
7884
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7885
+ else
7886
+ //LA.matScale(toParent, hScale, 1, vScale);
7887
+ LA.matScale(toParent, 1, totalScale, 1);
75287888 } else
75297889 {
75307890 LA.matScale(toParent, totalScale, 1, totalScale);
....@@ -7534,8 +7894,11 @@
75347894 case 1: // '\003'
75357895 if (modified || opposite)
75367896 {
7537
- //LA.matScale(toParent, hScale, vScale, 1);
7538
- LA.matScale(toParent, 1, 1, totalScale);
7897
+ if (modified && opposite)
7898
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7899
+ else
7900
+ //LA.matScale(toParent, hScale, vScale, 1);
7901
+ LA.matScale(toParent, 1, 1, totalScale);
75397902 } else
75407903 {
75417904 LA.matScale(toParent, totalScale, totalScale, 1);
....@@ -7572,7 +7935,7 @@
75727935 } // NEW ...
75737936
75747937
7575
- info.pane.repaint();
7938
+ clickInfo.pane.repaint();
75767939 }
75777940
75787941 boolean overflow = false;
....@@ -7752,6 +8115,10 @@
77528115 editWindow = null;
77538116 } // ?
77548117 }
8118
+ else
8119
+ {
8120
+ //editWindow.closeUI();
8121
+ }
77558122 }
77568123
77578124 boolean root; // patch for edit windows
....@@ -7909,6 +8276,10 @@
79098276 }
79108277
79118278 transient ObjEditor editWindow;
8279
+ transient ObjEditor manipWindow;
8280
+
8281
+ transient boolean pinned;
8282
+
79128283 transient ObjectUI objectUI;
79138284 public static int povDepth = 0;
79148285 private static cVector tbMin = new cVector();