Normand Briere
2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253
Object3D.java
....@@ -14,11 +14,20 @@
1414 import //weka.core.
1515 matrix.Matrix;
1616
17
+import java.util.UUID;
18
+
1719 //import net.sourceforge.sizeof.SizeOf;
1820 public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
1921 {
2022 //static final long serialVersionUID = -607422624994562685L;
2123 static final long serialVersionUID = 5022536242724664900L;
24
+
25
+ private UUID uuid = UUID.randomUUID();
26
+
27
+ // TEMPORARY for mocap undo
28
+ mocap.reader.BVHReader.BVHResult bvh;
29
+ Object3D skeleton;
30
+ //
2231
2332 ScriptNode scriptnode;
2433
....@@ -100,64 +109,136 @@
100109
101110 // transient boolean reduced; // for morph reduction
102111
103
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
112
+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
113
+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105114
106
-transient Object3D transientsupport; // for cloning
107
-transient boolean transientlink2master;
115
+ transient Object3D transientsupport; // for cloning
116
+ transient boolean transientlink2master;
108117
109
-void SaveSupports()
110
-{
111
- if (blockloop)
112
- return;
113
-
114
- transientsupport = support;
115
- transientlink2master = link2master;
116
-
117
- support = null;
118
- link2master = false;
119
-
120
- if (bRep != null)
118
+ void SaveSupports()
121119 {
122
- bRep.SaveSupports();
123
- }
124
-
125
- for (int i = 0; i < Size(); i++)
126
- {
127
- Object3D child = (Object3D) get(i);
128
- if (child == null)
129
- continue;
130
- blockloop = true;
131
- child.SaveSupports();
132
- blockloop = false;
133
- }
134
-}
120
+ if (blockloop)
121
+ return;
135122
136
-void RestoreSupports()
137
-{
138
- if (blockloop)
139
- return;
123
+ transientsupport = support;
124
+ transientlink2master = link2master;
140125
141
- support = transientsupport;
142
- link2master = transientlink2master;
143
- transientsupport = null;
144
- transientlink2master = false;
145
-
146
- if (bRep != null)
147
- {
148
- bRep.RestoreSupports();
126
+ support = null;
127
+ link2master = false;
128
+
129
+ if (bRep != null)
130
+ {
131
+ bRep.SaveSupports();
132
+ }
133
+
134
+ for (int i = 0; i < Size(); i++)
135
+ {
136
+ Object3D child = (Object3D) get(i);
137
+ if (child == null)
138
+ continue;
139
+ blockloop = true;
140
+ child.SaveSupports();
141
+ blockloop = false;
142
+ }
149143 }
150
-
151
- for (int i = 0; i < Size(); i++)
144
+
145
+ void RestoreSupports()
152146 {
153
- Object3D child = (Object3D) get(i);
154
- if (child == null)
155
- continue;
156
- blockloop = true;
157
- child.RestoreSupports();
158
- blockloop = false;
147
+ if (blockloop)
148
+ return;
149
+
150
+ support = transientsupport;
151
+ link2master = transientlink2master;
152
+ transientsupport = null;
153
+ transientlink2master = false;
154
+
155
+ if (bRep != null)
156
+ {
157
+ bRep.RestoreSupports();
158
+ }
159
+
160
+ for (int i = 0; i < Size(); i++)
161
+ {
162
+ Object3D child = (Object3D) get(i);
163
+ if (child == null)
164
+ continue;
165
+ blockloop = true;
166
+ child.RestoreSupports();
167
+ blockloop = false;
168
+ }
159169 }
160
-}
170
+
171
+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172
+ {
173
+ if (hashtable.containsKey(GetUUID()))
174
+ {
175
+ Object3D o = hashtable.get(GetUUID());
176
+
177
+ Grafreed.Assert(this.bRep == o.bRep);
178
+ if (this.bRep != null)
179
+ assert(this.bRep.support == o.transientrep);
180
+
181
+ return;
182
+ }
183
+
184
+ Object3D o = new Object3D();
185
+
186
+ hashtable.put(GetUUID(), o);
187
+
188
+ for (int i=0; i<Size(); i++)
189
+ {
190
+ get(i).ExtractBigData(hashtable);
191
+ }
192
+
193
+ ExtractBigData(o);
194
+ }
195
+
196
+ void ExtractBigData(Object3D o)
197
+ {
198
+ o.bRep = this.bRep;
199
+ if (this.bRep != null)
200
+ {
201
+ o.transientrep = this.bRep.support;
202
+ o.bRep.support = null;
203
+ }
204
+
205
+ // o.support = this.support;
206
+ // o.fileparent = this.fileparent;
207
+ // if (this.bRep != null)
208
+ // o.bRep = this.bRep.support;
209
+
210
+ this.bRep = null;
211
+ // if (this.bRep != null)
212
+ // this.bRep.support = null;
213
+ // this.support = null;
214
+ // this.fileparent = null;
215
+ }
216
+
217
+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218
+ {
219
+ if (!hashtable.containsKey(GetUUID()))
220
+ return;
221
+
222
+ Object3D o = hashtable.get(GetUUID());
223
+
224
+ RestoreBigData(o);
225
+
226
+ hashtable.remove(GetUUID());
227
+
228
+ for (int i=0; i<Size(); i++)
229
+ {
230
+ get(i).RestoreBigData(hashtable);
231
+ }
232
+ }
233
+
234
+ void RestoreBigData(Object3D o)
235
+ {
236
+ this.bRep = o.bRep;
237
+ if (this.bRep != null)
238
+ this.bRep.support = o.transientrep;
239
+ // this.support = o.support;
240
+ // this.fileparent = o.fileparent;
241
+ }
161242
162243 // MOCAP SUPPORT
163244 double tx,ty,tz,rx,ry,rz;
....@@ -300,6 +381,7 @@
300381 }
301382
302383 boolean live = false;
384
+ boolean dontselect = false;
303385 boolean hide = false;
304386 boolean link2master = false; // performs reset support/master at each frame
305387 boolean marked = false; // animation node
....@@ -481,12 +563,14 @@
481563 toParent = LA.newMatrix();
482564 fromParent = LA.newMatrix();
483565 }
566
+
484567 if (toParentMarked == null)
485568 {
486569 if (maxcount != 1)
487570 {
488571 new Exception().printStackTrace();
489572 }
573
+
490574 toParentMarked = LA.newMatrix();
491575 fromParentMarked = LA.newMatrix();
492576 }
....@@ -774,7 +858,7 @@
774858 if (step == 0)
775859 step = 1;
776860 if (maxcount == 0)
777
- maxcount = 2048; // 4;
861
+ maxcount = 128; // 2048; // 4;
778862 // if (acceleration == 0)
779863 // acceleration = 10;
780864 if (delay == 0) // serial
....@@ -797,7 +881,7 @@
797881
798882 if (marked && Globals.isLIVE() && live &&
799883 //TEMP21aug2018
800
- Globals.DrawMode() == iCameraPane.SHADOW &&
884
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
801885 currentframe != Globals.framecount)
802886 {
803887 currentframe = Globals.framecount;
....@@ -809,7 +893,8 @@
809893
810894 boolean changedir = random && Math.random() < 0.01; // && !link2master;
811895
812
- if (transformcount*factor > maxcount || (step == 1 && changedir))
896
+ if (transformcount*factor >= maxcount && (rewind || random) ||
897
+ (step == 1 && changedir))
813898 {
814899 countdown = 1;
815900 delay = speedup?8:1;
....@@ -881,6 +966,7 @@
881966 if (material == null || material.multiply)
882967 return true;
883968
969
+ // Transparent objects are dynamic because we have to sort the triangles.
884970 return material.opacity > 0.99;
885971 }
886972
....@@ -912,6 +998,11 @@
912998 fromParent = null; // LA.newMatrix();
913999 bRep = null; // new BoundaryRep();
9141000
1001
+ if (oname != null && oname.equals("LeftHand"))
1002
+ {
1003
+ name = oname;
1004
+ }
1005
+
9151006 /*
9161007 float hue = (float)Math.random();
9171008 Color col;
....@@ -954,7 +1045,7 @@
9541045
9551046 public Object clone()
9561047 {
957
- return GrafreeD.clone(this);
1048
+ return Grafreed.clone(this);
9581049 }
9591050
9601051 Object3D copyExpand()
....@@ -1470,7 +1561,7 @@
14701561 BoundaryRep.SEUIL = other.material.cameralight;
14711562
14721563 // Set default to 0.1
1473
- BoundaryRep.SEUIL /= 2;
1564
+ BoundaryRep.SEUIL /= 4; // 2;
14741565 System.out.println("SEUIL = " + BoundaryRep.SEUIL);
14751566 }
14761567
....@@ -1729,7 +1820,7 @@
17291820 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17301821 o.bRep = transientrep;
17311822 if (clone)
1732
- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1823
+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17331824 o.CreateMaterial();
17341825 o.SetAttributes(this, -1);
17351826 //parent
....@@ -1742,7 +1833,7 @@
17421833 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17431834 o.bRep = bRep;
17441835 if (clone)
1745
- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1836
+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17461837 o.CreateMaterial();
17471838 //o.overwriteThis(this, -1);
17481839 o.SetAttributes(this, -1);
....@@ -1829,12 +1920,15 @@
18291920 if (obj.name == null)
18301921 continue; // can't be a null one
18311922
1923
+ // Try perfect match first.
18321924 if (n.equals(obj.name))
18331925 {
18341926 theobj = obj;
18351927 count++;
18361928 }
18371929 }
1930
+
1931
+ // not needed: n = n.split(":")[0]; // Poser generates a count
18381932
18391933 if (count != 1)
18401934 for (int i=Size(); --i>=0;)
....@@ -2294,12 +2388,17 @@
22942388 }
22952389 */
22962390 }
2391
+ else
2392
+ {
2393
+ //((ObjEditor)editWindow).SetupUI2(null);
2394
+ }
22972395 }
22982396
22992397 void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
23002398 {
23012399 if (newWindow)
23022400 {
2401
+ new Exception().printStackTrace();
23032402 System.exit(0);
23042403 if (parent != null)
23052404 {
....@@ -2476,13 +2575,13 @@
24762575 return retval;
24772576 }
24782577
2479
- void doEditDrag(ClickInfo info)
2578
+ void doEditDrag(ClickInfo info, boolean opposite)
24802579 {
24812580 switch (doSomething)
24822581 {
24832582 case 1: // '\001'
24842583 //super.
2485
- doEditDrag0(info);
2584
+ doEditDrag0(info, opposite);
24862585 break;
24872586
24882587 case 2: // '\002'
....@@ -2495,11 +2594,11 @@
24952594 {
24962595 //sel.hitSomething = childToDrag.hitSomething;
24972596 //childToDrag.doEditDrag(info);
2498
- sel.doEditDrag(info);
2597
+ sel.doEditDrag(info, opposite);
24992598 } else
25002599 {
25012600 //super.
2502
- doEditDrag0(info);
2601
+ doEditDrag0(info, opposite);
25032602 }
25042603 }
25052604 break;
....@@ -2609,6 +2708,18 @@
26092708 void GenNormalsS(boolean crease)
26102709 {
26112710 selection.GenNormals(crease);
2711
+// for (int i=0; i<selection.size(); i++)
2712
+// {
2713
+// Object3D selectee = (Object3D) selection.elementAt(i);
2714
+// selectee.GenNormals(crease);
2715
+// }
2716
+
2717
+ //Touch();
2718
+ }
2719
+
2720
+ void GenNormalsMeshS()
2721
+ {
2722
+ selection.GenNormalsMesh();
26122723 // for (int i=0; i<selection.size(); i++)
26132724 // {
26142725 // Object3D selectee = (Object3D) selection.elementAt(i);
....@@ -2749,6 +2860,24 @@
27492860 if (child == null)
27502861 continue;
27512862 child.GenNormals(crease);
2863
+// Children().release(i);
2864
+ }
2865
+ blockloop = false;
2866
+ }
2867
+
2868
+ void GenNormalsMesh()
2869
+ {
2870
+ if (blockloop)
2871
+ return;
2872
+
2873
+ blockloop = true;
2874
+ GenNormalsMesh0();
2875
+ for (int i = 0; i < Children().Size(); i++)
2876
+ {
2877
+ Object3D child = (Object3D) Children().get(i); // reserve(i);
2878
+ if (child == null)
2879
+ continue;
2880
+ child.GenNormalsMesh();
27522881 // Children().release(i);
27532882 }
27542883 blockloop = false;
....@@ -2906,7 +3035,8 @@
29063035 {
29073036 if (bRep != null)
29083037 {
2909
- bRep.GenUV();
3038
+ bRep.GenUV(); //1);
3039
+ //bRep.UnfoldUV();
29103040 Touch();
29113041 }
29123042 }
....@@ -2916,6 +3046,15 @@
29163046 if (bRep != null)
29173047 {
29183048 bRep.GenerateNormals(crease);
3049
+ Touch();
3050
+ }
3051
+ }
3052
+
3053
+ void GenNormalsMesh0()
3054
+ {
3055
+ if (bRep != null)
3056
+ {
3057
+ bRep.GenerateNormalsMesh();
29193058 Touch();
29203059 }
29213060 }
....@@ -2981,6 +3120,33 @@
29813120 blockloop = false;
29823121 }
29833122
3123
+ void TransformChildren()
3124
+ {
3125
+ if (toParent != null)
3126
+ {
3127
+ for (int i=Size(); --i>=0;)
3128
+ {
3129
+ Object3D v = get(i);
3130
+
3131
+ if (v.toParent == null)
3132
+ {
3133
+ v.toParent = LA.newMatrix();
3134
+ v.fromParent = LA.newMatrix();
3135
+ }
3136
+
3137
+// LA.matConcat(v.toParent, toParent, v.toParent);
3138
+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
3139
+ LA.matConcat(toParent, v.toParent, v.toParent);
3140
+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3141
+ }
3142
+
3143
+ toParent = null; // LA.matIdentity(toParent);
3144
+ fromParent = null; // LA.matIdentity(fromParent);
3145
+
3146
+ Touch();
3147
+ }
3148
+ }
3149
+
29843150 void TransformGeometry()
29853151 {
29863152 Object3D obj = this;
....@@ -3202,9 +3368,11 @@
32023368
32033369 BoundaryRep sup = bRep.support;
32043370 bRep.support = null;
3205
- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3371
+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32063372 // bRep.SplitInTwo(onlyone); // thread...
3207
- temprep.SplitInTwo(reduction34, onlyone);
3373
+
3374
+ while(temprep.SplitInTwo(reduction34, onlyone));
3375
+
32083376 bRep = temprep;
32093377 bRep.support = sup;
32103378 Touch();
....@@ -3341,7 +3509,8 @@
33413509 if (blockloop)
33423510 return;
33433511
3344
- if (marked || (bRep != null && material != null)) // borderline...
3512
+ if (//marked || // does not make sense
3513
+ (bRep != null || material != null)) // borderline...
33453514 live = h;
33463515
33473516 for (int i = 0; i < Size(); i++)
....@@ -3362,7 +3531,8 @@
33623531 return;
33633532
33643533 //if (bRep != null)
3365
- if (marked || (bRep != null && material != null)) // borderline...
3534
+ if (//marked || // does not make sense
3535
+ (bRep != null || material != null)) // borderline...
33663536 link2master = h;
33673537
33683538 for (int i = 0; i < Size(); i++)
....@@ -3382,7 +3552,8 @@
33823552 if (blockloop)
33833553 return;
33843554
3385
- if (marked || (bRep != null && material != null)) // borderline...
3555
+ if (//marked || // does not make sense
3556
+ (bRep != null || material != null)) // borderline...
33863557 hide = h;
33873558
33883559 for (int i = 0; i < Size(); i++)
....@@ -3402,7 +3573,7 @@
34023573 if (blockloop)
34033574 return;
34043575
3405
- if (bRep != null && material != null) // borderline...
3576
+ if (bRep != null || material != null) // borderline...
34063577 marked = h;
34073578
34083579 for (int i = 0; i < Size(); i++)
....@@ -3412,6 +3583,46 @@
34123583 continue;
34133584 blockloop = true;
34143585 child.MarkLeaves(h);
3586
+ blockloop = false;
3587
+ // release(i);
3588
+ }
3589
+ }
3590
+
3591
+ void RewindLeaves(boolean h)
3592
+ {
3593
+ if (blockloop)
3594
+ return;
3595
+
3596
+ if (bRep != null || material != null) // borderline...
3597
+ rewind = h;
3598
+
3599
+ for (int i = 0; i < Size(); i++)
3600
+ {
3601
+ Object3D child = (Object3D) get(i); // reserve(i);
3602
+ if (child == null)
3603
+ continue;
3604
+ blockloop = true;
3605
+ child.RewindLeaves(h);
3606
+ blockloop = false;
3607
+ // release(i);
3608
+ }
3609
+ }
3610
+
3611
+ void RandomLeaves(boolean h)
3612
+ {
3613
+ if (blockloop)
3614
+ return;
3615
+
3616
+ if (bRep != null || material != null) // borderline...
3617
+ random = h;
3618
+
3619
+ for (int i = 0; i < Size(); i++)
3620
+ {
3621
+ Object3D child = (Object3D) get(i); // reserve(i);
3622
+ if (child == null)
3623
+ continue;
3624
+ blockloop = true;
3625
+ child.RandomLeaves(h);
34153626 blockloop = false;
34163627 // release(i);
34173628 }
....@@ -3726,7 +3937,7 @@
37263937 if (child == null)
37273938 continue;
37283939
3729
- if (GrafreeD.RENDERME > 0)
3940
+ if (Grafreed.RENDERME > 0)
37303941 {
37313942 if (child instanceof Merge)
37323943 ((Merge)child).renderme();
....@@ -3877,7 +4088,7 @@
38774088 if (child == null)
38784089 continue;
38794090
3880
- if (GrafreeD.RENDERME > 0)
4091
+ if (Grafreed.RENDERME > 0)
38814092 {
38824093 if (child instanceof Merge)
38834094 ((Merge)child).renderme();
....@@ -4072,7 +4283,7 @@
40724283 if (child == null)
40734284 continue;
40744285
4075
- if (GrafreeD.RENDERME > 0)
4286
+ if (Grafreed.RENDERME > 0)
40764287 {
40774288 if (child instanceof Merge)
40784289 ((Merge)child).renderme();
....@@ -4185,6 +4396,55 @@
41854396 {
41864397 blockloop = true;
41874398 get(i).RepairShadow();
4399
+ blockloop = false;
4400
+ }
4401
+ }
4402
+
4403
+ void RepairSOV()
4404
+ {
4405
+ if (blockloop)
4406
+ return;
4407
+
4408
+ String texname = this.GetPigmentTexture();
4409
+
4410
+ if (texname.startsWith("sov"))
4411
+ {
4412
+ String[] s = texname.split("/");
4413
+
4414
+ String[] sname = s[1].split("Color.pn");
4415
+
4416
+ texname = sname[0];
4417
+
4418
+ if (sname.length > 1)
4419
+ {
4420
+ texname += "Color.jpg";
4421
+ }
4422
+
4423
+ this.SetPigmentTexture("sov/" + texname);
4424
+ }
4425
+
4426
+ texname = this.GetBumpTexture();
4427
+
4428
+ if (texname.startsWith("sov"))
4429
+ {
4430
+ String[] s = texname.split("/");
4431
+
4432
+ String[] sname = s[1].split("Bump.pn");
4433
+
4434
+ texname = sname[0];
4435
+
4436
+ if (sname.length > 1)
4437
+ {
4438
+ texname += "Bump.jpg";
4439
+ }
4440
+
4441
+ this.SetBumpTexture("sov/" + texname);
4442
+ }
4443
+
4444
+ for (int i=0; i<Size(); i++)
4445
+ {
4446
+ blockloop = true;
4447
+ get(i).RepairSOV();
41884448 blockloop = false;
41894449 }
41904450 }
....@@ -4679,7 +4939,7 @@
46794939
46804940 cTreePath SelectLeaf(int indexcount, boolean deselect)
46814941 {
4682
- if (hide)
4942
+ if (hide || dontselect)
46834943 return null;
46844944
46854945 if (count <= 0)
....@@ -4705,7 +4965,7 @@
47054965
47064966 cTreePath Select(int indexcount, boolean deselect)
47074967 {
4708
- if (hide)
4968
+ if (hide || dontselect)
47094969 return null;
47104970
47114971 if (count <= 0)
....@@ -5157,10 +5417,34 @@
51575417
51585418 // System.out.println("Fullname = " + fullname);
51595419
5160
- if (fullname.name.indexOf(":") == -1)
5161
- return fullname.name;
5420
+ // Does not work on Windows due to C:
5421
+// if (fullname.name.indexOf(":") == -1)
5422
+// return fullname.name;
5423
+//
5424
+// return fullname.name.substring(0,fullname.name.indexOf(":"));
51625425
5163
- return fullname.name.substring(0,fullname.name.indexOf(":"));
5426
+ String[] split = fullname.name.split(":");
5427
+
5428
+ if (split.length == 0)
5429
+ {
5430
+ return "";
5431
+ }
5432
+
5433
+ if (split.length <= 2)
5434
+ {
5435
+ if (fullname.name.endsWith(":"))
5436
+ {
5437
+ // Windows
5438
+ return fullname.name.substring(0, fullname.name.length()-1);
5439
+ }
5440
+
5441
+ return split[0];
5442
+ }
5443
+
5444
+ // Windows
5445
+ assert(split.length == 4);
5446
+
5447
+ return split[0] + ":" + split[1];
51645448 }
51655449
51665450 static String GetBump(cTexture fullname)
....@@ -5169,10 +5453,38 @@
51695453 return "";
51705454
51715455 // System.out.println("Fullname = " + fullname);
5172
- if (fullname.name.indexOf(":") == -1)
5173
- return "";
5174
-
5175
- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5456
+ // Does not work on Windows due to C:
5457
+// if (fullname.name.indexOf(":") == -1)
5458
+// return "";
5459
+//
5460
+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5461
+ String[] split = fullname.name.split(":");
5462
+
5463
+ if (split.length == 0)
5464
+ {
5465
+ return "";
5466
+ }
5467
+
5468
+ if (split.length == 1)
5469
+ {
5470
+ return "";
5471
+ }
5472
+
5473
+ if (split.length == 2)
5474
+ {
5475
+ if (fullname.name.endsWith(":"))
5476
+ {
5477
+ // Windows
5478
+ return "";
5479
+ }
5480
+
5481
+ return split[1];
5482
+ }
5483
+
5484
+ // Windows
5485
+ assert(split.length == 4);
5486
+
5487
+ return split[2] + ":" + split[3];
51765488 }
51775489
51785490 String GetPigmentTexture()
....@@ -5246,7 +5558,7 @@
52465558 System.out.print("; textures = " + textures);
52475559 System.out.println("; usedtextures = " + usedtextures);
52485560
5249
- if (GetTextures() == null)
5561
+ if (GetTextures() == null) // What is that??
52505562 GetTextures().name = ":";
52515563
52525564 String texname = tex;
....@@ -5277,6 +5589,43 @@
52775589 child.ResetPigmentTexture();
52785590 blockloop = false;
52795591 }
5592
+ }
5593
+
5594
+ UUID GetUUID()
5595
+ {
5596
+ if (uuid == null)
5597
+ {
5598
+ // Serial
5599
+ uuid = UUID.randomUUID();
5600
+ }
5601
+
5602
+ return uuid;
5603
+ }
5604
+
5605
+ Object3D GetObject(UUID uid)
5606
+ {
5607
+ if (blockloop)
5608
+ return null;
5609
+
5610
+ if (GetUUID().equals(uid))
5611
+ return this;
5612
+
5613
+ int nb = Size();
5614
+ for (int i = 0; i < nb; i++)
5615
+ {
5616
+ Object3D child = (Object3D) get(i);
5617
+
5618
+ if (child == null)
5619
+ continue;
5620
+
5621
+ blockloop = true;
5622
+ Object3D obj = child.GetObject(uid);
5623
+ blockloop = false;
5624
+ if (obj != null)
5625
+ return obj;
5626
+ }
5627
+
5628
+ return null;
52805629 }
52815630
52825631 void SetBumpTexture(String tex)
....@@ -5323,12 +5672,23 @@
53235672 boolean NeedSupport()
53245673 {
53255674 return
5326
- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
5675
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
53275676 // PROBLEM with CROWD!!
5328
- && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5677
+ && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
53295678 }
53305679
53315680 static boolean DEBUG_SELECTION = false;
5681
+
5682
+ boolean IsLive()
5683
+ {
5684
+ if (live)
5685
+ return true;
5686
+
5687
+ if (parent == null)
5688
+ return false;
5689
+
5690
+ return parent.IsLive();
5691
+ }
53325692
53335693 void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
53345694 {
....@@ -5340,7 +5700,7 @@
53405700 }
53415701
53425702 if (display.DrawMode() == iCameraPane.SELECTION &&
5343
- hide)
5703
+ (hide || dontselect))
53445704 return;
53455705
53465706 if (name != null && name.contains("sclera"))
....@@ -5391,7 +5751,7 @@
53915751 support = support;
53925752
53935753 //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5394
- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754
+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
53955755
53965756 if (!usecalllists && bRep != null && bRep.displaylist > 0)
53975757 {
....@@ -5411,10 +5771,12 @@
54115771 boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
54125772
54135773 if (!selectmode && //display.DrawMode() != display.SELECTION &&
5414
- (touched || (bRep != null && bRep.displaylist <= 0)))
5774
+ //(touched || (bRep != null && bRep.displaylist <= 0)))
5775
+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && (bRep != null && bRep.displaylist <= 0)))
54155776 {
54165777 Globals.lighttouched = true;
54175778 } // all panes...
5779
+
54185780 //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
54195781 if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
54205782 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5582,7 +5944,28 @@
55825944 tex = GetTextures();
55835945 }
55845946
5585
- display.BindTextures(tex, texres);
5947
+ boolean failedPigment = false;
5948
+ boolean failedBump = false;
5949
+
5950
+ try
5951
+ {
5952
+ display.BindPigmentTexture(tex, texres);
5953
+ }
5954
+ catch (Exception e)
5955
+ {
5956
+ System.err.println("FAILED: " + this);
5957
+ failedPigment = true;
5958
+ }
5959
+
5960
+ try
5961
+ {
5962
+ display.BindBumpTexture(tex, texres);
5963
+ }
5964
+ catch (Exception e)
5965
+ {
5966
+ //System.err.println("FAILED: " + this);
5967
+ failedBump = true;
5968
+ }
55865969
55875970 if (!compiled)
55885971 {
....@@ -5604,7 +5987,11 @@
56045987 }
56055988 }
56065989
5607
- display.ReleaseTextures(tex);
5990
+ if (!failedBump)
5991
+ display.ReleaseBumpTexture(tex);
5992
+
5993
+ if (!failedPigment)
5994
+ display.ReleasePigmentTexture(tex);
56085995
56095996 display.PopMaterial(this, selected);
56105997 }
....@@ -5733,6 +6120,9 @@
57336120
57346121 void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57356122 {
6123
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6124
+ return;
6125
+
57366126 if (hide)
57376127 return;
57386128 // shadow optimisation
....@@ -5858,6 +6248,9 @@
58586248 if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
58596249 return; // no shadow for transparent objects
58606250
6251
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6252
+ return;
6253
+
58616254 if (hide)
58626255 return;
58636256
....@@ -5898,6 +6291,7 @@
58986291 return;
58996292 }
59006293
6294
+ //bRep.GenUV(1/material.diffuseness);
59016295 // bRep.lock = true;
59026296
59036297 //javax.media.opengl.GL gl = display.GetGL();
....@@ -5970,6 +6364,11 @@
59706364 // dec 2012
59716365 new Exception().printStackTrace();
59726366 return;
6367
+ }
6368
+
6369
+ if (dontselect)
6370
+ {
6371
+ //bRep.GenerateNormalsMINE();
59736372 }
59746373
59756374 display.DrawGeometry(bRep, flipV, selectmode);
....@@ -6822,7 +7221,7 @@
68227221 spot.translate(32, 32);
68237222 spotw = spot.x + spot.width;
68247223 spoth = spot.y + spot.height;
6825
- info.g.setColor(Color.blue);
7224
+ info.g.setColor(Color.cyan);
68267225 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
68277226 // if (CameraPane.Xmin > spot.x)
68287227 // {
....@@ -6840,11 +7239,12 @@
68407239 // {
68417240 // CameraPane.Ymax = spoth;
68427241 // }
6843
- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6844
- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7242
+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7243
+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
68457244 spot.translate(0, -32);
6846
- info.g.setColor(Color.green);
7245
+ info.g.setColor(Color.yellow);
68477246 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7247
+ info.g.setColor(Color.green);
68487248 // if (CameraPane.Xmin > spot.x)
68497249 // {
68507250 // CameraPane.Xmin = spot.x;
....@@ -6896,7 +7296,7 @@
68967296 startX = info.x;
68977297 startY = info.y;
68987298
6899
- hitSomething = 0;
7299
+ hitSomething = -1;
69007300 cVector origin = new cVector();
69017301 //LA.xformPos(origin, toParent, origin);
69027302 Rectangle spot = new Rectangle();
....@@ -6929,7 +7329,7 @@
69297329 }
69307330
69317331 //System.out.println("info.modifiers = " + info.modifiers);
6932
- modified = (info.modifiers & CameraPane.META) != 0;
7332
+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
69337333 //System.out.println("modified = " + modified);
69347334 //new Exception().printStackTrace();
69357335 //viewCode = info.pane.renderCamera.viewCode;
....@@ -6957,7 +7357,7 @@
69577357 return true;
69587358 }
69597359
6960
- void doEditDrag0(ClickInfo info)
7360
+ void doEditDrag0(ClickInfo info, boolean opposite)
69617361 {
69627362 if (hitSomething == 0)
69637363 {
....@@ -6972,6 +7372,7 @@
69727372 //System.out.println("hitSomething = " + hitSomething);
69737373
69747374 double scale = 0.005f * info.camera.Distance();
7375
+
69757376 cVector xlate = new cVector();
69767377 //cVector xlate2 = new cVector();
69777378 switch (hitSomething)
....@@ -6984,7 +7385,7 @@
69847385
69857386 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
69867387
6987
- if (modified)
7388
+ if (modified || opposite)
69887389 {
69897390 //assert(false);
69907391 /*
....@@ -7078,6 +7479,7 @@
70787479
70797480 if (modified)
70807481 {
7482
+ // Rotate 90 degrees
70817483 angle /= (Math.PI / 4);
70827484 angle = Math.floor(angle + 0.5);
70837485 angle *= (Math.PI / 4);
....@@ -7119,24 +7521,27 @@
71197521
71207522 case hitScale: // scale
71217523 double hScale = (double) (info.x - centerPt.x) / 32;
7524
+ double sign = 1;
7525
+ if (hScale < 0)
7526
+ {
7527
+ sign = -1;
7528
+ }
7529
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
71227530 if (hScale < 0.01)
71237531 {
7124
- hScale = 0.01;
7532
+ //hScale = 0.01;
71257533 }
7126
- hScale = Math.pow(hScale, scale * 50);
7127
- if (hScale < 0.01)
7128
- {
7129
- hScale = 0.01;
7130
- }
7534
+
71317535 double vScale = (double) (info.y - centerPt.y) / 32;
7132
- if (vScale < 0.01)
7536
+ sign = 1;
7537
+ if (vScale < 0)
71337538 {
7134
- vScale = 0.01;
7539
+ sign = -1;
71357540 }
7136
- vScale = Math.pow(vScale, scale * 50);
7541
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
71377542 if (vScale < 0.01)
71387543 {
7139
- vScale = 0.01;
7544
+ //vScale = 0.01;
71407545 }
71417546 LA.matCopy(startMat, toParent);
71427547 /**/
....@@ -7147,39 +7552,47 @@
71477552 }
71487553 /**/
71497554
7555
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7556
+
7557
+ if (totalScale < 0.01)
7558
+ {
7559
+ totalScale = 0.01;
7560
+ }
7561
+
71507562 switch (info.pane.RenderCamera().viewCode)
71517563 {
71527564 case 3: // '\001'
7153
- if (modified)
7565
+ if (modified || opposite)
71547566 {
71557567 //LA.matScale(toParent, 1, hScale, vScale);
7156
- LA.matScale(toParent, vScale, 1, 1);
7568
+ LA.matScale(toParent, totalScale, 1, 1);
71577569 } // vScale, 1);
71587570 else
71597571 {
7160
- LA.matScale(toParent, vScale, vScale, vScale);
7572
+ // EXCEPTION!
7573
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
71617574 } // vScale, 1);
71627575 break;
71637576
71647577 case 2: // '\002'
7165
- if (modified)
7578
+ if (modified || opposite)
71667579 {
71677580 //LA.matScale(toParent, hScale, 1, vScale);
7168
- LA.matScale(toParent, 1, vScale, 1);
7581
+ LA.matScale(toParent, 1, totalScale, 1);
71697582 } else
71707583 {
7171
- LA.matScale(toParent, vScale, 1, vScale);
7584
+ LA.matScale(toParent, totalScale, 1, totalScale);
71727585 }
71737586 break;
71747587
71757588 case 1: // '\003'
7176
- if (modified)
7589
+ if (modified || opposite)
71777590 {
71787591 //LA.matScale(toParent, hScale, vScale, 1);
7179
- LA.matScale(toParent, 1, 1, vScale);
7592
+ LA.matScale(toParent, 1, 1, totalScale);
71807593 } else
71817594 {
7182
- LA.matScale(toParent, vScale, vScale, 1);
7595
+ LA.matScale(toParent, totalScale, totalScale, 1);
71837596 }
71847597 break;
71857598 }
....@@ -7312,14 +7725,22 @@
73127725 //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
73137726 //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
73147727 //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
7728
+
7729
+ String objname;
7730
+
73157731 if (false) //parent != null)
73167732 {
7317
- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7733
+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
73187734 } else
73197735 {
7320
- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
7736
+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
73217737 } // + super.toString();
73227738 //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7739
+
7740
+ if (!Globals.ADVANCED)
7741
+ return objname;
7742
+
7743
+ return objname + " " + System.identityHashCode(this);
73237744 }
73247745
73257746 public int hashCode()
....@@ -7375,6 +7796,7 @@
73757796 objectUI.closeUI();
73767797 if (editWindow != null)
73777798 {
7799
+ editWindow.ctrlPanel.FlushUI();
73787800 editWindow.refreshContents();
73797801 } // ? new
73807802 objectUI = null;
....@@ -7383,6 +7805,10 @@
73837805 {
73847806 editWindow = null;
73857807 } // ?
7808
+ }
7809
+ else
7810
+ {
7811
+ //editWindow.closeUI();
73867812 }
73877813 }
73887814
....@@ -7395,7 +7821,7 @@
73957821 /*transient*/ cVector2[] projectedVertices = new cVector2[0];
73967822
73977823 Object3D /*Composite*/ parent;
7398
- Object3D /*Composite*/ fileparent;
7824
+ Object3D /*Composite*/ fileparent; // In the case of FileObject
73997825
74007826 double[][] toParent; // dynamic matrix
74017827 double[][] fromParent;
....@@ -7510,7 +7936,7 @@
75107936 {
75117937 assert(bRep != null);
75127938 if (!(support instanceof GenericJoint)) // support.bRep != null)
7513
- GrafreeD.Assert(support.bRep == bRep.support);
7939
+ Grafreed.Assert(support.bRep == bRep.support);
75147940 }
75157941 else
75167942 {
....@@ -7559,9 +7985,9 @@
75597985 private static cVector edge2 = new cVector();
75607986 //private static cVector norm = new cVector();
75617987 /*transient private*/ int hitSomething;
7562
- private static final int hitCenter = 1;
7563
- private static final int hitScale = 2;
7564
- private static final int hitRotate = 3;
7988
+ static final int hitCenter = 1;
7989
+ static final int hitScale = 2;
7990
+ static final int hitRotate = 3;
75657991 /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
75667992 /*transient*/ private Point centerPt;
75677993 /*transient*/ private int startX;