blame | history | patch | commit | commitdiff
Normand Briere
2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e 
 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;
....@@ -482,12 +563,14 @@
482563             toParent = LA.newMatrix();
483564             fromParent = LA.newMatrix();
484565         }
566
+        
485567         if (toParentMarked == null)
486568         {
487569             if (maxcount != 1)
488570             {
489571                 new Exception().printStackTrace();
490572             }
573
+            
491574             toParentMarked = LA.newMatrix();
492575             fromParentMarked = LA.newMatrix();
493576         }
....@@ -775,7 +858,7 @@
775858         if (step == 0)
776859             step = 1;
777860         if (maxcount == 0)
778
-            maxcount = 2048; // 4;
861
+            maxcount = 128; // 2048; // 4;
779862 //        if (acceleration == 0)
780863 //            acceleration = 10;
781864         if (delay == 0) // serial
....@@ -810,7 +893,8 @@
810893             
811894             boolean changedir = random && Math.random() < 0.01; // && !link2master;
812895 
813
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
896
+            if (transformcount*factor >= maxcount && (rewind || random) ||
897
+                    (step == 1 && changedir))
814898             {
815899                 countdown = 1;
816900                 delay = speedup?8:1;
....@@ -2628,6 +2712,18 @@
26282712         //Touch();
26292713     }
26302714 
2715
+    void GenNormalsMeshS()
2716
+    {
2717
+        selection.GenNormalsMesh();
2718
+//        for (int i=0; i<selection.size(); i++)
2719
+//        {
2720
+//            Object3D selectee = (Object3D) selection.elementAt(i);
2721
+//            selectee.GenNormals(crease);
2722
+//        }
2723
+
2724
+        //Touch();
2725
+    }
2726
+
26312727     void ClearColorsS()
26322728     {
26332729         selection.ClearColors();
....@@ -2759,6 +2855,24 @@
27592855             if (child == null)
27602856                 continue;
27612857             child.GenNormals(crease);
2858
+//            Children().release(i);
2859
+        }
2860
+        blockloop = false;
2861
+    }
2862
+
2863
+    void GenNormalsMesh()
2864
+    {
2865
+        if (blockloop)
2866
+            return;
2867
+        
2868
+        blockloop = true;
2869
+        GenNormalsMesh0();
2870
+        for (int i = 0; i < Children().Size(); i++)
2871
+        {
2872
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2873
+            if (child == null)
2874
+                continue;
2875
+            child.GenNormalsMesh();
27622876 //            Children().release(i);
27632877         }
27642878         blockloop = false;
....@@ -2927,6 +3041,15 @@
29273041         if (bRep != null)
29283042         {
29293043             bRep.GenerateNormals(crease);
3044
+            Touch();
3045
+        }
3046
+    }
3047
+
3048
+    void GenNormalsMesh0()
3049
+    {
3050
+        if (bRep != null)
3051
+        {
3052
+            bRep.GenerateNormalsMesh();
29303053             Touch();
29313054         }
29323055     }
....@@ -3381,7 +3504,8 @@
33813504         if (blockloop)
33823505             return;
33833506         
3384
-        if (marked || (bRep != null && material != null)) // borderline...
3507
+        if (//marked || // does not make sense
3508
+                (bRep != null || material != null)) // borderline...
33853509             live = h;
33863510         
33873511         for (int i = 0; i < Size(); i++)
....@@ -3402,7 +3526,8 @@
34023526             return;
34033527         
34043528         //if (bRep != null)
3405
-        if (marked || (bRep != null && material != null)) // borderline...
3529
+        if (//marked || // does not make sense
3530
+                (bRep != null || material != null)) // borderline...
34063531             link2master = h;
34073532         
34083533         for (int i = 0; i < Size(); i++)
....@@ -3422,7 +3547,8 @@
34223547         if (blockloop)
34233548             return;
34243549         
3425
-        if (marked || (bRep != null && material != null)) // borderline...
3550
+        if (//marked || // does not make sense
3551
+                (bRep != null || material != null)) // borderline...
34263552             hide = h;
34273553         
34283554         for (int i = 0; i < Size(); i++)
....@@ -3442,7 +3568,7 @@
34423568         if (blockloop)
34433569             return;
34443570         
3445
-        if (bRep != null && material != null) // borderline...
3571
+        if (bRep != null || material != null) // borderline...
34463572             marked = h;
34473573         
34483574         for (int i = 0; i < Size(); i++)
....@@ -3452,6 +3578,46 @@
34523578                 continue;
34533579             blockloop = true;
34543580             child.MarkLeaves(h);
3581
+            blockloop = false;
3582
+         //   release(i);
3583
+        }
3584
+    }
3585
+    
3586
+    void RewindLeaves(boolean h)
3587
+    {
3588
+        if (blockloop)
3589
+            return;
3590
+        
3591
+        if (bRep != null || material != null) // borderline...
3592
+            rewind = h;
3593
+        
3594
+        for (int i = 0; i < Size(); i++)
3595
+        {
3596
+            Object3D child = (Object3D) get(i); // reserve(i);
3597
+            if (child == null)
3598
+                continue;
3599
+            blockloop = true;
3600
+            child.RewindLeaves(h);
3601
+            blockloop = false;
3602
+         //   release(i);
3603
+        }
3604
+    }
3605
+    
3606
+    void RandomLeaves(boolean h)
3607
+    {
3608
+        if (blockloop)
3609
+            return;
3610
+        
3611
+        if (bRep != null || material != null) // borderline...
3612
+            random = h;
3613
+        
3614
+        for (int i = 0; i < Size(); i++)
3615
+        {
3616
+            Object3D child = (Object3D) get(i); // reserve(i);
3617
+            if (child == null)
3618
+                continue;
3619
+            blockloop = true;
3620
+            child.RandomLeaves(h);
34553621             blockloop = false;
34563622          //   release(i);
34573623         }
....@@ -4225,6 +4391,55 @@
42254391         {               
42264392                 blockloop = true;
42274393             get(i).RepairShadow();
4394
+                blockloop = false;
4395
+        }
4396
+    }
4397
+    
4398
+    void RepairSOV()
4399
+    {
4400
+        if (blockloop)
4401
+            return;
4402
+
4403
+        String texname = this.GetPigmentTexture();
4404
+        
4405
+        if (texname.startsWith("sov"))
4406
+        {
4407
+            String[] s = texname.split("/");
4408
+
4409
+            String[] sname = s[1].split("Color.pn");
4410
+            
4411
+            texname = sname[0];
4412
+            
4413
+            if (sname.length > 1)
4414
+            {
4415
+                texname += "Color.jpg";
4416
+            }
4417
+            
4418
+            this.SetPigmentTexture("sov/" + texname);
4419
+        }
4420
+                
4421
+        texname = this.GetBumpTexture();
4422
+        
4423
+        if (texname.startsWith("sov"))
4424
+        {
4425
+            String[] s = texname.split("/");
4426
+
4427
+            String[] sname = s[1].split("Bump.pn");
4428
+            
4429
+            texname = sname[0];
4430
+            
4431
+            if (sname.length > 1)
4432
+            {
4433
+                texname += "Bump.jpg";
4434
+            }
4435
+            
4436
+            this.SetBumpTexture("sov/" + texname);
4437
+        }
4438
+                
4439
+        for (int i=0; i<Size(); i++)
4440
+        {               
4441
+                blockloop = true;
4442
+            get(i).RepairSOV();
42284443                 blockloop = false;
42294444         }
42304445     }
....@@ -5371,6 +5586,43 @@
53715586         }
53725587     }
53735588     
5589
+    UUID GetUUID()
5590
+    {
5591
+        if (uuid == null)
5592
+        {
5593
+            // Serial
5594
+            uuid = UUID.randomUUID();
5595
+        }
5596
+        
5597
+        return uuid;
5598
+    }
5599
+    
5600
+    Object3D GetObject(UUID uid)
5601
+    {
5602
+        if (blockloop)
5603
+            return null;
5604
+        
5605
+        if (GetUUID().equals(uid))
5606
+            return this;
5607
+        
5608
+        int nb = Size();
5609
+        for (int i = 0; i < nb; i++)
5610
+        {
5611
+            Object3D child = (Object3D) get(i);
5612
+
5613
+            if (child == null)
5614
+                continue;
5615
+
5616
+            blockloop = true;
5617
+            Object3D obj = child.GetObject(uid);
5618
+            blockloop = false;
5619
+            if (obj != null)
5620
+                return obj;
5621
+        }
5622
+        
5623
+        return null;
5624
+    }
5625
+    
53745626     void SetBumpTexture(String tex)
53755627     {
53765628         if (GetTextures() == null)
....@@ -5415,12 +5667,23 @@
54155667     boolean NeedSupport()
54165668     {
54175669         return
5418
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5670
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
54195671                  // PROBLEM with CROWD!!
54205672                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
54215673     }
54225674     
54235675     static boolean DEBUG_SELECTION = false;
5676
+    
5677
+    boolean IsLive()
5678
+    {
5679
+        if (live)
5680
+            return true;
5681
+        
5682
+        if (parent == null)
5683
+            return false;
5684
+        
5685
+        return parent.IsLive();
5686
+    }
54245687     
54255688     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
54265689     {
....@@ -5483,7 +5746,7 @@
54835746             support = support;
54845747         
54855748         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5486
-        boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749
+        boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
54875750         
54885751         if (!usecalllists && bRep != null && bRep.displaylist > 0)
54895752         {
....@@ -5503,10 +5766,12 @@
55035766         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
55045767         
55055768         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5506
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5769
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5770
+                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
55075771         {
55085772             Globals.lighttouched = true;
55095773         } // all panes...
5774
+        
55105775         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
55115776         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
55125777                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5674,16 +5939,27 @@
56745939         tex = GetTextures();
56755940     }
56765941 
5677
-    boolean failed = false;
5942
+    boolean failedPigment = false;
5943
+    boolean failedBump = false;
56785944     
56795945     try
56805946     {
5681
-        display.BindTextures(tex, texres);
5947
+        display.BindPigmentTexture(tex, texres);
56825948     }
56835949     catch (Exception e)
56845950     {
56855951         System.err.println("FAILED: " + this);
5686
-        failed = true;
5952
+        failedPigment = true;
5953
+    }
5954
+           
5955
+    try
5956
+    {
5957
+        display.BindBumpTexture(tex, texres);
5958
+    }
5959
+    catch (Exception e)
5960
+    {
5961
+        //System.err.println("FAILED: " + this);
5962
+        failedBump = true;
56875963     }
56885964            
56895965             if (!compiled)
....@@ -5706,8 +5982,11 @@
57065982                 }
57075983             }
57085984 
5709
-    if (!failed)
5710
-        display.ReleaseTextures(tex);
5985
+    if (!failedBump)
5986
+        display.ReleaseBumpTexture(tex);
5987
+
5988
+    if (!failedPigment)
5989
+        display.ReleasePigmentTexture(tex);
57115990 
57125991     display.PopMaterial(this, selected);
57135992         }
....@@ -6932,7 +7211,7 @@
69327211             spot.translate(32, 32);
69337212             spotw = spot.x + spot.width;
69347213             spoth = spot.y + spot.height;
6935
-            info.g.setColor(Color.blue);
7214
+            info.g.setColor(Color.cyan);
69367215             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
69377216 //            if (CameraPane.Xmin > spot.x)
69387217 //            {
....@@ -6950,11 +7229,12 @@
69507229 //            {
69517230 //                CameraPane.Ymax = spoth;
69527231 //            }
6953
-            info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6954
-            info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7232
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
69557234             spot.translate(0, -32);
6956
-            info.g.setColor(Color.green);
7235
+            info.g.setColor(Color.yellow);
69577236             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7237
+            info.g.setColor(Color.green);
69587238 //            if (CameraPane.Xmin > spot.x)
69597239 //            {
69607240 //                CameraPane.Xmin = spot.x;
....@@ -7006,7 +7286,7 @@
70067286         startX = info.x;
70077287         startY = info.y;
70087288 
7009
-        hitSomething = 0;
7289
+        hitSomething = -1;
70107290         cVector origin = new cVector();
70117291         //LA.xformPos(origin, toParent, origin);
70127292         Rectangle spot = new Rectangle();
....@@ -7082,6 +7362,7 @@
70827362         //System.out.println("hitSomething = " + hitSomething);
70837363 
70847364         double scale = 0.005f * info.camera.Distance();
7365
+        
70857366         cVector xlate = new cVector();
70867367         //cVector xlate2 = new cVector();
70877368         switch (hitSomething)
....@@ -7230,24 +7511,27 @@
72307511 
72317512             case hitScale: // scale
72327513                 double hScale = (double) (info.x - centerPt.x) / 32;
7514
+                double sign = 1;
7515
+                if (hScale < 0)
7516
+                {
7517
+                    sign = -1;
7518
+                }
7519
+                hScale = sign*Math.pow(sign*hScale, scale * 50);
72337520                 if (hScale < 0.01)
72347521                 {
7235
-                    hScale = 0.01;
7522
+                    //hScale = 0.01;
72367523                 }
7237
-                hScale = Math.pow(hScale, scale * 50);
7238
-                if (hScale < 0.01)
7239
-                {
7240
-                    hScale = 0.01;
7241
-                }
7524
+                
72427525                 double vScale = (double) (info.y - centerPt.y) / 32;
7243
-                if (vScale < 0.01)
7526
+                sign = 1;
7527
+                if (vScale < 0)
72447528                 {
7245
-                    vScale = 0.01;
7529
+                    sign = -1;
72467530                 }
7247
-                vScale = Math.pow(vScale, scale * 50);
7531
+                vScale = sign*Math.pow(sign*vScale, scale * 50);
72487532                 if (vScale < 0.01)
72497533                 {
7250
-                    vScale = 0.01;
7534
+                    //vScale = 0.01;
72517535                 }
72527536                 LA.matCopy(startMat, toParent);
72537537                 /**/
....@@ -7258,39 +7542,47 @@
72587542                 }
72597543                 /**/
72607544 
7545
+                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7546
+                        
7547
+                if (totalScale < 0.01)
7548
+                {
7549
+                    totalScale = 0.01;
7550
+                }
7551
+                
72617552                 switch (info.pane.RenderCamera().viewCode)
72627553                 {
72637554                     case 3: // '\001'
7264
-                        if (modified)
7555
+                        if (modified || opposite)
72657556                         {
72667557                             //LA.matScale(toParent, 1, hScale, vScale);
7267
-                            LA.matScale(toParent, vScale, 1, 1);
7558
+                            LA.matScale(toParent, totalScale, 1, 1);
72687559                         } // vScale, 1);
72697560                         else
72707561                         {
7271
-                            LA.matScale(toParent, vScale, vScale, vScale);
7562
+                            // EXCEPTION!
7563
+                            LA.matScale(toParent, totalScale, totalScale, totalScale);
72727564                         } // vScale, 1);
72737565                         break;
72747566 
72757567                     case 2: // '\002'
7276
-                        if (modified)
7568
+                        if (modified || opposite)
72777569                         {
72787570                             //LA.matScale(toParent, hScale, 1, vScale);
7279
-                            LA.matScale(toParent, 1, vScale, 1);
7571
+                            LA.matScale(toParent, 1, totalScale, 1);
72807572                         } else
72817573                         {
7282
-                            LA.matScale(toParent, vScale, 1, vScale);
7574
+                            LA.matScale(toParent, totalScale, 1, totalScale);
72837575                         }
72847576                         break;
72857577 
72867578                     case 1: // '\003'
7287
-                        if (modified)
7579
+                        if (modified || opposite)
72887580                         {
72897581                             //LA.matScale(toParent, hScale, vScale, 1);
7290
-                            LA.matScale(toParent, 1, 1, vScale);
7582
+                            LA.matScale(toParent, 1, 1, totalScale);
72917583                         } else
72927584                         {
7293
-                            LA.matScale(toParent, vScale, vScale, 1);
7585
+                            LA.matScale(toParent, totalScale, totalScale, 1);
72947586                         }
72957587                         break;
72967588                 }
....@@ -7431,7 +7723,7 @@
74317723             objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
74327724         } else
74337725         {
7434
-            objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
7726
+            objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
74357727         } //  + super.toString();
74367728     //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
74377729         
....@@ -7515,7 +7807,7 @@
75157807 	/*transient*/ cVector2[] projectedVertices = new cVector2[0];
75167808         
75177809     Object3D /*Composite*/ parent;
7518
-    Object3D /*Composite*/ fileparent;
7810
+    Object3D /*Composite*/ fileparent; // In the case of FileObject
75197811     
75207812     double[][] toParent; // dynamic matrix
75217813     double[][] fromParent;
....@@ -7679,9 +7971,9 @@
76797971     private static cVector edge2 = new cVector();
76807972     //private static cVector norm = new cVector();
76817973     /*transient private*/ int hitSomething;
7682
-    private static final int hitCenter = 1;
7683
-    private static final int hitScale = 2;
7684
-    private static final int hitRotate = 3;
7974
+    static final int hitCenter = 1;
7975
+    static final int hitScale = 2;
7976
+    static final int hitRotate = 3;
76857977     /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
76867978 	/*transient*/ private Point centerPt;
76877979     /*transient*/ private int startX;