Normand Briere
2019-06-11 d0dc7ff35d71919d503ae35592478b173cf3cfd3
Object3D.java
....@@ -14,11 +14,15 @@
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();
2226
2327 ScriptNode scriptnode;
2428
....@@ -156,6 +160,59 @@
156160 blockloop = true;
157161 child.RestoreSupports();
158162 blockloop = false;
163
+ }
164
+}
165
+
166
+void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167
+{
168
+ if (hashtable.containsKey(GetUUID()))
169
+ return;
170
+
171
+ Object3D o = new Object3D();
172
+ o.bRep = this.bRep;
173
+ if (this.bRep != null)
174
+ {
175
+ o.transientrep = this.bRep.support;
176
+ o.bRep.support = null;
177
+ }
178
+
179
+// o.support = this.support;
180
+// o.fileparent = this.fileparent;
181
+// if (this.bRep != null)
182
+// o.bRep = this.bRep.support;
183
+
184
+ hashtable.put(GetUUID(), o);
185
+
186
+ this.bRep = null;
187
+// if (this.bRep != null)
188
+// this.bRep.support = null;
189
+// this.support = null;
190
+// this.fileparent = null;
191
+
192
+ for (int i=0; i<Size(); i++)
193
+ {
194
+ get(i).ExtractBigData(hashtable);
195
+ }
196
+}
197
+
198
+void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199
+{
200
+ if (!hashtable.containsKey(GetUUID()))
201
+ return;
202
+
203
+ Object3D o = hashtable.get(GetUUID());
204
+
205
+ this.bRep = o.bRep;
206
+ if (this.bRep != null)
207
+ this.bRep.support = o.transientrep;
208
+// this.support = o.support;
209
+// this.fileparent = o.fileparent;
210
+
211
+ hashtable.remove(GetUUID());
212
+
213
+ for (int i=0; i<Size(); i++)
214
+ {
215
+ get(i).RestoreBigData(hashtable);
159216 }
160217 }
161218
....@@ -300,6 +357,7 @@
300357 }
301358
302359 boolean live = false;
360
+ boolean dontselect = false;
303361 boolean hide = false;
304362 boolean link2master = false; // performs reset support/master at each frame
305363 boolean marked = false; // animation node
....@@ -774,7 +832,7 @@
774832 if (step == 0)
775833 step = 1;
776834 if (maxcount == 0)
777
- maxcount = 2048; // 4;
835
+ maxcount = 128; // 2048; // 4;
778836 // if (acceleration == 0)
779837 // acceleration = 10;
780838 if (delay == 0) // serial
....@@ -797,7 +855,7 @@
797855
798856 if (marked && Globals.isLIVE() && live &&
799857 //TEMP21aug2018
800
- Globals.DrawMode() == iCameraPane.SHADOW &&
858
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
801859 currentframe != Globals.framecount)
802860 {
803861 currentframe = Globals.framecount;
....@@ -912,6 +970,11 @@
912970 fromParent = null; // LA.newMatrix();
913971 bRep = null; // new BoundaryRep();
914972
973
+ if (oname != null && oname.equals("LeftHand"))
974
+ {
975
+ name = oname;
976
+ }
977
+
915978 /*
916979 float hue = (float)Math.random();
917980 Color col;
....@@ -954,7 +1017,7 @@
9541017
9551018 public Object clone()
9561019 {
957
- return GrafreeD.clone(this);
1020
+ return Grafreed.clone(this);
9581021 }
9591022
9601023 Object3D copyExpand()
....@@ -1470,7 +1533,7 @@
14701533 BoundaryRep.SEUIL = other.material.cameralight;
14711534
14721535 // Set default to 0.1
1473
- BoundaryRep.SEUIL /= 2;
1536
+ BoundaryRep.SEUIL /= 4; // 2;
14741537 System.out.println("SEUIL = " + BoundaryRep.SEUIL);
14751538 }
14761539
....@@ -1729,7 +1792,7 @@
17291792 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17301793 o.bRep = transientrep;
17311794 if (clone)
1732
- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1795
+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17331796 o.CreateMaterial();
17341797 o.SetAttributes(this, -1);
17351798 //parent
....@@ -1742,7 +1805,7 @@
17421805 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17431806 o.bRep = bRep;
17441807 if (clone)
1745
- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1808
+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17461809 o.CreateMaterial();
17471810 //o.overwriteThis(this, -1);
17481811 o.SetAttributes(this, -1);
....@@ -1829,12 +1892,15 @@
18291892 if (obj.name == null)
18301893 continue; // can't be a null one
18311894
1895
+ // Try perfect match first.
18321896 if (n.equals(obj.name))
18331897 {
18341898 theobj = obj;
18351899 count++;
18361900 }
18371901 }
1902
+
1903
+ // not needed: n = n.split(":")[0]; // Poser generates a count
18381904
18391905 if (count != 1)
18401906 for (int i=Size(); --i>=0;)
....@@ -2300,6 +2366,7 @@
23002366 {
23012367 if (newWindow)
23022368 {
2369
+ new Exception().printStackTrace();
23032370 System.exit(0);
23042371 if (parent != null)
23052372 {
....@@ -2476,13 +2543,13 @@
24762543 return retval;
24772544 }
24782545
2479
- void doEditDrag(ClickInfo info)
2546
+ void doEditDrag(ClickInfo info, boolean opposite)
24802547 {
24812548 switch (doSomething)
24822549 {
24832550 case 1: // '\001'
24842551 //super.
2485
- doEditDrag0(info);
2552
+ doEditDrag0(info, opposite);
24862553 break;
24872554
24882555 case 2: // '\002'
....@@ -2495,11 +2562,11 @@
24952562 {
24962563 //sel.hitSomething = childToDrag.hitSomething;
24972564 //childToDrag.doEditDrag(info);
2498
- sel.doEditDrag(info);
2565
+ sel.doEditDrag(info, opposite);
24992566 } else
25002567 {
25012568 //super.
2502
- doEditDrag0(info);
2569
+ doEditDrag0(info, opposite);
25032570 }
25042571 }
25052572 break;
....@@ -2982,6 +3049,33 @@
29823049 blockloop = false;
29833050 }
29843051
3052
+ void TransformChildren()
3053
+ {
3054
+ if (toParent != null)
3055
+ {
3056
+ for (int i=Size(); --i>=0;)
3057
+ {
3058
+ Object3D v = get(i);
3059
+
3060
+ if (v.toParent == null)
3061
+ {
3062
+ v.toParent = LA.newMatrix();
3063
+ v.fromParent = LA.newMatrix();
3064
+ }
3065
+
3066
+// LA.matConcat(v.toParent, toParent, v.toParent);
3067
+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
3068
+ LA.matConcat(toParent, v.toParent, v.toParent);
3069
+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
3070
+ }
3071
+
3072
+ toParent = null; // LA.matIdentity(toParent);
3073
+ fromParent = null; // LA.matIdentity(fromParent);
3074
+
3075
+ Touch();
3076
+ }
3077
+ }
3078
+
29853079 void TransformGeometry()
29863080 {
29873081 Object3D obj = this;
....@@ -3203,9 +3297,11 @@
32033297
32043298 BoundaryRep sup = bRep.support;
32053299 bRep.support = null;
3206
- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3300
+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32073301 // bRep.SplitInTwo(onlyone); // thread...
3208
- temprep.SplitInTwo(reduction34, onlyone);
3302
+
3303
+ while(temprep.SplitInTwo(reduction34, onlyone));
3304
+
32093305 bRep = temprep;
32103306 bRep.support = sup;
32113307 Touch();
....@@ -3727,7 +3823,7 @@
37273823 if (child == null)
37283824 continue;
37293825
3730
- if (GrafreeD.RENDERME > 0)
3826
+ if (Grafreed.RENDERME > 0)
37313827 {
37323828 if (child instanceof Merge)
37333829 ((Merge)child).renderme();
....@@ -3878,7 +3974,7 @@
38783974 if (child == null)
38793975 continue;
38803976
3881
- if (GrafreeD.RENDERME > 0)
3977
+ if (Grafreed.RENDERME > 0)
38823978 {
38833979 if (child instanceof Merge)
38843980 ((Merge)child).renderme();
....@@ -4073,7 +4169,7 @@
40734169 if (child == null)
40744170 continue;
40754171
4076
- if (GrafreeD.RENDERME > 0)
4172
+ if (Grafreed.RENDERME > 0)
40774173 {
40784174 if (child instanceof Merge)
40794175 ((Merge)child).renderme();
....@@ -4680,7 +4776,7 @@
46804776
46814777 cTreePath SelectLeaf(int indexcount, boolean deselect)
46824778 {
4683
- if (hide)
4779
+ if (hide || dontselect)
46844780 return null;
46854781
46864782 if (count <= 0)
....@@ -4706,7 +4802,7 @@
47064802
47074803 cTreePath Select(int indexcount, boolean deselect)
47084804 {
4709
- if (hide)
4805
+ if (hide || dontselect)
47104806 return null;
47114807
47124808 if (count <= 0)
....@@ -5158,10 +5254,34 @@
51585254
51595255 // System.out.println("Fullname = " + fullname);
51605256
5161
- if (fullname.name.indexOf(":") == -1)
5162
- return fullname.name;
5257
+ // Does not work on Windows due to C:
5258
+// if (fullname.name.indexOf(":") == -1)
5259
+// return fullname.name;
5260
+//
5261
+// return fullname.name.substring(0,fullname.name.indexOf(":"));
51635262
5164
- return fullname.name.substring(0,fullname.name.indexOf(":"));
5263
+ String[] split = fullname.name.split(":");
5264
+
5265
+ if (split.length == 0)
5266
+ {
5267
+ return "";
5268
+ }
5269
+
5270
+ if (split.length <= 2)
5271
+ {
5272
+ if (fullname.name.endsWith(":"))
5273
+ {
5274
+ // Windows
5275
+ return fullname.name.substring(0, fullname.name.length()-1);
5276
+ }
5277
+
5278
+ return split[0];
5279
+ }
5280
+
5281
+ // Windows
5282
+ assert(split.length == 4);
5283
+
5284
+ return split[0] + ":" + split[1];
51655285 }
51665286
51675287 static String GetBump(cTexture fullname)
....@@ -5170,10 +5290,38 @@
51705290 return "";
51715291
51725292 // System.out.println("Fullname = " + fullname);
5173
- if (fullname.name.indexOf(":") == -1)
5174
- return "";
5175
-
5176
- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5293
+ // Does not work on Windows due to C:
5294
+// if (fullname.name.indexOf(":") == -1)
5295
+// return "";
5296
+//
5297
+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
5298
+ String[] split = fullname.name.split(":");
5299
+
5300
+ if (split.length == 0)
5301
+ {
5302
+ return "";
5303
+ }
5304
+
5305
+ if (split.length == 1)
5306
+ {
5307
+ return "";
5308
+ }
5309
+
5310
+ if (split.length == 2)
5311
+ {
5312
+ if (fullname.name.endsWith(":"))
5313
+ {
5314
+ // Windows
5315
+ return "";
5316
+ }
5317
+
5318
+ return split[1];
5319
+ }
5320
+
5321
+ // Windows
5322
+ assert(split.length == 4);
5323
+
5324
+ return split[2] + ":" + split[3];
51775325 }
51785326
51795327 String GetPigmentTexture()
....@@ -5247,7 +5395,7 @@
52475395 System.out.print("; textures = " + textures);
52485396 System.out.println("; usedtextures = " + usedtextures);
52495397
5250
- if (GetTextures() == null)
5398
+ if (GetTextures() == null) // What is that??
52515399 GetTextures().name = ":";
52525400
52535401 String texname = tex;
....@@ -5278,6 +5426,43 @@
52785426 child.ResetPigmentTexture();
52795427 blockloop = false;
52805428 }
5429
+ }
5430
+
5431
+ UUID GetUUID()
5432
+ {
5433
+ if (uuid == null)
5434
+ {
5435
+ // Serial
5436
+ uuid = UUID.randomUUID();
5437
+ }
5438
+
5439
+ return uuid;
5440
+ }
5441
+
5442
+ Object3D GetObject(UUID uid)
5443
+ {
5444
+ if (blockloop)
5445
+ return null;
5446
+
5447
+ if (GetUUID().equals(uid))
5448
+ return this;
5449
+
5450
+ int nb = Size();
5451
+ for (int i = 0; i < nb; i++)
5452
+ {
5453
+ Object3D child = (Object3D) get(i);
5454
+
5455
+ if (child == null)
5456
+ continue;
5457
+
5458
+ blockloop = true;
5459
+ Object3D obj = child.GetObject(uid);
5460
+ blockloop = false;
5461
+ if (obj != null)
5462
+ return obj;
5463
+ }
5464
+
5465
+ return null;
52815466 }
52825467
52835468 void SetBumpTexture(String tex)
....@@ -5324,9 +5509,9 @@
53245509 boolean NeedSupport()
53255510 {
53265511 return
5327
- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
5512
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
53285513 // PROBLEM with CROWD!!
5329
- && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5514
+ && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
53305515 }
53315516
53325517 static boolean DEBUG_SELECTION = false;
....@@ -5341,7 +5526,7 @@
53415526 }
53425527
53435528 if (display.DrawMode() == iCameraPane.SELECTION &&
5344
- hide)
5529
+ (hide || dontselect))
53455530 return;
53465531
53475532 if (name != null && name.contains("sclera"))
....@@ -5583,7 +5768,17 @@
55835768 tex = GetTextures();
55845769 }
55855770
5586
- display.BindTextures(tex, texres);
5771
+ boolean failed = false;
5772
+
5773
+ try
5774
+ {
5775
+ display.BindTextures(tex, texres);
5776
+ }
5777
+ catch (Exception e)
5778
+ {
5779
+ System.err.println("FAILED: " + this);
5780
+ failed = true;
5781
+ }
55875782
55885783 if (!compiled)
55895784 {
....@@ -5605,7 +5800,8 @@
56055800 }
56065801 }
56075802
5608
- display.ReleaseTextures(tex);
5803
+ if (!failed)
5804
+ display.ReleaseTextures(tex);
56095805
56105806 display.PopMaterial(this, selected);
56115807 }
....@@ -5734,6 +5930,9 @@
57345930
57355931 void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57365932 {
5933
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
5934
+ return;
5935
+
57375936 if (hide)
57385937 return;
57395938 // shadow optimisation
....@@ -5858,6 +6057,9 @@
58586057 {
58596058 if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
58606059 return; // no shadow for transparent objects
6060
+
6061
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6062
+ return;
58616063
58626064 if (hide)
58636065 return;
....@@ -6842,8 +7044,8 @@
68427044 // {
68437045 // CameraPane.Ymax = spoth;
68447046 // }
6845
- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6846
- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7047
+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048
+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
68477049 spot.translate(0, -32);
68487050 info.g.setColor(Color.green);
68497051 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
....@@ -6898,7 +7100,7 @@
68987100 startX = info.x;
68997101 startY = info.y;
69007102
6901
- hitSomething = 0;
7103
+ hitSomething = -1;
69027104 cVector origin = new cVector();
69037105 //LA.xformPos(origin, toParent, origin);
69047106 Rectangle spot = new Rectangle();
....@@ -6931,7 +7133,7 @@
69317133 }
69327134
69337135 //System.out.println("info.modifiers = " + info.modifiers);
6934
- modified = (info.modifiers & CameraPane.META) != 0;
7136
+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
69357137 //System.out.println("modified = " + modified);
69367138 //new Exception().printStackTrace();
69377139 //viewCode = info.pane.renderCamera.viewCode;
....@@ -6959,7 +7161,7 @@
69597161 return true;
69607162 }
69617163
6962
- void doEditDrag0(ClickInfo info)
7164
+ void doEditDrag0(ClickInfo info, boolean opposite)
69637165 {
69647166 if (hitSomething == 0)
69657167 {
....@@ -6974,6 +7176,7 @@
69747176 //System.out.println("hitSomething = " + hitSomething);
69757177
69767178 double scale = 0.005f * info.camera.Distance();
7179
+
69777180 cVector xlate = new cVector();
69787181 //cVector xlate2 = new cVector();
69797182 switch (hitSomething)
....@@ -6986,7 +7189,7 @@
69867189
69877190 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
69887191
6989
- if (modified)
7192
+ if (modified || opposite)
69907193 {
69917194 //assert(false);
69927195 /*
....@@ -7080,6 +7283,7 @@
70807283
70817284 if (modified)
70827285 {
7286
+ // Rotate 90 degrees
70837287 angle /= (Math.PI / 4);
70847288 angle = Math.floor(angle + 0.5);
70857289 angle *= (Math.PI / 4);
....@@ -7121,24 +7325,27 @@
71217325
71227326 case hitScale: // scale
71237327 double hScale = (double) (info.x - centerPt.x) / 32;
7328
+ double sign = 1;
7329
+ if (hScale < 0)
7330
+ {
7331
+ sign = -1;
7332
+ }
7333
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
71247334 if (hScale < 0.01)
71257335 {
7126
- hScale = 0.01;
7336
+ //hScale = 0.01;
71277337 }
7128
- hScale = Math.pow(hScale, scale * 50);
7129
- if (hScale < 0.01)
7130
- {
7131
- hScale = 0.01;
7132
- }
7338
+
71337339 double vScale = (double) (info.y - centerPt.y) / 32;
7134
- if (vScale < 0.01)
7340
+ sign = 1;
7341
+ if (vScale < 0)
71357342 {
7136
- vScale = 0.01;
7343
+ sign = -1;
71377344 }
7138
- vScale = Math.pow(vScale, scale * 50);
7345
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
71397346 if (vScale < 0.01)
71407347 {
7141
- vScale = 0.01;
7348
+ //vScale = 0.01;
71427349 }
71437350 LA.matCopy(startMat, toParent);
71447351 /**/
....@@ -7149,17 +7356,24 @@
71497356 }
71507357 /**/
71517358
7359
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7360
+
7361
+ if (totalScale < 0.01)
7362
+ {
7363
+ totalScale = 0.01;
7364
+ }
7365
+
71527366 switch (info.pane.RenderCamera().viewCode)
71537367 {
71547368 case 3: // '\001'
71557369 if (modified)
71567370 {
71577371 //LA.matScale(toParent, 1, hScale, vScale);
7158
- LA.matScale(toParent, vScale, 1, 1);
7372
+ LA.matScale(toParent, totalScale, 1, 1);
71597373 } // vScale, 1);
71607374 else
71617375 {
7162
- LA.matScale(toParent, vScale, vScale, vScale);
7376
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
71637377 } // vScale, 1);
71647378 break;
71657379
....@@ -7167,10 +7381,10 @@
71677381 if (modified)
71687382 {
71697383 //LA.matScale(toParent, hScale, 1, vScale);
7170
- LA.matScale(toParent, 1, vScale, 1);
7384
+ LA.matScale(toParent, 1, totalScale, 1);
71717385 } else
71727386 {
7173
- LA.matScale(toParent, vScale, 1, vScale);
7387
+ LA.matScale(toParent, totalScale, 1, totalScale);
71747388 }
71757389 break;
71767390
....@@ -7178,10 +7392,10 @@
71787392 if (modified)
71797393 {
71807394 //LA.matScale(toParent, hScale, vScale, 1);
7181
- LA.matScale(toParent, 1, 1, vScale);
7395
+ LA.matScale(toParent, 1, 1, totalScale);
71827396 } else
71837397 {
7184
- LA.matScale(toParent, vScale, vScale, 1);
7398
+ LA.matScale(toParent, totalScale, totalScale, 1);
71857399 }
71867400 break;
71877401 }
....@@ -7314,14 +7528,22 @@
73147528 //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
73157529 //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
73167530 //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
7531
+
7532
+ String objname;
7533
+
73177534 if (false) //parent != null)
73187535 {
7319
- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7536
+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
73207537 } else
73217538 {
7322
- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
7539
+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
73237540 } // + super.toString();
73247541 //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7542
+
7543
+ if (!Globals.ADVANCED)
7544
+ return objname;
7545
+
7546
+ return objname + " " + System.identityHashCode(this);
73257547 }
73267548
73277549 public int hashCode()
....@@ -7377,6 +7599,7 @@
73777599 objectUI.closeUI();
73787600 if (editWindow != null)
73797601 {
7602
+ editWindow.ctrlPanel.FlushUI();
73807603 editWindow.refreshContents();
73817604 } // ? new
73827605 objectUI = null;
....@@ -7397,7 +7620,7 @@
73977620 /*transient*/ cVector2[] projectedVertices = new cVector2[0];
73987621
73997622 Object3D /*Composite*/ parent;
7400
- Object3D /*Composite*/ fileparent;
7623
+ Object3D /*Composite*/ fileparent; // In the case of FileObject
74017624
74027625 double[][] toParent; // dynamic matrix
74037626 double[][] fromParent;
....@@ -7512,7 +7735,7 @@
75127735 {
75137736 assert(bRep != null);
75147737 if (!(support instanceof GenericJoint)) // support.bRep != null)
7515
- GrafreeD.Assert(support.bRep == bRep.support);
7738
+ Grafreed.Assert(support.bRep == bRep.support);
75167739 }
75177740 else
75187741 {
....@@ -7561,9 +7784,9 @@
75617784 private static cVector edge2 = new cVector();
75627785 //private static cVector norm = new cVector();
75637786 /*transient private*/ int hitSomething;
7564
- private static final int hitCenter = 1;
7565
- private static final int hitScale = 2;
7566
- private static final int hitRotate = 3;
7787
+ static final int hitCenter = 1;
7788
+ static final int hitScale = 2;
7789
+ static final int hitRotate = 3;
75677790 /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
75687791 /*transient*/ private Point centerPt;
75697792 /*transient*/ private int startX;