Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a
Object3D.java
....@@ -22,15 +22,37 @@
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
43
+ int VersionCount()
44
+ {
45
+ int count = 0;
46
+
47
+ for (int i = versionlist.length; --i >= 0;)
48
+ {
49
+ if (versionlist[i] != null)
50
+ count++;
51
+ }
52
+
53
+ return count;
54
+ }
55
+
3456 void InitOthers()
3557 {
3658 if (projectedVertices == null || projectedVertices.length <= 2)
....@@ -170,24 +192,35 @@
170192
171193 void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172194 {
195
+ Object3D o;
196
+
173197 if (hashtable.containsKey(GetUUID()))
174198 {
175
- Object3D o = hashtable.get(GetUUID());
199
+ o = hashtable.get(GetUUID());
176200
177
- assert(this.bRep == o.bRep);
178
- if (this.bRep != null)
179
- assert(this.bRep.support == o.transientrep);
201
+ Grafreed.Assert(this.bRep == o.bRep);
202
+ //if (this.bRep != null)
203
+ // assert(this.bRep.support == o.transientrep);
204
+ if (this.support != null)
205
+ assert(this.support.bRep == o.transientrep);
206
+ }
207
+ else
208
+ {
209
+ o = new Object3D("copy of " + this.name);
180210
181
- return;
211
+ hashtable.put(GetUUID(), o);
182212 }
183213
184
- Object3D o = new Object3D();
185
-
186
- hashtable.put(GetUUID(), o);
187
-
188
- for (int i=0; i<Size(); i++)
214
+ if (!blockloop)
189215 {
190
- get(i).ExtractBigData(hashtable);
216
+ blockloop = true;
217
+
218
+ for (int i=0; i<Size(); i++)
219
+ {
220
+ get(i).ExtractBigData(hashtable);
221
+ }
222
+
223
+ blockloop = false;
191224 }
192225
193226 ExtractBigData(o);
....@@ -195,11 +228,26 @@
195228
196229 void ExtractBigData(Object3D o)
197230 {
231
+ if (o.bRep != null)
232
+ Grafreed.Assert(o.bRep == this.bRep);
233
+
198234 o.bRep = this.bRep;
199
- if (this.bRep != null)
235
+// July 2019 if (this.bRep != null)
236
+// {
237
+// o.transientrep = this.bRep.support;
238
+// o.bRep.support = null;
239
+// }
240
+ o.selection = this.selection;
241
+ o.versionlist = this.versionlist;
242
+ o.versionindex = this.versionindex;
243
+
244
+ if (this.support != null)
200245 {
201
- o.transientrep = this.bRep.support;
202
- o.bRep.support = null;
246
+ if (o.transientrep != null)
247
+ Grafreed.Assert(o.transientrep == this.support.bRep);
248
+
249
+ o.transientrep = this.support.bRep;
250
+ this.support.bRep = null;
203251 }
204252
205253 // o.support = this.support;
....@@ -214,6 +262,73 @@
214262 // this.fileparent = null;
215263 }
216264
265
+// Object3D GetObject(java.util.UUID uuid)
266
+// {
267
+// if (this.uuid.equals(uuid))
268
+// return this;
269
+//
270
+// if (blockloop)
271
+// return null;
272
+//
273
+// blockloop = true;
274
+//
275
+// for (int i=0; i<Size(); i++)
276
+// {
277
+// Object3D o = get(i).GetObject(uuid);
278
+//
279
+// if (o != null)
280
+// return o;
281
+// }
282
+//
283
+// blockloop = false;
284
+//
285
+// return null;
286
+// }
287
+
288
+ transient boolean tag;
289
+
290
+ void TagObjects(Object3D o, boolean tag)
291
+ {
292
+ if (blockloop)
293
+ return;
294
+
295
+ o.tag = tag;
296
+
297
+ if (o == this)
298
+ return;
299
+
300
+ blockloop = true;
301
+
302
+ for (int i=0; i<Size(); i++)
303
+ {
304
+ get(i).TagObjects(o, tag);
305
+ }
306
+
307
+ blockloop = false;
308
+ }
309
+
310
+ boolean HasTags()
311
+ {
312
+ if (blockloop)
313
+ return false;
314
+
315
+ blockloop = true;
316
+
317
+ boolean hasTags = false;
318
+
319
+ for (int i=0; i<Size(); i++)
320
+ {
321
+ hasTags |= get(i).tag || get(i).HasTags();
322
+
323
+ if (hasTags)
324
+ break;
325
+ }
326
+
327
+ blockloop = false;
328
+
329
+ return hasTags;
330
+ }
331
+
217332 void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218333 {
219334 if (!hashtable.containsKey(GetUUID()))
....@@ -223,19 +338,35 @@
223338
224339 RestoreBigData(o);
225340
226
- hashtable.remove(GetUUID());
341
+ if (blockloop)
342
+ return;
343
+
344
+ blockloop = true;
345
+
346
+ //hashtable.remove(GetUUID());
227347
228348 for (int i=0; i<Size(); i++)
229349 {
230350 get(i).RestoreBigData(hashtable);
231351 }
352
+
353
+ blockloop = false;
232354 }
233355
234356 void RestoreBigData(Object3D o)
235357 {
236358 this.bRep = o.bRep;
237
- if (this.bRep != null)
238
- this.bRep.support = o.transientrep;
359
+ if (this.support != null && o.transientrep != null)
360
+ {
361
+ this.support.bRep = o.transientrep;
362
+ }
363
+
364
+ this.selection = o.selection;
365
+
366
+ this.versionlist = o.versionlist;
367
+ this.versionindex = o.versionindex;
368
+// July 2019 if (this.bRep != null)
369
+// this.bRep.support = o.transientrep;
239370 // this.support = o.support;
240371 // this.fileparent = o.fileparent;
241372 }
....@@ -381,6 +512,7 @@
381512 }
382513
383514 boolean live = false;
515
+ transient boolean keepdontselect;
384516 boolean dontselect = false;
385517 boolean hide = false;
386518 boolean link2master = false; // performs reset support/master at each frame
....@@ -449,11 +581,11 @@
449581 }
450582 }
451583
452
- int memorysize;
584
+ transient int memorysize; // needs to be transient, dunno why
453585
454586 int MemorySize()
455587 {
456
- if (true) // memorysize == 0)
588
+ if (memorysize == 0)
457589 {
458590 try
459591 {
....@@ -563,12 +695,14 @@
563695 toParent = LA.newMatrix();
564696 fromParent = LA.newMatrix();
565697 }
698
+
566699 if (toParentMarked == null)
567700 {
568701 if (maxcount != 1)
569702 {
570
- new Exception().printStackTrace();
703
+ //new Exception().printStackTrace();
571704 }
705
+
572706 toParentMarked = LA.newMatrix();
573707 fromParentMarked = LA.newMatrix();
574708 }
....@@ -879,7 +1013,7 @@
8791013
8801014 if (marked && Globals.isLIVE() && live &&
8811015 //TEMP21aug2018
882
- (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
1016
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
8831017 currentframe != Globals.framecount)
8841018 {
8851019 currentframe = Globals.framecount;
....@@ -891,7 +1025,8 @@
8911025
8921026 boolean changedir = random && Math.random() < 0.01; // && !link2master;
8931027
894
- if (transformcount*factor > maxcount || (step == 1 && changedir))
1028
+ if (transformcount*factor >= maxcount && (rewind || random) ||
1029
+ (step == 1 && changedir))
8951030 {
8961031 countdown = 1;
8971032 delay = speedup?8:1;
....@@ -963,6 +1098,10 @@
9631098 if (material == null || material.multiply)
9641099 return true;
9651100
1101
+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1102
+ return false;
1103
+
1104
+ // Transparent objects are dynamic because we have to sort the triangles.
9661105 return material.opacity > 0.99;
9671106 }
9681107
....@@ -1363,6 +1502,7 @@
13631502 toParent = LA.newMatrix();
13641503 fromParent = LA.newMatrix();
13651504 }
1505
+
13661506 LA.matCopy(other.toParent, toParent);
13671507 LA.matCopy(other.fromParent, fromParent);
13681508
....@@ -2242,11 +2382,6 @@
22422382
22432383 InitOthers();
22442384
2245
- if (this instanceof Camera)
2246
- {
2247
- material.shift = 90;
2248
- }
2249
-
22502385 material.multiply = multiply;
22512386
22522387 if (multiply)
....@@ -2384,6 +2519,15 @@
23842519 }
23852520 */
23862521 }
2522
+ else
2523
+ {
2524
+ //((ObjEditor)editWindow).SetupUI2(null);
2525
+ if (objectUI != null)
2526
+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
2527
+ else
2528
+ //new Exception().printStackTrace();
2529
+ System.err.println("objectUI is null");
2530
+ }
23872531 }
23882532
23892533 void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2425,6 +2569,14 @@
24252569 {
24262570 editWindow.refreshContents();
24272571 }
2572
+ else
2573
+ {
2574
+ if (manipWindow != null)
2575
+ {
2576
+ manipWindow.refreshContents();
2577
+ }
2578
+ }
2579
+
24282580 //if (parent != null)
24292581 //parent.refreshEditWindow();
24302582 }
....@@ -2504,7 +2656,8 @@
25042656 private static final int editSelf = 1;
25052657 private static final int editChild = 2;
25062658
2507
- void drawEditHandles(ClickInfo info, int level)
2659
+ void drawEditHandles(//ClickInfo info,
2660
+ int level)
25082661 {
25092662 if (level == 0)
25102663 {
....@@ -2512,7 +2665,8 @@
25122665 return;
25132666
25142667 Object3D selectee;
2515
- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
2668
+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
2669
+ level + 1))
25162670 {
25172671 selectee = (Object3D) e.nextElement();
25182672 }
....@@ -2520,19 +2674,22 @@
25202674 } else
25212675 {
25222676 //super.
2523
- drawEditHandles0(info, level + 1);
2677
+ drawEditHandles0(//info,
2678
+ level + 1);
25242679 }
25252680 }
25262681
2527
- boolean doEditClick(ClickInfo info, int level)
2682
+ boolean doEditClick(//ClickInfo info,
2683
+ int level)
25282684 {
25292685 doSomething = 0;
25302686 if (level == 0)
25312687 {
2532
- return doParentClick(info);
2688
+ return doParentClick(); //info);
25332689 }
25342690 if (//super.
2535
- doEditClick0(info, level))
2691
+ doEditClick0(//info,
2692
+ level))
25362693 {
25372694 doSomething = 1;
25382695 return true;
....@@ -2542,7 +2699,7 @@
25422699 }
25432700 }
25442701
2545
- boolean doParentClick(ClickInfo info)
2702
+ boolean doParentClick() //ClickInfo info)
25462703 {
25472704 if (selection == null)
25482705 {
....@@ -2555,7 +2712,8 @@
25552712 for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
25562713 {
25572714 Object3D selectee = (Object3D) e.nextElement();
2558
- if (selectee.doEditClick(info, 1))
2715
+ if (selectee.doEditClick(//info,
2716
+ 1))
25592717 {
25602718 childToDrag = selectee;
25612719 doSomething = 2;
....@@ -2567,13 +2725,15 @@
25672725 return retval;
25682726 }
25692727
2570
- void doEditDrag(ClickInfo info, boolean opposite)
2728
+ void doEditDrag(//ClickInfo clickInfo,
2729
+ boolean opposite)
25712730 {
25722731 switch (doSomething)
25732732 {
25742733 case 1: // '\001'
25752734 //super.
2576
- doEditDrag0(info, opposite);
2735
+ doEditDrag0(//clickInfo,
2736
+ opposite);
25772737 break;
25782738
25792739 case 2: // '\002'
....@@ -2586,11 +2746,13 @@
25862746 {
25872747 //sel.hitSomething = childToDrag.hitSomething;
25882748 //childToDrag.doEditDrag(info);
2589
- sel.doEditDrag(info, opposite);
2749
+ sel.doEditDrag(//clickInfo,
2750
+ opposite);
25902751 } else
25912752 {
25922753 //super.
2593
- doEditDrag0(info, opposite);
2754
+ doEditDrag0(//clickInfo,
2755
+ opposite);
25942756 }
25952757 }
25962758 break;
....@@ -2608,6 +2770,9 @@
26082770 {
26092771 deselectAll();
26102772 }
2773
+
2774
+ new Exception().printStackTrace();
2775
+
26112776 ClickInfo newInfo = new ClickInfo();
26122777 newInfo.flags = info.flags;
26132778 newInfo.bounds = info.bounds;
....@@ -3055,7 +3220,7 @@
30553220 {
30563221 if (bRep != null)
30573222 {
3058
- bRep.GenerateNormalsMINE();
3223
+ bRep.MergeNormals(); //.GenerateNormalsMINE();
30593224 Touch();
30603225 }
30613226 }
....@@ -3112,6 +3277,93 @@
31123277 blockloop = false;
31133278 }
31143279
3280
+ public void ResetTransform(int mask)
3281
+ {
3282
+ Object3D obj = this;
3283
+
3284
+ if (mask == -1)
3285
+ {
3286
+ if (obj instanceof Camera) // jan 2014
3287
+ {
3288
+ LA.matIdentity(obj.toParent);
3289
+ LA.matIdentity(obj.fromParent);
3290
+ }
3291
+ else
3292
+ {
3293
+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3294
+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3295
+ }
3296
+ return;
3297
+ }
3298
+
3299
+ if ((mask&2) != 0) // Scale/rotation
3300
+ {
3301
+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3302
+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3303
+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3304
+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3305
+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3306
+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3307
+ }
3308
+ if ((mask&1) != 0) // Translation
3309
+ {
3310
+ if (obj.toParent != null)
3311
+ {
3312
+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3313
+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3314
+ }
3315
+ }
3316
+ }
3317
+
3318
+ public void TextureRatioTransform(int axis)
3319
+ {
3320
+ cTexture tex = GetTextures();
3321
+
3322
+ com.sun.opengl.util.texture.TextureData texturedata = null;
3323
+
3324
+ try
3325
+ {
3326
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
3327
+ }
3328
+ catch (Exception e)
3329
+ {
3330
+ System.err.println("FAIL TextureRatio: " + this);
3331
+ }
3332
+
3333
+ LA.matIdentity(Object3D.mat);
3334
+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
3335
+
3336
+ if (toParent == null)
3337
+ {
3338
+ toParent = LA.newMatrix();
3339
+ fromParent = LA.newMatrix();
3340
+ }
3341
+
3342
+ ResetTransform(2);
3343
+
3344
+ LA.matConcat(Object3D.mat, fromParent, fromParent);
3345
+ LA.matInvert(fromParent, toParent);
3346
+ }
3347
+
3348
+ void TextureRatio(int axis)
3349
+ {
3350
+ if (blockloop)
3351
+ return;
3352
+
3353
+ blockloop = true;
3354
+
3355
+ TextureRatioTransform(axis);
3356
+
3357
+ for (int i=Size(); --i>=0;)
3358
+ {
3359
+ Object3D v = get(i);
3360
+
3361
+ v.TextureRatio(axis);
3362
+ }
3363
+
3364
+ blockloop = false;
3365
+ }
3366
+
31153367 void TransformChildren()
31163368 {
31173369 if (toParent != null)
....@@ -3465,15 +3717,47 @@
34653717
34663718 void ClearMaterials()
34673719 {
3720
+ if (blockloop)
3721
+ return;
3722
+
3723
+ blockloop = true;
3724
+
34683725 ClearMaterial();
3469
- for (int i = 0; i < size(); i++)
3726
+ for (int i = 0; i < Size(); i++)
34703727 {
3471
- Object3D child = (Object3D) reserve(i);
3728
+ Object3D child = (Object3D) get(i);
34723729 if (child == null)
34733730 continue;
34743731 child.ClearMaterials();
3475
- release(i);
34763732 }
3733
+
3734
+ blockloop = false;
3735
+ }
3736
+
3737
+ void ClearVersionList()
3738
+ {
3739
+ this.versionlist = null;
3740
+ this.versionindex = -1;
3741
+ this.versiontable = null;
3742
+ }
3743
+
3744
+ void ClearVersions()
3745
+ {
3746
+ if (blockloop)
3747
+ return;
3748
+
3749
+ blockloop = true;
3750
+
3751
+ ClearVersionList();
3752
+ for (int i = 0; i < Size(); i++)
3753
+ {
3754
+ Object3D child = (Object3D) get(i);
3755
+ if (child == null)
3756
+ continue;
3757
+ child.ClearVersions();
3758
+ }
3759
+
3760
+ blockloop = false;
34773761 }
34783762
34793763 void FlipV(boolean flip)
....@@ -3501,7 +3785,8 @@
35013785 if (blockloop)
35023786 return;
35033787
3504
- if (marked || (bRep != null && material != null)) // borderline...
3788
+ if (//marked || // does not make sense
3789
+ (bRep != null || material != null)) // borderline...
35053790 live = h;
35063791
35073792 for (int i = 0; i < Size(); i++)
....@@ -3522,7 +3807,8 @@
35223807 return;
35233808
35243809 //if (bRep != null)
3525
- if (marked || (bRep != null && material != null)) // borderline...
3810
+ if (//marked || // does not make sense
3811
+ (bRep != null || material != null)) // borderline...
35263812 link2master = h;
35273813
35283814 for (int i = 0; i < Size(); i++)
....@@ -3542,7 +3828,8 @@
35423828 if (blockloop)
35433829 return;
35443830
3545
- if (marked || (bRep != null && material != null)) // borderline...
3831
+ if (//marked || // does not make sense
3832
+ (bRep != null || material != null)) // borderline...
35463833 hide = h;
35473834
35483835 for (int i = 0; i < Size(); i++)
....@@ -3562,7 +3849,7 @@
35623849 if (blockloop)
35633850 return;
35643851
3565
- if (bRep != null && material != null) // borderline...
3852
+ if (bRep != null || material != null) // borderline...
35663853 marked = h;
35673854
35683855 for (int i = 0; i < Size(); i++)
....@@ -3572,6 +3859,46 @@
35723859 continue;
35733860 blockloop = true;
35743861 child.MarkLeaves(h);
3862
+ blockloop = false;
3863
+ // release(i);
3864
+ }
3865
+ }
3866
+
3867
+ void RewindLeaves(boolean h)
3868
+ {
3869
+ if (blockloop)
3870
+ return;
3871
+
3872
+ if (bRep != null || material != null) // borderline...
3873
+ rewind = h;
3874
+
3875
+ for (int i = 0; i < Size(); i++)
3876
+ {
3877
+ Object3D child = (Object3D) get(i); // reserve(i);
3878
+ if (child == null)
3879
+ continue;
3880
+ blockloop = true;
3881
+ child.RewindLeaves(h);
3882
+ blockloop = false;
3883
+ // release(i);
3884
+ }
3885
+ }
3886
+
3887
+ void RandomLeaves(boolean h)
3888
+ {
3889
+ if (blockloop)
3890
+ return;
3891
+
3892
+ if (bRep != null || material != null) // borderline...
3893
+ random = h;
3894
+
3895
+ for (int i = 0; i < Size(); i++)
3896
+ {
3897
+ Object3D child = (Object3D) get(i); // reserve(i);
3898
+ if (child == null)
3899
+ continue;
3900
+ blockloop = true;
3901
+ child.RandomLeaves(h);
35753902 blockloop = false;
35763903 // release(i);
35773904 }
....@@ -4349,6 +4676,55 @@
43494676 }
43504677 }
43514678
4679
+ void RepairSOV()
4680
+ {
4681
+ if (blockloop)
4682
+ return;
4683
+
4684
+ String texname = this.GetPigmentTexture();
4685
+
4686
+ if (texname.startsWith("sov"))
4687
+ {
4688
+ String[] s = texname.split("/");
4689
+
4690
+ String[] sname = s[1].split("Color.pn");
4691
+
4692
+ texname = sname[0];
4693
+
4694
+ if (sname.length > 1)
4695
+ {
4696
+ texname += "Color.jpg";
4697
+ }
4698
+
4699
+ this.SetPigmentTexture("sov/" + texname);
4700
+ }
4701
+
4702
+ texname = this.GetBumpTexture();
4703
+
4704
+ if (texname.startsWith("sov"))
4705
+ {
4706
+ String[] s = texname.split("/");
4707
+
4708
+ String[] sname = s[1].split("Bump.pn");
4709
+
4710
+ texname = sname[0];
4711
+
4712
+ if (sname.length > 1)
4713
+ {
4714
+ texname += "Bump.jpg";
4715
+ }
4716
+
4717
+ this.SetBumpTexture("sov/" + texname);
4718
+ }
4719
+
4720
+ for (int i=0; i<Size(); i++)
4721
+ {
4722
+ blockloop = true;
4723
+ get(i).RepairSOV();
4724
+ blockloop = false;
4725
+ }
4726
+ }
4727
+
43524728 void RepairTexture()
43534729 {
43544730 if (this instanceof FileObject || blockloop)
....@@ -4863,6 +5239,14 @@
48635239 }
48645240 }
48655241
5242
+ ObjEditor GetWindow()
5243
+ {
5244
+ if (editWindow != null)
5245
+ return editWindow;
5246
+
5247
+ return manipWindow;
5248
+ }
5249
+
48665250 cTreePath Select(int indexcount, boolean deselect)
48675251 {
48685252 if (hide || dontselect)
....@@ -4899,10 +5283,11 @@
48995283 if (leaf != null)
49005284 {
49015285 cTreePath tp = new cTreePath(this, leaf);
4902
- if (editWindow != null)
5286
+ ObjEditor window = GetWindow();
5287
+ if (window != null)
49035288 {
49045289 //System.out.println("editWindow = " + editWindow + " vs " + this);
4905
- editWindow.Select(tp, deselect, true);
5290
+ window.Select(tp, deselect, true);
49065291 }
49075292
49085293 return tp;
....@@ -4919,6 +5304,7 @@
49195304
49205305 if (child == null)
49215306 continue;
5307
+
49225308 if (child.HasTransparency() && child.size() != 0)
49235309 {
49245310 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4928,9 +5314,10 @@
49285314 if (leaf != null)
49295315 {
49305316 cTreePath tp = new cTreePath(this, leaf);
4931
- if (editWindow != null)
5317
+ ObjEditor window = GetWindow();
5318
+ if (window != null)
49325319 {
4933
- editWindow.Select(tp, deselect, true);
5320
+ window.Select(tp, deselect, true);
49345321 }
49355322
49365323 return tp;
....@@ -5255,6 +5642,51 @@
52555642 blockloop = false;
52565643 }
52575644
5645
+ void ResetSelectable()
5646
+ {
5647
+ if (blockloop)
5648
+ return;
5649
+
5650
+ blockloop = true;
5651
+
5652
+ keepdontselect = dontselect;
5653
+ dontselect = true;
5654
+
5655
+ Object3D child;
5656
+ int nb = Size();
5657
+ for (int i = 0; i < nb; i++)
5658
+ {
5659
+ child = (Object3D) get(i);
5660
+ if (child == null)
5661
+ continue;
5662
+ child.ResetSelectable();
5663
+ }
5664
+
5665
+ blockloop = false;
5666
+ }
5667
+
5668
+ void RestoreSelectable()
5669
+ {
5670
+ if (blockloop)
5671
+ return;
5672
+
5673
+ blockloop = true;
5674
+
5675
+ dontselect = keepdontselect;
5676
+
5677
+ Object3D child;
5678
+ int nb = Size();
5679
+ for (int i = 0; i < nb; i++)
5680
+ {
5681
+ child = (Object3D) get(i);
5682
+ if (child == null)
5683
+ continue;
5684
+ child.RestoreSelectable();
5685
+ }
5686
+
5687
+ blockloop = false;
5688
+ }
5689
+
52585690 boolean IsSelected()
52595691 {
52605692 if (parent == null)
....@@ -5315,6 +5747,11 @@
53155747 if (fullname == null)
53165748 return "";
53175749
5750
+ if (fullname.pigment != null)
5751
+ {
5752
+ return fullname.pigment;
5753
+ }
5754
+
53185755 // System.out.println("Fullname = " + fullname);
53195756
53205757 // Does not work on Windows due to C:
....@@ -5327,7 +5764,7 @@
53275764
53285765 if (split.length == 0)
53295766 {
5330
- return "";
5767
+ return fullname.pigment = "";
53315768 }
53325769
53335770 if (split.length <= 2)
....@@ -5335,22 +5772,27 @@
53355772 if (fullname.name.endsWith(":"))
53365773 {
53375774 // Windows
5338
- return fullname.name.substring(0, fullname.name.length()-1);
5775
+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
53395776 }
53405777
5341
- return split[0];
5778
+ return fullname.pigment = split[0];
53425779 }
53435780
53445781 // Windows
53455782 assert(split.length == 4);
53465783
5347
- return split[0] + ":" + split[1];
5784
+ return fullname.pigment = split[0] + ":" + split[1];
53485785 }
53495786
53505787 static String GetBump(cTexture fullname)
53515788 {
53525789 if (fullname == null)
53535790 return "";
5791
+
5792
+ if (fullname.bump != null)
5793
+ {
5794
+ return fullname.bump;
5795
+ }
53545796
53555797 // System.out.println("Fullname = " + fullname);
53565798 // Does not work on Windows due to C:
....@@ -5362,12 +5804,12 @@
53625804
53635805 if (split.length == 0)
53645806 {
5365
- return "";
5807
+ return fullname.bump = "";
53665808 }
53675809
53685810 if (split.length == 1)
53695811 {
5370
- return "";
5812
+ return fullname.bump = "";
53715813 }
53725814
53735815 if (split.length == 2)
....@@ -5375,16 +5817,16 @@
53755817 if (fullname.name.endsWith(":"))
53765818 {
53775819 // Windows
5378
- return "";
5820
+ return fullname.bump = "";
53795821 }
53805822
5381
- return split[1];
5823
+ return fullname.bump = split[1];
53825824 }
53835825
53845826 // Windows
53855827 assert(split.length == 4);
53865828
5387
- return split[2] + ":" + split[3];
5829
+ return fullname.bump = split[2] + ":" + split[3];
53885830 }
53895831
53905832 String GetPigmentTexture()
....@@ -5467,6 +5909,9 @@
54675909 texname = "";
54685910
54695911 GetTextures().name = texname + ":" + GetBump(GetTextures());
5912
+
5913
+ GetTextures().pigment = null;
5914
+
54705915 Touch();
54715916 }
54725917
....@@ -5540,6 +5985,8 @@
55405985
55415986 GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
55425987
5988
+ GetTextures().bump = null;
5989
+
55435990 Touch();
55445991 }
55455992
....@@ -5564,6 +6011,38 @@
55646011 }
55656012 }
55666013
6014
+ void EmbedTextures(boolean embed)
6015
+ {
6016
+ if (blockloop)
6017
+ return;
6018
+
6019
+ //if (GetTextures() != null)
6020
+ if (embed)
6021
+ CameraPane.EmbedTextures(GetTextures());
6022
+ else
6023
+ {
6024
+ GetTextures().pigmentdata = null;
6025
+ GetTextures().bumpdata = null;
6026
+ GetTextures().pw = 0;
6027
+ GetTextures().ph = 0;
6028
+ GetTextures().bw = 0;
6029
+ GetTextures().bh = 0;
6030
+ }
6031
+
6032
+ int nb = Size();
6033
+ for (int i = 0; i < nb; i++)
6034
+ {
6035
+ Object3D child = (Object3D) get(i);
6036
+
6037
+ if (child == null)
6038
+ continue;
6039
+
6040
+ blockloop = true;
6041
+ child.EmbedTextures(embed);
6042
+ blockloop = false;
6043
+ }
6044
+ }
6045
+
55676046 void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55686047 {
55696048 Draw(display, root, selected, blocked);
....@@ -5572,12 +6051,28 @@
55726051 boolean NeedSupport()
55736052 {
55746053 return
5575
- CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
6054
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55766055 // PROBLEM with CROWD!!
55776056 && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55786057 }
55796058
55806059 static boolean DEBUG_SELECTION = false;
6060
+
6061
+ boolean IsLive()
6062
+ {
6063
+ if (live)
6064
+ return true;
6065
+
6066
+ if (parent == null)
6067
+ return false;
6068
+
6069
+ return parent.IsLive();
6070
+ }
6071
+
6072
+ boolean IsDynamic()
6073
+ {
6074
+ return live && bRep != null;
6075
+ }
55816076
55826077 void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55836078 {
....@@ -5639,8 +6134,11 @@
56396134 if (support != null)
56406135 support = support;
56416136
5642
- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5643
- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6137
+ boolean usecalllists = !IsDynamic() &&
6138
+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6139
+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6140
+
6141
+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
56446142
56456143 if (!usecalllists && bRep != null && bRep.displaylist > 0)
56466144 {
....@@ -5650,8 +6148,9 @@
56506148 // usecalllists &= !(parent instanceof RandomNode);
56516149 // usecalllists = false;
56526150
5653
- if (GetBRep() != null)
5654
- usecalllists = usecalllists;
6151
+ if (display.DrawMode() == display.SHADOW)
6152
+ //GetBRep() != null)
6153
+ usecalllists = !!usecalllists;
56556154 //System.out.println("draw " + this);
56566155 //new Exception().printStackTrace();
56576156
....@@ -5660,10 +6159,12 @@
56606159 boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
56616160
56626161 if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663
- (touched || (bRep != null && bRep.displaylist <= 0)))
6162
+ //(touched || (bRep != null && bRep.displaylist <= 0)))
6163
+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
56646164 {
56656165 Globals.lighttouched = true;
56666166 } // all panes...
6167
+
56676168 //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56686169 if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56696170 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5671,7 +6172,7 @@
56716172 if (!(this instanceof Composite))
56726173 touched = false;
56736174 //if (displaylist == -1 && usecalllists)
5674
- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
6175
+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
56756176 {
56766177 bRep.displaylist = display.GenList();
56776178 assert(bRep.displaylist != 0);
....@@ -5682,7 +6183,7 @@
56826183
56836184 //System.out.println("\tnew list " + list);
56846185 //gl.glDrawBuffer(gl.GL_NONE);
5685
- if (usecalllists)
6186
+ if (usecalllists && bRep.displaylist > 0)
56866187 {
56876188 // System.err.println("new list " + bRep.displaylist + " for " + this);
56886189 display.NewList(bRep.displaylist);
....@@ -5691,7 +6192,7 @@
56916192 CallList(display, root, selected, blocked);
56926193
56936194 // compiled = true;
5694
- if (usecalllists)
6195
+ if (usecalllists && bRep.displaylist > 0)
56956196 {
56966197 // System.err.println("end list " + bRep.displaylist + " for " + this);
56976198 display.EndList();
....@@ -5791,6 +6292,7 @@
57916292 if (GetBRep() != null)
57926293 {
57936294 display.NextIndex();
6295
+
57946296 // vertex color conflict : gl.glCallList(list);
57956297 DrawNode(display, root, selected);
57966298 if (this instanceof BezierPatch)
....@@ -5831,16 +6333,27 @@
58316333 tex = GetTextures();
58326334 }
58336335
5834
- boolean failed = false;
6336
+ boolean failedPigment = false;
6337
+ boolean failedBump = false;
58356338
58366339 try
58376340 {
5838
- display.BindTextures(tex, texres);
6341
+ display.BindPigmentTexture(tex, texres);
58396342 }
58406343 catch (Exception e)
58416344 {
58426345 System.err.println("FAILED: " + this);
5843
- failed = true;
6346
+ failedPigment = true;
6347
+ }
6348
+
6349
+ try
6350
+ {
6351
+ display.BindBumpTexture(tex, texres);
6352
+ }
6353
+ catch (Exception e)
6354
+ {
6355
+ //System.err.println("FAILED: " + this);
6356
+ failedBump = true;
58446357 }
58456358
58466359 if (!compiled)
....@@ -5863,8 +6376,11 @@
58636376 }
58646377 }
58656378
5866
- if (!failed)
5867
- display.ReleaseTextures(tex);
6379
+ if (!failedBump)
6380
+ display.ReleaseBumpTexture(tex);
6381
+
6382
+ if (!failedPigment)
6383
+ display.ReleasePigmentTexture(tex);
58686384
58696385 display.PopMaterial(this, selected);
58706386 }
....@@ -6237,6 +6753,11 @@
62376753 // dec 2012
62386754 new Exception().printStackTrace();
62396755 return;
6756
+ }
6757
+
6758
+ if (dontselect)
6759
+ {
6760
+ //bRep.GenerateNormalsMINE();
62406761 }
62416762
62426763 display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7022,20 +7543,23 @@
70227543 }
70237544 }
70247545
7025
- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7546
+ static ClickInfo clickInfo = new ClickInfo();
7547
+
7548
+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7549
+ Point outPt, Rectangle outRec)
70267550 {
7027
- int hc = info.bounds.x + info.bounds.width / 2;
7028
- int vc = info.bounds.y + info.bounds.height / 2;
7029
- double[][] toscreen = info.toScreen;
7551
+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7552
+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7553
+ double[][] toscreen = clickInfo.toScreen;
70307554 if (toscreen == null)
70317555 {
7032
- toscreen = new Camera(info.camera.viewCode).toScreen;
7556
+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
70337557 }
70347558 cVector vec = in;
70357559 LA.xformPos(in, toscreen, in);
70367560 //System.out.println("Distance = " + info.camera.Distance());
7037
- vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
7038
- vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
7561
+ vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7562
+ vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
70397563 outPt.x = hc + (int) vec.x;
70407564 outPt.y = vc - (int) vec.y;
70417565 outRec.x = outPt.x - 3;
....@@ -7043,15 +7567,18 @@
70437567 outRec.width = outRec.height = 6;
70447568 }
70457569
7046
- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7570
+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7571
+ )
70477572 {
70487573 Point pt = new Point(0, 0);
70497574 Rectangle rec = new Rectangle();
7050
- calcHotSpot(in, info, pt, rec);
7575
+ calcHotSpot(in, //clickInfo,
7576
+ pt, rec);
70517577 return rec;
70527578 }
70537579
7054
- void drawEditHandles0(ClickInfo info, int level)
7580
+ void drawEditHandles0(//ClickInfo clickInfo,
7581
+ int level)
70557582 {
70567583 if (level == 0)
70577584 {
....@@ -7060,16 +7587,19 @@
70607587 {
70617588 cVector origin = new cVector();
70627589 //LA.xformPos(origin, toParent, origin);
7063
- Rectangle spot = calcHotSpot(origin, info);
7590
+ if (this.clickInfo == null)
7591
+ this.clickInfo = new ClickInfo();
7592
+
7593
+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
70647594 Rectangle boundary = new Rectangle();
70657595 boundary.x = spot.x - 30;
70667596 boundary.y = spot.y - 30;
70677597 boundary.width = spot.width + 60;
70687598 boundary.height = spot.height + 60;
7069
- info.g.setColor(Color.red);
7599
+ clickInfo.g.setColor(Color.white);
70707600 int spotw = spot.x + spot.width;
70717601 int spoth = spot.y + spot.height;
7072
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7602
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70737603 // if (CameraPane.Xmin > spot.x)
70747604 // {
70757605 // CameraPane.Xmin = spot.x;
....@@ -7086,11 +7616,33 @@
70867616 // {
70877617 // CameraPane.Ymax = spoth;
70887618 // }
7089
- spot.translate(32, 32);
7619
+// if (CameraPane.Xmin > spot.x)
7620
+// {
7621
+// CameraPane.Xmin = spot.x;
7622
+// }
7623
+// if (CameraPane.Xmax < spotw)
7624
+// {
7625
+// CameraPane.Xmax = spotw;
7626
+// }
7627
+// if (CameraPane.Ymin > spot.y)
7628
+// {
7629
+// CameraPane.Ymin = spot.y;
7630
+// }
7631
+// if (CameraPane.Ymax < spoth)
7632
+// {
7633
+// CameraPane.Ymax = spoth;
7634
+// }
7635
+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7636
+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7637
+ spot.translate(32, 0);
7638
+ clickInfo.g.setColor(Color.yellow);
7639
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7640
+
7641
+ spot.translate(32, 64);
70907642 spotw = spot.x + spot.width;
70917643 spoth = spot.y + spot.height;
7092
- info.g.setColor(Color.blue);
7093
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7644
+ clickInfo.g.setColor(Color.cyan);
7645
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70947646 // if (CameraPane.Xmin > spot.x)
70957647 // {
70967648 // CameraPane.Xmin = spot.x;
....@@ -7107,29 +7659,9 @@
71077659 // {
71087660 // CameraPane.Ymax = spoth;
71097661 // }
7110
- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111
- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7112
- spot.translate(0, -32);
7113
- info.g.setColor(Color.green);
7114
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7115
-// if (CameraPane.Xmin > spot.x)
7116
-// {
7117
-// CameraPane.Xmin = spot.x;
7118
-// }
7119
-// if (CameraPane.Xmax < spotw)
7120
-// {
7121
-// CameraPane.Xmax = spotw;
7122
-// }
7123
-// if (CameraPane.Ymin > spot.y)
7124
-// {
7125
-// CameraPane.Ymin = spot.y;
7126
-// }
7127
-// if (CameraPane.Ymax < spoth)
7128
-// {
7129
-// CameraPane.Ymax = spoth;
7130
-// }
7131
- info.g.drawArc(boundary.x, boundary.y,
7132
- boundary.width, boundary.height, 0, 360);
7662
+ clickInfo.g.setColor(Color.green);
7663
+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7664
+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
71337665 //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
71347666 // if (CameraPane.Xmin > boundary.x)
71357667 // {
....@@ -7151,7 +7683,8 @@
71517683 }
71527684 }
71537685
7154
- boolean doEditClick0(ClickInfo info, int level)
7686
+ boolean doEditClick0(//ClickInfo clickInfo,
7687
+ int level)
71557688 {
71567689 if (level == 0)
71577690 {
....@@ -7160,8 +7693,8 @@
71607693
71617694 boolean retval = false;
71627695
7163
- startX = info.x;
7164
- startY = info.y;
7696
+ startX = clickInfo.x;
7697
+ startY = clickInfo.y;
71657698
71667699 hitSomething = -1;
71677700 cVector origin = new cVector();
....@@ -7171,22 +7704,53 @@
71717704 {
71727705 centerPt = new Point(0, 0);
71737706 }
7174
- calcHotSpot(origin, info, centerPt, spot);
7175
- if (spot.contains(info.x, info.y))
7707
+ calcHotSpot(origin, //info,
7708
+ centerPt, spot);
7709
+ if (spot.contains(clickInfo.x, clickInfo.y))
71767710 {
71777711 hitSomething = hitCenter;
71787712 retval = true;
71797713 }
71807714 spot.translate(32, 0);
7181
- if (spot.contains(info.x, info.y))
7715
+ if (spot.contains(clickInfo.x, clickInfo.y))
71827716 {
71837717 hitSomething = hitRotate;
71847718 retval = true;
71857719 }
71867720 spot.translate(0, 32);
7187
- if (spot.contains(info.x, info.y))
7721
+ spot.translate(32, 0);
7722
+ spot.translate(0, 32);
7723
+ if (spot.contains(clickInfo.x, clickInfo.y))
71887724 {
71897725 hitSomething = hitScale;
7726
+
7727
+ double scale = 0.005f * clickInfo.camera.Distance();
7728
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7729
+ double sign = 1;
7730
+ if (hScale < 0)
7731
+ {
7732
+ sign = -1;
7733
+ }
7734
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
7735
+ if (hScale < 0.01)
7736
+ {
7737
+ //hScale = 0.01;
7738
+ }
7739
+
7740
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7741
+ sign = 1;
7742
+ if (vScale < 0)
7743
+ {
7744
+ sign = -1;
7745
+ }
7746
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
7747
+ if (vScale < 0.01)
7748
+ {
7749
+ //vScale = 0.01;
7750
+ }
7751
+
7752
+ clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7753
+
71907754 retval = true;
71917755 }
71927756
....@@ -7196,7 +7760,7 @@
71967760 }
71977761
71987762 //System.out.println("info.modifiers = " + info.modifiers);
7199
- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7763
+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
72007764 //System.out.println("modified = " + modified);
72017765 //new Exception().printStackTrace();
72027766 //viewCode = info.pane.renderCamera.viewCode;
....@@ -7224,7 +7788,8 @@
72247788 return true;
72257789 }
72267790
7227
- void doEditDrag0(ClickInfo info, boolean opposite)
7791
+ void doEditDrag0(//ClickInfo info,
7792
+ boolean opposite)
72287793 {
72297794 if (hitSomething == 0)
72307795 {
....@@ -7238,7 +7803,7 @@
72387803
72397804 //System.out.println("hitSomething = " + hitSomething);
72407805
7241
- double scale = 0.005f * info.camera.Distance();
7806
+ double scale = 0.005f * clickInfo.camera.Distance();
72427807
72437808 cVector xlate = new cVector();
72447809 //cVector xlate2 = new cVector();
....@@ -7252,7 +7817,9 @@
72527817
72537818 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
72547819
7255
- if (modified || opposite)
7820
+ // Modified could snap
7821
+ if (//modified ||
7822
+ opposite)
72567823 {
72577824 //assert(false);
72587825 /*
....@@ -7272,8 +7839,8 @@
72727839 toParent[3][i] = xlate.get(i);
72737840 LA.matInvert(toParent, fromParent);
72747841 */
7275
- cVector delta = LA.newVector(0, 0, startY - info.y);
7276
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7842
+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
7843
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
72777844
72787845 LA.matCopy(startMat, toParent);
72797846 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7282,7 +7849,7 @@
72827849 } else
72837850 {
72847851 //LA.xformDir(delta, info.camera.fromScreen, delta);
7285
- cVector up = new cVector(info.camera.up);
7852
+ cVector up = new cVector(clickInfo.camera.up);
72867853 cVector away = new cVector();
72877854 //cVector right2 = new cVector();
72887855 //LA.vecCross(up, cVector.Z, right);
....@@ -7299,19 +7866,19 @@
72997866 LA.xformDir(up, ClickInfo.matbuffer, up);
73007867 // if (!CameraPane.LOCALTRANSFORM)
73017868 LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7302
- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7869
+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
73037870 // if (!CameraPane.LOCALTRANSFORM)
73047871 LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
73057872 //LA.vecCross(up, cVector.Z, right2);
73067873
7307
- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7874
+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
73087875
73097876 //System.out.println("DELTA0 = " + delta);
73107877 //System.out.println("AWAY = " + info.camera.away);
73117878 //System.out.println("UP = " + info.camera.up);
73127879 if (away.z > 0)
73137880 {
7314
- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7881
+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
73157882 {
73167883 delta.x = -delta.x;
73177884 } else
....@@ -7326,7 +7893,7 @@
73267893 //System.out.println("DELTA1 = " + delta);
73277894 LA.xformDir(delta, ClickInfo.matbuffer, delta);
73287895 //System.out.println("DELTA2 = " + delta);
7329
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7896
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
73307897 LA.matCopy(startMat, toParent);
73317898 //System.out.println("DELTA3 = " + delta);
73327899 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7336,8 +7903,8 @@
73367903 break;
73377904
73387905 case hitRotate: // rotate
7339
- int dx = info.x - centerPt.x;
7340
- int dy = -(info.y - centerPt.y);
7906
+ int dx = clickInfo.x - centerPt.x;
7907
+ int dy = -(clickInfo.y - centerPt.y);
73417908 double angle = (double) Math.atan2(dx, dy);
73427909 angle = -(1.570796 - angle);
73437910
....@@ -7346,7 +7913,7 @@
73467913
73477914 if (modified)
73487915 {
7349
- // Rotate 90 degrees
7916
+ // Rotate 45 degrees
73507917 angle /= (Math.PI / 4);
73517918 angle = Math.floor(angle + 0.5);
73527919 angle *= (Math.PI / 4);
....@@ -7360,7 +7927,7 @@
73607927 }
73617928 /**/
73627929
7363
- switch (info.pane.RenderCamera().viewCode)
7930
+ switch (clickInfo.pane.RenderCamera().viewCode)
73647931 {
73657932 case 1: // '\001'
73667933 LA.matZRotate(toParent, angle);
....@@ -7387,7 +7954,7 @@
73877954 break;
73887955
73897956 case hitScale: // scale
7390
- double hScale = (double) (info.x - centerPt.x) / 32;
7957
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
73917958 double sign = 1;
73927959 if (hScale < 0)
73937960 {
....@@ -7399,7 +7966,7 @@
73997966 //hScale = 0.01;
74007967 }
74017968
7402
- double vScale = (double) (info.y - centerPt.y) / 32;
7969
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
74037970 sign = 1;
74047971 if (vScale < 0)
74057972 {
....@@ -7410,6 +7977,7 @@
74107977 {
74117978 //vScale = 0.01;
74127979 }
7980
+
74137981 LA.matCopy(startMat, toParent);
74147982 /**/
74157983 for (int i = 0; i < 3; i++)
....@@ -7419,32 +7987,39 @@
74197987 }
74207988 /**/
74217989
7422
- double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7990
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
74237991
74247992 if (totalScale < 0.01)
74257993 {
74267994 totalScale = 0.01;
74277995 }
74287996
7429
- switch (info.pane.RenderCamera().viewCode)
7997
+ switch (clickInfo.pane.RenderCamera().viewCode)
74307998 {
74317999 case 3: // '\001'
7432
- if (modified)
8000
+ if (modified || opposite)
74338001 {
8002
+ if (modified) // && opposite)
8003
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
8004
+ else
74348005 //LA.matScale(toParent, 1, hScale, vScale);
7435
- LA.matScale(toParent, totalScale, 1, 1);
8006
+ LA.matScale(toParent, totalScale, 1, 1);
74368007 } // vScale, 1);
74378008 else
74388009 {
7439
- LA.matScale(toParent, totalScale, totalScale, totalScale);
8010
+ // EXCEPTION!
8011
+ LA.matScale(toParent, 1, totalScale, totalScale);
74408012 } // vScale, 1);
74418013 break;
74428014
74438015 case 2: // '\002'
7444
- if (modified)
8016
+ if (modified || opposite)
74458017 {
7446
- //LA.matScale(toParent, hScale, 1, vScale);
7447
- LA.matScale(toParent, 1, totalScale, 1);
8018
+ if (modified) // && opposite)
8019
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
8020
+ else
8021
+ //LA.matScale(toParent, hScale, 1, vScale);
8022
+ LA.matScale(toParent, 1, totalScale, 1);
74488023 } else
74498024 {
74508025 LA.matScale(toParent, totalScale, 1, totalScale);
....@@ -7452,10 +8027,13 @@
74528027 break;
74538028
74548029 case 1: // '\003'
7455
- if (modified)
8030
+ if (modified || opposite)
74568031 {
7457
- //LA.matScale(toParent, hScale, vScale, 1);
7458
- LA.matScale(toParent, 1, 1, totalScale);
8032
+ if (modified) // && opposite)
8033
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
8034
+ else
8035
+ //LA.matScale(toParent, hScale, vScale, 1);
8036
+ LA.matScale(toParent, 1, 1, totalScale);
74598037 } else
74608038 {
74618039 LA.matScale(toParent, totalScale, totalScale, 1);
....@@ -7492,7 +8070,7 @@
74928070 } // NEW ...
74938071
74948072
7495
- info.pane.repaint();
8073
+ clickInfo.pane.repaint();
74968074 }
74978075
74988076 boolean overflow = false;
....@@ -7603,10 +8181,10 @@
76038181 } // + super.toString();
76048182 //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
76058183
7606
- if (!Globals.ADVANCED)
7607
- return objname;
8184
+// if (!Globals.ADVANCED)
8185
+// return objname;
76088186
7609
- return objname + " " + System.identityHashCode(this);
8187
+ return objname + " " + System.identityHashCode(this); // + GetUUID()
76108188 }
76118189
76128190 public int hashCode()
....@@ -7671,6 +8249,10 @@
76718249 {
76728250 editWindow = null;
76738251 } // ?
8252
+ }
8253
+ else
8254
+ {
8255
+ //editWindow.closeUI();
76748256 }
76758257 }
76768258
....@@ -7829,6 +8411,10 @@
78298411 }
78308412
78318413 transient ObjEditor editWindow;
8414
+ transient ObjEditor manipWindow;
8415
+
8416
+ transient boolean pinned;
8417
+
78328418 transient ObjectUI objectUI;
78338419 public static int povDepth = 0;
78348420 private static cVector tbMin = new cVector();