Normand Briere
2019-06-17 26b49d8e26625491f4a407a05e9bc9d72037f938
Object3D.java
....@@ -14,11 +14,20 @@
1414 import //weka.core.
1515 matrix.Matrix;
1616
17
+import java.util.UUID;
18
+
1719 //import net.sourceforge.sizeof.SizeOf;
1820 public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
1921 {
2022 //static final long serialVersionUID = -607422624994562685L;
2123 static final long serialVersionUID = 5022536242724664900L;
24
+
25
+ private UUID uuid = UUID.randomUUID();
26
+
27
+ // TEMPORARY for mocap undo
28
+ mocap.reader.BVHReader.BVHResult bvh;
29
+ Object3D skeleton;
30
+ //
2231
2332 ScriptNode scriptnode;
2433
....@@ -100,64 +109,136 @@
100109
101110 // transient boolean reduced; // for morph reduction
102111
103
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
104
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
112
+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
113
+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
105114
106
-transient Object3D transientsupport; // for cloning
107
-transient boolean transientlink2master;
115
+ transient Object3D transientsupport; // for cloning
116
+ transient boolean transientlink2master;
108117
109
-void SaveSupports()
110
-{
111
- if (blockloop)
112
- return;
113
-
114
- transientsupport = support;
115
- transientlink2master = link2master;
116
-
117
- support = null;
118
- link2master = false;
119
-
120
- if (bRep != null)
118
+ void SaveSupports()
121119 {
122
- bRep.SaveSupports();
123
- }
124
-
125
- for (int i = 0; i < Size(); i++)
126
- {
127
- Object3D child = (Object3D) get(i);
128
- if (child == null)
129
- continue;
130
- blockloop = true;
131
- child.SaveSupports();
132
- blockloop = false;
133
- }
134
-}
120
+ if (blockloop)
121
+ return;
135122
136
-void RestoreSupports()
137
-{
138
- if (blockloop)
139
- return;
123
+ transientsupport = support;
124
+ transientlink2master = link2master;
140125
141
- support = transientsupport;
142
- link2master = transientlink2master;
143
- transientsupport = null;
144
- transientlink2master = false;
145
-
146
- if (bRep != null)
147
- {
148
- bRep.RestoreSupports();
126
+ support = null;
127
+ link2master = false;
128
+
129
+ if (bRep != null)
130
+ {
131
+ bRep.SaveSupports();
132
+ }
133
+
134
+ for (int i = 0; i < Size(); i++)
135
+ {
136
+ Object3D child = (Object3D) get(i);
137
+ if (child == null)
138
+ continue;
139
+ blockloop = true;
140
+ child.SaveSupports();
141
+ blockloop = false;
142
+ }
149143 }
150
-
151
- for (int i = 0; i < Size(); i++)
144
+
145
+ void RestoreSupports()
152146 {
153
- Object3D child = (Object3D) get(i);
154
- if (child == null)
155
- continue;
156
- blockloop = true;
157
- child.RestoreSupports();
158
- blockloop = false;
147
+ if (blockloop)
148
+ return;
149
+
150
+ support = transientsupport;
151
+ link2master = transientlink2master;
152
+ transientsupport = null;
153
+ transientlink2master = false;
154
+
155
+ if (bRep != null)
156
+ {
157
+ bRep.RestoreSupports();
158
+ }
159
+
160
+ for (int i = 0; i < Size(); i++)
161
+ {
162
+ Object3D child = (Object3D) get(i);
163
+ if (child == null)
164
+ continue;
165
+ blockloop = true;
166
+ child.RestoreSupports();
167
+ blockloop = false;
168
+ }
159169 }
160
-}
170
+
171
+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172
+ {
173
+ if (hashtable.containsKey(GetUUID()))
174
+ {
175
+ Object3D o = hashtable.get(GetUUID());
176
+
177
+ Grafreed.Assert(this.bRep == o.bRep);
178
+ if (this.bRep != null)
179
+ assert(this.bRep.support == o.transientrep);
180
+
181
+ return;
182
+ }
183
+
184
+ Object3D o = new Object3D();
185
+
186
+ hashtable.put(GetUUID(), o);
187
+
188
+ for (int i=0; i<Size(); i++)
189
+ {
190
+ get(i).ExtractBigData(hashtable);
191
+ }
192
+
193
+ ExtractBigData(o);
194
+ }
195
+
196
+ void ExtractBigData(Object3D o)
197
+ {
198
+ o.bRep = this.bRep;
199
+ if (this.bRep != null)
200
+ {
201
+ o.transientrep = this.bRep.support;
202
+ o.bRep.support = null;
203
+ }
204
+
205
+ // o.support = this.support;
206
+ // o.fileparent = this.fileparent;
207
+ // if (this.bRep != null)
208
+ // o.bRep = this.bRep.support;
209
+
210
+ this.bRep = null;
211
+ // if (this.bRep != null)
212
+ // this.bRep.support = null;
213
+ // this.support = null;
214
+ // this.fileparent = null;
215
+ }
216
+
217
+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218
+ {
219
+ if (!hashtable.containsKey(GetUUID()))
220
+ return;
221
+
222
+ Object3D o = hashtable.get(GetUUID());
223
+
224
+ RestoreBigData(o);
225
+
226
+ hashtable.remove(GetUUID());
227
+
228
+ for (int i=0; i<Size(); i++)
229
+ {
230
+ get(i).RestoreBigData(hashtable);
231
+ }
232
+ }
233
+
234
+ void RestoreBigData(Object3D o)
235
+ {
236
+ this.bRep = o.bRep;
237
+ if (this.bRep != null)
238
+ this.bRep.support = o.transientrep;
239
+ // this.support = o.support;
240
+ // this.fileparent = o.fileparent;
241
+ }
161242
162243 // MOCAP SUPPORT
163244 double tx,ty,tz,rx,ry,rz;
....@@ -300,6 +381,7 @@
300381 }
301382
302383 boolean live = false;
384
+ boolean dontselect = false;
303385 boolean hide = false;
304386 boolean link2master = false; // performs reset support/master at each frame
305387 boolean marked = false; // animation node
....@@ -481,12 +563,14 @@
481563 toParent = LA.newMatrix();
482564 fromParent = LA.newMatrix();
483565 }
566
+
484567 if (toParentMarked == null)
485568 {
486569 if (maxcount != 1)
487570 {
488571 new Exception().printStackTrace();
489572 }
573
+
490574 toParentMarked = LA.newMatrix();
491575 fromParentMarked = LA.newMatrix();
492576 }
....@@ -774,7 +858,7 @@
774858 if (step == 0)
775859 step = 1;
776860 if (maxcount == 0)
777
- maxcount = 2048; // 4;
861
+ maxcount = 128; // 2048; // 4;
778862 // if (acceleration == 0)
779863 // acceleration = 10;
780864 if (delay == 0) // serial
....@@ -797,7 +881,7 @@
797881
798882 if (marked && Globals.isLIVE() && live &&
799883 //TEMP21aug2018
800
- Globals.DrawMode() == iCameraPane.SHADOW &&
884
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
801885 currentframe != Globals.framecount)
802886 {
803887 currentframe = Globals.framecount;
....@@ -912,6 +996,11 @@
912996 fromParent = null; // LA.newMatrix();
913997 bRep = null; // new BoundaryRep();
914998
999
+ if (oname != null && oname.equals("LeftHand"))
1000
+ {
1001
+ name = oname;
1002
+ }
1003
+
9151004 /*
9161005 float hue = (float)Math.random();
9171006 Color col;
....@@ -954,7 +1043,7 @@
9541043
9551044 public Object clone()
9561045 {
957
- return GrafreeD.clone(this);
1046
+ return Grafreed.clone(this);
9581047 }
9591048
9601049 Object3D copyExpand()
....@@ -1470,7 +1559,7 @@
14701559 BoundaryRep.SEUIL = other.material.cameralight;
14711560
14721561 // Set default to 0.1
1473
- BoundaryRep.SEUIL /= 2;
1562
+ BoundaryRep.SEUIL /= 4; // 2;
14741563 System.out.println("SEUIL = " + BoundaryRep.SEUIL);
14751564 }
14761565
....@@ -1729,7 +1818,7 @@
17291818 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17301819 o.bRep = transientrep;
17311820 if (clone)
1732
- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1821
+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17331822 o.CreateMaterial();
17341823 o.SetAttributes(this, -1);
17351824 //parent
....@@ -1742,7 +1831,7 @@
17421831 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17431832 o.bRep = bRep;
17441833 if (clone)
1745
- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1834
+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17461835 o.CreateMaterial();
17471836 //o.overwriteThis(this, -1);
17481837 o.SetAttributes(this, -1);
....@@ -1829,12 +1918,15 @@
18291918 if (obj.name == null)
18301919 continue; // can't be a null one
18311920
1921
+ // Try perfect match first.
18321922 if (n.equals(obj.name))
18331923 {
18341924 theobj = obj;
18351925 count++;
18361926 }
18371927 }
1928
+
1929
+ // not needed: n = n.split(":")[0]; // Poser generates a count
18381930
18391931 if (count != 1)
18401932 for (int i=Size(); --i>=0;)
....@@ -2477,13 +2569,13 @@
24772569 return retval;
24782570 }
24792571
2480
- void doEditDrag(ClickInfo info)
2572
+ void doEditDrag(ClickInfo info, boolean opposite)
24812573 {
24822574 switch (doSomething)
24832575 {
24842576 case 1: // '\001'
24852577 //super.
2486
- doEditDrag0(info);
2578
+ doEditDrag0(info, opposite);
24872579 break;
24882580
24892581 case 2: // '\002'
....@@ -2496,11 +2588,11 @@
24962588 {
24972589 //sel.hitSomething = childToDrag.hitSomething;
24982590 //childToDrag.doEditDrag(info);
2499
- sel.doEditDrag(info);
2591
+ sel.doEditDrag(info, opposite);
25002592 } else
25012593 {
25022594 //super.
2503
- doEditDrag0(info);
2595
+ doEditDrag0(info, opposite);
25042596 }
25052597 }
25062598 break;
....@@ -2610,6 +2702,18 @@
26102702 void GenNormalsS(boolean crease)
26112703 {
26122704 selection.GenNormals(crease);
2705
+// for (int i=0; i<selection.size(); i++)
2706
+// {
2707
+// Object3D selectee = (Object3D) selection.elementAt(i);
2708
+// selectee.GenNormals(crease);
2709
+// }
2710
+
2711
+ //Touch();
2712
+ }
2713
+
2714
+ void GenNormalsMeshS()
2715
+ {
2716
+ selection.GenNormalsMesh();
26132717 // for (int i=0; i<selection.size(); i++)
26142718 // {
26152719 // Object3D selectee = (Object3D) selection.elementAt(i);
....@@ -2750,6 +2854,24 @@
27502854 if (child == null)
27512855 continue;
27522856 child.GenNormals(crease);
2857
+// Children().release(i);
2858
+ }
2859
+ blockloop = false;
2860
+ }
2861
+
2862
+ void GenNormalsMesh()
2863
+ {
2864
+ if (blockloop)
2865
+ return;
2866
+
2867
+ blockloop = true;
2868
+ GenNormalsMesh0();
2869
+ for (int i = 0; i < Children().Size(); i++)
2870
+ {
2871
+ Object3D child = (Object3D) Children().get(i); // reserve(i);
2872
+ if (child == null)
2873
+ continue;
2874
+ child.GenNormalsMesh();
27532875 // Children().release(i);
27542876 }
27552877 blockloop = false;
....@@ -2922,6 +3044,15 @@
29223044 }
29233045 }
29243046
3047
+ void GenNormalsMesh0()
3048
+ {
3049
+ if (bRep != null)
3050
+ {
3051
+ bRep.GenerateNormalsMesh();
3052
+ Touch();
3053
+ }
3054
+ }
3055
+
29253056 void GenNormalsMINE0()
29263057 {
29273058 if (bRep != null)
....@@ -2983,6 +3114,33 @@
29833114 blockloop = false;
29843115 }
29853116
3117
+ void TransformChildren()
3118
+ {
3119
+ if (toParent != null)
3120
+ {
3121
+ for (int i=Size(); --i>=0;)
3122
+ {
3123
+ Object3D v = get(i);
3124
+
3125
+ if (v.toParent == null)
3126
+ {
3127
+ v.toParent = LA.newMatrix();
3128
+ v.fromParent = LA.newMatrix();
3129
+ }
3130
+
3131
+// LA.matConcat(v.toParent, toParent, v.toParent);
3132
+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
3133
+ LA.matConcat(toParent, v.toParent, v.toParent);
3134
+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3135
+ }
3136
+
3137
+ toParent = null; // LA.matIdentity(toParent);
3138
+ fromParent = null; // LA.matIdentity(fromParent);
3139
+
3140
+ Touch();
3141
+ }
3142
+ }
3143
+
29863144 void TransformGeometry()
29873145 {
29883146 Object3D obj = this;
....@@ -3204,9 +3362,11 @@
32043362
32053363 BoundaryRep sup = bRep.support;
32063364 bRep.support = null;
3207
- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3365
+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32083366 // bRep.SplitInTwo(onlyone); // thread...
3209
- temprep.SplitInTwo(reduction34, onlyone);
3367
+
3368
+ while(temprep.SplitInTwo(reduction34, onlyone));
3369
+
32103370 bRep = temprep;
32113371 bRep.support = sup;
32123372 Touch();
....@@ -3728,7 +3888,7 @@
37283888 if (child == null)
37293889 continue;
37303890
3731
- if (GrafreeD.RENDERME > 0)
3891
+ if (Grafreed.RENDERME > 0)
37323892 {
37333893 if (child instanceof Merge)
37343894 ((Merge)child).renderme();
....@@ -3879,7 +4039,7 @@
38794039 if (child == null)
38804040 continue;
38814041
3882
- if (GrafreeD.RENDERME > 0)
4042
+ if (Grafreed.RENDERME > 0)
38834043 {
38844044 if (child instanceof Merge)
38854045 ((Merge)child).renderme();
....@@ -4074,7 +4234,7 @@
40744234 if (child == null)
40754235 continue;
40764236
4077
- if (GrafreeD.RENDERME > 0)
4237
+ if (Grafreed.RENDERME > 0)
40784238 {
40794239 if (child instanceof Merge)
40804240 ((Merge)child).renderme();
....@@ -4681,7 +4841,7 @@
46814841
46824842 cTreePath SelectLeaf(int indexcount, boolean deselect)
46834843 {
4684
- if (hide)
4844
+ if (hide || dontselect)
46854845 return null;
46864846
46874847 if (count <= 0)
....@@ -4707,7 +4867,7 @@
47074867
47084868 cTreePath Select(int indexcount, boolean deselect)
47094869 {
4710
- if (hide)
4870
+ if (hide || dontselect)
47114871 return null;
47124872
47134873 if (count <= 0)
....@@ -5159,10 +5319,34 @@
51595319
51605320 // System.out.println("Fullname = " + fullname);
51615321
5162
- if (fullname.name.indexOf(":") == -1)
5163
- return fullname.name;
5322
+ // Does not work on Windows due to C:
5323
+// if (fullname.name.indexOf(":") == -1)
5324
+// return fullname.name;
5325
+//
5326
+// return fullname.name.substring(0,fullname.name.indexOf(":"));
51645327
5165
- return fullname.name.substring(0,fullname.name.indexOf(":"));
5328
+ String[] split = fullname.name.split(":");
5329
+
5330
+ if (split.length == 0)
5331
+ {
5332
+ return "";
5333
+ }
5334
+
5335
+ if (split.length <= 2)
5336
+ {
5337
+ if (fullname.name.endsWith(":"))
5338
+ {
5339
+ // Windows
5340
+ return fullname.name.substring(0, fullname.name.length()-1);
5341
+ }
5342
+
5343
+ return split[0];
5344
+ }
5345
+
5346
+ // Windows
5347
+ assert(split.length == 4);
5348
+
5349
+ return split[0] + ":" + split[1];
51665350 }
51675351
51685352 static String GetBump(cTexture fullname)
....@@ -5171,10 +5355,38 @@
51715355 return "";
51725356
51735357 // System.out.println("Fullname = " + fullname);
5174
- if (fullname.name.indexOf(":") == -1)
5175
- return "";
5176
-
5177
- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5358
+ // Does not work on Windows due to C:
5359
+// if (fullname.name.indexOf(":") == -1)
5360
+// return "";
5361
+//
5362
+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5363
+ String[] split = fullname.name.split(":");
5364
+
5365
+ if (split.length == 0)
5366
+ {
5367
+ return "";
5368
+ }
5369
+
5370
+ if (split.length == 1)
5371
+ {
5372
+ return "";
5373
+ }
5374
+
5375
+ if (split.length == 2)
5376
+ {
5377
+ if (fullname.name.endsWith(":"))
5378
+ {
5379
+ // Windows
5380
+ return "";
5381
+ }
5382
+
5383
+ return split[1];
5384
+ }
5385
+
5386
+ // Windows
5387
+ assert(split.length == 4);
5388
+
5389
+ return split[2] + ":" + split[3];
51785390 }
51795391
51805392 String GetPigmentTexture()
....@@ -5248,7 +5460,7 @@
52485460 System.out.print("; textures = " + textures);
52495461 System.out.println("; usedtextures = " + usedtextures);
52505462
5251
- if (GetTextures() == null)
5463
+ if (GetTextures() == null) // What is that??
52525464 GetTextures().name = ":";
52535465
52545466 String texname = tex;
....@@ -5279,6 +5491,43 @@
52795491 child.ResetPigmentTexture();
52805492 blockloop = false;
52815493 }
5494
+ }
5495
+
5496
+ UUID GetUUID()
5497
+ {
5498
+ if (uuid == null)
5499
+ {
5500
+ // Serial
5501
+ uuid = UUID.randomUUID();
5502
+ }
5503
+
5504
+ return uuid;
5505
+ }
5506
+
5507
+ Object3D GetObject(UUID uid)
5508
+ {
5509
+ if (blockloop)
5510
+ return null;
5511
+
5512
+ if (GetUUID().equals(uid))
5513
+ return this;
5514
+
5515
+ int nb = Size();
5516
+ for (int i = 0; i < nb; i++)
5517
+ {
5518
+ Object3D child = (Object3D) get(i);
5519
+
5520
+ if (child == null)
5521
+ continue;
5522
+
5523
+ blockloop = true;
5524
+ Object3D obj = child.GetObject(uid);
5525
+ blockloop = false;
5526
+ if (obj != null)
5527
+ return obj;
5528
+ }
5529
+
5530
+ return null;
52825531 }
52835532
52845533 void SetBumpTexture(String tex)
....@@ -5325,12 +5574,23 @@
53255574 boolean NeedSupport()
53265575 {
53275576 return
5328
- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
5577
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
53295578 // PROBLEM with CROWD!!
5330
- && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5579
+ && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
53315580 }
53325581
53335582 static boolean DEBUG_SELECTION = false;
5583
+
5584
+ boolean IsLive()
5585
+ {
5586
+ if (live)
5587
+ return true;
5588
+
5589
+ if (parent == null)
5590
+ return false;
5591
+
5592
+ return parent.IsLive();
5593
+ }
53345594
53355595 void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
53365596 {
....@@ -5342,7 +5602,7 @@
53425602 }
53435603
53445604 if (display.DrawMode() == iCameraPane.SELECTION &&
5345
- hide)
5605
+ (hide || dontselect))
53465606 return;
53475607
53485608 if (name != null && name.contains("sclera"))
....@@ -5393,7 +5653,7 @@
53935653 support = support;
53945654
53955655 //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5396
- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5656
+ boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
53975657
53985658 if (!usecalllists && bRep != null && bRep.displaylist > 0)
53995659 {
....@@ -5413,10 +5673,12 @@
54135673 boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
54145674
54155675 if (!selectmode && //display.DrawMode() != display.SELECTION &&
5416
- (touched || (bRep != null && bRep.displaylist <= 0)))
5676
+ //(touched || (bRep != null && bRep.displaylist <= 0)))
5677
+ (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
54175678 {
54185679 Globals.lighttouched = true;
54195680 } // all panes...
5681
+
54205682 //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
54215683 if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
54225684 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5584,7 +5846,17 @@
55845846 tex = GetTextures();
55855847 }
55865848
5587
- display.BindTextures(tex, texres);
5849
+ boolean failed = false;
5850
+
5851
+ try
5852
+ {
5853
+ display.BindTextures(tex, texres);
5854
+ }
5855
+ catch (Exception e)
5856
+ {
5857
+ System.err.println("FAILED: " + this);
5858
+ failed = true;
5859
+ }
55885860
55895861 if (!compiled)
55905862 {
....@@ -5606,7 +5878,8 @@
56065878 }
56075879 }
56085880
5609
- display.ReleaseTextures(tex);
5881
+ if (!failed)
5882
+ display.ReleaseTextures(tex);
56105883
56115884 display.PopMaterial(this, selected);
56125885 }
....@@ -5735,6 +6008,9 @@
57356008
57366009 void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57376010 {
6011
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6012
+ return;
6013
+
57386014 if (hide)
57396015 return;
57406016 // shadow optimisation
....@@ -5859,6 +6135,9 @@
58596135 {
58606136 if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
58616137 return; // no shadow for transparent objects
6138
+
6139
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6140
+ return;
58626141
58636142 if (hide)
58646143 return;
....@@ -6825,7 +7104,7 @@
68257104 spot.translate(32, 32);
68267105 spotw = spot.x + spot.width;
68277106 spoth = spot.y + spot.height;
6828
- info.g.setColor(Color.blue);
7107
+ info.g.setColor(Color.cyan);
68297108 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
68307109 // if (CameraPane.Xmin > spot.x)
68317110 // {
....@@ -6843,11 +7122,12 @@
68437122 // {
68447123 // CameraPane.Ymax = spoth;
68457124 // }
6846
- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6847
- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7125
+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7126
+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
68487127 spot.translate(0, -32);
6849
- info.g.setColor(Color.green);
7128
+ info.g.setColor(Color.yellow);
68507129 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7130
+ info.g.setColor(Color.green);
68517131 // if (CameraPane.Xmin > spot.x)
68527132 // {
68537133 // CameraPane.Xmin = spot.x;
....@@ -6899,7 +7179,7 @@
68997179 startX = info.x;
69007180 startY = info.y;
69017181
6902
- hitSomething = 0;
7182
+ hitSomething = -1;
69037183 cVector origin = new cVector();
69047184 //LA.xformPos(origin, toParent, origin);
69057185 Rectangle spot = new Rectangle();
....@@ -6932,7 +7212,7 @@
69327212 }
69337213
69347214 //System.out.println("info.modifiers = " + info.modifiers);
6935
- modified = (info.modifiers & CameraPane.META) != 0;
7215
+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
69367216 //System.out.println("modified = " + modified);
69377217 //new Exception().printStackTrace();
69387218 //viewCode = info.pane.renderCamera.viewCode;
....@@ -6960,7 +7240,7 @@
69607240 return true;
69617241 }
69627242
6963
- void doEditDrag0(ClickInfo info)
7243
+ void doEditDrag0(ClickInfo info, boolean opposite)
69647244 {
69657245 if (hitSomething == 0)
69667246 {
....@@ -6975,6 +7255,7 @@
69757255 //System.out.println("hitSomething = " + hitSomething);
69767256
69777257 double scale = 0.005f * info.camera.Distance();
7258
+
69787259 cVector xlate = new cVector();
69797260 //cVector xlate2 = new cVector();
69807261 switch (hitSomething)
....@@ -6987,7 +7268,7 @@
69877268
69887269 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
69897270
6990
- if (modified)
7271
+ if (modified || opposite)
69917272 {
69927273 //assert(false);
69937274 /*
....@@ -7081,6 +7362,7 @@
70817362
70827363 if (modified)
70837364 {
7365
+ // Rotate 90 degrees
70847366 angle /= (Math.PI / 4);
70857367 angle = Math.floor(angle + 0.5);
70867368 angle *= (Math.PI / 4);
....@@ -7122,24 +7404,27 @@
71227404
71237405 case hitScale: // scale
71247406 double hScale = (double) (info.x - centerPt.x) / 32;
7407
+ double sign = 1;
7408
+ if (hScale < 0)
7409
+ {
7410
+ sign = -1;
7411
+ }
7412
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
71257413 if (hScale < 0.01)
71267414 {
7127
- hScale = 0.01;
7415
+ //hScale = 0.01;
71287416 }
7129
- hScale = Math.pow(hScale, scale * 50);
7130
- if (hScale < 0.01)
7131
- {
7132
- hScale = 0.01;
7133
- }
7417
+
71347418 double vScale = (double) (info.y - centerPt.y) / 32;
7135
- if (vScale < 0.01)
7419
+ sign = 1;
7420
+ if (vScale < 0)
71367421 {
7137
- vScale = 0.01;
7422
+ sign = -1;
71387423 }
7139
- vScale = Math.pow(vScale, scale * 50);
7424
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
71407425 if (vScale < 0.01)
71417426 {
7142
- vScale = 0.01;
7427
+ //vScale = 0.01;
71437428 }
71447429 LA.matCopy(startMat, toParent);
71457430 /**/
....@@ -7150,39 +7435,47 @@
71507435 }
71517436 /**/
71527437
7438
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7439
+
7440
+ if (totalScale < 0.01)
7441
+ {
7442
+ totalScale = 0.01;
7443
+ }
7444
+
71537445 switch (info.pane.RenderCamera().viewCode)
71547446 {
71557447 case 3: // '\001'
7156
- if (modified)
7448
+ if (modified || opposite)
71577449 {
71587450 //LA.matScale(toParent, 1, hScale, vScale);
7159
- LA.matScale(toParent, vScale, 1, 1);
7451
+ LA.matScale(toParent, totalScale, 1, 1);
71607452 } // vScale, 1);
71617453 else
71627454 {
7163
- LA.matScale(toParent, vScale, vScale, vScale);
7455
+ // EXCEPTION!
7456
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
71647457 } // vScale, 1);
71657458 break;
71667459
71677460 case 2: // '\002'
7168
- if (modified)
7461
+ if (modified || opposite)
71697462 {
71707463 //LA.matScale(toParent, hScale, 1, vScale);
7171
- LA.matScale(toParent, 1, vScale, 1);
7464
+ LA.matScale(toParent, 1, totalScale, 1);
71727465 } else
71737466 {
7174
- LA.matScale(toParent, vScale, 1, vScale);
7467
+ LA.matScale(toParent, totalScale, 1, totalScale);
71757468 }
71767469 break;
71777470
71787471 case 1: // '\003'
7179
- if (modified)
7472
+ if (modified || opposite)
71807473 {
71817474 //LA.matScale(toParent, hScale, vScale, 1);
7182
- LA.matScale(toParent, 1, 1, vScale);
7475
+ LA.matScale(toParent, 1, 1, totalScale);
71837476 } else
71847477 {
7185
- LA.matScale(toParent, vScale, vScale, 1);
7478
+ LA.matScale(toParent, totalScale, totalScale, 1);
71867479 }
71877480 break;
71887481 }
....@@ -7315,14 +7608,22 @@
73157608 //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
73167609 //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
73177610 //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
7611
+
7612
+ String objname;
7613
+
73187614 if (false) //parent != null)
73197615 {
7320
- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7616
+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
73217617 } else
73227618 {
7323
- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
7619
+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
73247620 } // + super.toString();
73257621 //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7622
+
7623
+ if (!Globals.ADVANCED)
7624
+ return objname;
7625
+
7626
+ return objname + " " + System.identityHashCode(this);
73267627 }
73277628
73287629 public int hashCode()
....@@ -7378,6 +7679,7 @@
73787679 objectUI.closeUI();
73797680 if (editWindow != null)
73807681 {
7682
+ editWindow.ctrlPanel.FlushUI();
73817683 editWindow.refreshContents();
73827684 } // ? new
73837685 objectUI = null;
....@@ -7398,7 +7700,7 @@
73987700 /*transient*/ cVector2[] projectedVertices = new cVector2[0];
73997701
74007702 Object3D /*Composite*/ parent;
7401
- Object3D /*Composite*/ fileparent;
7703
+ Object3D /*Composite*/ fileparent; // In the case of FileObject
74027704
74037705 double[][] toParent; // dynamic matrix
74047706 double[][] fromParent;
....@@ -7513,7 +7815,7 @@
75137815 {
75147816 assert(bRep != null);
75157817 if (!(support instanceof GenericJoint)) // support.bRep != null)
7516
- GrafreeD.Assert(support.bRep == bRep.support);
7818
+ Grafreed.Assert(support.bRep == bRep.support);
75177819 }
75187820 else
75197821 {
....@@ -7562,9 +7864,9 @@
75627864 private static cVector edge2 = new cVector();
75637865 //private static cVector norm = new cVector();
75647866 /*transient private*/ int hitSomething;
7565
- private static final int hitCenter = 1;
7566
- private static final int hitScale = 2;
7567
- private static final int hitRotate = 3;
7867
+ static final int hitCenter = 1;
7868
+ static final int hitScale = 2;
7869
+ static final int hitRotate = 3;
75687870 /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
75697871 /*transient*/ private Point centerPt;
75707872 /*transient*/ private int startX;