Normand Briere
2019-10-06 9cf2c36d644d0aaa28797f57a3e71591d8e66973
Object3D.java
....@@ -22,18 +22,115 @@
2222 //static final long serialVersionUID = -607422624994562685L;
2323 static final long serialVersionUID = 5022536242724664900L;
2424
25
+ // Use GetUUID for backward compatibility with null.
2526 private UUID uuid = UUID.randomUUID();
2627
27
- // TEMPORARY for mocap undo. No need to be transient.
28
+ // TEMPORARY for versions. No need to be transient.
2829 mocap.reader.BVHReader.BVHResult savebvh;
2930 Object3D saveskeleton;
31
+
32
+ // FileObject
33
+ Object3D savefilecontent;
3034 //
3135
32
- byte[] versions[];
36
+ String skyboxname;
37
+ String skyboxext;
38
+
39
+ Object3D[] versionlist;
3340 int versionindex = -1;
3441
42
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
43
+
44
+ transient int tabIndex; // Tabs can change between sessions.
45
+
3546 ScriptNode scriptnode;
3647
48
+ void deepCopyNode(Object3D other)
49
+ {
50
+ other.skyboxname = skyboxname;
51
+ other.skyboxext = skyboxext;
52
+
53
+ if (toParent != null)
54
+ {
55
+ other.toParent = LA.newMatrix();
56
+ other.fromParent = LA.newMatrix();
57
+ LA.matCopy(toParent, other.toParent);
58
+ LA.matCopy(fromParent, other.fromParent);
59
+ if (toParentMarked != null)
60
+ {
61
+ other.toParentMarked = LA.newMatrix();
62
+ other.fromParentMarked = LA.newMatrix();
63
+ LA.matCopy(toParentMarked, other.toParentMarked);
64
+ LA.matCopy(fromParentMarked, other.fromParentMarked);
65
+ }
66
+ }
67
+ else
68
+ {
69
+ if (other.toParent == null)
70
+// assert(other.toParent == null);
71
+// new Exception().printStackTrace();
72
+ System.err.println("null parent: " + other);
73
+ }
74
+
75
+ /*
76
+ double ident[][] = LA.newMatrix();
77
+ if (bRep == null)
78
+ other.bRep = null;
79
+ else
80
+ other.bRep = new BoundaryRep(bRep, ident);
81
+ */
82
+ // Really new...
83
+ //other.editWindow = null;
84
+ if (name == null)
85
+ other.name = null;
86
+ else
87
+ other.name = new String(name);
88
+
89
+ if (material != null)
90
+ {
91
+ other.material = new cMaterial(material);
92
+ } else
93
+ {
94
+ other.material = null;
95
+ }
96
+
97
+ other.GetTextures().name = GetTextures().name;
98
+
99
+ CopyExtraMaterial(other);
100
+
101
+ other.touched = touched;
102
+ other.softtouched = softtouched;
103
+
104
+ other.random = random;
105
+ other.link2master = Link2Support();
106
+ other.transformcount = transformcount;
107
+ other.marked = marked;
108
+ other.skip = skip;
109
+ other.count = count;
110
+ other.flipV = flipV;
111
+ other.live = live;
112
+ other.rewind = rewind;
113
+ other.hide = hide;
114
+ other.texres = texres;
115
+ other.speedup = speedup;
116
+ other.height = height;
117
+ other.depth = depth;
118
+ }
119
+
120
+ int VersionCount()
121
+ {
122
+ int count = 0;
123
+
124
+ if (versionlist != null)
125
+ for (int i = versionlist.length; --i >= 0;)
126
+ {
127
+ if (versionlist[i] != null)
128
+ count++;
129
+ }
130
+
131
+ return count;
132
+ }
133
+
37134 void InitOthers()
38135 {
39136 if (projectedVertices == null || projectedVertices.length <= 2)
....@@ -45,6 +142,7 @@
45142 projectedVertices[i] = new cVector2(); // Others
46143 }
47144 projectedVertices[0].x = 100; // bump
145
+ projectedVertices[1].y = 1000; // punchthrough. only for png
48146 }
49147
50148 void MinMax(cVector minima, cVector maxima)
....@@ -124,7 +222,7 @@
124222 return;
125223
126224 transientsupport = support;
127
- transientlink2master = link2master;
225
+ transientlink2master = Link2Support();
128226
129227 support = null;
130228 link2master = false;
....@@ -171,9 +269,42 @@
171269 }
172270 }
173271
272
+ boolean HasBigData()
273
+ {
274
+ if (blockloop)
275
+ return false;
276
+
277
+ if (bRep != null)
278
+ {
279
+ return true;
280
+ }
281
+
282
+ blockloop = true;
283
+
284
+ for (int i = 0; i < Size(); i++)
285
+ {
286
+ Object3D child = (Object3D) get(i);
287
+ if (child == null)
288
+ continue;
289
+ if (child.HasBigData())
290
+ {
291
+ blockloop = false;
292
+ return true;
293
+ }
294
+ }
295
+
296
+ blockloop = false;
297
+ return false;
298
+ }
299
+
174300 void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
175301 {
302
+ if (blockloop)
303
+ return;
304
+
176305 Object3D o;
306
+
307
+ boolean isnew = false;
177308
178309 if (hashtable.containsKey(GetUUID()))
179310 {
....@@ -187,12 +318,14 @@
187318 }
188319 else
189320 {
321
+ isnew = true;
322
+
190323 o = new Object3D("copy of " + this.name);
191324
192325 hashtable.put(GetUUID(), o);
193326 }
194327
195
- if (!blockloop)
328
+ //if (!blockloop)
196329 {
197330 blockloop = true;
198331
....@@ -203,12 +336,15 @@
203336
204337 blockloop = false;
205338 }
206
-
207
- ExtractBigData(o);
339
+
340
+ //if (isnew)
341
+ ExtractBigData(o);
208342 }
209343
210344 void ExtractBigData(Object3D o)
211345 {
346
+ //System.err.println("ExtractBigData : " + this + " --> " + o);
347
+
212348 if (o.bRep != null)
213349 Grafreed.Assert(o.bRep == this.bRep);
214350
....@@ -219,8 +355,8 @@
219355 // o.bRep.support = null;
220356 // }
221357 o.selection = this.selection;
222
- o.versions = this.versions;
223
- o.versionindex = this.versionindex;
358
+ //o.versionlist = this.versionlist;
359
+ //o.versionindex = this.versionindex;
224360
225361 if (this.support != null)
226362 {
....@@ -243,17 +379,84 @@
243379 // this.fileparent = null;
244380 }
245381
382
+// Object3D GetObject(java.util.UUID uuid)
383
+// {
384
+// if (this.uuid.equals(uuid))
385
+// return this;
386
+//
387
+// if (blockloop)
388
+// return null;
389
+//
390
+// blockloop = true;
391
+//
392
+// for (int i=0; i<Size(); i++)
393
+// {
394
+// Object3D o = get(i).GetObject(uuid);
395
+//
396
+// if (o != null)
397
+// return o;
398
+// }
399
+//
400
+// blockloop = false;
401
+//
402
+// return null;
403
+// }
404
+
405
+ transient boolean tag;
406
+
407
+ void TagObjects(Object3D o, boolean tag)
408
+ {
409
+ if (blockloop)
410
+ return;
411
+
412
+ o.tag = tag;
413
+
414
+ if (o == this)
415
+ return;
416
+
417
+ blockloop = true;
418
+
419
+ for (int i=0; i<Size(); i++)
420
+ {
421
+ get(i).TagObjects(o, tag);
422
+ }
423
+
424
+ blockloop = false;
425
+ }
426
+
427
+ boolean HasTags()
428
+ {
429
+ if (blockloop)
430
+ return false;
431
+
432
+ blockloop = true;
433
+
434
+ boolean hasTags = false;
435
+
436
+ for (int i=0; i<Size(); i++)
437
+ {
438
+ hasTags |= get(i).tag || get(i).HasTags();
439
+
440
+ if (hasTags)
441
+ break;
442
+ }
443
+
444
+ blockloop = false;
445
+
446
+ return hasTags;
447
+ }
448
+
246449 void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
247450 {
451
+ if (blockloop)
452
+ return;
453
+
248454 if (!hashtable.containsKey(GetUUID()))
249455 return;
250456
251457 Object3D o = hashtable.get(GetUUID());
252458
253459 RestoreBigData(o);
254
-
255
- if (blockloop)
256
- return;
257460
258461 blockloop = true;
259462
....@@ -269,6 +472,9 @@
269472
270473 void RestoreBigData(Object3D o)
271474 {
475
+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
476
+ Grafreed.Assert(this.bRep == null);
477
+
272478 this.bRep = o.bRep;
273479 if (this.support != null && o.transientrep != null)
274480 {
....@@ -277,8 +483,8 @@
277483
278484 this.selection = o.selection;
279485
280
- this.versions = o.versions;
281
- this.versionindex = o.versionindex;
486
+ //this.versionlist = o.versionlist;
487
+ //this.versionindex = o.versionindex;
282488 // July 2019 if (this.bRep != null)
283489 // this.bRep.support = o.transientrep;
284490 // this.support = o.support;
....@@ -429,7 +635,10 @@
429635 transient boolean keepdontselect;
430636 boolean dontselect = false;
431637 boolean hide = false;
432
- boolean link2master = false; // performs reset support/master at each frame
638
+
639
+ boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
640
+ boolean link2support = false; // (cannot rename due to serialization)
641
+
433642 boolean marked = false; // animation node
434643 boolean skip = false; // centroid issue
435644 boolean skipmocap = false; // mocap data
....@@ -437,6 +646,9 @@
437646 boolean random = false;
438647 boolean speedup = false;
439648 boolean rewind = false;
649
+
650
+ // Option to sort triangles, e.g. for transparency.
651
+ boolean sort = false;
440652
441653 float NORMALPUSH = 0;
442654
....@@ -455,7 +667,7 @@
455667 {
456668 sorted = true;
457669
458
- for (int i=0; i<size()-1; i++)
670
+ for (int i=0; i<Size()-1; i++)
459671 {
460672 Object3D obji = get(i);
461673 Object3D objj = get(i+1);
....@@ -479,7 +691,7 @@
479691 {
480692 sorted = true;
481693
482
- for (int i=0; i<size()-1; i++)
694
+ for (int i=0; i<Size()-1; i++)
483695 {
484696 Object3D obji = get(i);
485697 Object3D objj = get(i+1);
....@@ -495,11 +707,11 @@
495707 }
496708 }
497709
498
- int memorysize;
710
+ transient int memorysize; // needs to be transient, dunno why
499711
500712 int MemorySize()
501713 {
502
- if (true) // memorysize == 0)
714
+ if (memorysize == 0)
503715 {
504716 try
505717 {
....@@ -614,7 +826,7 @@
614826 {
615827 if (maxcount != 1)
616828 {
617
- new Exception().printStackTrace();
829
+ //new Exception().printStackTrace();
618830 }
619831
620832 toParentMarked = LA.newMatrix();
....@@ -816,7 +1028,7 @@
8161028
8171029 void Step()
8181030 {
819
- // marde pour serialization de Texture
1031
+ // patch pour serialization de Texture
8201032 resetmaxcount();
8211033 resettransformcount();
8221034 resetstep();
....@@ -930,6 +1142,8 @@
9301142 (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
9311143 currentframe != Globals.framecount)
9321144 {
1145
+ Globals.lighttouched = true;
1146
+
9331147 currentframe = Globals.framecount;
9341148
9351149 // System.err.println("transformcount = " + transformcount);
....@@ -1009,21 +1223,28 @@
10091223 {
10101224 // return true;
10111225
1012
- if (material == null || material.multiply)
1013
- return true;
1226
+// if (material == null || material.multiply)
1227
+// return true;
1228
+//
1229
+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1230
+// return false;
1231
+//
1232
+// // Transparent objects are dynamic because we have to sort the triangles.
1233
+// return material.opacity > 0.99;
10141234
1015
- // Transparent objects are dynamic because we have to sort the triangles.
1016
- return material.opacity > 0.99;
1235
+ return !sort;
10171236 }
10181237
10191238 boolean IsOpaque()
10201239 {
10211240 // return true;
10221241
1023
- if (material == null || material.multiply)
1024
- return true;
1242
+// if (material == null || material.multiply)
1243
+// return true;
1244
+//
1245
+// return material.opacity > 0.99;
10251246
1026
- return material.opacity > 0.99;
1247
+ return !sort;
10271248 }
10281249
10291250 Object3D()
....@@ -1101,8 +1322,10 @@
11011322
11021323 // will share the geometry
11031324 assert (!(this instanceof Composite));
1104
- return deepCopy(); // Never called for Composite
1105
-
1325
+
1326
+ Object3D obj = deepCopy(); // Never called for Composite
1327
+ obj.count = 2;
1328
+ return obj;
11061329 }
11071330
11081331 boolean HasLoops()
....@@ -1110,6 +1333,30 @@
11101333 return false;
11111334 }
11121335
1336
+ void ResetUUIDs()
1337
+ {
1338
+ if (blockloop)
1339
+ {
1340
+ return;
1341
+ }
1342
+
1343
+ this.uuid = null;
1344
+
1345
+ blockloop = true;
1346
+
1347
+ for (int i = 0; i < Size(); i++)
1348
+ {
1349
+ Object3D obj = (Object3D) Children().get(i);
1350
+
1351
+ if (obj != null)
1352
+ {
1353
+ obj.ResetUUIDs();
1354
+ }
1355
+ }
1356
+
1357
+ blockloop = false;
1358
+ }
1359
+
11131360 boolean IsInfinite()
11141361 {
11151362 if (blockloop)
....@@ -1180,78 +1427,16 @@
11801427 return;
11811428
11821429 blockloop = true;
1430
+
1431
+ other.parent = parent;
1432
+
11831433 //System.out.println("COPY " + this + " to " + other);
11841434 //new Exception().printStackTrace();
1435
+ deepCopyNode(other);
11851436
1186
- other.parent = parent;
1187
- if (toParent != null)
1188
- {
1189
- other.toParent = LA.newMatrix();
1190
- other.fromParent = LA.newMatrix();
1191
- LA.matCopy(toParent, other.toParent);
1192
- LA.matCopy(fromParent, other.fromParent);
1193
- if (toParentMarked != null)
1194
- {
1195
- other.toParentMarked = LA.newMatrix();
1196
- other.fromParentMarked = LA.newMatrix();
1197
- LA.matCopy(toParentMarked, other.toParentMarked);
1198
- LA.matCopy(fromParentMarked, other.fromParentMarked);
1199
- }
1200
- }
1201
- else
1202
- {
1203
- if (other.toParent == null)
1204
-// assert(other.toParent == null);
1205
-// new Exception().printStackTrace();
1206
- System.err.println("null parent: " + other);
1207
- }
1208
- /*
1209
- double ident[][] = LA.newMatrix();
1210
- if (bRep == null)
1211
- other.bRep = null;
1212
- else
1213
- other.bRep = new BoundaryRep(bRep, ident);
1214
- */
1215
- // Really new...
12161437 other.bRep = bRep; // Share the geometry
12171438
12181439 other.support = support; // Share the support
1219
-
1220
- //other.editWindow = null;
1221
- if (name == null)
1222
- other.name = null;
1223
- else
1224
- other.name = new String(name);
1225
-
1226
- if (material != null)
1227
- {
1228
- other.material = new cMaterial(material);
1229
- } else
1230
- {
1231
- other.material = null;
1232
- }
1233
-
1234
- other.GetTextures().name = GetTextures().name;
1235
-
1236
- CopyExtraMaterial(other);
1237
-
1238
- other.touched = touched;
1239
- other.softtouched = softtouched;
1240
-
1241
- other.random = random;
1242
- other.link2master = link2master;
1243
- other.transformcount = transformcount;
1244
- other.marked = marked;
1245
- other.skip = skip;
1246
- other.count = count;
1247
- other.flipV = flipV;
1248
- other.live = live;
1249
- other.rewind = rewind;
1250
- other.hide = hide;
1251
- other.texres = texres;
1252
- other.speedup = speedup;
1253
- other.height = height;
1254
- other.depth = depth;
12551440
12561441 // aout 2013 if (/*displaylist != -1 &&*/other.displaylist != displaylist)
12571442 // {
....@@ -1307,17 +1492,24 @@
13071492 if ((mask & GEOMETRY) != 0)
13081493 {
13091494 if (bRep != null)
1310
- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1311
- else
1312
- assert(other.bRep == null);
1313
-
1314
- if (bRep != null)
13151495 {
1496
+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
13161497 CameraPane.RemoveList(bRep.displaylist);
13171498 bRep.displaylist = 0; // june 2013 -1;
13181499 }
13191500 else
1320
- bRep = bRep;
1501
+ {
1502
+ //assert(other.bRep == null);
1503
+ bRep = other.bRep;
1504
+ }
1505
+
1506
+// if (bRep != null)
1507
+// {
1508
+// CameraPane.RemoveList(bRep.displaylist);
1509
+// bRep.displaylist = 0; // june 2013 -1;
1510
+// }
1511
+// else
1512
+// bRep = bRep;
13211513 }
13221514
13231515 /* Use a MASK = GEO/MAT
....@@ -2293,11 +2485,6 @@
22932485
22942486 InitOthers();
22952487
2296
- if (this instanceof Camera)
2297
- {
2298
- material.shift = 90;
2299
- }
2300
-
23012488 material.multiply = multiply;
23022489
23032490 if (multiply)
....@@ -2438,6 +2625,11 @@
24382625 else
24392626 {
24402627 //((ObjEditor)editWindow).SetupUI2(null);
2628
+ if (objectUI != null)
2629
+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
2630
+ else
2631
+ //new Exception().printStackTrace();
2632
+ System.err.println("objectUI is null");
24412633 }
24422634 }
24432635
....@@ -2567,7 +2759,8 @@
25672759 private static final int editSelf = 1;
25682760 private static final int editChild = 2;
25692761
2570
- void drawEditHandles(ClickInfo info, int level)
2762
+ void drawEditHandles(//ClickInfo info,
2763
+ int level)
25712764 {
25722765 if (level == 0)
25732766 {
....@@ -2575,7 +2768,8 @@
25752768 return;
25762769
25772770 Object3D selectee;
2578
- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
2771
+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
2772
+ level + 1))
25792773 {
25802774 selectee = (Object3D) e.nextElement();
25812775 }
....@@ -2583,19 +2777,22 @@
25832777 } else
25842778 {
25852779 //super.
2586
- drawEditHandles0(info, level + 1);
2780
+ drawEditHandles0(//info,
2781
+ level + 1);
25872782 }
25882783 }
25892784
2590
- boolean doEditClick(ClickInfo info, int level)
2785
+ boolean doEditClick(//ClickInfo info,
2786
+ int level)
25912787 {
25922788 doSomething = 0;
25932789 if (level == 0)
25942790 {
2595
- return doParentClick(info);
2791
+ return doParentClick(); //info);
25962792 }
25972793 if (//super.
2598
- doEditClick0(info, level))
2794
+ doEditClick0(//info,
2795
+ level))
25992796 {
26002797 doSomething = 1;
26012798 return true;
....@@ -2605,7 +2802,7 @@
26052802 }
26062803 }
26072804
2608
- boolean doParentClick(ClickInfo info)
2805
+ boolean doParentClick() //ClickInfo info)
26092806 {
26102807 if (selection == null)
26112808 {
....@@ -2618,7 +2815,8 @@
26182815 for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
26192816 {
26202817 Object3D selectee = (Object3D) e.nextElement();
2621
- if (selectee.doEditClick(info, 1))
2818
+ if (selectee.doEditClick(//info,
2819
+ 1))
26222820 {
26232821 childToDrag = selectee;
26242822 doSomething = 2;
....@@ -2630,13 +2828,15 @@
26302828 return retval;
26312829 }
26322830
2633
- void doEditDrag(ClickInfo info, boolean opposite)
2831
+ void doEditDrag(//ClickInfo clickInfo,
2832
+ boolean opposite)
26342833 {
26352834 switch (doSomething)
26362835 {
26372836 case 1: // '\001'
26382837 //super.
2639
- doEditDrag0(info, opposite);
2838
+ doEditDrag0(//clickInfo,
2839
+ opposite);
26402840 break;
26412841
26422842 case 2: // '\002'
....@@ -2649,11 +2849,13 @@
26492849 {
26502850 //sel.hitSomething = childToDrag.hitSomething;
26512851 //childToDrag.doEditDrag(info);
2652
- sel.doEditDrag(info, opposite);
2852
+ sel.doEditDrag(//clickInfo,
2853
+ opposite);
26532854 } else
26542855 {
26552856 //super.
2656
- doEditDrag0(info, opposite);
2857
+ doEditDrag0(//clickInfo,
2858
+ opposite);
26572859 }
26582860 }
26592861 break;
....@@ -2671,6 +2873,9 @@
26712873 {
26722874 deselectAll();
26732875 }
2876
+
2877
+ new Exception().printStackTrace();
2878
+
26742879 ClickInfo newInfo = new ClickInfo();
26752880 newInfo.flags = info.flags;
26762881 newInfo.bounds = info.bounds;
....@@ -3100,7 +3305,10 @@
31003305 {
31013306 if (bRep != null)
31023307 {
3308
+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
31033309 bRep.GenerateNormals(crease);
3310
+ if (!bRep.trimmed)
3311
+ bRep.MergeNormals();
31043312 Touch();
31053313 }
31063314 }
....@@ -3175,6 +3383,105 @@
31753383 blockloop = false;
31763384 }
31773385
3386
+ public void ResetTransform(int mask)
3387
+ {
3388
+ Object3D obj = this;
3389
+
3390
+ if (mask == -1)
3391
+ {
3392
+ if (obj instanceof Camera) // jan 2014
3393
+ {
3394
+ LA.matIdentity(obj.toParent);
3395
+ LA.matIdentity(obj.fromParent);
3396
+ }
3397
+ else
3398
+ {
3399
+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3400
+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3401
+ }
3402
+ return;
3403
+ }
3404
+
3405
+ if ((mask&2) != 0) // Scale/rotation
3406
+ {
3407
+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3408
+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3409
+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3410
+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3411
+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3412
+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3413
+ }
3414
+ if ((mask&1) != 0) // Translation
3415
+ {
3416
+ if (obj.toParent != null)
3417
+ {
3418
+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3419
+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3420
+ }
3421
+ }
3422
+ }
3423
+
3424
+ public void Scale(float scale)
3425
+ {
3426
+ Object3D obj = this;
3427
+
3428
+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
3429
+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3430
+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3431
+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
3432
+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3433
+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3434
+ }
3435
+
3436
+ public void TextureRatioTransform(int axis)
3437
+ {
3438
+ cTexture tex = GetTextures();
3439
+
3440
+ com.sun.opengl.util.texture.TextureData texturedata = null;
3441
+
3442
+ try
3443
+ {
3444
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
3445
+ }
3446
+ catch (Exception e)
3447
+ {
3448
+ System.err.println("FAIL TextureRatio: " + this);
3449
+ }
3450
+
3451
+ LA.matIdentity(Object3D.mat);
3452
+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
3453
+
3454
+ if (toParent == null)
3455
+ {
3456
+ toParent = LA.newMatrix();
3457
+ fromParent = LA.newMatrix();
3458
+ }
3459
+
3460
+ ResetTransform(2);
3461
+
3462
+ LA.matConcat(Object3D.mat, fromParent, fromParent);
3463
+ LA.matInvert(fromParent, toParent);
3464
+ }
3465
+
3466
+ void TextureRatio(int axis)
3467
+ {
3468
+ if (blockloop)
3469
+ return;
3470
+
3471
+ blockloop = true;
3472
+
3473
+ TextureRatioTransform(axis);
3474
+
3475
+ for (int i=Size(); --i>=0;)
3476
+ {
3477
+ Object3D v = get(i);
3478
+
3479
+ v.TextureRatio(axis);
3480
+ }
3481
+
3482
+ blockloop = false;
3483
+ }
3484
+
31783485 void TransformChildren()
31793486 {
31803487 if (toParent != null)
....@@ -3417,6 +3724,7 @@
34173724 if (bRep != null)
34183725 {
34193726 //bRep.RemoveOneTriangle();
3727
+ System.out.println();
34203728 System.out.println("Reducing " + this);
34213729 if (name != null && name.contains("lockpickstraps"))
34223730 name = name;
....@@ -3528,15 +3836,47 @@
35283836
35293837 void ClearMaterials()
35303838 {
3839
+ if (blockloop)
3840
+ return;
3841
+
3842
+ blockloop = true;
3843
+
35313844 ClearMaterial();
3532
- for (int i = 0; i < size(); i++)
3845
+ for (int i = 0; i < Size(); i++)
35333846 {
3534
- Object3D child = (Object3D) reserve(i);
3847
+ Object3D child = (Object3D) get(i);
35353848 if (child == null)
35363849 continue;
35373850 child.ClearMaterials();
3538
- release(i);
35393851 }
3852
+
3853
+ blockloop = false;
3854
+ }
3855
+
3856
+ void ClearVersionList()
3857
+ {
3858
+ this.versionlist = null;
3859
+ this.versionindex = -1;
3860
+ this.versiontable = null;
3861
+ }
3862
+
3863
+ void ClearVersions()
3864
+ {
3865
+ if (blockloop)
3866
+ return;
3867
+
3868
+ blockloop = true;
3869
+
3870
+ ClearVersionList();
3871
+ for (int i = 0; i < Size(); i++)
3872
+ {
3873
+ Object3D child = (Object3D) get(i);
3874
+ if (child == null)
3875
+ continue;
3876
+ child.ClearVersions();
3877
+ }
3878
+
3879
+ blockloop = false;
35403880 }
35413881
35423882 void FlipV(boolean flip)
....@@ -3715,6 +4055,7 @@
37154055
37164056 void RevertMeshes()
37174057 {
4058
+ // BLOCKLOOP
37184059 if (this instanceof cMesh)
37194060 {
37204061 ((cMesh)this).Revert();
....@@ -3745,11 +4086,6 @@
37454086 Touch();
37464087 }
37474088
3748
- ResetRecur();
3749
- }
3750
-
3751
- void ResetRecur()
3752
- {
37534089 for (int i = 0; i < size(); i++)
37544090 {
37554091 Object3D child = (Object3D) get(i); // reserve(i);
....@@ -3772,11 +4108,6 @@
37724108 Step();
37734109 Touch();
37744110
3775
- StepRecur();
3776
- }
3777
-
3778
- void StepRecur()
3779
- {
37804111 for (int i = 0; i < size(); i++)
37814112 {
37824113 Object3D child = (Object3D) get(i); // reserve(i);
....@@ -3963,8 +4294,8 @@
39634294 Touch();
39644295 }
39654296
3966
- transient cVector min = new cVector();
3967
- transient cVector max = new cVector();
4297
+ transient cVector min;
4298
+ transient cVector max;
39684299
39694300 void getBounds(cVector minima, cVector maxima, boolean xform)
39704301 {
....@@ -3980,15 +4311,15 @@
39804311 if (blockloop)
39814312 return;
39824313
3983
- if (min == null) // ???
4314
+ if (min == null)
39844315 {
39854316 min = new cVector();
39864317 max = new cVector();
39874318 }
39884319
3989
- for (int i = 0; i<size(); i++)
4320
+ for (int i = 0; i<Size(); i++)
39904321 {
3991
- Object3D child = (Object3D) reserve(i);
4322
+ Object3D child = (Object3D) get(i); //reserve(i);
39924323 if (child == null)
39934324 continue;
39944325
....@@ -4007,21 +4338,21 @@
40074338 if (child.hide && !(child instanceof Merge) || child.skip)
40084339 //if (child.hide)
40094340 {
4010
- release(i);
4341
+ //release(i);
40114342 continue;
40124343 }
40134344
40144345 blockloop = true;
40154346 child.getBounds(min, max, true); // xform);
40164347 blockloop = false;
4017
- release(i);
4348
+ //release(i);
40184349
40194350 MinMax(minima, maxima);
40204351 }
40214352
40224353 if (bRep != null)
40234354 {
4024
- bRep.getBounds(minima,maxima,this);
4355
+ bRep.getBounds(minima, maxima, xform?this:null);
40254356 }
40264357
40274358 if (false) // xform)
....@@ -5526,6 +5857,11 @@
55265857 if (fullname == null)
55275858 return "";
55285859
5860
+ if (fullname.pigment != null)
5861
+ {
5862
+ return fullname.pigment;
5863
+ }
5864
+
55295865 // System.out.println("Fullname = " + fullname);
55305866
55315867 // Does not work on Windows due to C:
....@@ -5538,7 +5874,7 @@
55385874
55395875 if (split.length == 0)
55405876 {
5541
- return "";
5877
+ return fullname.pigment = "";
55425878 }
55435879
55445880 if (split.length <= 2)
....@@ -5546,22 +5882,27 @@
55465882 if (fullname.name.endsWith(":"))
55475883 {
55485884 // Windows
5549
- return fullname.name.substring(0, fullname.name.length()-1);
5885
+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
55505886 }
55515887
5552
- return split[0];
5888
+ return fullname.pigment = split[0];
55535889 }
55545890
55555891 // Windows
55565892 assert(split.length == 4);
55575893
5558
- return split[0] + ":" + split[1];
5894
+ return fullname.pigment = split[0] + ":" + split[1];
55595895 }
55605896
55615897 static String GetBump(cTexture fullname)
55625898 {
55635899 if (fullname == null)
55645900 return "";
5901
+
5902
+ if (fullname.bump != null)
5903
+ {
5904
+ return fullname.bump;
5905
+ }
55655906
55665907 // System.out.println("Fullname = " + fullname);
55675908 // Does not work on Windows due to C:
....@@ -5573,12 +5914,12 @@
55735914
55745915 if (split.length == 0)
55755916 {
5576
- return "";
5917
+ return fullname.bump = "";
55775918 }
55785919
55795920 if (split.length == 1)
55805921 {
5581
- return "";
5922
+ return fullname.bump = "";
55825923 }
55835924
55845925 if (split.length == 2)
....@@ -5586,16 +5927,16 @@
55865927 if (fullname.name.endsWith(":"))
55875928 {
55885929 // Windows
5589
- return "";
5930
+ return fullname.bump = "";
55905931 }
55915932
5592
- return split[1];
5933
+ return fullname.bump = split[1];
55935934 }
55945935
55955936 // Windows
55965937 assert(split.length == 4);
55975938
5598
- return split[2] + ":" + split[3];
5939
+ return fullname.bump = split[2] + ":" + split[3];
55995940 }
56005941
56015942 String GetPigmentTexture()
....@@ -5678,6 +6019,9 @@
56786019 texname = "";
56796020
56806021 GetTextures().name = texname + ":" + GetBump(GetTextures());
6022
+
6023
+ GetTextures().pigment = null;
6024
+
56816025 Touch();
56826026 }
56836027
....@@ -5751,6 +6095,8 @@
57516095
57526096 GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
57536097
6098
+ GetTextures().bump = null;
6099
+
57546100 Touch();
57556101 }
57566102
....@@ -5815,7 +6161,7 @@
58156161 boolean NeedSupport()
58166162 {
58176163 return
5818
- CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
6164
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /*live &&*/ support != null
58196165 // PROBLEM with CROWD!!
58206166 && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
58216167 }
....@@ -5833,6 +6179,20 @@
58336179 return parent.IsLive();
58346180 }
58356181
6182
+ boolean IsDynamic()
6183
+ {
6184
+ return live && bRep != null;
6185
+ }
6186
+
6187
+ boolean Link2Support()
6188
+ {
6189
+ return link2master || link2support;
6190
+ }
6191
+
6192
+ static cVector minima = new cVector();
6193
+ static cVector maxima = new cVector();
6194
+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
6195
+
58366196 void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
58376197 {
58386198 Invariants(); // june 2013
....@@ -5840,6 +6200,29 @@
58406200 if (support != null)
58416201 {
58426202 // System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
6203
+ }
6204
+
6205
+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
6206
+ {
6207
+ getBounds(minima, maxima, true);
6208
+ center.x = (minima.x + maxima.x) / 2;
6209
+ center.y = 10000; // (minima.y + maxima.y) / 2;
6210
+ center.z = (minima.z + maxima.z) / 2;
6211
+
6212
+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
6213
+
6214
+ IntersectResult res = new IntersectResult();
6215
+ res.t = Double.POSITIVE_INFINITY;
6216
+
6217
+ if (Grafreed.grafreed.universe.intersect(ray, res))
6218
+ {
6219
+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
6220
+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
6221
+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
6222
+
6223
+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
6224
+ LA.matInvert(toParent, fromParent);
6225
+ }
58436226 }
58446227
58456228 if (display.DrawMode() == iCameraPane.SELECTION &&
....@@ -5893,8 +6276,11 @@
58936276 if (support != null)
58946277 support = support;
58956278
5896
- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5897
- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6279
+ boolean usecalllists = !IsDynamic() &&
6280
+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6281
+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6282
+
6283
+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
58986284
58996285 if (!usecalllists && bRep != null && bRep.displaylist > 0)
59006286 {
....@@ -5902,10 +6288,12 @@
59026288 bRep.displaylist = 0;
59036289 }
59046290 // usecalllists &= !(parent instanceof RandomNode);
5905
- // usecalllists = false;
6291
+ if (CameraPane.BOXMODE) // Too dynamic
6292
+ usecalllists = false;
59066293
5907
- if (GetBRep() != null)
5908
- usecalllists = usecalllists;
6294
+ if (display.DrawMode() == display.SHADOW)
6295
+ //GetBRep() != null)
6296
+ usecalllists = !!usecalllists;
59096297 //System.out.println("draw " + this);
59106298 //new Exception().printStackTrace();
59116299
....@@ -5915,7 +6303,7 @@
59156303
59166304 if (!selectmode && //display.DrawMode() != display.SELECTION &&
59176305 //(touched || (bRep != null && bRep.displaylist <= 0)))
5918
- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
6306
+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0)))
59196307 {
59206308 Globals.lighttouched = true;
59216309 } // all panes...
....@@ -5927,7 +6315,7 @@
59276315 if (!(this instanceof Composite))
59286316 touched = false;
59296317 //if (displaylist == -1 && usecalllists)
5930
- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
6318
+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
59316319 {
59326320 bRep.displaylist = display.GenList();
59336321 assert(bRep.displaylist != 0);
....@@ -5938,7 +6326,7 @@
59386326
59396327 //System.out.println("\tnew list " + list);
59406328 //gl.glDrawBuffer(gl.GL_NONE);
5941
- if (usecalllists)
6329
+ if (usecalllists && bRep.displaylist > 0)
59426330 {
59436331 // System.err.println("new list " + bRep.displaylist + " for " + this);
59446332 display.NewList(bRep.displaylist);
....@@ -5947,7 +6335,7 @@
59476335 CallList(display, root, selected, blocked);
59486336
59496337 // compiled = true;
5950
- if (usecalllists)
6338
+ if (usecalllists && bRep.displaylist > 0)
59516339 {
59526340 // System.err.println("end list " + bRep.displaylist + " for " + this);
59536341 display.EndList();
....@@ -5957,8 +6345,8 @@
59576345 Globals.lighttouched = true; // all panes...
59586346 }
59596347
5960
- touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
5961
- //touched = false;
6348
+ //touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
6349
+ touched = false;
59626350
59636351 if (this instanceof Texture || this instanceof TextureNode)
59646352 {
....@@ -5997,7 +6385,7 @@
59976385 {
59986386 if (display.DrawMode() == iCameraPane.SHADOW)
59996387 {
6000
- if (!link2master // tricky to cull in shadow mode.
6388
+ if (!Link2Support() // tricky to cull in shadow mode.
60016389 && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
60026390 {
60036391 //System.out.print("CULLED");
....@@ -6059,6 +6447,20 @@
60596447 {
60606448 drawSelf(display, root, selected, blocked);
60616449 }
6450
+
6451
+// if (!(this instanceof Composite))
6452
+// {
6453
+// for (int i = 0; i < size(); i++)
6454
+// {
6455
+// Object3D child = (Object3D) reserve(i);
6456
+// if (child == null)
6457
+// continue;
6458
+//
6459
+// child.draw(display, root, selected, blocked);
6460
+//
6461
+// release(i);
6462
+// }
6463
+// }
60626464 } else
60636465 {
60646466 /*
....@@ -6091,13 +6493,14 @@
60916493 boolean failedPigment = false;
60926494 boolean failedBump = false;
60936495
6496
+ CameraPane.lastObject = this;
60946497 try
60956498 {
60966499 display.BindPigmentTexture(tex, texres);
60976500 }
60986501 catch (Exception e)
60996502 {
6100
- System.err.println("FAILED: " + this);
6503
+ // System.err.println("FAILED: " + this);
61016504 failedPigment = true;
61026505 }
61036506
....@@ -6128,6 +6531,20 @@
61286531 display.CallList(bRep.displaylist);
61296532 // june 2013 drawSelf(display, root, selected);
61306533 }
6534
+ }
6535
+
6536
+ assert (!(this instanceof Composite));
6537
+ {
6538
+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
6539
+// {
6540
+// Object3D child = (Object3D) reserve(i);
6541
+// if (child == null)
6542
+// continue;
6543
+//
6544
+// child.draw(display, root, selected, blocked);
6545
+//
6546
+// release(i);
6547
+// }
61316548 }
61326549 }
61336550
....@@ -6181,16 +6598,17 @@
61816598
61826599 void CallList(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
61836600 {
6184
- if (GetBRep() == null)
6185
- {
6186
- drawSelf(display, root, selected, blocked);
6187
- } else
6601
+ if (GetBRep() != null)
61886602 {
61896603 DrawNode(display, root, selected);
61906604 if (this instanceof BezierPatch)
61916605 {
61926606 //drawSelf(display, root, selected);
61936607 }
6608
+ }
6609
+ else
6610
+ {
6611
+ drawSelf(display, root, selected, blocked);
61946612 }
61956613 }
61966614
....@@ -6440,7 +6858,8 @@
64406858
64416859 //javax.media.opengl.GL gl = display.GetGL();
64426860
6443
- if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
6861
+ if (CameraPane.BOXMODE && //!Link2Support()) //
6862
+ !selected) // || CameraPane.movingcamera)
64446863 {
64456864 int fc = bRep.FaceCount();
64466865 int vc = bRep.VertexCount();
....@@ -6602,7 +7021,7 @@
66027021 facescompare[k] = new FaceCompare(k);
66037022 }
66047023
6605
- center = new cVector();
7024
+ centertriangle = new cVector();
66067025 }
66077026 else
66087027 {
....@@ -6725,7 +7144,7 @@
67257144 */
67267145 }
67277146
6728
- transient cVector center;
7147
+ transient cVector centertriangle;
67297148
67307149 class FaceCompare implements Comparable
67317150 {
....@@ -6754,14 +7173,14 @@
67547173 Vertex q = bRep.GetVertex(face.q);
67557174 Vertex r = bRep.GetVertex(face.r);
67567175
6757
- center.set(p);
6758
- center.add(q);
6759
- center.add(r);
6760
- center.mul(1.0/3);
7176
+ centertriangle.set(p);
7177
+ centertriangle.add(q);
7178
+ centertriangle.add(r);
7179
+ centertriangle.mul(1.0/3);
67617180
6762
- center.sub(Globals.theRenderer.EyeCamera().location);
7181
+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
67637182
6764
- distance = center.dot(center);
7183
+ distance = centertriangle.dot(centertriangle);
67657184 }
67667185
67677186 return distance;
....@@ -7298,20 +7717,23 @@
72987717 }
72997718 }
73007719
7301
- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7720
+ static ClickInfo clickInfo = new ClickInfo();
7721
+
7722
+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7723
+ Point outPt, Rectangle outRec)
73027724 {
7303
- int hc = info.bounds.x + info.bounds.width / 2;
7304
- int vc = info.bounds.y + info.bounds.height / 2;
7305
- double[][] toscreen = info.toScreen;
7725
+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7726
+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7727
+ double[][] toscreen = clickInfo.toScreen;
73067728 if (toscreen == null)
73077729 {
7308
- toscreen = new Camera(info.camera.viewCode).toScreen;
7730
+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
73097731 }
73107732 cVector vec = in;
73117733 LA.xformPos(in, toscreen, in);
73127734 //System.out.println("Distance = " + info.camera.Distance());
7313
- vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
7314
- vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
7735
+ vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7736
+ vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
73157737 outPt.x = hc + (int) vec.x;
73167738 outPt.y = vc - (int) vec.y;
73177739 outRec.x = outPt.x - 3;
....@@ -7319,15 +7741,18 @@
73197741 outRec.width = outRec.height = 6;
73207742 }
73217743
7322
- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7744
+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7745
+ )
73237746 {
73247747 Point pt = new Point(0, 0);
73257748 Rectangle rec = new Rectangle();
7326
- calcHotSpot(in, info, pt, rec);
7749
+ calcHotSpot(in, //clickInfo,
7750
+ pt, rec);
73277751 return rec;
73287752 }
73297753
7330
- void drawEditHandles0(ClickInfo info, int level)
7754
+ void drawEditHandles0(//ClickInfo clickInfo,
7755
+ int level)
73317756 {
73327757 if (level == 0)
73337758 {
....@@ -7336,16 +7761,19 @@
73367761 {
73377762 cVector origin = new cVector();
73387763 //LA.xformPos(origin, toParent, origin);
7339
- Rectangle spot = calcHotSpot(origin, info);
7764
+ if (this.clickInfo == null)
7765
+ this.clickInfo = new ClickInfo();
7766
+
7767
+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
73407768 Rectangle boundary = new Rectangle();
73417769 boundary.x = spot.x - 30;
73427770 boundary.y = spot.y - 30;
73437771 boundary.width = spot.width + 60;
73447772 boundary.height = spot.height + 60;
7345
- info.g.setColor(Color.red);
7773
+ clickInfo.g.setColor(Color.white);
73467774 int spotw = spot.x + spot.width;
73477775 int spoth = spot.y + spot.height;
7348
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7776
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73497777 // if (CameraPane.Xmin > spot.x)
73507778 // {
73517779 // CameraPane.Xmin = spot.x;
....@@ -7362,11 +7790,6 @@
73627790 // {
73637791 // CameraPane.Ymax = spoth;
73647792 // }
7365
- spot.translate(32, 32);
7366
- spotw = spot.x + spot.width;
7367
- spoth = spot.y + spot.height;
7368
- info.g.setColor(Color.cyan);
7369
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73707793 // if (CameraPane.Xmin > spot.x)
73717794 // {
73727795 // CameraPane.Xmin = spot.x;
....@@ -7385,10 +7808,15 @@
73857808 // }
73867809 // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
73877810 //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7388
- spot.translate(0, -32);
7389
- info.g.setColor(Color.yellow);
7390
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7391
- info.g.setColor(Color.green);
7811
+ spot.translate(32, 0);
7812
+ clickInfo.g.setColor(Color.yellow);
7813
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7814
+
7815
+ spot.translate(32, 64);
7816
+ spotw = spot.x + spot.width;
7817
+ spoth = spot.y + spot.height;
7818
+ clickInfo.g.setColor(Color.cyan);
7819
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73927820 // if (CameraPane.Xmin > spot.x)
73937821 // {
73947822 // CameraPane.Xmin = spot.x;
....@@ -7405,8 +7833,9 @@
74057833 // {
74067834 // CameraPane.Ymax = spoth;
74077835 // }
7408
- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7409
- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7836
+ clickInfo.g.setColor(Color.green);
7837
+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7838
+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
74107839 //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
74117840 // if (CameraPane.Xmin > boundary.x)
74127841 // {
....@@ -7428,7 +7857,8 @@
74287857 }
74297858 }
74307859
7431
- boolean doEditClick0(ClickInfo info, int level)
7860
+ boolean doEditClick0(//ClickInfo clickInfo,
7861
+ int level)
74327862 {
74337863 if (level == 0)
74347864 {
....@@ -7437,8 +7867,8 @@
74377867
74387868 boolean retval = false;
74397869
7440
- startX = info.x;
7441
- startY = info.y;
7870
+ startX = clickInfo.x;
7871
+ startY = clickInfo.y;
74427872
74437873 hitSomething = -1;
74447874 cVector origin = new cVector();
....@@ -7448,22 +7878,53 @@
74487878 {
74497879 centerPt = new Point(0, 0);
74507880 }
7451
- calcHotSpot(origin, info, centerPt, spot);
7452
- if (spot.contains(info.x, info.y))
7881
+ calcHotSpot(origin, //info,
7882
+ centerPt, spot);
7883
+ if (spot.contains(clickInfo.x, clickInfo.y))
74537884 {
74547885 hitSomething = hitCenter;
74557886 retval = true;
74567887 }
74577888 spot.translate(32, 0);
7458
- if (spot.contains(info.x, info.y))
7889
+ if (spot.contains(clickInfo.x, clickInfo.y))
74597890 {
74607891 hitSomething = hitRotate;
74617892 retval = true;
74627893 }
74637894 spot.translate(0, 32);
7464
- if (spot.contains(info.x, info.y))
7895
+ spot.translate(32, 0);
7896
+ spot.translate(0, 32);
7897
+ if (spot.contains(clickInfo.x, clickInfo.y))
74657898 {
74667899 hitSomething = hitScale;
7900
+
7901
+ double scale = 0.005f * clickInfo.camera.Distance();
7902
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7903
+ double sign = 1;
7904
+ if (hScale < 0)
7905
+ {
7906
+ sign = -1;
7907
+ }
7908
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
7909
+ if (hScale < 0.01)
7910
+ {
7911
+ //hScale = 0.01;
7912
+ }
7913
+
7914
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7915
+ sign = 1;
7916
+ if (vScale < 0)
7917
+ {
7918
+ sign = -1;
7919
+ }
7920
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
7921
+ if (vScale < 0.01)
7922
+ {
7923
+ //vScale = 0.01;
7924
+ }
7925
+
7926
+ clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7927
+
74677928 retval = true;
74687929 }
74697930
....@@ -7473,7 +7934,7 @@
74737934 }
74747935
74757936 //System.out.println("info.modifiers = " + info.modifiers);
7476
- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7937
+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
74777938 //System.out.println("modified = " + modified);
74787939 //new Exception().printStackTrace();
74797940 //viewCode = info.pane.renderCamera.viewCode;
....@@ -7501,7 +7962,8 @@
75017962 return true;
75027963 }
75037964
7504
- void doEditDrag0(ClickInfo info, boolean opposite)
7965
+ void doEditDrag0(//ClickInfo info,
7966
+ boolean opposite)
75057967 {
75067968 if (hitSomething == 0)
75077969 {
....@@ -7515,7 +7977,7 @@
75157977
75167978 //System.out.println("hitSomething = " + hitSomething);
75177979
7518
- double scale = 0.005f * info.camera.Distance();
7980
+ double scale = 0.005f * clickInfo.camera.Distance();
75197981
75207982 cVector xlate = new cVector();
75217983 //cVector xlate2 = new cVector();
....@@ -7529,7 +7991,9 @@
75297991
75307992 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
75317993
7532
- if (modified || opposite)
7994
+ // Modified could snap
7995
+ if (//modified ||
7996
+ opposite)
75337997 {
75347998 //assert(false);
75357999 /*
....@@ -7549,8 +8013,8 @@
75498013 toParent[3][i] = xlate.get(i);
75508014 LA.matInvert(toParent, fromParent);
75518015 */
7552
- cVector delta = LA.newVector(0, 0, startY - info.y);
7553
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
8016
+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
8017
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
75548018
75558019 LA.matCopy(startMat, toParent);
75568020 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7559,7 +8023,7 @@
75598023 } else
75608024 {
75618025 //LA.xformDir(delta, info.camera.fromScreen, delta);
7562
- cVector up = new cVector(info.camera.up);
8026
+ cVector up = new cVector(clickInfo.camera.up);
75638027 cVector away = new cVector();
75648028 //cVector right2 = new cVector();
75658029 //LA.vecCross(up, cVector.Z, right);
....@@ -7576,19 +8040,19 @@
75768040 LA.xformDir(up, ClickInfo.matbuffer, up);
75778041 // if (!CameraPane.LOCALTRANSFORM)
75788042 LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7579
- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
8043
+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
75808044 // if (!CameraPane.LOCALTRANSFORM)
75818045 LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
75828046 //LA.vecCross(up, cVector.Z, right2);
75838047
7584
- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
8048
+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
75858049
75868050 //System.out.println("DELTA0 = " + delta);
75878051 //System.out.println("AWAY = " + info.camera.away);
75888052 //System.out.println("UP = " + info.camera.up);
75898053 if (away.z > 0)
75908054 {
7591
- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
8055
+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
75928056 {
75938057 delta.x = -delta.x;
75948058 } else
....@@ -7603,7 +8067,7 @@
76038067 //System.out.println("DELTA1 = " + delta);
76048068 LA.xformDir(delta, ClickInfo.matbuffer, delta);
76058069 //System.out.println("DELTA2 = " + delta);
7606
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
8070
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
76078071 LA.matCopy(startMat, toParent);
76088072 //System.out.println("DELTA3 = " + delta);
76098073 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7613,8 +8077,8 @@
76138077 break;
76148078
76158079 case hitRotate: // rotate
7616
- int dx = info.x - centerPt.x;
7617
- int dy = -(info.y - centerPt.y);
8080
+ int dx = clickInfo.x - centerPt.x;
8081
+ int dy = -(clickInfo.y - centerPt.y);
76188082 double angle = (double) Math.atan2(dx, dy);
76198083 angle = -(1.570796 - angle);
76208084
....@@ -7623,7 +8087,7 @@
76238087
76248088 if (modified)
76258089 {
7626
- // Rotate 90 degrees
8090
+ // Rotate 45 degrees
76278091 angle /= (Math.PI / 4);
76288092 angle = Math.floor(angle + 0.5);
76298093 angle *= (Math.PI / 4);
....@@ -7637,7 +8101,7 @@
76378101 }
76388102 /**/
76398103
7640
- switch (info.pane.RenderCamera().viewCode)
8104
+ switch (clickInfo.pane.RenderCamera().viewCode)
76418105 {
76428106 case 1: // '\001'
76438107 LA.matZRotate(toParent, angle);
....@@ -7664,7 +8128,7 @@
76648128 break;
76658129
76668130 case hitScale: // scale
7667
- double hScale = (double) (info.x - centerPt.x) / 32;
8131
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
76688132 double sign = 1;
76698133 if (hScale < 0)
76708134 {
....@@ -7676,7 +8140,7 @@
76768140 //hScale = 0.01;
76778141 }
76788142
7679
- double vScale = (double) (info.y - centerPt.y) / 32;
8143
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
76808144 sign = 1;
76818145 if (vScale < 0)
76828146 {
....@@ -7687,6 +8151,7 @@
76878151 {
76888152 //vScale = 0.01;
76898153 }
8154
+
76908155 LA.matCopy(startMat, toParent);
76918156 /**/
76928157 for (int i = 0; i < 3; i++)
....@@ -7696,33 +8161,39 @@
76968161 }
76978162 /**/
76988163
7699
- double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
8164
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
77008165
77018166 if (totalScale < 0.01)
77028167 {
77038168 totalScale = 0.01;
77048169 }
77058170
7706
- switch (info.pane.RenderCamera().viewCode)
8171
+ switch (clickInfo.pane.RenderCamera().viewCode)
77078172 {
77088173 case 3: // '\001'
77098174 if (modified || opposite)
77108175 {
8176
+ if (modified) // && opposite)
8177
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
8178
+ else
77118179 //LA.matScale(toParent, 1, hScale, vScale);
7712
- LA.matScale(toParent, totalScale, 1, 1);
8180
+ LA.matScale(toParent, totalScale, 1, 1);
77138181 } // vScale, 1);
77148182 else
77158183 {
77168184 // EXCEPTION!
7717
- LA.matScale(toParent, totalScale, totalScale, totalScale);
8185
+ LA.matScale(toParent, 1, totalScale, totalScale);
77188186 } // vScale, 1);
77198187 break;
77208188
77218189 case 2: // '\002'
77228190 if (modified || opposite)
77238191 {
7724
- //LA.matScale(toParent, hScale, 1, vScale);
7725
- LA.matScale(toParent, 1, totalScale, 1);
8192
+ if (modified) // && opposite)
8193
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
8194
+ else
8195
+ //LA.matScale(toParent, hScale, 1, vScale);
8196
+ LA.matScale(toParent, 1, totalScale, 1);
77268197 } else
77278198 {
77288199 LA.matScale(toParent, totalScale, 1, totalScale);
....@@ -7732,8 +8203,11 @@
77328203 case 1: // '\003'
77338204 if (modified || opposite)
77348205 {
7735
- //LA.matScale(toParent, hScale, vScale, 1);
7736
- LA.matScale(toParent, 1, 1, totalScale);
8206
+ if (modified) // && opposite)
8207
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
8208
+ else
8209
+ //LA.matScale(toParent, hScale, vScale, 1);
8210
+ LA.matScale(toParent, 1, 1, totalScale);
77378211 } else
77388212 {
77398213 LA.matScale(toParent, totalScale, totalScale, 1);
....@@ -7770,7 +8244,7 @@
77708244 } // NEW ...
77718245
77728246
7773
- info.pane.repaint();
8247
+ clickInfo.pane.repaint();
77748248 }
77758249
77768250 boolean overflow = false;
....@@ -7884,12 +8358,12 @@
78848358 if (!Globals.ADVANCED)
78858359 return objname;
78868360
7887
- return objname + " " + System.identityHashCode(this);
8361
+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
78888362 }
78898363
78908364 public int hashCode()
78918365 {
7892
- // Fuck Vector...
8366
+ // Do not use Vector...
78938367 return System.identityHashCode(this);
78948368 }
78958369
....@@ -8129,8 +8603,8 @@
81298603 private static cVector2 qq2 = new cVector2();
81308604 private static cVector2 rr2 = new cVector2();
81318605 private static cVector2 ss2 = new cVector2();
8132
- private static cVector edge1 = new cVector();
8133
- private static cVector edge2 = new cVector();
8606
+// private static cVector edge1 = new cVector();
8607
+// private static cVector edge2 = new cVector();
81348608 //private static cVector norm = new cVector();
81358609 /*transient private*/ int hitSomething;
81368610 static final int hitCenter = 1;
....@@ -8328,7 +8802,275 @@
83288802
83298803 Touch();
83308804 }
8805
+
8806
+ static Vertex s1 = new Vertex();
8807
+ static Vertex s2 = new Vertex();
8808
+ static Vertex s3 = new Vertex();
83318809
8810
+ boolean intersectMesh(Ray ray, IntersectResult result)
8811
+ {
8812
+ boolean success = false;
8813
+
8814
+ if (bRep.stripified)
8815
+ {
8816
+ int[] strips = bRep.getRawIndices();
8817
+
8818
+ // TRIANGLE STRIP ARRAY
8819
+ if (bRep.trimmed)
8820
+ {
8821
+ float[] v = bRep.getRawVertices();
8822
+
8823
+ int count3 = 0;
8824
+
8825
+ if (v.length > 0)
8826
+ {
8827
+ for (int i = 0; i < strips.length; i++)
8828
+ {
8829
+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
8830
+ count3 += 3;
8831
+
8832
+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
8833
+ count3 += 3;
8834
+
8835
+ for (int j = 0; j < strips[i] - 2; j++)
8836
+ {
8837
+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
8838
+ count3 += 3;
8839
+
8840
+ if (j%2 == 0)
8841
+ success |= intersectTriangle(ray, result, s1, s2, s3);
8842
+ else
8843
+ success |= intersectTriangle(ray, result, s1, s3, s2);
8844
+
8845
+ s1.set(s2);
8846
+ s2.set(s3);
8847
+ }
8848
+ }
8849
+ }
8850
+
8851
+ assert count3 == v.length;
8852
+ }
8853
+ else // !trimmed
8854
+ {
8855
+ int count = 0;
8856
+ for (int i = 0; i < strips.length; i++)
8857
+ {
8858
+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
8859
+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
8860
+
8861
+ for (int j = 0; j < strips[i] - 2; j++)
8862
+ {
8863
+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
8864
+
8865
+ if (j%2 == 0)
8866
+ success |= intersectTriangle(ray, result, p, q, r);
8867
+ else
8868
+ success |= intersectTriangle(ray, result, p, r, q);
8869
+
8870
+ p = q;
8871
+ q = r;
8872
+ }
8873
+ }
8874
+ }
8875
+ } else // catch (Error e)
8876
+ {
8877
+ int facecount = bRep.FaceCount();
8878
+ for (int i = 0; i < facecount; i++)
8879
+ {
8880
+ Face face = bRep.GetFace(i);
8881
+
8882
+ Vertex p = bRep.GetVertex(face.p);
8883
+ Vertex q = bRep.GetVertex(face.q);
8884
+ Vertex r = bRep.GetVertex(face.r);
8885
+
8886
+ success |= intersectTriangle(ray, result, p, q, r);
8887
+ }
8888
+ }
8889
+
8890
+ return success;
8891
+ }
8892
+
8893
+ static cVector eye = new cVector();
8894
+ static cVector dir = new cVector();
8895
+
8896
+ transient BBox bbox = null;
8897
+
8898
+ boolean intersect(Ray ray, IntersectResult result)
8899
+ {
8900
+ double eyex = ray.eyePoint.x;
8901
+ double eyey = ray.eyePoint.y;
8902
+ double eyez = ray.eyePoint.z;
8903
+
8904
+ double dirx = ray.viewDirection.x;
8905
+ double diry = ray.viewDirection.y;
8906
+ double dirz = ray.viewDirection.z;
8907
+
8908
+ if (this.fromParent != null && !(this instanceof TextureNode))
8909
+ {
8910
+ eye.x = eyex;
8911
+ eye.y = eyey;
8912
+ eye.z = eyez;
8913
+ dir.x = dirx;
8914
+ dir.y = diry;
8915
+ dir.z = dirz;
8916
+
8917
+ LA.xformPos(eye, this.fromParent, eye);
8918
+ LA.xformDir(dir, this.fromParent, dir);
8919
+
8920
+ ray.eyePoint.x = eye.x;
8921
+ ray.eyePoint.y = eye.y;
8922
+ ray.eyePoint.z = eye.z;
8923
+
8924
+ ray.viewDirection.x = dir.x;
8925
+ ray.viewDirection.y = dir.y;
8926
+ ray.viewDirection.z = dir.z;
8927
+ }
8928
+
8929
+ boolean success = false;
8930
+
8931
+ boolean touch = false;
8932
+
8933
+ if (bRep != null && Link2Support())
8934
+ {
8935
+ if (bbox == null)
8936
+ {
8937
+ bbox = new BBox();
8938
+
8939
+ cVector min = new cVector();
8940
+ cVector max = new cVector();
8941
+
8942
+ this.getBounds(min, max, true);
8943
+
8944
+ bbox.min.x = min.x;
8945
+ bbox.min.y = min.y;
8946
+ bbox.min.z = min.z;
8947
+
8948
+ bbox.max.x = max.x;
8949
+ bbox.max.y = max.y;
8950
+ bbox.max.z = max.z;
8951
+ }
8952
+
8953
+ if (true) // NOT WORKING bbox.intersect(ray, result))
8954
+ {
8955
+ success |= intersectMesh(ray, result);
8956
+ }
8957
+ else
8958
+ {
8959
+ //this.hide = true;
8960
+ touch = true;
8961
+ }
8962
+ }
8963
+
8964
+ for (int i=0; i<size(); i++)
8965
+ {
8966
+ Object3D child = (Object3D) reserve(i);
8967
+
8968
+ if (child == null)
8969
+ continue;
8970
+
8971
+ success |= child.intersect(ray, result);
8972
+ release(i);
8973
+ }
8974
+
8975
+ ray.eyePoint.x = eyex;
8976
+ ray.eyePoint.y = eyey;
8977
+ ray.eyePoint.z = eyez;
8978
+
8979
+ ray.viewDirection.x = dirx;
8980
+ ray.viewDirection.y = diry;
8981
+ ray.viewDirection.z = dirz;
8982
+
8983
+// if (touch)
8984
+// this.Touch(); // refresh display list
8985
+
8986
+ return success;
8987
+ }
8988
+
8989
+ static Vector3d edge1 = new Vector3d();
8990
+ static Vector3d edge2 = new Vector3d();
8991
+ static Vector3d P = new Vector3d();
8992
+ static Vector3d T = new Vector3d();
8993
+ static Vector3d Q = new Vector3d();
8994
+
8995
+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
8996
+ {
8997
+ if (false)
8998
+ {
8999
+ result.t = 0;
9000
+ return true;
9001
+ }
9002
+
9003
+ /*
9004
+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
9005
+
9006
+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
9007
+ */
9008
+
9009
+ // Calculate edges of the triangle
9010
+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
9011
+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
9012
+
9013
+ // Calculate the determinant (U parameter)
9014
+ P.cross(ray.viewDirection, edge2);
9015
+ double det = edge1.dot(P);
9016
+
9017
+ if (det > -1e-9 && det < 1e-9)
9018
+ {
9019
+ return false;
9020
+ } // Ray lies in plane of triangle
9021
+
9022
+ double invDet = 1 / det;
9023
+
9024
+ // Calculate distance from vertex1 to ray origin
9025
+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
9026
+
9027
+ double U = (T.dot(P)) * invDet; // Calculate U parameter
9028
+
9029
+ if (U < 0.f || U > 1.f)
9030
+ {
9031
+ return false;
9032
+ } // Intersection lies outside of the triangle
9033
+
9034
+ // Calculate V parameter
9035
+ Q.cross(T, edge1);
9036
+
9037
+ double V = ray.viewDirection.dot(Q) * invDet;
9038
+
9039
+ if (V < 0.f || (U + V) > 1.f)
9040
+ {
9041
+ return false;
9042
+ } // Intersection lies outside of the triangle
9043
+
9044
+ double t = edge2.dot(Q) * invDet;
9045
+
9046
+ if (t > 1e-9) // Triangle and ray intersects
9047
+ {
9048
+ //result.isIntersected = true;
9049
+ //result.id = id;
9050
+
9051
+ if (false) // isShadow)
9052
+ {
9053
+ result.t = t;
9054
+ return true;
9055
+ } else if (t < result.t)
9056
+ {
9057
+ result.object = this;
9058
+
9059
+ result.t = t;
9060
+
9061
+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
9062
+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
9063
+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
9064
+
9065
+ result.n.cross(edge1, edge2);
9066
+ result.n.normalize();
9067
+ }
9068
+
9069
+ return true;
9070
+ }
9071
+
9072
+ return false;
9073
+ }
83329074
83339075 public int Size()
83349076 {