Normand Briere
2019-08-22 0c7b833be7d86598a6813cd1c6db0ca9e1b17966
Object3D.java
....@@ -5,6 +5,7 @@
55 import java.util.Vector;
66
77 import javax.media.j3d.Transform3D;
8
+import javax.media.opengl.GL;
89 import javax.vecmath.Vector3d;
910
1011 import javax.imageio.ImageIO;
....@@ -13,11 +14,29 @@
1314 import //weka.core.
1415 matrix.Matrix;
1516
17
+import java.util.UUID;
18
+
1619 //import net.sourceforge.sizeof.SizeOf;
1720 public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
1821 {
1922 //static final long serialVersionUID = -607422624994562685L;
2023 static final long serialVersionUID = 5022536242724664900L;
24
+
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>();
2140
2241 ScriptNode scriptnode;
2342
....@@ -99,64 +118,245 @@
99118
100119 // transient boolean reduced; // for morph reduction
101120
102
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
121
+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
122
+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104123
105
-transient Object3D transientsupport; // for cloning
106
-transient boolean transientlink2master;
124
+ transient Object3D transientsupport; // for cloning
125
+ transient boolean transientlink2master;
107126
108
-void SaveSupports()
109
-{
110
- if (blockloop)
111
- return;
112
-
113
- transientsupport = support;
114
- transientlink2master = link2master;
115
-
116
- support = null;
117
- link2master = false;
118
-
119
- if (bRep != null)
127
+ void SaveSupports()
120128 {
121
- bRep.SaveSupports();
129
+ if (blockloop)
130
+ return;
131
+
132
+ transientsupport = support;
133
+ transientlink2master = link2master;
134
+
135
+ support = null;
136
+ link2master = false;
137
+
138
+ if (bRep != null)
139
+ {
140
+ bRep.SaveSupports();
141
+ }
142
+
143
+ for (int i = 0; i < Size(); i++)
144
+ {
145
+ Object3D child = (Object3D) get(i);
146
+ if (child == null)
147
+ continue;
148
+ blockloop = true;
149
+ child.SaveSupports();
150
+ blockloop = false;
151
+ }
122152 }
123
-
124
- for (int i = 0; i < Size(); i++)
153
+
154
+ void RestoreSupports()
125155 {
126
- Object3D child = (Object3D) get(i);
127
- if (child == null)
128
- continue;
156
+ if (blockloop)
157
+ return;
158
+
159
+ support = transientsupport;
160
+ link2master = transientlink2master;
161
+ transientsupport = null;
162
+ transientlink2master = false;
163
+
164
+ if (bRep != null)
165
+ {
166
+ bRep.RestoreSupports();
167
+ }
168
+
169
+ for (int i = 0; i < Size(); i++)
170
+ {
171
+ Object3D child = (Object3D) get(i);
172
+ if (child == null)
173
+ continue;
174
+ blockloop = true;
175
+ child.RestoreSupports();
176
+ blockloop = false;
177
+ }
178
+ }
179
+
180
+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
181
+ {
182
+ Object3D o;
183
+
184
+ if (hashtable.containsKey(GetUUID()))
185
+ {
186
+ o = hashtable.get(GetUUID());
187
+
188
+ Grafreed.Assert(this.bRep == o.bRep);
189
+ //if (this.bRep != null)
190
+ // assert(this.bRep.support == o.transientrep);
191
+ if (this.support != null)
192
+ assert(this.support.bRep == o.transientrep);
193
+ }
194
+ else
195
+ {
196
+ o = new Object3D("copy of " + this.name);
197
+
198
+ hashtable.put(GetUUID(), o);
199
+ }
200
+
201
+ if (!blockloop)
202
+ {
203
+ blockloop = true;
204
+
205
+ for (int i=0; i<Size(); i++)
206
+ {
207
+ get(i).ExtractBigData(hashtable);
208
+ }
209
+
210
+ blockloop = false;
211
+ }
212
+
213
+ ExtractBigData(o);
214
+ }
215
+
216
+ void ExtractBigData(Object3D o)
217
+ {
218
+ if (o.bRep != null)
219
+ Grafreed.Assert(o.bRep == this.bRep);
220
+
221
+ o.bRep = this.bRep;
222
+// July 2019 if (this.bRep != null)
223
+// {
224
+// o.transientrep = this.bRep.support;
225
+// o.bRep.support = null;
226
+// }
227
+ o.selection = this.selection;
228
+ o.versionlist = this.versionlist;
229
+ o.versionindex = this.versionindex;
230
+
231
+ if (this.support != null)
232
+ {
233
+ if (o.transientrep != null)
234
+ Grafreed.Assert(o.transientrep == this.support.bRep);
235
+
236
+ o.transientrep = this.support.bRep;
237
+ this.support.bRep = null;
238
+ }
239
+
240
+ // o.support = this.support;
241
+ // o.fileparent = this.fileparent;
242
+ // if (this.bRep != null)
243
+ // o.bRep = this.bRep.support;
244
+
245
+ this.bRep = null;
246
+ // if (this.bRep != null)
247
+ // this.bRep.support = null;
248
+ // this.support = null;
249
+ // this.fileparent = null;
250
+ }
251
+
252
+// Object3D GetObject(java.util.UUID uuid)
253
+// {
254
+// if (this.uuid.equals(uuid))
255
+// return this;
256
+//
257
+// if (blockloop)
258
+// return null;
259
+//
260
+// blockloop = true;
261
+//
262
+// for (int i=0; i<Size(); i++)
263
+// {
264
+// Object3D o = get(i).GetObject(uuid);
265
+//
266
+// if (o != null)
267
+// return o;
268
+// }
269
+//
270
+// blockloop = false;
271
+//
272
+// return null;
273
+// }
274
+
275
+ transient boolean tag;
276
+
277
+ void TagObjects(Object3D o, boolean tag)
278
+ {
279
+ if (blockloop)
280
+ return;
281
+
282
+ o.tag = tag;
283
+
284
+ if (o == this)
285
+ return;
286
+
129287 blockloop = true;
130
- child.SaveSupports();
288
+
289
+ for (int i=0; i<Size(); i++)
290
+ {
291
+ get(i).TagObjects(o, tag);
292
+ }
293
+
131294 blockloop = false;
132295 }
133
-}
134296
135
-void RestoreSupports()
136
-{
137
- if (blockloop)
138
- return;
297
+ boolean HasTags()
298
+ {
299
+ if (blockloop)
300
+ return false;
139301
140
- support = transientsupport;
141
- link2master = transientlink2master;
142
- transientsupport = null;
143
- transientlink2master = false;
144
-
145
- if (bRep != null)
146
- {
147
- bRep.RestoreSupports();
148
- }
149
-
150
- for (int i = 0; i < Size(); i++)
151
- {
152
- Object3D child = (Object3D) get(i);
153
- if (child == null)
154
- continue;
155302 blockloop = true;
156
- child.RestoreSupports();
303
+
304
+ boolean hasTags = false;
305
+
306
+ for (int i=0; i<Size(); i++)
307
+ {
308
+ hasTags |= get(i).tag || get(i).HasTags();
309
+
310
+ if (hasTags)
311
+ break;
312
+ }
313
+
314
+ blockloop = false;
315
+
316
+ return hasTags;
317
+ }
318
+
319
+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
320
+ {
321
+ if (!hashtable.containsKey(GetUUID()))
322
+ return;
323
+
324
+ Object3D o = hashtable.get(GetUUID());
325
+
326
+ RestoreBigData(o);
327
+
328
+ if (blockloop)
329
+ return;
330
+
331
+ blockloop = true;
332
+
333
+ //hashtable.remove(GetUUID());
334
+
335
+ for (int i=0; i<Size(); i++)
336
+ {
337
+ get(i).RestoreBigData(hashtable);
338
+ }
339
+
157340 blockloop = false;
158341 }
159
-}
342
+
343
+ void RestoreBigData(Object3D o)
344
+ {
345
+ this.bRep = o.bRep;
346
+ if (this.support != null && o.transientrep != null)
347
+ {
348
+ this.support.bRep = o.transientrep;
349
+ }
350
+
351
+ this.selection = o.selection;
352
+
353
+ this.versionlist = o.versionlist;
354
+ this.versionindex = o.versionindex;
355
+// July 2019 if (this.bRep != null)
356
+// this.bRep.support = o.transientrep;
357
+ // this.support = o.support;
358
+ // this.fileparent = o.fileparent;
359
+ }
160360
161361 // MOCAP SUPPORT
162362 double tx,ty,tz,rx,ry,rz;
....@@ -299,6 +499,8 @@
299499 }
300500
301501 boolean live = false;
502
+ transient boolean keepdontselect;
503
+ boolean dontselect = false;
302504 boolean hide = false;
303505 boolean link2master = false; // performs reset support/master at each frame
304506 boolean marked = false; // animation node
....@@ -430,16 +632,16 @@
430632 {
431633 Object3D copy = this;
432634
433
- Camera parentcam = CameraPane.theRenderer.ManipCamera();
635
+ Camera parentcam = Globals.theRenderer.ManipCamera();
434636
435
- if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
637
+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436638 {
437
- parentcam = CameraPane.theRenderer.Cameras()[1];
639
+ parentcam = Globals.theRenderer.Cameras()[1];
438640 }
439641
440
- if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
642
+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441643 {
442
- parentcam = CameraPane.theRenderer.Cameras()[0];
644
+ parentcam = Globals.theRenderer.Cameras()[0];
443645 }
444646
445647 if (this == parentcam)
....@@ -447,7 +649,7 @@
447649 //assert(this instanceof Camera);
448650
449651 for (int count = parentcam.GetTransformCount(); --count>=0;)
450
- LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
652
+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451653 }
452654
453655 copy.marked ^= true;
....@@ -467,7 +669,7 @@
467669 //assert(this instanceof Camera);
468670
469671 for (int count = parentcam.GetTransformCount(); --count>=0;)
470
- LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
672
+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471673 }
472674
473675 copy.Touch(); // display list issue
....@@ -480,12 +682,14 @@
480682 toParent = LA.newMatrix();
481683 fromParent = LA.newMatrix();
482684 }
685
+
483686 if (toParentMarked == null)
484687 {
485688 if (maxcount != 1)
486689 {
487690 new Exception().printStackTrace();
488691 }
692
+
489693 toParentMarked = LA.newMatrix();
490694 fromParentMarked = LA.newMatrix();
491695 }
....@@ -773,7 +977,7 @@
773977 if (step == 0)
774978 step = 1;
775979 if (maxcount == 0)
776
- maxcount = 2048; // 4;
980
+ maxcount = 128; // 2048; // 4;
777981 // if (acceleration == 0)
778982 // acceleration = 10;
779983 if (delay == 0) // serial
....@@ -796,7 +1000,7 @@
7961000
7971001 if (marked && Globals.isLIVE() && live &&
7981002 //TEMP21aug2018
799
- Globals.DrawMode() == iCameraPane.SHADOW &&
1003
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
8001004 currentframe != Globals.framecount)
8011005 {
8021006 currentframe = Globals.framecount;
....@@ -808,7 +1012,8 @@
8081012
8091013 boolean changedir = random && Math.random() < 0.01; // && !link2master;
8101014
811
- if (transformcount*factor > maxcount || (step == 1 && changedir))
1015
+ if (transformcount*factor >= maxcount && (rewind || random) ||
1016
+ (step == 1 && changedir))
8121017 {
8131018 countdown = 1;
8141019 delay = speedup?8:1;
....@@ -880,6 +1085,10 @@
8801085 if (material == null || material.multiply)
8811086 return true;
8821087
1088
+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1089
+ return false;
1090
+
1091
+ // Transparent objects are dynamic because we have to sort the triangles.
8831092 return material.opacity > 0.99;
8841093 }
8851094
....@@ -911,6 +1120,11 @@
9111120 fromParent = null; // LA.newMatrix();
9121121 bRep = null; // new BoundaryRep();
9131122
1123
+ if (oname != null && oname.equals("LeftHand"))
1124
+ {
1125
+ name = oname;
1126
+ }
1127
+
9141128 /*
9151129 float hue = (float)Math.random();
9161130 Color col;
....@@ -953,7 +1167,7 @@
9531167
9541168 public Object clone()
9551169 {
956
- return GrafreeD.clone(this);
1170
+ return Grafreed.clone(this);
9571171 }
9581172
9591173 Object3D copyExpand()
....@@ -1275,6 +1489,7 @@
12751489 toParent = LA.newMatrix();
12761490 fromParent = LA.newMatrix();
12771491 }
1492
+
12781493 LA.matCopy(other.toParent, toParent);
12791494 LA.matCopy(other.fromParent, fromParent);
12801495
....@@ -1469,7 +1684,7 @@
14691684 BoundaryRep.SEUIL = other.material.cameralight;
14701685
14711686 // Set default to 0.1
1472
- BoundaryRep.SEUIL /= 2;
1687
+ BoundaryRep.SEUIL /= 4; // 2;
14731688 System.out.println("SEUIL = " + BoundaryRep.SEUIL);
14741689 }
14751690
....@@ -1728,7 +1943,7 @@
17281943 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17291944 o.bRep = transientrep;
17301945 if (clone)
1731
- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1946
+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17321947 o.CreateMaterial();
17331948 o.SetAttributes(this, -1);
17341949 //parent
....@@ -1741,7 +1956,7 @@
17411956 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17421957 o.bRep = bRep;
17431958 if (clone)
1744
- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1959
+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17451960 o.CreateMaterial();
17461961 //o.overwriteThis(this, -1);
17471962 o.SetAttributes(this, -1);
....@@ -1828,12 +2043,15 @@
18282043 if (obj.name == null)
18292044 continue; // can't be a null one
18302045
2046
+ // Try perfect match first.
18312047 if (n.equals(obj.name))
18322048 {
18332049 theobj = obj;
18342050 count++;
18352051 }
18362052 }
2053
+
2054
+ // not needed: n = n.split(":")[0]; // Poser generates a count
18372055
18382056 if (count != 1)
18392057 for (int i=Size(); --i>=0;)
....@@ -2293,12 +2511,22 @@
22932511 }
22942512 */
22952513 }
2514
+ else
2515
+ {
2516
+ //((ObjEditor)editWindow).SetupUI2(null);
2517
+ if (objectUI != null)
2518
+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
2519
+ else
2520
+ //new Exception().printStackTrace();
2521
+ System.err.println("objectUI is null");
2522
+ }
22962523 }
22972524
22982525 void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
22992526 {
23002527 if (newWindow)
23012528 {
2529
+ new Exception().printStackTrace();
23022530 System.exit(0);
23032531 if (parent != null)
23042532 {
....@@ -2333,6 +2561,14 @@
23332561 {
23342562 editWindow.refreshContents();
23352563 }
2564
+ else
2565
+ {
2566
+ if (manipWindow != null)
2567
+ {
2568
+ manipWindow.refreshContents();
2569
+ }
2570
+ }
2571
+
23362572 //if (parent != null)
23372573 //parent.refreshEditWindow();
23382574 }
....@@ -2412,7 +2648,8 @@
24122648 private static final int editSelf = 1;
24132649 private static final int editChild = 2;
24142650
2415
- void drawEditHandles(ClickInfo info, int level)
2651
+ void drawEditHandles(//ClickInfo info,
2652
+ int level)
24162653 {
24172654 if (level == 0)
24182655 {
....@@ -2420,7 +2657,8 @@
24202657 return;
24212658
24222659 Object3D selectee;
2423
- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
2660
+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
2661
+ level + 1))
24242662 {
24252663 selectee = (Object3D) e.nextElement();
24262664 }
....@@ -2428,19 +2666,22 @@
24282666 } else
24292667 {
24302668 //super.
2431
- drawEditHandles0(info, level + 1);
2669
+ drawEditHandles0(//info,
2670
+ level + 1);
24322671 }
24332672 }
24342673
2435
- boolean doEditClick(ClickInfo info, int level)
2674
+ boolean doEditClick(//ClickInfo info,
2675
+ int level)
24362676 {
24372677 doSomething = 0;
24382678 if (level == 0)
24392679 {
2440
- return doParentClick(info);
2680
+ return doParentClick(); //info);
24412681 }
24422682 if (//super.
2443
- doEditClick0(info, level))
2683
+ doEditClick0(//info,
2684
+ level))
24442685 {
24452686 doSomething = 1;
24462687 return true;
....@@ -2450,7 +2691,7 @@
24502691 }
24512692 }
24522693
2453
- boolean doParentClick(ClickInfo info)
2694
+ boolean doParentClick() //ClickInfo info)
24542695 {
24552696 if (selection == null)
24562697 {
....@@ -2463,7 +2704,8 @@
24632704 for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
24642705 {
24652706 Object3D selectee = (Object3D) e.nextElement();
2466
- if (selectee.doEditClick(info, 1))
2707
+ if (selectee.doEditClick(//info,
2708
+ 1))
24672709 {
24682710 childToDrag = selectee;
24692711 doSomething = 2;
....@@ -2475,13 +2717,15 @@
24752717 return retval;
24762718 }
24772719
2478
- void doEditDrag(ClickInfo info)
2720
+ void doEditDrag(//ClickInfo clickInfo,
2721
+ boolean opposite)
24792722 {
24802723 switch (doSomething)
24812724 {
24822725 case 1: // '\001'
24832726 //super.
2484
- doEditDrag0(info);
2727
+ doEditDrag0(//clickInfo,
2728
+ opposite);
24852729 break;
24862730
24872731 case 2: // '\002'
....@@ -2494,11 +2738,13 @@
24942738 {
24952739 //sel.hitSomething = childToDrag.hitSomething;
24962740 //childToDrag.doEditDrag(info);
2497
- sel.doEditDrag(info);
2741
+ sel.doEditDrag(//clickInfo,
2742
+ opposite);
24982743 } else
24992744 {
25002745 //super.
2501
- doEditDrag0(info);
2746
+ doEditDrag0(//clickInfo,
2747
+ opposite);
25022748 }
25032749 }
25042750 break;
....@@ -2516,6 +2762,9 @@
25162762 {
25172763 deselectAll();
25182764 }
2765
+
2766
+ new Exception().printStackTrace();
2767
+
25192768 ClickInfo newInfo = new ClickInfo();
25202769 newInfo.flags = info.flags;
25212770 newInfo.bounds = info.bounds;
....@@ -2608,6 +2857,18 @@
26082857 void GenNormalsS(boolean crease)
26092858 {
26102859 selection.GenNormals(crease);
2860
+// for (int i=0; i<selection.size(); i++)
2861
+// {
2862
+// Object3D selectee = (Object3D) selection.elementAt(i);
2863
+// selectee.GenNormals(crease);
2864
+// }
2865
+
2866
+ //Touch();
2867
+ }
2868
+
2869
+ void GenNormalsMeshS()
2870
+ {
2871
+ selection.GenNormalsMesh();
26112872 // for (int i=0; i<selection.size(); i++)
26122873 // {
26132874 // Object3D selectee = (Object3D) selection.elementAt(i);
....@@ -2748,6 +3009,24 @@
27483009 if (child == null)
27493010 continue;
27503011 child.GenNormals(crease);
3012
+// Children().release(i);
3013
+ }
3014
+ blockloop = false;
3015
+ }
3016
+
3017
+ void GenNormalsMesh()
3018
+ {
3019
+ if (blockloop)
3020
+ return;
3021
+
3022
+ blockloop = true;
3023
+ GenNormalsMesh0();
3024
+ for (int i = 0; i < Children().Size(); i++)
3025
+ {
3026
+ Object3D child = (Object3D) Children().get(i); // reserve(i);
3027
+ if (child == null)
3028
+ continue;
3029
+ child.GenNormalsMesh();
27513030 // Children().release(i);
27523031 }
27533032 blockloop = false;
....@@ -2905,7 +3184,8 @@
29053184 {
29063185 if (bRep != null)
29073186 {
2908
- bRep.GenUV();
3187
+ bRep.GenUV(); //1);
3188
+ //bRep.UnfoldUV();
29093189 Touch();
29103190 }
29113191 }
....@@ -2919,11 +3199,20 @@
29193199 }
29203200 }
29213201
3202
+ void GenNormalsMesh0()
3203
+ {
3204
+ if (bRep != null)
3205
+ {
3206
+ bRep.GenerateNormalsMesh();
3207
+ Touch();
3208
+ }
3209
+ }
3210
+
29223211 void GenNormalsMINE0()
29233212 {
29243213 if (bRep != null)
29253214 {
2926
- bRep.GenerateNormalsMINE();
3215
+ bRep.MergeNormals(); //.GenerateNormalsMINE();
29273216 Touch();
29283217 }
29293218 }
....@@ -2980,6 +3269,33 @@
29803269 blockloop = false;
29813270 }
29823271
3272
+ void TransformChildren()
3273
+ {
3274
+ if (toParent != null)
3275
+ {
3276
+ for (int i=Size(); --i>=0;)
3277
+ {
3278
+ Object3D v = get(i);
3279
+
3280
+ if (v.toParent == null)
3281
+ {
3282
+ v.toParent = LA.newMatrix();
3283
+ v.fromParent = LA.newMatrix();
3284
+ }
3285
+
3286
+// LA.matConcat(v.toParent, toParent, v.toParent);
3287
+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
3288
+ LA.matConcat(toParent, v.toParent, v.toParent);
3289
+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3290
+ }
3291
+
3292
+ toParent = null; // LA.matIdentity(toParent);
3293
+ fromParent = null; // LA.matIdentity(fromParent);
3294
+
3295
+ Touch();
3296
+ }
3297
+ }
3298
+
29833299 void TransformGeometry()
29843300 {
29853301 Object3D obj = this;
....@@ -3201,9 +3517,11 @@
32013517
32023518 BoundaryRep sup = bRep.support;
32033519 bRep.support = null;
3204
- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3520
+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32053521 // bRep.SplitInTwo(onlyone); // thread...
3206
- temprep.SplitInTwo(reduction34, onlyone);
3522
+
3523
+ while(temprep.SplitInTwo(reduction34, onlyone));
3524
+
32073525 bRep = temprep;
32083526 bRep.support = sup;
32093527 Touch();
....@@ -3304,15 +3622,47 @@
33043622
33053623 void ClearMaterials()
33063624 {
3625
+ if (blockloop)
3626
+ return;
3627
+
3628
+ blockloop = true;
3629
+
33073630 ClearMaterial();
3308
- for (int i = 0; i < size(); i++)
3631
+ for (int i = 0; i < Size(); i++)
33093632 {
3310
- Object3D child = (Object3D) reserve(i);
3633
+ Object3D child = (Object3D) get(i);
33113634 if (child == null)
33123635 continue;
33133636 child.ClearMaterials();
3314
- release(i);
33153637 }
3638
+
3639
+ blockloop = false;
3640
+ }
3641
+
3642
+ void ClearVersionList()
3643
+ {
3644
+ this.versionlist = null;
3645
+ this.versionindex = -1;
3646
+ this.versiontable = null;
3647
+ }
3648
+
3649
+ void ClearVersions()
3650
+ {
3651
+ if (blockloop)
3652
+ return;
3653
+
3654
+ blockloop = true;
3655
+
3656
+ ClearVersionList();
3657
+ for (int i = 0; i < Size(); i++)
3658
+ {
3659
+ Object3D child = (Object3D) get(i);
3660
+ if (child == null)
3661
+ continue;
3662
+ child.ClearVersions();
3663
+ }
3664
+
3665
+ blockloop = false;
33163666 }
33173667
33183668 void FlipV(boolean flip)
....@@ -3340,7 +3690,8 @@
33403690 if (blockloop)
33413691 return;
33423692
3343
- if (marked || (bRep != null && material != null)) // borderline...
3693
+ if (//marked || // does not make sense
3694
+ (bRep != null || material != null)) // borderline...
33443695 live = h;
33453696
33463697 for (int i = 0; i < Size(); i++)
....@@ -3361,7 +3712,8 @@
33613712 return;
33623713
33633714 //if (bRep != null)
3364
- if (marked || (bRep != null && material != null)) // borderline...
3715
+ if (//marked || // does not make sense
3716
+ (bRep != null || material != null)) // borderline...
33653717 link2master = h;
33663718
33673719 for (int i = 0; i < Size(); i++)
....@@ -3381,7 +3733,8 @@
33813733 if (blockloop)
33823734 return;
33833735
3384
- if (marked || (bRep != null && material != null)) // borderline...
3736
+ if (//marked || // does not make sense
3737
+ (bRep != null || material != null)) // borderline...
33853738 hide = h;
33863739
33873740 for (int i = 0; i < Size(); i++)
....@@ -3401,7 +3754,7 @@
34013754 if (blockloop)
34023755 return;
34033756
3404
- if (bRep != null && material != null) // borderline...
3757
+ if (bRep != null || material != null) // borderline...
34053758 marked = h;
34063759
34073760 for (int i = 0; i < Size(); i++)
....@@ -3411,6 +3764,46 @@
34113764 continue;
34123765 blockloop = true;
34133766 child.MarkLeaves(h);
3767
+ blockloop = false;
3768
+ // release(i);
3769
+ }
3770
+ }
3771
+
3772
+ void RewindLeaves(boolean h)
3773
+ {
3774
+ if (blockloop)
3775
+ return;
3776
+
3777
+ if (bRep != null || material != null) // borderline...
3778
+ rewind = h;
3779
+
3780
+ for (int i = 0; i < Size(); i++)
3781
+ {
3782
+ Object3D child = (Object3D) get(i); // reserve(i);
3783
+ if (child == null)
3784
+ continue;
3785
+ blockloop = true;
3786
+ child.RewindLeaves(h);
3787
+ blockloop = false;
3788
+ // release(i);
3789
+ }
3790
+ }
3791
+
3792
+ void RandomLeaves(boolean h)
3793
+ {
3794
+ if (blockloop)
3795
+ return;
3796
+
3797
+ if (bRep != null || material != null) // borderline...
3798
+ random = h;
3799
+
3800
+ for (int i = 0; i < Size(); i++)
3801
+ {
3802
+ Object3D child = (Object3D) get(i); // reserve(i);
3803
+ if (child == null)
3804
+ continue;
3805
+ blockloop = true;
3806
+ child.RandomLeaves(h);
34143807 blockloop = false;
34153808 // release(i);
34163809 }
....@@ -3725,7 +4118,7 @@
37254118 if (child == null)
37264119 continue;
37274120
3728
- if (GrafreeD.RENDERME > 0)
4121
+ if (Grafreed.RENDERME > 0)
37294122 {
37304123 if (child instanceof Merge)
37314124 ((Merge)child).renderme();
....@@ -3876,7 +4269,7 @@
38764269 if (child == null)
38774270 continue;
38784271
3879
- if (GrafreeD.RENDERME > 0)
4272
+ if (Grafreed.RENDERME > 0)
38804273 {
38814274 if (child instanceof Merge)
38824275 ((Merge)child).renderme();
....@@ -4071,7 +4464,7 @@
40714464 if (child == null)
40724465 continue;
40734466
4074
- if (GrafreeD.RENDERME > 0)
4467
+ if (Grafreed.RENDERME > 0)
40754468 {
40764469 if (child instanceof Merge)
40774470 ((Merge)child).renderme();
....@@ -4184,6 +4577,55 @@
41844577 {
41854578 blockloop = true;
41864579 get(i).RepairShadow();
4580
+ blockloop = false;
4581
+ }
4582
+ }
4583
+
4584
+ void RepairSOV()
4585
+ {
4586
+ if (blockloop)
4587
+ return;
4588
+
4589
+ String texname = this.GetPigmentTexture();
4590
+
4591
+ if (texname.startsWith("sov"))
4592
+ {
4593
+ String[] s = texname.split("/");
4594
+
4595
+ String[] sname = s[1].split("Color.pn");
4596
+
4597
+ texname = sname[0];
4598
+
4599
+ if (sname.length > 1)
4600
+ {
4601
+ texname += "Color.jpg";
4602
+ }
4603
+
4604
+ this.SetPigmentTexture("sov/" + texname);
4605
+ }
4606
+
4607
+ texname = this.GetBumpTexture();
4608
+
4609
+ if (texname.startsWith("sov"))
4610
+ {
4611
+ String[] s = texname.split("/");
4612
+
4613
+ String[] sname = s[1].split("Bump.pn");
4614
+
4615
+ texname = sname[0];
4616
+
4617
+ if (sname.length > 1)
4618
+ {
4619
+ texname += "Bump.jpg";
4620
+ }
4621
+
4622
+ this.SetBumpTexture("sov/" + texname);
4623
+ }
4624
+
4625
+ for (int i=0; i<Size(); i++)
4626
+ {
4627
+ blockloop = true;
4628
+ get(i).RepairSOV();
41874629 blockloop = false;
41884630 }
41894631 }
....@@ -4678,7 +5120,7 @@
46785120
46795121 cTreePath SelectLeaf(int indexcount, boolean deselect)
46805122 {
4681
- if (hide)
5123
+ if (hide || dontselect)
46825124 return null;
46835125
46845126 if (count <= 0)
....@@ -4702,9 +5144,17 @@
47025144 }
47035145 }
47045146
5147
+ ObjEditor GetWindow()
5148
+ {
5149
+ if (editWindow != null)
5150
+ return editWindow;
5151
+
5152
+ return manipWindow;
5153
+ }
5154
+
47055155 cTreePath Select(int indexcount, boolean deselect)
47065156 {
4707
- if (hide)
5157
+ if (hide || dontselect)
47085158 return null;
47095159
47105160 if (count <= 0)
....@@ -4738,10 +5188,11 @@
47385188 if (leaf != null)
47395189 {
47405190 cTreePath tp = new cTreePath(this, leaf);
4741
- if (editWindow != null)
5191
+ ObjEditor window = GetWindow();
5192
+ if (window != null)
47425193 {
47435194 //System.out.println("editWindow = " + editWindow + " vs " + this);
4744
- editWindow.Select(tp, deselect, true);
5195
+ window.Select(tp, deselect, true);
47455196 }
47465197
47475198 return tp;
....@@ -4758,6 +5209,7 @@
47585209
47595210 if (child == null)
47605211 continue;
5212
+
47615213 if (child.HasTransparency() && child.size() != 0)
47625214 {
47635215 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4767,9 +5219,10 @@
47675219 if (leaf != null)
47685220 {
47695221 cTreePath tp = new cTreePath(this, leaf);
4770
- if (editWindow != null)
5222
+ ObjEditor window = GetWindow();
5223
+ if (window != null)
47715224 {
4772
- editWindow.Select(tp, deselect, true);
5225
+ window.Select(tp, deselect, true);
47735226 }
47745227
47755228 return tp;
....@@ -5094,6 +5547,51 @@
50945547 blockloop = false;
50955548 }
50965549
5550
+ void ResetSelectable()
5551
+ {
5552
+ if (blockloop)
5553
+ return;
5554
+
5555
+ blockloop = true;
5556
+
5557
+ keepdontselect = dontselect;
5558
+ dontselect = true;
5559
+
5560
+ Object3D child;
5561
+ int nb = Size();
5562
+ for (int i = 0; i < nb; i++)
5563
+ {
5564
+ child = (Object3D) get(i);
5565
+ if (child == null)
5566
+ continue;
5567
+ child.ResetSelectable();
5568
+ }
5569
+
5570
+ blockloop = false;
5571
+ }
5572
+
5573
+ void RestoreSelectable()
5574
+ {
5575
+ if (blockloop)
5576
+ return;
5577
+
5578
+ blockloop = true;
5579
+
5580
+ dontselect = keepdontselect;
5581
+
5582
+ Object3D child;
5583
+ int nb = Size();
5584
+ for (int i = 0; i < nb; i++)
5585
+ {
5586
+ child = (Object3D) get(i);
5587
+ if (child == null)
5588
+ continue;
5589
+ child.RestoreSelectable();
5590
+ }
5591
+
5592
+ blockloop = false;
5593
+ }
5594
+
50975595 boolean IsSelected()
50985596 {
50995597 if (parent == null)
....@@ -5154,12 +5652,41 @@
51545652 if (fullname == null)
51555653 return "";
51565654
5655
+ if (fullname.pigment != null)
5656
+ {
5657
+ return fullname.pigment;
5658
+ }
5659
+
51575660 // System.out.println("Fullname = " + fullname);
51585661
5159
- if (fullname.name.indexOf(":") == -1)
5160
- return fullname.name;
5662
+ // Does not work on Windows due to C:
5663
+// if (fullname.name.indexOf(":") == -1)
5664
+// return fullname.name;
5665
+//
5666
+// return fullname.name.substring(0,fullname.name.indexOf(":"));
51615667
5162
- return fullname.name.substring(0,fullname.name.indexOf(":"));
5668
+ String[] split = fullname.name.split(":");
5669
+
5670
+ if (split.length == 0)
5671
+ {
5672
+ return fullname.pigment = "";
5673
+ }
5674
+
5675
+ if (split.length <= 2)
5676
+ {
5677
+ if (fullname.name.endsWith(":"))
5678
+ {
5679
+ // Windows
5680
+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5681
+ }
5682
+
5683
+ return fullname.pigment = split[0];
5684
+ }
5685
+
5686
+ // Windows
5687
+ assert(split.length == 4);
5688
+
5689
+ return fullname.pigment = split[0] + ":" + split[1];
51635690 }
51645691
51655692 static String GetBump(cTexture fullname)
....@@ -5167,11 +5694,44 @@
51675694 if (fullname == null)
51685695 return "";
51695696
5697
+ if (fullname.bump != null)
5698
+ {
5699
+ return fullname.bump;
5700
+ }
5701
+
51705702 // System.out.println("Fullname = " + fullname);
5171
- if (fullname.name.indexOf(":") == -1)
5172
- return "";
5173
-
5174
- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5703
+ // Does not work on Windows due to C:
5704
+// if (fullname.name.indexOf(":") == -1)
5705
+// return "";
5706
+//
5707
+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5708
+ String[] split = fullname.name.split(":");
5709
+
5710
+ if (split.length == 0)
5711
+ {
5712
+ return fullname.bump = "";
5713
+ }
5714
+
5715
+ if (split.length == 1)
5716
+ {
5717
+ return fullname.bump = "";
5718
+ }
5719
+
5720
+ if (split.length == 2)
5721
+ {
5722
+ if (fullname.name.endsWith(":"))
5723
+ {
5724
+ // Windows
5725
+ return fullname.bump = "";
5726
+ }
5727
+
5728
+ return fullname.bump = split[1];
5729
+ }
5730
+
5731
+ // Windows
5732
+ assert(split.length == 4);
5733
+
5734
+ return fullname.bump = split[2] + ":" + split[3];
51755735 }
51765736
51775737 String GetPigmentTexture()
....@@ -5245,7 +5805,7 @@
52455805 System.out.print("; textures = " + textures);
52465806 System.out.println("; usedtextures = " + usedtextures);
52475807
5248
- if (GetTextures() == null)
5808
+ if (GetTextures() == null) // What is that??
52495809 GetTextures().name = ":";
52505810
52515811 String texname = tex;
....@@ -5254,6 +5814,9 @@
52545814 texname = "";
52555815
52565816 GetTextures().name = texname + ":" + GetBump(GetTextures());
5817
+
5818
+ GetTextures().pigment = null;
5819
+
52575820 Touch();
52585821 }
52595822
....@@ -5278,6 +5841,43 @@
52785841 }
52795842 }
52805843
5844
+ UUID GetUUID()
5845
+ {
5846
+ if (uuid == null)
5847
+ {
5848
+ // Serial
5849
+ uuid = UUID.randomUUID();
5850
+ }
5851
+
5852
+ return uuid;
5853
+ }
5854
+
5855
+ Object3D GetObject(UUID uid)
5856
+ {
5857
+ if (blockloop)
5858
+ return null;
5859
+
5860
+ if (GetUUID().equals(uid))
5861
+ return this;
5862
+
5863
+ int nb = Size();
5864
+ for (int i = 0; i < nb; i++)
5865
+ {
5866
+ Object3D child = (Object3D) get(i);
5867
+
5868
+ if (child == null)
5869
+ continue;
5870
+
5871
+ blockloop = true;
5872
+ Object3D obj = child.GetObject(uid);
5873
+ blockloop = false;
5874
+ if (obj != null)
5875
+ return obj;
5876
+ }
5877
+
5878
+ return null;
5879
+ }
5880
+
52815881 void SetBumpTexture(String tex)
52825882 {
52835883 if (GetTextures() == null)
....@@ -5289,6 +5889,8 @@
52895889 texname = "";
52905890
52915891 GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5892
+
5893
+ GetTextures().bump = null;
52925894
52935895 Touch();
52945896 }
....@@ -5314,6 +5916,38 @@
53145916 }
53155917 }
53165918
5919
+ void EmbedTextures(boolean embed)
5920
+ {
5921
+ if (blockloop)
5922
+ return;
5923
+
5924
+ //if (GetTextures() != null)
5925
+ if (embed)
5926
+ CameraPane.EmbedTextures(GetTextures());
5927
+ else
5928
+ {
5929
+ GetTextures().pigmentdata = null;
5930
+ GetTextures().bumpdata = null;
5931
+ GetTextures().pw = 0;
5932
+ GetTextures().ph = 0;
5933
+ GetTextures().bw = 0;
5934
+ GetTextures().bh = 0;
5935
+ }
5936
+
5937
+ int nb = Size();
5938
+ for (int i = 0; i < nb; i++)
5939
+ {
5940
+ Object3D child = (Object3D) get(i);
5941
+
5942
+ if (child == null)
5943
+ continue;
5944
+
5945
+ blockloop = true;
5946
+ child.EmbedTextures(embed);
5947
+ blockloop = false;
5948
+ }
5949
+ }
5950
+
53175951 void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
53185952 {
53195953 Draw(display, root, selected, blocked);
....@@ -5322,12 +5956,23 @@
53225956 boolean NeedSupport()
53235957 {
53245958 return
5325
- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
5959
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
53265960 // PROBLEM with CROWD!!
5327
- && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5961
+ && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
53285962 }
53295963
53305964 static boolean DEBUG_SELECTION = false;
5965
+
5966
+ boolean IsLive()
5967
+ {
5968
+ if (live)
5969
+ return true;
5970
+
5971
+ if (parent == null)
5972
+ return false;
5973
+
5974
+ return parent.IsLive();
5975
+ }
53315976
53325977 void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
53335978 {
....@@ -5339,7 +5984,7 @@
53395984 }
53405985
53415986 if (display.DrawMode() == iCameraPane.SELECTION &&
5342
- hide)
5987
+ (hide || dontselect))
53435988 return;
53445989
53455990 if (name != null && name.contains("sclera"))
....@@ -5371,7 +6016,7 @@
53716016 return;
53726017 }
53736018
5374
- javax.media.opengl.GL gl = display.GetGL();
6019
+ //javax.media.opengl.GL gl = display.GetGL();
53756020
53766021 /*
53776022 if (touched)
....@@ -5389,8 +6034,10 @@
53896034 if (support != null)
53906035 support = support;
53916036
5392
- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5393
- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6037
+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6038
+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6039
+
6040
+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
53946041
53956042 if (!usecalllists && bRep != null && bRep.displaylist > 0)
53966043 {
....@@ -5400,8 +6047,9 @@
54006047 // usecalllists &= !(parent instanceof RandomNode);
54016048 // usecalllists = false;
54026049
5403
- if (GetBRep() != null)
5404
- usecalllists = usecalllists;
6050
+ if (display.DrawMode() == display.SHADOW)
6051
+ //GetBRep() != null)
6052
+ usecalllists = !!usecalllists;
54056053 //System.out.println("draw " + this);
54066054 //new Exception().printStackTrace();
54076055
....@@ -5410,10 +6058,12 @@
54106058 boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
54116059
54126060 if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413
- (touched || (bRep != null && bRep.displaylist <= 0)))
6061
+ //(touched || (bRep != null && bRep.displaylist <= 0)))
6062
+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
54146063 {
54156064 Globals.lighttouched = true;
54166065 } // all panes...
6066
+
54176067 //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
54186068 if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
54196069 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5421,9 +6071,9 @@
54216071 if (!(this instanceof Composite))
54226072 touched = false;
54236073 //if (displaylist == -1 && usecalllists)
5424
- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
6074
+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
54256075 {
5426
- bRep.displaylist = gl.glGenLists(1);
6076
+ bRep.displaylist = display.GenList();
54276077 assert(bRep.displaylist != 0);
54286078 // System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
54296079 //System.out.println("\tgen list " + list);
....@@ -5432,17 +6082,19 @@
54326082
54336083 //System.out.println("\tnew list " + list);
54346084 //gl.glDrawBuffer(gl.GL_NONE);
5435
- if (usecalllists)
6085
+ if (usecalllists && bRep.displaylist > 0)
54366086 {
54376087 // System.err.println("new list " + bRep.displaylist + " for " + this);
5438
- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
6088
+ display.NewList(bRep.displaylist);
54396089 }
6090
+
54406091 CallList(display, root, selected, blocked);
6092
+
54416093 // compiled = true;
5442
- if (usecalllists)
6094
+ if (usecalllists && bRep.displaylist > 0)
54436095 {
54446096 // System.err.println("end list " + bRep.displaylist + " for " + this);
5445
- gl.glEndList();
6097
+ display.EndList();
54466098 }
54476099 //gl.glDrawBuffer(gl.GL_BACK);
54486100 // XXX touched = false;
....@@ -5490,7 +6142,7 @@
54906142 if (display.DrawMode() == iCameraPane.SHADOW)
54916143 {
54926144 if (!link2master // tricky to cull in shadow mode.
5493
- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
6145
+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
54946146 {
54956147 //System.out.print("CULLED");
54966148 culled = true;
....@@ -5498,7 +6150,7 @@
54986150 }
54996151 else
55006152 //GetBRep().getBounds(v0, v1, this);
5501
- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
6153
+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
55026154 culled = true;
55036155
55046156 // LA.xformPos(v0, display.renderCamera.toScreen, v0);
....@@ -5538,7 +6190,8 @@
55386190 {
55396191 if (GetBRep() != null)
55406192 {
5541
- CameraPane.NextIndex(this, gl);
6193
+ display.NextIndex();
6194
+
55426195 // vertex color conflict : gl.glCallList(list);
55436196 DrawNode(display, root, selected);
55446197 if (this instanceof BezierPatch)
....@@ -5579,7 +6232,28 @@
55796232 tex = GetTextures();
55806233 }
55816234
5582
- display.BindTextures(tex, texres);
6235
+ boolean failedPigment = false;
6236
+ boolean failedBump = false;
6237
+
6238
+ try
6239
+ {
6240
+ display.BindPigmentTexture(tex, texres);
6241
+ }
6242
+ catch (Exception e)
6243
+ {
6244
+ System.err.println("FAILED: " + this);
6245
+ failedPigment = true;
6246
+ }
6247
+
6248
+ try
6249
+ {
6250
+ display.BindBumpTexture(tex, texres);
6251
+ }
6252
+ catch (Exception e)
6253
+ {
6254
+ //System.err.println("FAILED: " + this);
6255
+ failedBump = true;
6256
+ }
55836257
55846258 if (!compiled)
55856259 {
....@@ -5595,13 +6269,17 @@
55956269
55966270 // System.err.println("glCallList: " + bRep.displaylist + " for " + this);
55976271 assert(bRep.displaylist != 0);
5598
- gl.glCallList(bRep.displaylist);
6272
+ display.CallList(bRep.displaylist);
55996273 // june 2013 drawSelf(display, root, selected);
56006274 }
56016275 }
56026276 }
56036277
5604
- display.ReleaseTextures(tex);
6278
+ if (!failedBump)
6279
+ display.ReleaseBumpTexture(tex);
6280
+
6281
+ if (!failedPigment)
6282
+ display.ReleasePigmentTexture(tex);
56056283
56066284 display.PopMaterial(this, selected);
56076285 }
....@@ -5730,6 +6408,9 @@
57306408
57316409 void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57326410 {
6411
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6412
+ return;
6413
+
57336414 if (hide)
57346415 return;
57356416 // shadow optimisation
....@@ -5855,6 +6536,9 @@
58556536 if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
58566537 return; // no shadow for transparent objects
58576538
6539
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6540
+ return;
6541
+
58586542 if (hide)
58596543 return;
58606544
....@@ -5895,9 +6579,10 @@
58956579 return;
58966580 }
58976581
6582
+ //bRep.GenUV(1/material.diffuseness);
58986583 // bRep.lock = true;
58996584
5900
- javax.media.opengl.GL gl = display.GetGL();
6585
+ //javax.media.opengl.GL gl = display.GetGL();
59016586
59026587 if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
59036588 {
....@@ -5914,23 +6599,7 @@
59146599
59156600 bRep.getMinMax(min, max, 100);
59166601
5917
- gl.glBegin(gl.GL_LINES);
5918
-
5919
- gl.glVertex3d(min.x, min.y, min.z);
5920
- gl.glVertex3d(min.x, min.y, max.z);
5921
- gl.glVertex3d(min.x, min.y, min.z);
5922
- gl.glVertex3d(min.x, max.y, min.z);
5923
- gl.glVertex3d(min.x, min.y, min.z);
5924
- gl.glVertex3d(max.x, min.y, min.z);
5925
-
5926
- gl.glVertex3d(max.x, max.y, max.z);
5927
- gl.glVertex3d(min.x, max.y, max.z);
5928
- gl.glVertex3d(max.x, max.y, max.z);
5929
- gl.glVertex3d(max.x, min.y, max.z);
5930
- gl.glVertex3d(max.x, max.y, max.z);
5931
- gl.glVertex3d(max.x, max.y, min.z);
5932
-
5933
- gl.glEnd();
6602
+ display.DrawBox(min, max);
59346603
59356604 return;
59366605 }
....@@ -5984,178 +6653,19 @@
59846653 new Exception().printStackTrace();
59856654 return;
59866655 }
5987
-
5988
- // TRIANGLE STRIP ARRAY
5989
- if (bRep.trimmed)
6656
+
6657
+ if (dontselect)
59906658 {
5991
- float[] v = bRep.getRawVertices();
5992
- float[] n = bRep.getRawNormals();
5993
- float[] c = bRep.getRawColors();
5994
- float[] uv = bRep.getRawUVMap();
5995
-
5996
- int count2 = 0;
5997
- int count3 = 0;
5998
-
5999
- if (n.length > 0)
6000
- {
6001
- for (int i = 0; i < strips.length; i++)
6002
- {
6003
- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6004
-
6005
- /*
6006
- boolean locked = false;
6007
- float eps = 0.1f;
6008
- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6009
-
6010
- int dot = 0;
6011
-
6012
- if ((dot&1) == 0)
6013
- dot |= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6014
-
6015
- if (wrap || (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6016
- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6017
- else
6018
- {
6019
- locked = true;
6020
- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6021
- }
6022
- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6023
- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6024
- if (hasnorm)
6025
- {
6026
- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6027
- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6028
- }
6029
-
6030
- if ((dot&4) == 0)
6031
- dot |= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6032
-
6033
- if (wrap || !locked && (dot&8) != 0)
6034
- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6035
- else
6036
- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6037
-
6038
- f.dot = dot;
6039
- */
6040
-
6041
- if (!selectmode)
6042
- {
6043
- if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
6044
- {
6045
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6046
- } else
6047
- {
6048
- gl.glNormal3f(0, 0, 1);
6049
- }
6050
-
6051
- if (c != null)
6052
- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6053
- {
6054
- gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
6055
- }
6056
- }
6057
- if (flipV)
6058
- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6059
- else
6060
- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6061
- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6062
- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6063
-
6064
- count2 += 2;
6065
- count3 += 3;
6066
- if (!selectmode)
6067
- {
6068
- if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
6069
- {
6070
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6071
- } else
6072
- {
6073
- gl.glNormal3f(0, 0, 1);
6074
- }
6075
- if (c != null)
6076
- {
6077
- gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
6078
- }
6079
- }
6080
- if (flipV)
6081
- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6082
- else
6083
- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6084
- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6085
- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6086
-
6087
- count2 += 2;
6088
- count3 += 3;
6089
- for (int j = 0; j < strips[i] - 2; j++)
6090
- {
6091
- //gl.glTexCoord2d(...);
6092
- if (!selectmode)
6093
- {
6094
- if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
6095
- {
6096
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6097
- } else
6098
- {
6099
- gl.glNormal3f(0, 0, 1);
6100
- }
6101
- if (c != null)
6102
- {
6103
- gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
6104
- }
6105
- }
6106
-
6107
- if (flipV)
6108
- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6109
- else
6110
- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6111
- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6112
- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6113
- count2 += 2;
6114
- count3 += 3;
6115
- }
6116
-
6117
- gl.glEnd();
6118
- }
6119
- }
6120
-
6121
- assert count3 == v.length;
6659
+ //bRep.GenerateNormalsMINE();
61226660 }
6123
- else // !trimmed
6124
- {
6125
- int count = 0;
6126
- for (int i = 0; i < strips.length; i++)
6127
- {
6128
- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6129
-
6130
- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6131
- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6132
-
6133
- drawVertex(gl, p, selectmode);
6134
- drawVertex(gl, q, selectmode);
6135
-
6136
- for (int j = 0; j < strips[i] - 2; j++)
6137
- {
6138
- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6139
-
6140
-// if (j%2 == 0)
6141
-// drawFace(p, q, r, display, null);
6142
-// else
6143
-// drawFace(p, r, q, display, null);
6144
-
6145
-// p = q;
6146
-// q = r;
6147
- drawVertex(gl, r, selectmode);
6148
- }
6149
-
6150
- gl.glEnd();
6151
- }
6152
- }
6661
+
6662
+ display.DrawGeometry(bRep, flipV, selectmode);
61536663 } else // catch (Error e)
61546664 {
61556665 // TRIANGLE ARRAY
61566666 if (IsOpaque()) // Static())
61576667 {
6158
- gl.glBegin(gl.GL_TRIANGLES);
6668
+ display.StartTriangles();
61596669 int facecount = bRep.FaceCount();
61606670 for (int i = 0; i < facecount; i++)
61616671 {
....@@ -6220,7 +6730,7 @@
62206730
62216731 display.DrawFace(this, p, q, r, face);
62226732 }
6223
- gl.glEnd();
6733
+ display.EndTriangles();
62246734 }
62256735 else
62266736 {
....@@ -6249,8 +6759,8 @@
62496759 //System.out.println("SORT");
62506760
62516761 java.util.Arrays.sort(facescompare);
6252
-
6253
- gl.glBegin(gl.GL_TRIANGLES);
6762
+
6763
+ display.StartTriangles();
62546764 for (int i = 0; i < facecount; i++)
62556765 {
62566766 Face face = bRep.GetFace(facescompare[i].index);
....@@ -6264,11 +6774,12 @@
62646774
62656775 display.DrawFace(this, p, q, r, face);
62666776 }
6267
- gl.glEnd();
6777
+ display.EndTriangles();
62686778 }
62696779
62706780 if (false) // live && support != null && support.bRep != null) // debug weights
62716781 {
6782
+ /*
62726783 gl.glDisable(gl.GL_LIGHTING);
62736784 float[] colorV = new float[3];
62746785
....@@ -6347,6 +6858,7 @@
63476858 // gl.glEnd();
63486859 }
63496860 }
6861
+ */
63506862 }
63516863 }
63526864
....@@ -6391,7 +6903,7 @@
63916903 center.add(r);
63926904 center.mul(1.0/3);
63936905
6394
- center.sub(CameraPane.theRenderer.eyeCamera.location);
6906
+ center.sub(Globals.theRenderer.EyeCamera().location);
63956907
63966908 distance = center.dot(center);
63976909 }
....@@ -6405,22 +6917,6 @@
64056917 void Print(Vertex v)
64066918 {
64076919 //System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6408
- }
6409
-
6410
- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6411
- {
6412
- if (!selectmode)
6413
- {
6414
- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6415
- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6416
-
6417
- if (flipV)
6418
- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6419
- else
6420
- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6421
- }
6422
-
6423
- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
64246920 }
64256921
64266922 void drawSelf(ClickInfo info, int level, boolean select)
....@@ -6946,20 +7442,23 @@
69467442 }
69477443 }
69487444
6949
- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7445
+ static ClickInfo clickInfo = new ClickInfo();
7446
+
7447
+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7448
+ Point outPt, Rectangle outRec)
69507449 {
6951
- int hc = info.bounds.x + info.bounds.width / 2;
6952
- int vc = info.bounds.y + info.bounds.height / 2;
6953
- double[][] toscreen = info.toScreen;
7450
+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7451
+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7452
+ double[][] toscreen = clickInfo.toScreen;
69547453 if (toscreen == null)
69557454 {
6956
- toscreen = new Camera(info.camera.viewCode).toScreen;
7455
+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
69577456 }
69587457 cVector vec = in;
69597458 LA.xformPos(in, toscreen, in);
69607459 //System.out.println("Distance = " + info.camera.Distance());
6961
- vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
6962
- vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
7460
+ vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7461
+ vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
69637462 outPt.x = hc + (int) vec.x;
69647463 outPt.y = vc - (int) vec.y;
69657464 outRec.x = outPt.x - 3;
....@@ -6967,15 +7466,18 @@
69677466 outRec.width = outRec.height = 6;
69687467 }
69697468
6970
- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7469
+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7470
+ )
69717471 {
69727472 Point pt = new Point(0, 0);
69737473 Rectangle rec = new Rectangle();
6974
- calcHotSpot(in, info, pt, rec);
7474
+ calcHotSpot(in, //clickInfo,
7475
+ pt, rec);
69757476 return rec;
69767477 }
69777478
6978
- void drawEditHandles0(ClickInfo info, int level)
7479
+ void drawEditHandles0(//ClickInfo clickInfo,
7480
+ int level)
69797481 {
69807482 if (level == 0)
69817483 {
....@@ -6984,16 +7486,19 @@
69847486 {
69857487 cVector origin = new cVector();
69867488 //LA.xformPos(origin, toParent, origin);
6987
- Rectangle spot = calcHotSpot(origin, info);
7489
+ if (this.clickInfo == null)
7490
+ this.clickInfo = new ClickInfo();
7491
+
7492
+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
69887493 Rectangle boundary = new Rectangle();
69897494 boundary.x = spot.x - 30;
69907495 boundary.y = spot.y - 30;
69917496 boundary.width = spot.width + 60;
69927497 boundary.height = spot.height + 60;
6993
- info.g.setColor(Color.red);
7498
+ clickInfo.g.setColor(Color.white);
69947499 int spotw = spot.x + spot.width;
69957500 int spoth = spot.y + spot.height;
6996
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7501
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
69977502 // if (CameraPane.Xmin > spot.x)
69987503 // {
69997504 // CameraPane.Xmin = spot.x;
....@@ -7010,11 +7515,33 @@
70107515 // {
70117516 // CameraPane.Ymax = spoth;
70127517 // }
7013
- spot.translate(32, 32);
7518
+// if (CameraPane.Xmin > spot.x)
7519
+// {
7520
+// CameraPane.Xmin = spot.x;
7521
+// }
7522
+// if (CameraPane.Xmax < spotw)
7523
+// {
7524
+// CameraPane.Xmax = spotw;
7525
+// }
7526
+// if (CameraPane.Ymin > spot.y)
7527
+// {
7528
+// CameraPane.Ymin = spot.y;
7529
+// }
7530
+// if (CameraPane.Ymax < spoth)
7531
+// {
7532
+// CameraPane.Ymax = spoth;
7533
+// }
7534
+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7535
+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7536
+ spot.translate(32, 0);
7537
+ clickInfo.g.setColor(Color.yellow);
7538
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7539
+
7540
+ spot.translate(32, 64);
70147541 spotw = spot.x + spot.width;
70157542 spoth = spot.y + spot.height;
7016
- info.g.setColor(Color.blue);
7017
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7543
+ clickInfo.g.setColor(Color.cyan);
7544
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70187545 // if (CameraPane.Xmin > spot.x)
70197546 // {
70207547 // CameraPane.Xmin = spot.x;
....@@ -7031,29 +7558,9 @@
70317558 // {
70327559 // CameraPane.Ymax = spoth;
70337560 // }
7034
- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035
- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7036
- spot.translate(0, -32);
7037
- info.g.setColor(Color.green);
7038
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7039
-// if (CameraPane.Xmin > spot.x)
7040
-// {
7041
-// CameraPane.Xmin = spot.x;
7042
-// }
7043
-// if (CameraPane.Xmax < spotw)
7044
-// {
7045
-// CameraPane.Xmax = spotw;
7046
-// }
7047
-// if (CameraPane.Ymin > spot.y)
7048
-// {
7049
-// CameraPane.Ymin = spot.y;
7050
-// }
7051
-// if (CameraPane.Ymax < spoth)
7052
-// {
7053
-// CameraPane.Ymax = spoth;
7054
-// }
7055
- info.g.drawArc(boundary.x, boundary.y,
7056
- boundary.width, boundary.height, 0, 360);
7561
+ clickInfo.g.setColor(Color.green);
7562
+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7563
+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
70577564 //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
70587565 // if (CameraPane.Xmin > boundary.x)
70597566 // {
....@@ -7075,7 +7582,8 @@
70757582 }
70767583 }
70777584
7078
- boolean doEditClick0(ClickInfo info, int level)
7585
+ boolean doEditClick0(//ClickInfo clickInfo,
7586
+ int level)
70797587 {
70807588 if (level == 0)
70817589 {
....@@ -7084,10 +7592,10 @@
70847592
70857593 boolean retval = false;
70867594
7087
- startX = info.x;
7088
- startY = info.y;
7595
+ startX = clickInfo.x;
7596
+ startY = clickInfo.y;
70897597
7090
- hitSomething = 0;
7598
+ hitSomething = -1;
70917599 cVector origin = new cVector();
70927600 //LA.xformPos(origin, toParent, origin);
70937601 Rectangle spot = new Rectangle();
....@@ -7095,22 +7603,53 @@
70957603 {
70967604 centerPt = new Point(0, 0);
70977605 }
7098
- calcHotSpot(origin, info, centerPt, spot);
7099
- if (spot.contains(info.x, info.y))
7606
+ calcHotSpot(origin, //info,
7607
+ centerPt, spot);
7608
+ if (spot.contains(clickInfo.x, clickInfo.y))
71007609 {
71017610 hitSomething = hitCenter;
71027611 retval = true;
71037612 }
71047613 spot.translate(32, 0);
7105
- if (spot.contains(info.x, info.y))
7614
+ if (spot.contains(clickInfo.x, clickInfo.y))
71067615 {
71077616 hitSomething = hitRotate;
71087617 retval = true;
71097618 }
71107619 spot.translate(0, 32);
7111
- if (spot.contains(info.x, info.y))
7620
+ spot.translate(32, 0);
7621
+ spot.translate(0, 32);
7622
+ if (spot.contains(clickInfo.x, clickInfo.y))
71127623 {
71137624 hitSomething = hitScale;
7625
+
7626
+ double scale = 0.005f * clickInfo.camera.Distance();
7627
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7628
+ double sign = 1;
7629
+ if (hScale < 0)
7630
+ {
7631
+ sign = -1;
7632
+ }
7633
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
7634
+ if (hScale < 0.01)
7635
+ {
7636
+ //hScale = 0.01;
7637
+ }
7638
+
7639
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7640
+ sign = 1;
7641
+ if (vScale < 0)
7642
+ {
7643
+ sign = -1;
7644
+ }
7645
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
7646
+ if (vScale < 0.01)
7647
+ {
7648
+ //vScale = 0.01;
7649
+ }
7650
+
7651
+ clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7652
+
71147653 retval = true;
71157654 }
71167655
....@@ -7120,7 +7659,7 @@
71207659 }
71217660
71227661 //System.out.println("info.modifiers = " + info.modifiers);
7123
- modified = (info.modifiers & CameraPane.META) != 0;
7662
+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
71247663 //System.out.println("modified = " + modified);
71257664 //new Exception().printStackTrace();
71267665 //viewCode = info.pane.renderCamera.viewCode;
....@@ -7148,7 +7687,8 @@
71487687 return true;
71497688 }
71507689
7151
- void doEditDrag0(ClickInfo info)
7690
+ void doEditDrag0(//ClickInfo info,
7691
+ boolean opposite)
71527692 {
71537693 if (hitSomething == 0)
71547694 {
....@@ -7162,7 +7702,8 @@
71627702
71637703 //System.out.println("hitSomething = " + hitSomething);
71647704
7165
- double scale = 0.005f * info.camera.Distance();
7705
+ double scale = 0.005f * clickInfo.camera.Distance();
7706
+
71667707 cVector xlate = new cVector();
71677708 //cVector xlate2 = new cVector();
71687709 switch (hitSomething)
....@@ -7173,9 +7714,9 @@
71737714
71747715 case hitCenter: // Translate
71757716
7176
- scale *= 0.05f * info.pane.theRenderer.renderCamera.Distance();
7717
+ scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
71777718
7178
- if (modified)
7719
+ if (modified || opposite)
71797720 {
71807721 //assert(false);
71817722 /*
....@@ -7195,8 +7736,8 @@
71957736 toParent[3][i] = xlate.get(i);
71967737 LA.matInvert(toParent, fromParent);
71977738 */
7198
- cVector delta = LA.newVector(0, 0, startY - info.y);
7199
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7739
+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
7740
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
72007741
72017742 LA.matCopy(startMat, toParent);
72027743 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7205,7 +7746,7 @@
72057746 } else
72067747 {
72077748 //LA.xformDir(delta, info.camera.fromScreen, delta);
7208
- cVector up = new cVector(info.camera.up);
7749
+ cVector up = new cVector(clickInfo.camera.up);
72097750 cVector away = new cVector();
72107751 //cVector right2 = new cVector();
72117752 //LA.vecCross(up, cVector.Z, right);
....@@ -7221,20 +7762,20 @@
72217762 }
72227763 LA.xformDir(up, ClickInfo.matbuffer, up);
72237764 // if (!CameraPane.LOCALTRANSFORM)
7224
- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7225
- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7765
+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7766
+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
72267767 // if (!CameraPane.LOCALTRANSFORM)
7227
- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
7768
+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
72287769 //LA.vecCross(up, cVector.Z, right2);
72297770
7230
- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7771
+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
72317772
72327773 //System.out.println("DELTA0 = " + delta);
72337774 //System.out.println("AWAY = " + info.camera.away);
72347775 //System.out.println("UP = " + info.camera.up);
72357776 if (away.z > 0)
72367777 {
7237
- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7778
+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
72387779 {
72397780 delta.x = -delta.x;
72407781 } else
....@@ -7249,7 +7790,7 @@
72497790 //System.out.println("DELTA1 = " + delta);
72507791 LA.xformDir(delta, ClickInfo.matbuffer, delta);
72517792 //System.out.println("DELTA2 = " + delta);
7252
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7793
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
72537794 LA.matCopy(startMat, toParent);
72547795 //System.out.println("DELTA3 = " + delta);
72557796 LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7259,8 +7800,8 @@
72597800 break;
72607801
72617802 case hitRotate: // rotate
7262
- int dx = info.x - centerPt.x;
7263
- int dy = -(info.y - centerPt.y);
7803
+ int dx = clickInfo.x - centerPt.x;
7804
+ int dy = -(clickInfo.y - centerPt.y);
72647805 double angle = (double) Math.atan2(dx, dy);
72657806 angle = -(1.570796 - angle);
72667807
....@@ -7269,6 +7810,7 @@
72697810
72707811 if (modified)
72717812 {
7813
+ // Rotate 90 degrees
72727814 angle /= (Math.PI / 4);
72737815 angle = Math.floor(angle + 0.5);
72747816 angle *= (Math.PI / 4);
....@@ -7282,7 +7824,7 @@
72827824 }
72837825 /**/
72847826
7285
- switch (info.pane.renderCamera.viewCode)
7827
+ switch (clickInfo.pane.RenderCamera().viewCode)
72867828 {
72877829 case 1: // '\001'
72887830 LA.matZRotate(toParent, angle);
....@@ -7309,26 +7851,30 @@
73097851 break;
73107852
73117853 case hitScale: // scale
7312
- double hScale = (double) (info.x - centerPt.x) / 32;
7854
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7855
+ double sign = 1;
7856
+ if (hScale < 0)
7857
+ {
7858
+ sign = -1;
7859
+ }
7860
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
73137861 if (hScale < 0.01)
73147862 {
7315
- hScale = 0.01;
7863
+ //hScale = 0.01;
73167864 }
7317
- hScale = Math.pow(hScale, scale * 50);
7318
- if (hScale < 0.01)
7865
+
7866
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7867
+ sign = 1;
7868
+ if (vScale < 0)
73197869 {
7320
- hScale = 0.01;
7870
+ sign = -1;
73217871 }
7322
- double vScale = (double) (info.y - centerPt.y) / 32;
7872
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
73237873 if (vScale < 0.01)
73247874 {
7325
- vScale = 0.01;
7875
+ //vScale = 0.01;
73267876 }
7327
- vScale = Math.pow(vScale, scale * 50);
7328
- if (vScale < 0.01)
7329
- {
7330
- vScale = 0.01;
7331
- }
7877
+
73327878 LA.matCopy(startMat, toParent);
73337879 /**/
73347880 for (int i = 0; i < 3; i++)
....@@ -7338,39 +7884,56 @@
73387884 }
73397885 /**/
73407886
7341
- switch (info.pane.renderCamera.viewCode)
7887
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
7888
+
7889
+ if (totalScale < 0.01)
7890
+ {
7891
+ totalScale = 0.01;
7892
+ }
7893
+
7894
+ switch (clickInfo.pane.RenderCamera().viewCode)
73427895 {
73437896 case 3: // '\001'
7344
- if (modified)
7897
+ if (modified || opposite)
73457898 {
7899
+ if (modified && opposite)
7900
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7901
+ else
73467902 //LA.matScale(toParent, 1, hScale, vScale);
7347
- LA.matScale(toParent, vScale, 1, 1);
7903
+ LA.matScale(toParent, totalScale, 1, 1);
73487904 } // vScale, 1);
73497905 else
73507906 {
7351
- LA.matScale(toParent, vScale, vScale, vScale);
7907
+ // EXCEPTION!
7908
+ LA.matScale(toParent, 1, totalScale, totalScale);
73527909 } // vScale, 1);
73537910 break;
73547911
73557912 case 2: // '\002'
7356
- if (modified)
7913
+ if (modified || opposite)
73577914 {
7358
- //LA.matScale(toParent, hScale, 1, vScale);
7359
- LA.matScale(toParent, 1, vScale, 1);
7915
+ if (modified && opposite)
7916
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7917
+ else
7918
+ //LA.matScale(toParent, hScale, 1, vScale);
7919
+ LA.matScale(toParent, 1, totalScale, 1);
73607920 } else
73617921 {
7362
- LA.matScale(toParent, vScale, 1, vScale);
7922
+ LA.matScale(toParent, totalScale, 1, totalScale);
73637923 }
73647924 break;
73657925
73667926 case 1: // '\003'
7367
- if (modified)
7927
+ if (modified || opposite)
73687928 {
7369
- //LA.matScale(toParent, hScale, vScale, 1);
7370
- LA.matScale(toParent, 1, 1, vScale);
7929
+ if (modified && opposite)
7930
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7931
+ else
7932
+ //LA.matScale(toParent, hScale, vScale, 1);
7933
+ LA.matScale(toParent, 1, 1, totalScale);
73717934 } else
73727935 {
7373
- LA.matScale(toParent, vScale, vScale, 1);
7936
+ LA.matScale(toParent, totalScale, totalScale, 1);
73747937 }
73757938 break;
73767939 }
....@@ -7404,7 +7967,7 @@
74047967 } // NEW ...
74057968
74067969
7407
- info.pane.repaint();
7970
+ clickInfo.pane.repaint();
74087971 }
74097972
74107973 boolean overflow = false;
....@@ -7503,14 +8066,22 @@
75038066 //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
75048067 //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
75058068 //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
8069
+
8070
+ String objname;
8071
+
75068072 if (false) //parent != null)
75078073 {
7508
- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
8074
+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
75098075 } else
75108076 {
7511
- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
8077
+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
75128078 } // + super.toString();
75138079 //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
8080
+
8081
+ if (!Globals.ADVANCED)
8082
+ return objname;
8083
+
8084
+ return objname + " " + System.identityHashCode(this);
75148085 }
75158086
75168087 public int hashCode()
....@@ -7566,6 +8137,7 @@
75668137 objectUI.closeUI();
75678138 if (editWindow != null)
75688139 {
8140
+ editWindow.ctrlPanel.FlushUI();
75698141 editWindow.refreshContents();
75708142 } // ? new
75718143 objectUI = null;
....@@ -7574,6 +8146,10 @@
75748146 {
75758147 editWindow = null;
75768148 } // ?
8149
+ }
8150
+ else
8151
+ {
8152
+ //editWindow.closeUI();
75778153 }
75788154 }
75798155
....@@ -7586,7 +8162,7 @@
75868162 /*transient*/ cVector2[] projectedVertices = new cVector2[0];
75878163
75888164 Object3D /*Composite*/ parent;
7589
- Object3D /*Composite*/ fileparent;
8165
+ Object3D /*Composite*/ fileparent; // In the case of FileObject
75908166
75918167 double[][] toParent; // dynamic matrix
75928168 double[][] fromParent;
....@@ -7701,7 +8277,7 @@
77018277 {
77028278 assert(bRep != null);
77038279 if (!(support instanceof GenericJoint)) // support.bRep != null)
7704
- GrafreeD.Assert(support.bRep == bRep.support);
8280
+ Grafreed.Assert(support.bRep == bRep.support);
77058281 }
77068282 else
77078283 {
....@@ -7732,6 +8308,10 @@
77328308 }
77338309
77348310 transient ObjEditor editWindow;
8311
+ transient ObjEditor manipWindow;
8312
+
8313
+ transient boolean pinned;
8314
+
77358315 transient ObjectUI objectUI;
77368316 public static int povDepth = 0;
77378317 private static cVector tbMin = new cVector();
....@@ -7750,9 +8330,9 @@
77508330 private static cVector edge2 = new cVector();
77518331 //private static cVector norm = new cVector();
77528332 /*transient private*/ int hitSomething;
7753
- private static final int hitCenter = 1;
7754
- private static final int hitScale = 2;
7755
- private static final int hitRotate = 3;
8333
+ static final int hitCenter = 1;
8334
+ static final int hitScale = 2;
8335
+ static final int hitRotate = 3;
77568336 /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
77578337 /*transient*/ private Point centerPt;
77588338 /*transient*/ private int startX;