Normand Briere
2019-07-21 40f408aaee14abd85d391008b4d22977dc586b50
Object3D.java
....@@ -14,12 +14,24 @@
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;
2224
25
+ private UUID uuid = UUID.randomUUID();
26
+
27
+ // TEMPORARY for mocap undo. No need to be transient.
28
+ mocap.reader.BVHReader.BVHResult savebvh;
29
+ Object3D saveskeleton;
30
+ //
31
+
32
+ byte[] versions[];
33
+ int versionindex = -1;
34
+
2335 ScriptNode scriptnode;
2436
2537 void InitOthers()
....@@ -100,64 +112,178 @@
100112
101113 // transient boolean reduced; // for morph reduction
102114
103
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
115
+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
116
+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105117
106
-transient Object3D transientsupport; // for cloning
107
-transient boolean transientlink2master;
118
+ transient Object3D transientsupport; // for cloning
119
+ transient boolean transientlink2master;
108120
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)
121
+ void SaveSupports()
121122 {
122
- bRep.SaveSupports();
123
+ if (blockloop)
124
+ return;
125
+
126
+ transientsupport = support;
127
+ transientlink2master = link2master;
128
+
129
+ support = null;
130
+ link2master = false;
131
+
132
+ if (bRep != null)
133
+ {
134
+ bRep.SaveSupports();
135
+ }
136
+
137
+ for (int i = 0; i < Size(); i++)
138
+ {
139
+ Object3D child = (Object3D) get(i);
140
+ if (child == null)
141
+ continue;
142
+ blockloop = true;
143
+ child.SaveSupports();
144
+ blockloop = false;
145
+ }
123146 }
124
-
125
- for (int i = 0; i < Size(); i++)
147
+
148
+ void RestoreSupports()
126149 {
127
- Object3D child = (Object3D) get(i);
128
- if (child == null)
129
- continue;
150
+ if (blockloop)
151
+ return;
152
+
153
+ support = transientsupport;
154
+ link2master = transientlink2master;
155
+ transientsupport = null;
156
+ transientlink2master = false;
157
+
158
+ if (bRep != null)
159
+ {
160
+ bRep.RestoreSupports();
161
+ }
162
+
163
+ for (int i = 0; i < Size(); i++)
164
+ {
165
+ Object3D child = (Object3D) get(i);
166
+ if (child == null)
167
+ continue;
168
+ blockloop = true;
169
+ child.RestoreSupports();
170
+ blockloop = false;
171
+ }
172
+ }
173
+
174
+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
175
+ {
176
+ Object3D o;
177
+
178
+ if (hashtable.containsKey(GetUUID()))
179
+ {
180
+ o = hashtable.get(GetUUID());
181
+
182
+ Grafreed.Assert(this.bRep == o.bRep);
183
+ //if (this.bRep != null)
184
+ // assert(this.bRep.support == o.transientrep);
185
+ if (this.support != null)
186
+ assert(this.support.bRep == o.transientrep);
187
+ }
188
+ else
189
+ {
190
+ o = new Object3D("copy of " + this.name);
191
+
192
+ hashtable.put(GetUUID(), o);
193
+ }
194
+
195
+ if (!blockloop)
196
+ {
197
+ blockloop = true;
198
+
199
+ for (int i=0; i<Size(); i++)
200
+ {
201
+ get(i).ExtractBigData(hashtable);
202
+ }
203
+
204
+ blockloop = false;
205
+ }
206
+
207
+ ExtractBigData(o);
208
+ }
209
+
210
+ void ExtractBigData(Object3D o)
211
+ {
212
+ if (o.bRep != null)
213
+ Grafreed.Assert(o.bRep == this.bRep);
214
+
215
+ o.bRep = this.bRep;
216
+// July 2019 if (this.bRep != null)
217
+// {
218
+// o.transientrep = this.bRep.support;
219
+// o.bRep.support = null;
220
+// }
221
+ o.selection = this.selection;
222
+ o.versions = this.versions;
223
+ o.versionindex = this.versionindex;
224
+
225
+ if (this.support != null)
226
+ {
227
+ if (o.transientrep != null)
228
+ Grafreed.Assert(o.transientrep == this.support.bRep);
229
+
230
+ o.transientrep = this.support.bRep;
231
+ this.support.bRep = null;
232
+ }
233
+
234
+ // o.support = this.support;
235
+ // o.fileparent = this.fileparent;
236
+ // if (this.bRep != null)
237
+ // o.bRep = this.bRep.support;
238
+
239
+ this.bRep = null;
240
+ // if (this.bRep != null)
241
+ // this.bRep.support = null;
242
+ // this.support = null;
243
+ // this.fileparent = null;
244
+ }
245
+
246
+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
247
+ {
248
+ if (!hashtable.containsKey(GetUUID()))
249
+ return;
250
+
251
+ Object3D o = hashtable.get(GetUUID());
252
+
253
+ RestoreBigData(o);
254
+
255
+ if (blockloop)
256
+ return;
257
+
130258 blockloop = true;
131
- child.SaveSupports();
259
+
260
+ //hashtable.remove(GetUUID());
261
+
262
+ for (int i=0; i<Size(); i++)
263
+ {
264
+ get(i).RestoreBigData(hashtable);
265
+ }
266
+
132267 blockloop = false;
133268 }
134
-}
135269
136
-void RestoreSupports()
137
-{
138
- if (blockloop)
139
- return;
140
-
141
- support = transientsupport;
142
- link2master = transientlink2master;
143
- transientsupport = null;
144
- transientlink2master = false;
145
-
146
- if (bRep != null)
270
+ void RestoreBigData(Object3D o)
147271 {
148
- bRep.RestoreSupports();
272
+ this.bRep = o.bRep;
273
+ if (this.support != null && o.transientrep != null)
274
+ {
275
+ this.support.bRep = o.transientrep;
276
+ }
277
+
278
+ this.selection = o.selection;
279
+
280
+ this.versions = o.versions;
281
+ this.versionindex = o.versionindex;
282
+// July 2019 if (this.bRep != null)
283
+// this.bRep.support = o.transientrep;
284
+ // this.support = o.support;
285
+ // this.fileparent = o.fileparent;
149286 }
150
-
151
- for (int i = 0; i < Size(); i++)
152
- {
153
- Object3D child = (Object3D) get(i);
154
- if (child == null)
155
- continue;
156
- blockloop = true;
157
- child.RestoreSupports();
158
- blockloop = false;
159
- }
160
-}
161287
162288 // MOCAP SUPPORT
163289 double tx,ty,tz,rx,ry,rz;
....@@ -300,6 +426,8 @@
300426 }
301427
302428 boolean live = false;
429
+ transient boolean keepdontselect;
430
+ boolean dontselect = false;
303431 boolean hide = false;
304432 boolean link2master = false; // performs reset support/master at each frame
305433 boolean marked = false; // animation node
....@@ -481,12 +609,14 @@
481609 toParent = LA.newMatrix();
482610 fromParent = LA.newMatrix();
483611 }
612
+
484613 if (toParentMarked == null)
485614 {
486615 if (maxcount != 1)
487616 {
488617 new Exception().printStackTrace();
489618 }
619
+
490620 toParentMarked = LA.newMatrix();
491621 fromParentMarked = LA.newMatrix();
492622 }
....@@ -774,7 +904,7 @@
774904 if (step == 0)
775905 step = 1;
776906 if (maxcount == 0)
777
- maxcount = 2048; // 4;
907
+ maxcount = 128; // 2048; // 4;
778908 // if (acceleration == 0)
779909 // acceleration = 10;
780910 if (delay == 0) // serial
....@@ -797,7 +927,7 @@
797927
798928 if (marked && Globals.isLIVE() && live &&
799929 //TEMP21aug2018
800
- Globals.DrawMode() == iCameraPane.SHADOW &&
930
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
801931 currentframe != Globals.framecount)
802932 {
803933 currentframe = Globals.framecount;
....@@ -809,7 +939,8 @@
809939
810940 boolean changedir = random && Math.random() < 0.01; // && !link2master;
811941
812
- if (transformcount*factor > maxcount || (step == 1 && changedir))
942
+ if (transformcount*factor >= maxcount && (rewind || random) ||
943
+ (step == 1 && changedir))
813944 {
814945 countdown = 1;
815946 delay = speedup?8:1;
....@@ -881,6 +1012,7 @@
8811012 if (material == null || material.multiply)
8821013 return true;
8831014
1015
+ // Transparent objects are dynamic because we have to sort the triangles.
8841016 return material.opacity > 0.99;
8851017 }
8861018
....@@ -912,6 +1044,11 @@
9121044 fromParent = null; // LA.newMatrix();
9131045 bRep = null; // new BoundaryRep();
9141046
1047
+ if (oname != null && oname.equals("LeftHand"))
1048
+ {
1049
+ name = oname;
1050
+ }
1051
+
9151052 /*
9161053 float hue = (float)Math.random();
9171054 Color col;
....@@ -954,7 +1091,7 @@
9541091
9551092 public Object clone()
9561093 {
957
- return GrafreeD.clone(this);
1094
+ return Grafreed.clone(this);
9581095 }
9591096
9601097 Object3D copyExpand()
....@@ -1276,6 +1413,7 @@
12761413 toParent = LA.newMatrix();
12771414 fromParent = LA.newMatrix();
12781415 }
1416
+
12791417 LA.matCopy(other.toParent, toParent);
12801418 LA.matCopy(other.fromParent, fromParent);
12811419
....@@ -1470,7 +1608,7 @@
14701608 BoundaryRep.SEUIL = other.material.cameralight;
14711609
14721610 // Set default to 0.1
1473
- BoundaryRep.SEUIL /= 2;
1611
+ BoundaryRep.SEUIL /= 4; // 2;
14741612 System.out.println("SEUIL = " + BoundaryRep.SEUIL);
14751613 }
14761614
....@@ -1729,7 +1867,7 @@
17291867 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17301868 o.bRep = transientrep;
17311869 if (clone)
1732
- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1870
+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17331871 o.CreateMaterial();
17341872 o.SetAttributes(this, -1);
17351873 //parent
....@@ -1742,7 +1880,7 @@
17421880 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17431881 o.bRep = bRep;
17441882 if (clone)
1745
- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1883
+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17461884 o.CreateMaterial();
17471885 //o.overwriteThis(this, -1);
17481886 o.SetAttributes(this, -1);
....@@ -1829,12 +1967,15 @@
18291967 if (obj.name == null)
18301968 continue; // can't be a null one
18311969
1970
+ // Try perfect match first.
18321971 if (n.equals(obj.name))
18331972 {
18341973 theobj = obj;
18351974 count++;
18361975 }
18371976 }
1977
+
1978
+ // not needed: n = n.split(":")[0]; // Poser generates a count
18381979
18391980 if (count != 1)
18401981 for (int i=Size(); --i>=0;)
....@@ -2294,6 +2435,10 @@
22942435 }
22952436 */
22962437 }
2438
+ else
2439
+ {
2440
+ //((ObjEditor)editWindow).SetupUI2(null);
2441
+ }
22972442 }
22982443
22992444 void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2335,6 +2480,14 @@
23352480 {
23362481 editWindow.refreshContents();
23372482 }
2483
+ else
2484
+ {
2485
+ if (manipWindow != null)
2486
+ {
2487
+ manipWindow.refreshContents();
2488
+ }
2489
+ }
2490
+
23382491 //if (parent != null)
23392492 //parent.refreshEditWindow();
23402493 }
....@@ -2477,13 +2630,13 @@
24772630 return retval;
24782631 }
24792632
2480
- void doEditDrag(ClickInfo info)
2633
+ void doEditDrag(ClickInfo info, boolean opposite)
24812634 {
24822635 switch (doSomething)
24832636 {
24842637 case 1: // '\001'
24852638 //super.
2486
- doEditDrag0(info);
2639
+ doEditDrag0(info, opposite);
24872640 break;
24882641
24892642 case 2: // '\002'
....@@ -2496,11 +2649,11 @@
24962649 {
24972650 //sel.hitSomething = childToDrag.hitSomething;
24982651 //childToDrag.doEditDrag(info);
2499
- sel.doEditDrag(info);
2652
+ sel.doEditDrag(info, opposite);
25002653 } else
25012654 {
25022655 //super.
2503
- doEditDrag0(info);
2656
+ doEditDrag0(info, opposite);
25042657 }
25052658 }
25062659 break;
....@@ -2610,6 +2763,18 @@
26102763 void GenNormalsS(boolean crease)
26112764 {
26122765 selection.GenNormals(crease);
2766
+// for (int i=0; i<selection.size(); i++)
2767
+// {
2768
+// Object3D selectee = (Object3D) selection.elementAt(i);
2769
+// selectee.GenNormals(crease);
2770
+// }
2771
+
2772
+ //Touch();
2773
+ }
2774
+
2775
+ void GenNormalsMeshS()
2776
+ {
2777
+ selection.GenNormalsMesh();
26132778 // for (int i=0; i<selection.size(); i++)
26142779 // {
26152780 // Object3D selectee = (Object3D) selection.elementAt(i);
....@@ -2750,6 +2915,24 @@
27502915 if (child == null)
27512916 continue;
27522917 child.GenNormals(crease);
2918
+// Children().release(i);
2919
+ }
2920
+ blockloop = false;
2921
+ }
2922
+
2923
+ void GenNormalsMesh()
2924
+ {
2925
+ if (blockloop)
2926
+ return;
2927
+
2928
+ blockloop = true;
2929
+ GenNormalsMesh0();
2930
+ for (int i = 0; i < Children().Size(); i++)
2931
+ {
2932
+ Object3D child = (Object3D) Children().get(i); // reserve(i);
2933
+ if (child == null)
2934
+ continue;
2935
+ child.GenNormalsMesh();
27532936 // Children().release(i);
27542937 }
27552938 blockloop = false;
....@@ -2922,11 +3105,20 @@
29223105 }
29233106 }
29243107
3108
+ void GenNormalsMesh0()
3109
+ {
3110
+ if (bRep != null)
3111
+ {
3112
+ bRep.GenerateNormalsMesh();
3113
+ Touch();
3114
+ }
3115
+ }
3116
+
29253117 void GenNormalsMINE0()
29263118 {
29273119 if (bRep != null)
29283120 {
2929
- bRep.GenerateNormalsMINE();
3121
+ bRep.MergeNormals(); //.GenerateNormalsMINE();
29303122 Touch();
29313123 }
29323124 }
....@@ -2983,6 +3175,33 @@
29833175 blockloop = false;
29843176 }
29853177
3178
+ void TransformChildren()
3179
+ {
3180
+ if (toParent != null)
3181
+ {
3182
+ for (int i=Size(); --i>=0;)
3183
+ {
3184
+ Object3D v = get(i);
3185
+
3186
+ if (v.toParent == null)
3187
+ {
3188
+ v.toParent = LA.newMatrix();
3189
+ v.fromParent = LA.newMatrix();
3190
+ }
3191
+
3192
+// LA.matConcat(v.toParent, toParent, v.toParent);
3193
+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
3194
+ LA.matConcat(toParent, v.toParent, v.toParent);
3195
+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3196
+ }
3197
+
3198
+ toParent = null; // LA.matIdentity(toParent);
3199
+ fromParent = null; // LA.matIdentity(fromParent);
3200
+
3201
+ Touch();
3202
+ }
3203
+ }
3204
+
29863205 void TransformGeometry()
29873206 {
29883207 Object3D obj = this;
....@@ -3204,9 +3423,11 @@
32043423
32053424 BoundaryRep sup = bRep.support;
32063425 bRep.support = null;
3207
- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3426
+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32083427 // bRep.SplitInTwo(onlyone); // thread...
3209
- temprep.SplitInTwo(reduction34, onlyone);
3428
+
3429
+ while(temprep.SplitInTwo(reduction34, onlyone));
3430
+
32103431 bRep = temprep;
32113432 bRep.support = sup;
32123433 Touch();
....@@ -3343,7 +3564,8 @@
33433564 if (blockloop)
33443565 return;
33453566
3346
- if (marked || (bRep != null && material != null)) // borderline...
3567
+ if (//marked || // does not make sense
3568
+ (bRep != null || material != null)) // borderline...
33473569 live = h;
33483570
33493571 for (int i = 0; i < Size(); i++)
....@@ -3364,7 +3586,8 @@
33643586 return;
33653587
33663588 //if (bRep != null)
3367
- if (marked || (bRep != null && material != null)) // borderline...
3589
+ if (//marked || // does not make sense
3590
+ (bRep != null || material != null)) // borderline...
33683591 link2master = h;
33693592
33703593 for (int i = 0; i < Size(); i++)
....@@ -3384,7 +3607,8 @@
33843607 if (blockloop)
33853608 return;
33863609
3387
- if (marked || (bRep != null && material != null)) // borderline...
3610
+ if (//marked || // does not make sense
3611
+ (bRep != null || material != null)) // borderline...
33883612 hide = h;
33893613
33903614 for (int i = 0; i < Size(); i++)
....@@ -3404,7 +3628,7 @@
34043628 if (blockloop)
34053629 return;
34063630
3407
- if (bRep != null && material != null) // borderline...
3631
+ if (bRep != null || material != null) // borderline...
34083632 marked = h;
34093633
34103634 for (int i = 0; i < Size(); i++)
....@@ -3414,6 +3638,46 @@
34143638 continue;
34153639 blockloop = true;
34163640 child.MarkLeaves(h);
3641
+ blockloop = false;
3642
+ // release(i);
3643
+ }
3644
+ }
3645
+
3646
+ void RewindLeaves(boolean h)
3647
+ {
3648
+ if (blockloop)
3649
+ return;
3650
+
3651
+ if (bRep != null || material != null) // borderline...
3652
+ rewind = h;
3653
+
3654
+ for (int i = 0; i < Size(); i++)
3655
+ {
3656
+ Object3D child = (Object3D) get(i); // reserve(i);
3657
+ if (child == null)
3658
+ continue;
3659
+ blockloop = true;
3660
+ child.RewindLeaves(h);
3661
+ blockloop = false;
3662
+ // release(i);
3663
+ }
3664
+ }
3665
+
3666
+ void RandomLeaves(boolean h)
3667
+ {
3668
+ if (blockloop)
3669
+ return;
3670
+
3671
+ if (bRep != null || material != null) // borderline...
3672
+ random = h;
3673
+
3674
+ for (int i = 0; i < Size(); i++)
3675
+ {
3676
+ Object3D child = (Object3D) get(i); // reserve(i);
3677
+ if (child == null)
3678
+ continue;
3679
+ blockloop = true;
3680
+ child.RandomLeaves(h);
34173681 blockloop = false;
34183682 // release(i);
34193683 }
....@@ -3728,7 +3992,7 @@
37283992 if (child == null)
37293993 continue;
37303994
3731
- if (GrafreeD.RENDERME > 0)
3995
+ if (Grafreed.RENDERME > 0)
37323996 {
37333997 if (child instanceof Merge)
37343998 ((Merge)child).renderme();
....@@ -3879,7 +4143,7 @@
38794143 if (child == null)
38804144 continue;
38814145
3882
- if (GrafreeD.RENDERME > 0)
4146
+ if (Grafreed.RENDERME > 0)
38834147 {
38844148 if (child instanceof Merge)
38854149 ((Merge)child).renderme();
....@@ -4074,7 +4338,7 @@
40744338 if (child == null)
40754339 continue;
40764340
4077
- if (GrafreeD.RENDERME > 0)
4341
+ if (Grafreed.RENDERME > 0)
40784342 {
40794343 if (child instanceof Merge)
40804344 ((Merge)child).renderme();
....@@ -4187,6 +4451,55 @@
41874451 {
41884452 blockloop = true;
41894453 get(i).RepairShadow();
4454
+ blockloop = false;
4455
+ }
4456
+ }
4457
+
4458
+ void RepairSOV()
4459
+ {
4460
+ if (blockloop)
4461
+ return;
4462
+
4463
+ String texname = this.GetPigmentTexture();
4464
+
4465
+ if (texname.startsWith("sov"))
4466
+ {
4467
+ String[] s = texname.split("/");
4468
+
4469
+ String[] sname = s[1].split("Color.pn");
4470
+
4471
+ texname = sname[0];
4472
+
4473
+ if (sname.length > 1)
4474
+ {
4475
+ texname += "Color.jpg";
4476
+ }
4477
+
4478
+ this.SetPigmentTexture("sov/" + texname);
4479
+ }
4480
+
4481
+ texname = this.GetBumpTexture();
4482
+
4483
+ if (texname.startsWith("sov"))
4484
+ {
4485
+ String[] s = texname.split("/");
4486
+
4487
+ String[] sname = s[1].split("Bump.pn");
4488
+
4489
+ texname = sname[0];
4490
+
4491
+ if (sname.length > 1)
4492
+ {
4493
+ texname += "Bump.jpg";
4494
+ }
4495
+
4496
+ this.SetBumpTexture("sov/" + texname);
4497
+ }
4498
+
4499
+ for (int i=0; i<Size(); i++)
4500
+ {
4501
+ blockloop = true;
4502
+ get(i).RepairSOV();
41904503 blockloop = false;
41914504 }
41924505 }
....@@ -4681,7 +4994,7 @@
46814994
46824995 cTreePath SelectLeaf(int indexcount, boolean deselect)
46834996 {
4684
- if (hide)
4997
+ if (hide || dontselect)
46854998 return null;
46864999
46875000 if (count <= 0)
....@@ -4705,9 +5018,17 @@
47055018 }
47065019 }
47075020
5021
+ ObjEditor GetWindow()
5022
+ {
5023
+ if (editWindow != null)
5024
+ return editWindow;
5025
+
5026
+ return manipWindow;
5027
+ }
5028
+
47085029 cTreePath Select(int indexcount, boolean deselect)
47095030 {
4710
- if (hide)
5031
+ if (hide || dontselect)
47115032 return null;
47125033
47135034 if (count <= 0)
....@@ -4741,10 +5062,11 @@
47415062 if (leaf != null)
47425063 {
47435064 cTreePath tp = new cTreePath(this, leaf);
4744
- if (editWindow != null)
5065
+ ObjEditor window = GetWindow();
5066
+ if (window != null)
47455067 {
47465068 //System.out.println("editWindow = " + editWindow + " vs " + this);
4747
- editWindow.Select(tp, deselect, true);
5069
+ window.Select(tp, deselect, true);
47485070 }
47495071
47505072 return tp;
....@@ -4761,6 +5083,7 @@
47615083
47625084 if (child == null)
47635085 continue;
5086
+
47645087 if (child.HasTransparency() && child.size() != 0)
47655088 {
47665089 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4770,9 +5093,10 @@
47705093 if (leaf != null)
47715094 {
47725095 cTreePath tp = new cTreePath(this, leaf);
4773
- if (editWindow != null)
5096
+ ObjEditor window = GetWindow();
5097
+ if (window != null)
47745098 {
4775
- editWindow.Select(tp, deselect, true);
5099
+ window.Select(tp, deselect, true);
47765100 }
47775101
47785102 return tp;
....@@ -5097,6 +5421,51 @@
50975421 blockloop = false;
50985422 }
50995423
5424
+ void ResetSelectable()
5425
+ {
5426
+ if (blockloop)
5427
+ return;
5428
+
5429
+ blockloop = true;
5430
+
5431
+ keepdontselect = dontselect;
5432
+ dontselect = true;
5433
+
5434
+ Object3D child;
5435
+ int nb = Size();
5436
+ for (int i = 0; i < nb; i++)
5437
+ {
5438
+ child = (Object3D) get(i);
5439
+ if (child == null)
5440
+ continue;
5441
+ child.ResetSelectable();
5442
+ }
5443
+
5444
+ blockloop = false;
5445
+ }
5446
+
5447
+ void RestoreSelectable()
5448
+ {
5449
+ if (blockloop)
5450
+ return;
5451
+
5452
+ blockloop = true;
5453
+
5454
+ dontselect = keepdontselect;
5455
+
5456
+ Object3D child;
5457
+ int nb = Size();
5458
+ for (int i = 0; i < nb; i++)
5459
+ {
5460
+ child = (Object3D) get(i);
5461
+ if (child == null)
5462
+ continue;
5463
+ child.RestoreSelectable();
5464
+ }
5465
+
5466
+ blockloop = false;
5467
+ }
5468
+
51005469 boolean IsSelected()
51015470 {
51025471 if (parent == null)
....@@ -5159,10 +5528,34 @@
51595528
51605529 // System.out.println("Fullname = " + fullname);
51615530
5162
- if (fullname.name.indexOf(":") == -1)
5163
- return fullname.name;
5531
+ // Does not work on Windows due to C:
5532
+// if (fullname.name.indexOf(":") == -1)
5533
+// return fullname.name;
5534
+//
5535
+// return fullname.name.substring(0,fullname.name.indexOf(":"));
51645536
5165
- return fullname.name.substring(0,fullname.name.indexOf(":"));
5537
+ String[] split = fullname.name.split(":");
5538
+
5539
+ if (split.length == 0)
5540
+ {
5541
+ return "";
5542
+ }
5543
+
5544
+ if (split.length <= 2)
5545
+ {
5546
+ if (fullname.name.endsWith(":"))
5547
+ {
5548
+ // Windows
5549
+ return fullname.name.substring(0, fullname.name.length()-1);
5550
+ }
5551
+
5552
+ return split[0];
5553
+ }
5554
+
5555
+ // Windows
5556
+ assert(split.length == 4);
5557
+
5558
+ return split[0] + ":" + split[1];
51665559 }
51675560
51685561 static String GetBump(cTexture fullname)
....@@ -5171,10 +5564,38 @@
51715564 return "";
51725565
51735566 // System.out.println("Fullname = " + fullname);
5174
- if (fullname.name.indexOf(":") == -1)
5175
- return "";
5176
-
5177
- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5567
+ // Does not work on Windows due to C:
5568
+// if (fullname.name.indexOf(":") == -1)
5569
+// return "";
5570
+//
5571
+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5572
+ String[] split = fullname.name.split(":");
5573
+
5574
+ if (split.length == 0)
5575
+ {
5576
+ return "";
5577
+ }
5578
+
5579
+ if (split.length == 1)
5580
+ {
5581
+ return "";
5582
+ }
5583
+
5584
+ if (split.length == 2)
5585
+ {
5586
+ if (fullname.name.endsWith(":"))
5587
+ {
5588
+ // Windows
5589
+ return "";
5590
+ }
5591
+
5592
+ return split[1];
5593
+ }
5594
+
5595
+ // Windows
5596
+ assert(split.length == 4);
5597
+
5598
+ return split[2] + ":" + split[3];
51785599 }
51795600
51805601 String GetPigmentTexture()
....@@ -5248,7 +5669,7 @@
52485669 System.out.print("; textures = " + textures);
52495670 System.out.println("; usedtextures = " + usedtextures);
52505671
5251
- if (GetTextures() == null)
5672
+ if (GetTextures() == null) // What is that??
52525673 GetTextures().name = ":";
52535674
52545675 String texname = tex;
....@@ -5279,6 +5700,43 @@
52795700 child.ResetPigmentTexture();
52805701 blockloop = false;
52815702 }
5703
+ }
5704
+
5705
+ UUID GetUUID()
5706
+ {
5707
+ if (uuid == null)
5708
+ {
5709
+ // Serial
5710
+ uuid = UUID.randomUUID();
5711
+ }
5712
+
5713
+ return uuid;
5714
+ }
5715
+
5716
+ Object3D GetObject(UUID uid)
5717
+ {
5718
+ if (blockloop)
5719
+ return null;
5720
+
5721
+ if (GetUUID().equals(uid))
5722
+ return this;
5723
+
5724
+ int nb = Size();
5725
+ for (int i = 0; i < nb; i++)
5726
+ {
5727
+ Object3D child = (Object3D) get(i);
5728
+
5729
+ if (child == null)
5730
+ continue;
5731
+
5732
+ blockloop = true;
5733
+ Object3D obj = child.GetObject(uid);
5734
+ blockloop = false;
5735
+ if (obj != null)
5736
+ return obj;
5737
+ }
5738
+
5739
+ return null;
52825740 }
52835741
52845742 void SetBumpTexture(String tex)
....@@ -5325,12 +5783,23 @@
53255783 boolean NeedSupport()
53265784 {
53275785 return
5328
- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
5786
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
53295787 // PROBLEM with CROWD!!
5330
- && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5788
+ && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
53315789 }
53325790
53335791 static boolean DEBUG_SELECTION = false;
5792
+
5793
+ boolean IsLive()
5794
+ {
5795
+ if (live)
5796
+ return true;
5797
+
5798
+ if (parent == null)
5799
+ return false;
5800
+
5801
+ return parent.IsLive();
5802
+ }
53345803
53355804 void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
53365805 {
....@@ -5342,7 +5811,7 @@
53425811 }
53435812
53445813 if (display.DrawMode() == iCameraPane.SELECTION &&
5345
- hide)
5814
+ (hide || dontselect))
53465815 return;
53475816
53485817 if (name != null && name.contains("sclera"))
....@@ -5393,7 +5862,7 @@
53935862 support = support;
53945863
53955864 //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5396
- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5865
+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
53975866
53985867 if (!usecalllists && bRep != null && bRep.displaylist > 0)
53995868 {
....@@ -5413,10 +5882,12 @@
54135882 boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
54145883
54155884 if (!selectmode && //display.DrawMode() != display.SELECTION &&
5416
- (touched || (bRep != null && bRep.displaylist <= 0)))
5885
+ //(touched || (bRep != null && bRep.displaylist <= 0)))
5886
+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
54175887 {
54185888 Globals.lighttouched = true;
54195889 } // all panes...
5890
+
54205891 //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
54215892 if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
54225893 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5544,6 +6015,7 @@
55446015 if (GetBRep() != null)
55456016 {
55466017 display.NextIndex();
6018
+
55476019 // vertex color conflict : gl.glCallList(list);
55486020 DrawNode(display, root, selected);
55496021 if (this instanceof BezierPatch)
....@@ -5584,7 +6056,28 @@
55846056 tex = GetTextures();
55856057 }
55866058
5587
- display.BindTextures(tex, texres);
6059
+ boolean failedPigment = false;
6060
+ boolean failedBump = false;
6061
+
6062
+ try
6063
+ {
6064
+ display.BindPigmentTexture(tex, texres);
6065
+ }
6066
+ catch (Exception e)
6067
+ {
6068
+ System.err.println("FAILED: " + this);
6069
+ failedPigment = true;
6070
+ }
6071
+
6072
+ try
6073
+ {
6074
+ display.BindBumpTexture(tex, texres);
6075
+ }
6076
+ catch (Exception e)
6077
+ {
6078
+ //System.err.println("FAILED: " + this);
6079
+ failedBump = true;
6080
+ }
55886081
55896082 if (!compiled)
55906083 {
....@@ -5606,7 +6099,11 @@
56066099 }
56076100 }
56086101
5609
- display.ReleaseTextures(tex);
6102
+ if (!failedBump)
6103
+ display.ReleaseBumpTexture(tex);
6104
+
6105
+ if (!failedPigment)
6106
+ display.ReleasePigmentTexture(tex);
56106107
56116108 display.PopMaterial(this, selected);
56126109 }
....@@ -5735,6 +6232,9 @@
57356232
57366233 void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57376234 {
6235
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6236
+ return;
6237
+
57386238 if (hide)
57396239 return;
57406240 // shadow optimisation
....@@ -5860,6 +6360,9 @@
58606360 if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
58616361 return; // no shadow for transparent objects
58626362
6363
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6364
+ return;
6365
+
58636366 if (hide)
58646367 return;
58656368
....@@ -5973,6 +6476,11 @@
59736476 // dec 2012
59746477 new Exception().printStackTrace();
59756478 return;
6479
+ }
6480
+
6481
+ if (dontselect)
6482
+ {
6483
+ //bRep.GenerateNormalsMINE();
59766484 }
59776485
59786486 display.DrawGeometry(bRep, flipV, selectmode);
....@@ -6825,7 +7333,7 @@
68257333 spot.translate(32, 32);
68267334 spotw = spot.x + spot.width;
68277335 spoth = spot.y + spot.height;
6828
- info.g.setColor(Color.blue);
7336
+ info.g.setColor(Color.cyan);
68297337 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
68307338 // if (CameraPane.Xmin > spot.x)
68317339 // {
....@@ -6843,11 +7351,12 @@
68437351 // {
68447352 // CameraPane.Ymax = spoth;
68457353 // }
6846
- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6847
- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7354
+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7355
+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
68487356 spot.translate(0, -32);
6849
- info.g.setColor(Color.green);
7357
+ info.g.setColor(Color.yellow);
68507358 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7359
+ info.g.setColor(Color.green);
68517360 // if (CameraPane.Xmin > spot.x)
68527361 // {
68537362 // CameraPane.Xmin = spot.x;
....@@ -6864,8 +7373,8 @@
68647373 // {
68657374 // CameraPane.Ymax = spoth;
68667375 // }
6867
- info.g.drawArc(boundary.x, boundary.y,
6868
- boundary.width, boundary.height, 0, 360);
7376
+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7377
+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
68697378 //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
68707379 // if (CameraPane.Xmin > boundary.x)
68717380 // {
....@@ -6899,7 +7408,7 @@
68997408 startX = info.x;
69007409 startY = info.y;
69017410
6902
- hitSomething = 0;
7411
+ hitSomething = -1;
69037412 cVector origin = new cVector();
69047413 //LA.xformPos(origin, toParent, origin);
69057414 Rectangle spot = new Rectangle();
....@@ -6932,7 +7441,7 @@
69327441 }
69337442
69347443 //System.out.println("info.modifiers = " + info.modifiers);
6935
- modified = (info.modifiers & CameraPane.META) != 0;
7444
+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
69367445 //System.out.println("modified = " + modified);
69377446 //new Exception().printStackTrace();
69387447 //viewCode = info.pane.renderCamera.viewCode;
....@@ -6960,7 +7469,7 @@
69607469 return true;
69617470 }
69627471
6963
- void doEditDrag0(ClickInfo info)
7472
+ void doEditDrag0(ClickInfo info, boolean opposite)
69647473 {
69657474 if (hitSomething == 0)
69667475 {
....@@ -6975,6 +7484,7 @@
69757484 //System.out.println("hitSomething = " + hitSomething);
69767485
69777486 double scale = 0.005f * info.camera.Distance();
7487
+
69787488 cVector xlate = new cVector();
69797489 //cVector xlate2 = new cVector();
69807490 switch (hitSomething)
....@@ -6987,7 +7497,7 @@
69877497
69887498 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
69897499
6990
- if (modified)
7500
+ if (modified || opposite)
69917501 {
69927502 //assert(false);
69937503 /*
....@@ -7081,6 +7591,7 @@
70817591
70827592 if (modified)
70837593 {
7594
+ // Rotate 90 degrees
70847595 angle /= (Math.PI / 4);
70857596 angle = Math.floor(angle + 0.5);
70867597 angle *= (Math.PI / 4);
....@@ -7122,24 +7633,27 @@
71227633
71237634 case hitScale: // scale
71247635 double hScale = (double) (info.x - centerPt.x) / 32;
7636
+ double sign = 1;
7637
+ if (hScale < 0)
7638
+ {
7639
+ sign = -1;
7640
+ }
7641
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
71257642 if (hScale < 0.01)
71267643 {
7127
- hScale = 0.01;
7644
+ //hScale = 0.01;
71287645 }
7129
- hScale = Math.pow(hScale, scale * 50);
7130
- if (hScale < 0.01)
7131
- {
7132
- hScale = 0.01;
7133
- }
7646
+
71347647 double vScale = (double) (info.y - centerPt.y) / 32;
7135
- if (vScale < 0.01)
7648
+ sign = 1;
7649
+ if (vScale < 0)
71367650 {
7137
- vScale = 0.01;
7651
+ sign = -1;
71387652 }
7139
- vScale = Math.pow(vScale, scale * 50);
7653
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
71407654 if (vScale < 0.01)
71417655 {
7142
- vScale = 0.01;
7656
+ //vScale = 0.01;
71437657 }
71447658 LA.matCopy(startMat, toParent);
71457659 /**/
....@@ -7150,39 +7664,47 @@
71507664 }
71517665 /**/
71527666
7667
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7668
+
7669
+ if (totalScale < 0.01)
7670
+ {
7671
+ totalScale = 0.01;
7672
+ }
7673
+
71537674 switch (info.pane.RenderCamera().viewCode)
71547675 {
71557676 case 3: // '\001'
7156
- if (modified)
7677
+ if (modified || opposite)
71577678 {
71587679 //LA.matScale(toParent, 1, hScale, vScale);
7159
- LA.matScale(toParent, vScale, 1, 1);
7680
+ LA.matScale(toParent, totalScale, 1, 1);
71607681 } // vScale, 1);
71617682 else
71627683 {
7163
- LA.matScale(toParent, vScale, vScale, vScale);
7684
+ // EXCEPTION!
7685
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
71647686 } // vScale, 1);
71657687 break;
71667688
71677689 case 2: // '\002'
7168
- if (modified)
7690
+ if (modified || opposite)
71697691 {
71707692 //LA.matScale(toParent, hScale, 1, vScale);
7171
- LA.matScale(toParent, 1, vScale, 1);
7693
+ LA.matScale(toParent, 1, totalScale, 1);
71727694 } else
71737695 {
7174
- LA.matScale(toParent, vScale, 1, vScale);
7696
+ LA.matScale(toParent, totalScale, 1, totalScale);
71757697 }
71767698 break;
71777699
71787700 case 1: // '\003'
7179
- if (modified)
7701
+ if (modified || opposite)
71807702 {
71817703 //LA.matScale(toParent, hScale, vScale, 1);
7182
- LA.matScale(toParent, 1, 1, vScale);
7704
+ LA.matScale(toParent, 1, 1, totalScale);
71837705 } else
71847706 {
7185
- LA.matScale(toParent, vScale, vScale, 1);
7707
+ LA.matScale(toParent, totalScale, totalScale, 1);
71867708 }
71877709 break;
71887710 }
....@@ -7315,14 +7837,22 @@
73157837 //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
73167838 //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
73177839 //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
7840
+
7841
+ String objname;
7842
+
73187843 if (false) //parent != null)
73197844 {
7320
- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7845
+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
73217846 } else
73227847 {
7323
- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
7848
+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
73247849 } // + super.toString();
73257850 //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7851
+
7852
+ if (!Globals.ADVANCED)
7853
+ return objname;
7854
+
7855
+ return objname + " " + System.identityHashCode(this);
73267856 }
73277857
73287858 public int hashCode()
....@@ -7378,6 +7908,7 @@
73787908 objectUI.closeUI();
73797909 if (editWindow != null)
73807910 {
7911
+ editWindow.ctrlPanel.FlushUI();
73817912 editWindow.refreshContents();
73827913 } // ? new
73837914 objectUI = null;
....@@ -7386,6 +7917,10 @@
73867917 {
73877918 editWindow = null;
73887919 } // ?
7920
+ }
7921
+ else
7922
+ {
7923
+ //editWindow.closeUI();
73897924 }
73907925 }
73917926
....@@ -7398,7 +7933,7 @@
73987933 /*transient*/ cVector2[] projectedVertices = new cVector2[0];
73997934
74007935 Object3D /*Composite*/ parent;
7401
- Object3D /*Composite*/ fileparent;
7936
+ Object3D /*Composite*/ fileparent; // In the case of FileObject
74027937
74037938 double[][] toParent; // dynamic matrix
74047939 double[][] fromParent;
....@@ -7513,7 +8048,7 @@
75138048 {
75148049 assert(bRep != null);
75158050 if (!(support instanceof GenericJoint)) // support.bRep != null)
7516
- GrafreeD.Assert(support.bRep == bRep.support);
8051
+ Grafreed.Assert(support.bRep == bRep.support);
75178052 }
75188053 else
75198054 {
....@@ -7544,6 +8079,10 @@
75448079 }
75458080
75468081 transient ObjEditor editWindow;
8082
+ transient ObjEditor manipWindow;
8083
+
8084
+ transient boolean pinned;
8085
+
75478086 transient ObjectUI objectUI;
75488087 public static int povDepth = 0;
75498088 private static cVector tbMin = new cVector();
....@@ -7562,9 +8101,9 @@
75628101 private static cVector edge2 = new cVector();
75638102 //private static cVector norm = new cVector();
75648103 /*transient private*/ int hitSomething;
7565
- private static final int hitCenter = 1;
7566
- private static final int hitScale = 2;
7567
- private static final int hitRotate = 3;
8104
+ static final int hitCenter = 1;
8105
+ static final int hitScale = 2;
8106
+ static final int hitRotate = 3;
75688107 /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
75698108 /*transient*/ private Point centerPt;
75708109 /*transient*/ private int startX;