Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a
Object3D.java
....@@ -14,14 +14,45 @@
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
+ // Use GetUUID for backward compatibility with null.
26
+ private UUID uuid = UUID.randomUUID();
27
+
28
+ // TEMPORARY for mocap undo. No need to be transient.
29
+ mocap.reader.BVHReader.BVHResult savebvh;
30
+ Object3D saveskeleton;
31
+ //
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>();
40
+
2341 ScriptNode scriptnode;
2442
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
+
2556 void InitOthers()
2657 {
2758 if (projectedVertices == null || projectedVertices.length <= 2)
....@@ -100,64 +131,245 @@
100131
101132 // transient boolean reduced; // for morph reduction
102133
103
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
134
+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
135
+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105136
106
-transient Object3D transientsupport; // for cloning
107
-transient boolean transientlink2master;
137
+ transient Object3D transientsupport; // for cloning
138
+ transient boolean transientlink2master;
108139
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)
140
+ void SaveSupports()
121141 {
122
- bRep.SaveSupports();
142
+ if (blockloop)
143
+ return;
144
+
145
+ transientsupport = support;
146
+ transientlink2master = link2master;
147
+
148
+ support = null;
149
+ link2master = false;
150
+
151
+ if (bRep != null)
152
+ {
153
+ bRep.SaveSupports();
154
+ }
155
+
156
+ for (int i = 0; i < Size(); i++)
157
+ {
158
+ Object3D child = (Object3D) get(i);
159
+ if (child == null)
160
+ continue;
161
+ blockloop = true;
162
+ child.SaveSupports();
163
+ blockloop = false;
164
+ }
123165 }
124
-
125
- for (int i = 0; i < Size(); i++)
166
+
167
+ void RestoreSupports()
126168 {
127
- Object3D child = (Object3D) get(i);
128
- if (child == null)
129
- continue;
169
+ if (blockloop)
170
+ return;
171
+
172
+ support = transientsupport;
173
+ link2master = transientlink2master;
174
+ transientsupport = null;
175
+ transientlink2master = false;
176
+
177
+ if (bRep != null)
178
+ {
179
+ bRep.RestoreSupports();
180
+ }
181
+
182
+ for (int i = 0; i < Size(); i++)
183
+ {
184
+ Object3D child = (Object3D) get(i);
185
+ if (child == null)
186
+ continue;
187
+ blockloop = true;
188
+ child.RestoreSupports();
189
+ blockloop = false;
190
+ }
191
+ }
192
+
193
+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
194
+ {
195
+ Object3D o;
196
+
197
+ if (hashtable.containsKey(GetUUID()))
198
+ {
199
+ o = hashtable.get(GetUUID());
200
+
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);
210
+
211
+ hashtable.put(GetUUID(), o);
212
+ }
213
+
214
+ if (!blockloop)
215
+ {
216
+ blockloop = true;
217
+
218
+ for (int i=0; i<Size(); i++)
219
+ {
220
+ get(i).ExtractBigData(hashtable);
221
+ }
222
+
223
+ blockloop = false;
224
+ }
225
+
226
+ ExtractBigData(o);
227
+ }
228
+
229
+ void ExtractBigData(Object3D o)
230
+ {
231
+ if (o.bRep != null)
232
+ Grafreed.Assert(o.bRep == this.bRep);
233
+
234
+ o.bRep = this.bRep;
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)
245
+ {
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;
251
+ }
252
+
253
+ // o.support = this.support;
254
+ // o.fileparent = this.fileparent;
255
+ // if (this.bRep != null)
256
+ // o.bRep = this.bRep.support;
257
+
258
+ this.bRep = null;
259
+ // if (this.bRep != null)
260
+ // this.bRep.support = null;
261
+ // this.support = null;
262
+ // this.fileparent = null;
263
+ }
264
+
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
+
130300 blockloop = true;
131
- child.SaveSupports();
301
+
302
+ for (int i=0; i<Size(); i++)
303
+ {
304
+ get(i).TagObjects(o, tag);
305
+ }
306
+
132307 blockloop = false;
133308 }
134
-}
135309
136
-void RestoreSupports()
137
-{
138
- if (blockloop)
139
- return;
310
+ boolean HasTags()
311
+ {
312
+ if (blockloop)
313
+ return false;
140314
141
- support = transientsupport;
142
- link2master = transientlink2master;
143
- transientsupport = null;
144
- transientlink2master = false;
145
-
146
- if (bRep != null)
147
- {
148
- bRep.RestoreSupports();
149
- }
150
-
151
- for (int i = 0; i < Size(); i++)
152
- {
153
- Object3D child = (Object3D) get(i);
154
- if (child == null)
155
- continue;
156315 blockloop = true;
157
- child.RestoreSupports();
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
+
332
+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
333
+ {
334
+ if (!hashtable.containsKey(GetUUID()))
335
+ return;
336
+
337
+ Object3D o = hashtable.get(GetUUID());
338
+
339
+ RestoreBigData(o);
340
+
341
+ if (blockloop)
342
+ return;
343
+
344
+ blockloop = true;
345
+
346
+ //hashtable.remove(GetUUID());
347
+
348
+ for (int i=0; i<Size(); i++)
349
+ {
350
+ get(i).RestoreBigData(hashtable);
351
+ }
352
+
158353 blockloop = false;
159354 }
160
-}
355
+
356
+ void RestoreBigData(Object3D o)
357
+ {
358
+ this.bRep = o.bRep;
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;
370
+ // this.support = o.support;
371
+ // this.fileparent = o.fileparent;
372
+ }
161373
162374 // MOCAP SUPPORT
163375 double tx,ty,tz,rx,ry,rz;
....@@ -300,6 +512,8 @@
300512 }
301513
302514 boolean live = false;
515
+ transient boolean keepdontselect;
516
+ boolean dontselect = false;
303517 boolean hide = false;
304518 boolean link2master = false; // performs reset support/master at each frame
305519 boolean marked = false; // animation node
....@@ -367,11 +581,11 @@
367581 }
368582 }
369583
370
- int memorysize;
584
+ transient int memorysize; // needs to be transient, dunno why
371585
372586 int MemorySize()
373587 {
374
- if (true) // memorysize == 0)
588
+ if (memorysize == 0)
375589 {
376590 try
377591 {
....@@ -481,12 +695,14 @@
481695 toParent = LA.newMatrix();
482696 fromParent = LA.newMatrix();
483697 }
698
+
484699 if (toParentMarked == null)
485700 {
486701 if (maxcount != 1)
487702 {
488
- new Exception().printStackTrace();
703
+ //new Exception().printStackTrace();
489704 }
705
+
490706 toParentMarked = LA.newMatrix();
491707 fromParentMarked = LA.newMatrix();
492708 }
....@@ -774,7 +990,7 @@
774990 if (step == 0)
775991 step = 1;
776992 if (maxcount == 0)
777
- maxcount = 2048; // 4;
993
+ maxcount = 128; // 2048; // 4;
778994 // if (acceleration == 0)
779995 // acceleration = 10;
780996 if (delay == 0) // serial
....@@ -797,7 +1013,7 @@
7971013
7981014 if (marked && Globals.isLIVE() && live &&
7991015 //TEMP21aug2018
800
- Globals.DrawMode() == iCameraPane.SHADOW &&
1016
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
8011017 currentframe != Globals.framecount)
8021018 {
8031019 currentframe = Globals.framecount;
....@@ -809,7 +1025,8 @@
8091025
8101026 boolean changedir = random && Math.random() < 0.01; // && !link2master;
8111027
812
- if (transformcount*factor > maxcount || (step == 1 && changedir))
1028
+ if (transformcount*factor >= maxcount && (rewind || random) ||
1029
+ (step == 1 && changedir))
8131030 {
8141031 countdown = 1;
8151032 delay = speedup?8:1;
....@@ -881,6 +1098,10 @@
8811098 if (material == null || material.multiply)
8821099 return true;
8831100
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.
8841105 return material.opacity > 0.99;
8851106 }
8861107
....@@ -912,6 +1133,11 @@
9121133 fromParent = null; // LA.newMatrix();
9131134 bRep = null; // new BoundaryRep();
9141135
1136
+ if (oname != null && oname.equals("LeftHand"))
1137
+ {
1138
+ name = oname;
1139
+ }
1140
+
9151141 /*
9161142 float hue = (float)Math.random();
9171143 Color col;
....@@ -954,7 +1180,7 @@
9541180
9551181 public Object clone()
9561182 {
957
- return GrafreeD.clone(this);
1183
+ return Grafreed.clone(this);
9581184 }
9591185
9601186 Object3D copyExpand()
....@@ -1276,6 +1502,7 @@
12761502 toParent = LA.newMatrix();
12771503 fromParent = LA.newMatrix();
12781504 }
1505
+
12791506 LA.matCopy(other.toParent, toParent);
12801507 LA.matCopy(other.fromParent, fromParent);
12811508
....@@ -1470,7 +1697,7 @@
14701697 BoundaryRep.SEUIL = other.material.cameralight;
14711698
14721699 // Set default to 0.1
1473
- BoundaryRep.SEUIL /= 2;
1700
+ BoundaryRep.SEUIL /= 4; // 2;
14741701 System.out.println("SEUIL = " + BoundaryRep.SEUIL);
14751702 }
14761703
....@@ -1729,7 +1956,7 @@
17291956 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17301957 o.bRep = transientrep;
17311958 if (clone)
1732
- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1959
+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17331960 o.CreateMaterial();
17341961 o.SetAttributes(this, -1);
17351962 //parent
....@@ -1742,7 +1969,7 @@
17421969 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17431970 o.bRep = bRep;
17441971 if (clone)
1745
- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1972
+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17461973 o.CreateMaterial();
17471974 //o.overwriteThis(this, -1);
17481975 o.SetAttributes(this, -1);
....@@ -1829,12 +2056,15 @@
18292056 if (obj.name == null)
18302057 continue; // can't be a null one
18312058
2059
+ // Try perfect match first.
18322060 if (n.equals(obj.name))
18332061 {
18342062 theobj = obj;
18352063 count++;
18362064 }
18372065 }
2066
+
2067
+ // not needed: n = n.split(":")[0]; // Poser generates a count
18382068
18392069 if (count != 1)
18402070 for (int i=Size(); --i>=0;)
....@@ -2152,11 +2382,6 @@
21522382
21532383 InitOthers();
21542384
2155
- if (this instanceof Camera)
2156
- {
2157
- material.shift = 90;
2158
- }
2159
-
21602385 material.multiply = multiply;
21612386
21622387 if (multiply)
....@@ -2294,12 +2519,22 @@
22942519 }
22952520 */
22962521 }
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
+ }
22972531 }
22982532
22992533 void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
23002534 {
23012535 if (newWindow)
23022536 {
2537
+ new Exception().printStackTrace();
23032538 System.exit(0);
23042539 if (parent != null)
23052540 {
....@@ -2334,6 +2569,14 @@
23342569 {
23352570 editWindow.refreshContents();
23362571 }
2572
+ else
2573
+ {
2574
+ if (manipWindow != null)
2575
+ {
2576
+ manipWindow.refreshContents();
2577
+ }
2578
+ }
2579
+
23372580 //if (parent != null)
23382581 //parent.refreshEditWindow();
23392582 }
....@@ -2413,7 +2656,8 @@
24132656 private static final int editSelf = 1;
24142657 private static final int editChild = 2;
24152658
2416
- void drawEditHandles(ClickInfo info, int level)
2659
+ void drawEditHandles(//ClickInfo info,
2660
+ int level)
24172661 {
24182662 if (level == 0)
24192663 {
....@@ -2421,7 +2665,8 @@
24212665 return;
24222666
24232667 Object3D selectee;
2424
- 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))
24252670 {
24262671 selectee = (Object3D) e.nextElement();
24272672 }
....@@ -2429,19 +2674,22 @@
24292674 } else
24302675 {
24312676 //super.
2432
- drawEditHandles0(info, level + 1);
2677
+ drawEditHandles0(//info,
2678
+ level + 1);
24332679 }
24342680 }
24352681
2436
- boolean doEditClick(ClickInfo info, int level)
2682
+ boolean doEditClick(//ClickInfo info,
2683
+ int level)
24372684 {
24382685 doSomething = 0;
24392686 if (level == 0)
24402687 {
2441
- return doParentClick(info);
2688
+ return doParentClick(); //info);
24422689 }
24432690 if (//super.
2444
- doEditClick0(info, level))
2691
+ doEditClick0(//info,
2692
+ level))
24452693 {
24462694 doSomething = 1;
24472695 return true;
....@@ -2451,7 +2699,7 @@
24512699 }
24522700 }
24532701
2454
- boolean doParentClick(ClickInfo info)
2702
+ boolean doParentClick() //ClickInfo info)
24552703 {
24562704 if (selection == null)
24572705 {
....@@ -2464,7 +2712,8 @@
24642712 for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
24652713 {
24662714 Object3D selectee = (Object3D) e.nextElement();
2467
- if (selectee.doEditClick(info, 1))
2715
+ if (selectee.doEditClick(//info,
2716
+ 1))
24682717 {
24692718 childToDrag = selectee;
24702719 doSomething = 2;
....@@ -2476,13 +2725,15 @@
24762725 return retval;
24772726 }
24782727
2479
- void doEditDrag(ClickInfo info)
2728
+ void doEditDrag(//ClickInfo clickInfo,
2729
+ boolean opposite)
24802730 {
24812731 switch (doSomething)
24822732 {
24832733 case 1: // '\001'
24842734 //super.
2485
- doEditDrag0(info);
2735
+ doEditDrag0(//clickInfo,
2736
+ opposite);
24862737 break;
24872738
24882739 case 2: // '\002'
....@@ -2495,11 +2746,13 @@
24952746 {
24962747 //sel.hitSomething = childToDrag.hitSomething;
24972748 //childToDrag.doEditDrag(info);
2498
- sel.doEditDrag(info);
2749
+ sel.doEditDrag(//clickInfo,
2750
+ opposite);
24992751 } else
25002752 {
25012753 //super.
2502
- doEditDrag0(info);
2754
+ doEditDrag0(//clickInfo,
2755
+ opposite);
25032756 }
25042757 }
25052758 break;
....@@ -2517,6 +2770,9 @@
25172770 {
25182771 deselectAll();
25192772 }
2773
+
2774
+ new Exception().printStackTrace();
2775
+
25202776 ClickInfo newInfo = new ClickInfo();
25212777 newInfo.flags = info.flags;
25222778 newInfo.bounds = info.bounds;
....@@ -2609,6 +2865,18 @@
26092865 void GenNormalsS(boolean crease)
26102866 {
26112867 selection.GenNormals(crease);
2868
+// for (int i=0; i<selection.size(); i++)
2869
+// {
2870
+// Object3D selectee = (Object3D) selection.elementAt(i);
2871
+// selectee.GenNormals(crease);
2872
+// }
2873
+
2874
+ //Touch();
2875
+ }
2876
+
2877
+ void GenNormalsMeshS()
2878
+ {
2879
+ selection.GenNormalsMesh();
26122880 // for (int i=0; i<selection.size(); i++)
26132881 // {
26142882 // Object3D selectee = (Object3D) selection.elementAt(i);
....@@ -2749,6 +3017,24 @@
27493017 if (child == null)
27503018 continue;
27513019 child.GenNormals(crease);
3020
+// Children().release(i);
3021
+ }
3022
+ blockloop = false;
3023
+ }
3024
+
3025
+ void GenNormalsMesh()
3026
+ {
3027
+ if (blockloop)
3028
+ return;
3029
+
3030
+ blockloop = true;
3031
+ GenNormalsMesh0();
3032
+ for (int i = 0; i < Children().Size(); i++)
3033
+ {
3034
+ Object3D child = (Object3D) Children().get(i); // reserve(i);
3035
+ if (child == null)
3036
+ continue;
3037
+ child.GenNormalsMesh();
27523038 // Children().release(i);
27533039 }
27543040 blockloop = false;
....@@ -2906,7 +3192,8 @@
29063192 {
29073193 if (bRep != null)
29083194 {
2909
- bRep.GenUV();
3195
+ bRep.GenUV(); //1);
3196
+ //bRep.UnfoldUV();
29103197 Touch();
29113198 }
29123199 }
....@@ -2920,11 +3207,20 @@
29203207 }
29213208 }
29223209
3210
+ void GenNormalsMesh0()
3211
+ {
3212
+ if (bRep != null)
3213
+ {
3214
+ bRep.GenerateNormalsMesh();
3215
+ Touch();
3216
+ }
3217
+ }
3218
+
29233219 void GenNormalsMINE0()
29243220 {
29253221 if (bRep != null)
29263222 {
2927
- bRep.GenerateNormalsMINE();
3223
+ bRep.MergeNormals(); //.GenerateNormalsMINE();
29283224 Touch();
29293225 }
29303226 }
....@@ -2981,6 +3277,120 @@
29813277 blockloop = false;
29823278 }
29833279
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
+
3367
+ void TransformChildren()
3368
+ {
3369
+ if (toParent != null)
3370
+ {
3371
+ for (int i=Size(); --i>=0;)
3372
+ {
3373
+ Object3D v = get(i);
3374
+
3375
+ if (v.toParent == null)
3376
+ {
3377
+ v.toParent = LA.newMatrix();
3378
+ v.fromParent = LA.newMatrix();
3379
+ }
3380
+
3381
+// LA.matConcat(v.toParent, toParent, v.toParent);
3382
+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
3383
+ LA.matConcat(toParent, v.toParent, v.toParent);
3384
+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3385
+ }
3386
+
3387
+ toParent = null; // LA.matIdentity(toParent);
3388
+ fromParent = null; // LA.matIdentity(fromParent);
3389
+
3390
+ Touch();
3391
+ }
3392
+ }
3393
+
29843394 void TransformGeometry()
29853395 {
29863396 Object3D obj = this;
....@@ -3202,9 +3612,11 @@
32023612
32033613 BoundaryRep sup = bRep.support;
32043614 bRep.support = null;
3205
- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3615
+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32063616 // bRep.SplitInTwo(onlyone); // thread...
3207
- temprep.SplitInTwo(reduction34, onlyone);
3617
+
3618
+ while(temprep.SplitInTwo(reduction34, onlyone));
3619
+
32083620 bRep = temprep;
32093621 bRep.support = sup;
32103622 Touch();
....@@ -3305,15 +3717,47 @@
33053717
33063718 void ClearMaterials()
33073719 {
3720
+ if (blockloop)
3721
+ return;
3722
+
3723
+ blockloop = true;
3724
+
33083725 ClearMaterial();
3309
- for (int i = 0; i < size(); i++)
3726
+ for (int i = 0; i < Size(); i++)
33103727 {
3311
- Object3D child = (Object3D) reserve(i);
3728
+ Object3D child = (Object3D) get(i);
33123729 if (child == null)
33133730 continue;
33143731 child.ClearMaterials();
3315
- release(i);
33163732 }
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;
33173761 }
33183762
33193763 void FlipV(boolean flip)
....@@ -3341,7 +3785,8 @@
33413785 if (blockloop)
33423786 return;
33433787
3344
- if (marked || (bRep != null && material != null)) // borderline...
3788
+ if (//marked || // does not make sense
3789
+ (bRep != null || material != null)) // borderline...
33453790 live = h;
33463791
33473792 for (int i = 0; i < Size(); i++)
....@@ -3362,7 +3807,8 @@
33623807 return;
33633808
33643809 //if (bRep != null)
3365
- if (marked || (bRep != null && material != null)) // borderline...
3810
+ if (//marked || // does not make sense
3811
+ (bRep != null || material != null)) // borderline...
33663812 link2master = h;
33673813
33683814 for (int i = 0; i < Size(); i++)
....@@ -3382,7 +3828,8 @@
33823828 if (blockloop)
33833829 return;
33843830
3385
- if (marked || (bRep != null && material != null)) // borderline...
3831
+ if (//marked || // does not make sense
3832
+ (bRep != null || material != null)) // borderline...
33863833 hide = h;
33873834
33883835 for (int i = 0; i < Size(); i++)
....@@ -3402,7 +3849,7 @@
34023849 if (blockloop)
34033850 return;
34043851
3405
- if (bRep != null && material != null) // borderline...
3852
+ if (bRep != null || material != null) // borderline...
34063853 marked = h;
34073854
34083855 for (int i = 0; i < Size(); i++)
....@@ -3412,6 +3859,46 @@
34123859 continue;
34133860 blockloop = true;
34143861 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);
34153902 blockloop = false;
34163903 // release(i);
34173904 }
....@@ -3726,7 +4213,7 @@
37264213 if (child == null)
37274214 continue;
37284215
3729
- if (GrafreeD.RENDERME > 0)
4216
+ if (Grafreed.RENDERME > 0)
37304217 {
37314218 if (child instanceof Merge)
37324219 ((Merge)child).renderme();
....@@ -3877,7 +4364,7 @@
38774364 if (child == null)
38784365 continue;
38794366
3880
- if (GrafreeD.RENDERME > 0)
4367
+ if (Grafreed.RENDERME > 0)
38814368 {
38824369 if (child instanceof Merge)
38834370 ((Merge)child).renderme();
....@@ -4072,7 +4559,7 @@
40724559 if (child == null)
40734560 continue;
40744561
4075
- if (GrafreeD.RENDERME > 0)
4562
+ if (Grafreed.RENDERME > 0)
40764563 {
40774564 if (child instanceof Merge)
40784565 ((Merge)child).renderme();
....@@ -4185,6 +4672,55 @@
41854672 {
41864673 blockloop = true;
41874674 get(i).RepairShadow();
4675
+ blockloop = false;
4676
+ }
4677
+ }
4678
+
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();
41884724 blockloop = false;
41894725 }
41904726 }
....@@ -4679,7 +5215,7 @@
46795215
46805216 cTreePath SelectLeaf(int indexcount, boolean deselect)
46815217 {
4682
- if (hide)
5218
+ if (hide || dontselect)
46835219 return null;
46845220
46855221 if (count <= 0)
....@@ -4703,9 +5239,17 @@
47035239 }
47045240 }
47055241
5242
+ ObjEditor GetWindow()
5243
+ {
5244
+ if (editWindow != null)
5245
+ return editWindow;
5246
+
5247
+ return manipWindow;
5248
+ }
5249
+
47065250 cTreePath Select(int indexcount, boolean deselect)
47075251 {
4708
- if (hide)
5252
+ if (hide || dontselect)
47095253 return null;
47105254
47115255 if (count <= 0)
....@@ -4739,10 +5283,11 @@
47395283 if (leaf != null)
47405284 {
47415285 cTreePath tp = new cTreePath(this, leaf);
4742
- if (editWindow != null)
5286
+ ObjEditor window = GetWindow();
5287
+ if (window != null)
47435288 {
47445289 //System.out.println("editWindow = " + editWindow + " vs " + this);
4745
- editWindow.Select(tp, deselect, true);
5290
+ window.Select(tp, deselect, true);
47465291 }
47475292
47485293 return tp;
....@@ -4759,6 +5304,7 @@
47595304
47605305 if (child == null)
47615306 continue;
5307
+
47625308 if (child.HasTransparency() && child.size() != 0)
47635309 {
47645310 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4768,9 +5314,10 @@
47685314 if (leaf != null)
47695315 {
47705316 cTreePath tp = new cTreePath(this, leaf);
4771
- if (editWindow != null)
5317
+ ObjEditor window = GetWindow();
5318
+ if (window != null)
47725319 {
4773
- editWindow.Select(tp, deselect, true);
5320
+ window.Select(tp, deselect, true);
47745321 }
47755322
47765323 return tp;
....@@ -5095,6 +5642,51 @@
50955642 blockloop = false;
50965643 }
50975644
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
+
50985690 boolean IsSelected()
50995691 {
51005692 if (parent == null)
....@@ -5155,12 +5747,41 @@
51555747 if (fullname == null)
51565748 return "";
51575749
5750
+ if (fullname.pigment != null)
5751
+ {
5752
+ return fullname.pigment;
5753
+ }
5754
+
51585755 // System.out.println("Fullname = " + fullname);
51595756
5160
- if (fullname.name.indexOf(":") == -1)
5161
- return fullname.name;
5757
+ // Does not work on Windows due to C:
5758
+// if (fullname.name.indexOf(":") == -1)
5759
+// return fullname.name;
5760
+//
5761
+// return fullname.name.substring(0,fullname.name.indexOf(":"));
51625762
5163
- return fullname.name.substring(0,fullname.name.indexOf(":"));
5763
+ String[] split = fullname.name.split(":");
5764
+
5765
+ if (split.length == 0)
5766
+ {
5767
+ return fullname.pigment = "";
5768
+ }
5769
+
5770
+ if (split.length <= 2)
5771
+ {
5772
+ if (fullname.name.endsWith(":"))
5773
+ {
5774
+ // Windows
5775
+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5776
+ }
5777
+
5778
+ return fullname.pigment = split[0];
5779
+ }
5780
+
5781
+ // Windows
5782
+ assert(split.length == 4);
5783
+
5784
+ return fullname.pigment = split[0] + ":" + split[1];
51645785 }
51655786
51665787 static String GetBump(cTexture fullname)
....@@ -5168,11 +5789,44 @@
51685789 if (fullname == null)
51695790 return "";
51705791
5792
+ if (fullname.bump != null)
5793
+ {
5794
+ return fullname.bump;
5795
+ }
5796
+
51715797 // 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());
5798
+ // Does not work on Windows due to C:
5799
+// if (fullname.name.indexOf(":") == -1)
5800
+// return "";
5801
+//
5802
+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5803
+ String[] split = fullname.name.split(":");
5804
+
5805
+ if (split.length == 0)
5806
+ {
5807
+ return fullname.bump = "";
5808
+ }
5809
+
5810
+ if (split.length == 1)
5811
+ {
5812
+ return fullname.bump = "";
5813
+ }
5814
+
5815
+ if (split.length == 2)
5816
+ {
5817
+ if (fullname.name.endsWith(":"))
5818
+ {
5819
+ // Windows
5820
+ return fullname.bump = "";
5821
+ }
5822
+
5823
+ return fullname.bump = split[1];
5824
+ }
5825
+
5826
+ // Windows
5827
+ assert(split.length == 4);
5828
+
5829
+ return fullname.bump = split[2] + ":" + split[3];
51765830 }
51775831
51785832 String GetPigmentTexture()
....@@ -5246,7 +5900,7 @@
52465900 System.out.print("; textures = " + textures);
52475901 System.out.println("; usedtextures = " + usedtextures);
52485902
5249
- if (GetTextures() == null)
5903
+ if (GetTextures() == null) // What is that??
52505904 GetTextures().name = ":";
52515905
52525906 String texname = tex;
....@@ -5255,6 +5909,9 @@
52555909 texname = "";
52565910
52575911 GetTextures().name = texname + ":" + GetBump(GetTextures());
5912
+
5913
+ GetTextures().pigment = null;
5914
+
52585915 Touch();
52595916 }
52605917
....@@ -5279,6 +5936,43 @@
52795936 }
52805937 }
52815938
5939
+ UUID GetUUID()
5940
+ {
5941
+ if (uuid == null)
5942
+ {
5943
+ // Serial
5944
+ uuid = UUID.randomUUID();
5945
+ }
5946
+
5947
+ return uuid;
5948
+ }
5949
+
5950
+ Object3D GetObject(UUID uid)
5951
+ {
5952
+ if (blockloop)
5953
+ return null;
5954
+
5955
+ if (GetUUID().equals(uid))
5956
+ return this;
5957
+
5958
+ int nb = Size();
5959
+ for (int i = 0; i < nb; i++)
5960
+ {
5961
+ Object3D child = (Object3D) get(i);
5962
+
5963
+ if (child == null)
5964
+ continue;
5965
+
5966
+ blockloop = true;
5967
+ Object3D obj = child.GetObject(uid);
5968
+ blockloop = false;
5969
+ if (obj != null)
5970
+ return obj;
5971
+ }
5972
+
5973
+ return null;
5974
+ }
5975
+
52825976 void SetBumpTexture(String tex)
52835977 {
52845978 if (GetTextures() == null)
....@@ -5290,6 +5984,8 @@
52905984 texname = "";
52915985
52925986 GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5987
+
5988
+ GetTextures().bump = null;
52935989
52945990 Touch();
52955991 }
....@@ -5315,6 +6011,38 @@
53156011 }
53166012 }
53176013
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
+
53186046 void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
53196047 {
53206048 Draw(display, root, selected, blocked);
....@@ -5323,12 +6051,28 @@
53236051 boolean NeedSupport()
53246052 {
53256053 return
5326
- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
6054
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
53276055 // PROBLEM with CROWD!!
5328
- && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
6056
+ && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
53296057 }
53306058
53316059 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
+ }
53326076
53336077 void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
53346078 {
....@@ -5340,7 +6084,7 @@
53406084 }
53416085
53426086 if (display.DrawMode() == iCameraPane.SELECTION &&
5343
- hide)
6087
+ (hide || dontselect))
53446088 return;
53456089
53466090 if (name != null && name.contains("sclera"))
....@@ -5390,8 +6134,11 @@
53906134 if (support != null)
53916135 support = support;
53926136
5393
- //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);
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.
53956142
53966143 if (!usecalllists && bRep != null && bRep.displaylist > 0)
53976144 {
....@@ -5401,8 +6148,9 @@
54016148 // usecalllists &= !(parent instanceof RandomNode);
54026149 // usecalllists = false;
54036150
5404
- if (GetBRep() != null)
5405
- usecalllists = usecalllists;
6151
+ if (display.DrawMode() == display.SHADOW)
6152
+ //GetBRep() != null)
6153
+ usecalllists = !!usecalllists;
54066154 //System.out.println("draw " + this);
54076155 //new Exception().printStackTrace();
54086156
....@@ -5411,10 +6159,12 @@
54116159 boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
54126160
54136161 if (!selectmode && //display.DrawMode() != display.SELECTION &&
5414
- (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)))
54156164 {
54166165 Globals.lighttouched = true;
54176166 } // all panes...
6167
+
54186168 //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
54196169 if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
54206170 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5422,7 +6172,7 @@
54226172 if (!(this instanceof Composite))
54236173 touched = false;
54246174 //if (displaylist == -1 && usecalllists)
5425
- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
6175
+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
54266176 {
54276177 bRep.displaylist = display.GenList();
54286178 assert(bRep.displaylist != 0);
....@@ -5433,7 +6183,7 @@
54336183
54346184 //System.out.println("\tnew list " + list);
54356185 //gl.glDrawBuffer(gl.GL_NONE);
5436
- if (usecalllists)
6186
+ if (usecalllists && bRep.displaylist > 0)
54376187 {
54386188 // System.err.println("new list " + bRep.displaylist + " for " + this);
54396189 display.NewList(bRep.displaylist);
....@@ -5442,7 +6192,7 @@
54426192 CallList(display, root, selected, blocked);
54436193
54446194 // compiled = true;
5445
- if (usecalllists)
6195
+ if (usecalllists && bRep.displaylist > 0)
54466196 {
54476197 // System.err.println("end list " + bRep.displaylist + " for " + this);
54486198 display.EndList();
....@@ -5542,6 +6292,7 @@
55426292 if (GetBRep() != null)
55436293 {
55446294 display.NextIndex();
6295
+
55456296 // vertex color conflict : gl.glCallList(list);
55466297 DrawNode(display, root, selected);
55476298 if (this instanceof BezierPatch)
....@@ -5582,7 +6333,28 @@
55826333 tex = GetTextures();
55836334 }
55846335
5585
- display.BindTextures(tex, texres);
6336
+ boolean failedPigment = false;
6337
+ boolean failedBump = false;
6338
+
6339
+ try
6340
+ {
6341
+ display.BindPigmentTexture(tex, texres);
6342
+ }
6343
+ catch (Exception e)
6344
+ {
6345
+ System.err.println("FAILED: " + this);
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;
6357
+ }
55866358
55876359 if (!compiled)
55886360 {
....@@ -5604,7 +6376,11 @@
56046376 }
56056377 }
56066378
5607
- display.ReleaseTextures(tex);
6379
+ if (!failedBump)
6380
+ display.ReleaseBumpTexture(tex);
6381
+
6382
+ if (!failedPigment)
6383
+ display.ReleasePigmentTexture(tex);
56086384
56096385 display.PopMaterial(this, selected);
56106386 }
....@@ -5733,6 +6509,9 @@
57336509
57346510 void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57356511 {
6512
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6513
+ return;
6514
+
57366515 if (hide)
57376516 return;
57386517 // shadow optimisation
....@@ -5858,6 +6637,9 @@
58586637 if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
58596638 return; // no shadow for transparent objects
58606639
6640
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6641
+ return;
6642
+
58616643 if (hide)
58626644 return;
58636645
....@@ -5898,6 +6680,7 @@
58986680 return;
58996681 }
59006682
6683
+ //bRep.GenUV(1/material.diffuseness);
59016684 // bRep.lock = true;
59026685
59036686 //javax.media.opengl.GL gl = display.GetGL();
....@@ -5970,6 +6753,11 @@
59706753 // dec 2012
59716754 new Exception().printStackTrace();
59726755 return;
6756
+ }
6757
+
6758
+ if (dontselect)
6759
+ {
6760
+ //bRep.GenerateNormalsMINE();
59736761 }
59746762
59756763 display.DrawGeometry(bRep, flipV, selectmode);
....@@ -6755,20 +7543,23 @@
67557543 }
67567544 }
67577545
6758
- 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)
67597550 {
6760
- int hc = info.bounds.x + info.bounds.width / 2;
6761
- int vc = info.bounds.y + info.bounds.height / 2;
6762
- 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;
67637554 if (toscreen == null)
67647555 {
6765
- toscreen = new Camera(info.camera.viewCode).toScreen;
7556
+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
67667557 }
67677558 cVector vec = in;
67687559 LA.xformPos(in, toscreen, in);
67697560 //System.out.println("Distance = " + info.camera.Distance());
6770
- vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
6771
- 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();
67727563 outPt.x = hc + (int) vec.x;
67737564 outPt.y = vc - (int) vec.y;
67747565 outRec.x = outPt.x - 3;
....@@ -6776,15 +7567,18 @@
67767567 outRec.width = outRec.height = 6;
67777568 }
67787569
6779
- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7570
+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7571
+ )
67807572 {
67817573 Point pt = new Point(0, 0);
67827574 Rectangle rec = new Rectangle();
6783
- calcHotSpot(in, info, pt, rec);
7575
+ calcHotSpot(in, //clickInfo,
7576
+ pt, rec);
67847577 return rec;
67857578 }
67867579
6787
- void drawEditHandles0(ClickInfo info, int level)
7580
+ void drawEditHandles0(//ClickInfo clickInfo,
7581
+ int level)
67887582 {
67897583 if (level == 0)
67907584 {
....@@ -6793,16 +7587,19 @@
67937587 {
67947588 cVector origin = new cVector();
67957589 //LA.xformPos(origin, toParent, origin);
6796
- Rectangle spot = calcHotSpot(origin, info);
7590
+ if (this.clickInfo == null)
7591
+ this.clickInfo = new ClickInfo();
7592
+
7593
+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
67977594 Rectangle boundary = new Rectangle();
67987595 boundary.x = spot.x - 30;
67997596 boundary.y = spot.y - 30;
68007597 boundary.width = spot.width + 60;
68017598 boundary.height = spot.height + 60;
6802
- info.g.setColor(Color.red);
7599
+ clickInfo.g.setColor(Color.white);
68037600 int spotw = spot.x + spot.width;
68047601 int spoth = spot.y + spot.height;
6805
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7602
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
68067603 // if (CameraPane.Xmin > spot.x)
68077604 // {
68087605 // CameraPane.Xmin = spot.x;
....@@ -6819,11 +7616,33 @@
68197616 // {
68207617 // CameraPane.Ymax = spoth;
68217618 // }
6822
- 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);
68237642 spotw = spot.x + spot.width;
68247643 spoth = spot.y + spot.height;
6825
- info.g.setColor(Color.blue);
6826
- 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);
68277646 // if (CameraPane.Xmin > spot.x)
68287647 // {
68297648 // CameraPane.Xmin = spot.x;
....@@ -6840,29 +7659,9 @@
68407659 // {
68417660 // CameraPane.Ymax = spoth;
68427661 // }
6843
- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6844
- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6845
- spot.translate(0, -32);
6846
- info.g.setColor(Color.green);
6847
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6848
-// if (CameraPane.Xmin > spot.x)
6849
-// {
6850
-// CameraPane.Xmin = spot.x;
6851
-// }
6852
-// if (CameraPane.Xmax < spotw)
6853
-// {
6854
-// CameraPane.Xmax = spotw;
6855
-// }
6856
-// if (CameraPane.Ymin > spot.y)
6857
-// {
6858
-// CameraPane.Ymin = spot.y;
6859
-// }
6860
-// if (CameraPane.Ymax < spoth)
6861
-// {
6862
-// CameraPane.Ymax = spoth;
6863
-// }
6864
- info.g.drawArc(boundary.x, boundary.y,
6865
- 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);
68667665 //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
68677666 // if (CameraPane.Xmin > boundary.x)
68687667 // {
....@@ -6884,7 +7683,8 @@
68847683 }
68857684 }
68867685
6887
- boolean doEditClick0(ClickInfo info, int level)
7686
+ boolean doEditClick0(//ClickInfo clickInfo,
7687
+ int level)
68887688 {
68897689 if (level == 0)
68907690 {
....@@ -6893,10 +7693,10 @@
68937693
68947694 boolean retval = false;
68957695
6896
- startX = info.x;
6897
- startY = info.y;
7696
+ startX = clickInfo.x;
7697
+ startY = clickInfo.y;
68987698
6899
- hitSomething = 0;
7699
+ hitSomething = -1;
69007700 cVector origin = new cVector();
69017701 //LA.xformPos(origin, toParent, origin);
69027702 Rectangle spot = new Rectangle();
....@@ -6904,22 +7704,53 @@
69047704 {
69057705 centerPt = new Point(0, 0);
69067706 }
6907
- calcHotSpot(origin, info, centerPt, spot);
6908
- if (spot.contains(info.x, info.y))
7707
+ calcHotSpot(origin, //info,
7708
+ centerPt, spot);
7709
+ if (spot.contains(clickInfo.x, clickInfo.y))
69097710 {
69107711 hitSomething = hitCenter;
69117712 retval = true;
69127713 }
69137714 spot.translate(32, 0);
6914
- if (spot.contains(info.x, info.y))
7715
+ if (spot.contains(clickInfo.x, clickInfo.y))
69157716 {
69167717 hitSomething = hitRotate;
69177718 retval = true;
69187719 }
69197720 spot.translate(0, 32);
6920
- 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))
69217724 {
69227725 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
+
69237754 retval = true;
69247755 }
69257756
....@@ -6929,7 +7760,7 @@
69297760 }
69307761
69317762 //System.out.println("info.modifiers = " + info.modifiers);
6932
- modified = (info.modifiers & CameraPane.META) != 0;
7763
+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
69337764 //System.out.println("modified = " + modified);
69347765 //new Exception().printStackTrace();
69357766 //viewCode = info.pane.renderCamera.viewCode;
....@@ -6957,7 +7788,8 @@
69577788 return true;
69587789 }
69597790
6960
- void doEditDrag0(ClickInfo info)
7791
+ void doEditDrag0(//ClickInfo info,
7792
+ boolean opposite)
69617793 {
69627794 if (hitSomething == 0)
69637795 {
....@@ -6971,7 +7803,8 @@
69717803
69727804 //System.out.println("hitSomething = " + hitSomething);
69737805
6974
- double scale = 0.005f * info.camera.Distance();
7806
+ double scale = 0.005f * clickInfo.camera.Distance();
7807
+
69757808 cVector xlate = new cVector();
69767809 //cVector xlate2 = new cVector();
69777810 switch (hitSomething)
....@@ -6984,7 +7817,9 @@
69847817
69857818 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
69867819
6987
- if (modified)
7820
+ // Modified could snap
7821
+ if (//modified ||
7822
+ opposite)
69887823 {
69897824 //assert(false);
69907825 /*
....@@ -7004,8 +7839,8 @@
70047839 toParent[3][i] = xlate.get(i);
70057840 LA.matInvert(toParent, fromParent);
70067841 */
7007
- cVector delta = LA.newVector(0, 0, startY - info.y);
7008
- 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);
70097844
70107845 LA.matCopy(startMat, toParent);
70117846 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7014,7 +7849,7 @@
70147849 } else
70157850 {
70167851 //LA.xformDir(delta, info.camera.fromScreen, delta);
7017
- cVector up = new cVector(info.camera.up);
7852
+ cVector up = new cVector(clickInfo.camera.up);
70187853 cVector away = new cVector();
70197854 //cVector right2 = new cVector();
70207855 //LA.vecCross(up, cVector.Z, right);
....@@ -7031,19 +7866,19 @@
70317866 LA.xformDir(up, ClickInfo.matbuffer, up);
70327867 // if (!CameraPane.LOCALTRANSFORM)
70337868 LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7034
- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7869
+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
70357870 // if (!CameraPane.LOCALTRANSFORM)
70367871 LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
70377872 //LA.vecCross(up, cVector.Z, right2);
70387873
7039
- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7874
+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
70407875
70417876 //System.out.println("DELTA0 = " + delta);
70427877 //System.out.println("AWAY = " + info.camera.away);
70437878 //System.out.println("UP = " + info.camera.up);
70447879 if (away.z > 0)
70457880 {
7046
- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7881
+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
70477882 {
70487883 delta.x = -delta.x;
70497884 } else
....@@ -7058,7 +7893,7 @@
70587893 //System.out.println("DELTA1 = " + delta);
70597894 LA.xformDir(delta, ClickInfo.matbuffer, delta);
70607895 //System.out.println("DELTA2 = " + delta);
7061
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7896
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
70627897 LA.matCopy(startMat, toParent);
70637898 //System.out.println("DELTA3 = " + delta);
70647899 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7068,8 +7903,8 @@
70687903 break;
70697904
70707905 case hitRotate: // rotate
7071
- int dx = info.x - centerPt.x;
7072
- int dy = -(info.y - centerPt.y);
7906
+ int dx = clickInfo.x - centerPt.x;
7907
+ int dy = -(clickInfo.y - centerPt.y);
70737908 double angle = (double) Math.atan2(dx, dy);
70747909 angle = -(1.570796 - angle);
70757910
....@@ -7078,6 +7913,7 @@
70787913
70797914 if (modified)
70807915 {
7916
+ // Rotate 45 degrees
70817917 angle /= (Math.PI / 4);
70827918 angle = Math.floor(angle + 0.5);
70837919 angle *= (Math.PI / 4);
....@@ -7091,7 +7927,7 @@
70917927 }
70927928 /**/
70937929
7094
- switch (info.pane.RenderCamera().viewCode)
7930
+ switch (clickInfo.pane.RenderCamera().viewCode)
70957931 {
70967932 case 1: // '\001'
70977933 LA.matZRotate(toParent, angle);
....@@ -7118,26 +7954,30 @@
71187954 break;
71197955
71207956 case hitScale: // scale
7121
- double hScale = (double) (info.x - centerPt.x) / 32;
7957
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7958
+ double sign = 1;
7959
+ if (hScale < 0)
7960
+ {
7961
+ sign = -1;
7962
+ }
7963
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
71227964 if (hScale < 0.01)
71237965 {
7124
- hScale = 0.01;
7966
+ //hScale = 0.01;
71257967 }
7126
- hScale = Math.pow(hScale, scale * 50);
7127
- if (hScale < 0.01)
7968
+
7969
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7970
+ sign = 1;
7971
+ if (vScale < 0)
71287972 {
7129
- hScale = 0.01;
7973
+ sign = -1;
71307974 }
7131
- double vScale = (double) (info.y - centerPt.y) / 32;
7975
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
71327976 if (vScale < 0.01)
71337977 {
7134
- vScale = 0.01;
7978
+ //vScale = 0.01;
71357979 }
7136
- vScale = Math.pow(vScale, scale * 50);
7137
- if (vScale < 0.01)
7138
- {
7139
- vScale = 0.01;
7140
- }
7980
+
71417981 LA.matCopy(startMat, toParent);
71427982 /**/
71437983 for (int i = 0; i < 3; i++)
....@@ -7147,39 +7987,56 @@
71477987 }
71487988 /**/
71497989
7150
- switch (info.pane.RenderCamera().viewCode)
7990
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
7991
+
7992
+ if (totalScale < 0.01)
7993
+ {
7994
+ totalScale = 0.01;
7995
+ }
7996
+
7997
+ switch (clickInfo.pane.RenderCamera().viewCode)
71517998 {
71527999 case 3: // '\001'
7153
- if (modified)
8000
+ if (modified || opposite)
71548001 {
8002
+ if (modified) // && opposite)
8003
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
8004
+ else
71558005 //LA.matScale(toParent, 1, hScale, vScale);
7156
- LA.matScale(toParent, vScale, 1, 1);
8006
+ LA.matScale(toParent, totalScale, 1, 1);
71578007 } // vScale, 1);
71588008 else
71598009 {
7160
- LA.matScale(toParent, vScale, vScale, vScale);
8010
+ // EXCEPTION!
8011
+ LA.matScale(toParent, 1, totalScale, totalScale);
71618012 } // vScale, 1);
71628013 break;
71638014
71648015 case 2: // '\002'
7165
- if (modified)
8016
+ if (modified || opposite)
71668017 {
7167
- //LA.matScale(toParent, hScale, 1, vScale);
7168
- LA.matScale(toParent, 1, vScale, 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);
71698023 } else
71708024 {
7171
- LA.matScale(toParent, vScale, 1, vScale);
8025
+ LA.matScale(toParent, totalScale, 1, totalScale);
71728026 }
71738027 break;
71748028
71758029 case 1: // '\003'
7176
- if (modified)
8030
+ if (modified || opposite)
71778031 {
7178
- //LA.matScale(toParent, hScale, vScale, 1);
7179
- LA.matScale(toParent, 1, 1, vScale);
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);
71808037 } else
71818038 {
7182
- LA.matScale(toParent, vScale, vScale, 1);
8039
+ LA.matScale(toParent, totalScale, totalScale, 1);
71838040 }
71848041 break;
71858042 }
....@@ -7213,7 +8070,7 @@
72138070 } // NEW ...
72148071
72158072
7216
- info.pane.repaint();
8073
+ clickInfo.pane.repaint();
72178074 }
72188075
72198076 boolean overflow = false;
....@@ -7312,14 +8169,22 @@
73128169 //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
73138170 //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
73148171 //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
8172
+
8173
+ String objname;
8174
+
73158175 if (false) //parent != null)
73168176 {
7317
- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
8177
+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
73188178 } else
73198179 {
7320
- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
8180
+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
73218181 } // + super.toString();
73228182 //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
8183
+
8184
+// if (!Globals.ADVANCED)
8185
+// return objname;
8186
+
8187
+ return objname + " " + System.identityHashCode(this); // + GetUUID()
73238188 }
73248189
73258190 public int hashCode()
....@@ -7375,6 +8240,7 @@
73758240 objectUI.closeUI();
73768241 if (editWindow != null)
73778242 {
8243
+ editWindow.ctrlPanel.FlushUI();
73788244 editWindow.refreshContents();
73798245 } // ? new
73808246 objectUI = null;
....@@ -7383,6 +8249,10 @@
73838249 {
73848250 editWindow = null;
73858251 } // ?
8252
+ }
8253
+ else
8254
+ {
8255
+ //editWindow.closeUI();
73868256 }
73878257 }
73888258
....@@ -7395,7 +8265,7 @@
73958265 /*transient*/ cVector2[] projectedVertices = new cVector2[0];
73968266
73978267 Object3D /*Composite*/ parent;
7398
- Object3D /*Composite*/ fileparent;
8268
+ Object3D /*Composite*/ fileparent; // In the case of FileObject
73998269
74008270 double[][] toParent; // dynamic matrix
74018271 double[][] fromParent;
....@@ -7510,7 +8380,7 @@
75108380 {
75118381 assert(bRep != null);
75128382 if (!(support instanceof GenericJoint)) // support.bRep != null)
7513
- GrafreeD.Assert(support.bRep == bRep.support);
8383
+ Grafreed.Assert(support.bRep == bRep.support);
75148384 }
75158385 else
75168386 {
....@@ -7541,6 +8411,10 @@
75418411 }
75428412
75438413 transient ObjEditor editWindow;
8414
+ transient ObjEditor manipWindow;
8415
+
8416
+ transient boolean pinned;
8417
+
75448418 transient ObjectUI objectUI;
75458419 public static int povDepth = 0;
75468420 private static cVector tbMin = new cVector();
....@@ -7559,9 +8433,9 @@
75598433 private static cVector edge2 = new cVector();
75608434 //private static cVector norm = new cVector();
75618435 /*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;
8436
+ static final int hitCenter = 1;
8437
+ static final int hitScale = 2;
8438
+ static final int hitRotate = 3;
75658439 /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
75668440 /*transient*/ private Point centerPt;
75678441 /*transient*/ private int startX;