blame | history | patch | commit | commitdiff
Normand Briere
2019-10-06 9cf2c36d644d0aaa28797f57a3e71591d8e66973 
 Object3D.java
....@@ -25,30 +25,108 @@
2525     // Use GetUUID for backward compatibility with null.
2626     private UUID uuid = UUID.randomUUID();
2727     
28
-    // TEMPORARY for mocap undo. No need to be transient.
28
+    // TEMPORARY for versions. No need to be transient.
2929     mocap.reader.BVHReader.BVHResult savebvh;
3030     Object3D saveskeleton;
31
+    
32
+    // FileObject
33
+    Object3D savefilecontent;
3134     //
3235     
3336     String skyboxname;
3437     String skyboxext;
3538     
36
-    Object3D versionlist[];
39
+    Object3D[] versionlist;
3740     int versionindex = -1;    
3841         
3942     java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
4043     
44
+    transient int tabIndex; // Tabs can change between sessions.
45
+    
4146     ScriptNode scriptnode;
47
+
48
+    void deepCopyNode(Object3D other)
49
+    {
50
+        other.skyboxname = skyboxname;
51
+        other.skyboxext = skyboxext;
52
+        
53
+        if (toParent != null)
54
+        {
55
+            other.toParent = LA.newMatrix();
56
+            other.fromParent = LA.newMatrix();
57
+            LA.matCopy(toParent, other.toParent);
58
+            LA.matCopy(fromParent, other.fromParent);
59
+            if (toParentMarked != null)
60
+            {
61
+                other.toParentMarked = LA.newMatrix();
62
+                other.fromParentMarked = LA.newMatrix();
63
+                LA.matCopy(toParentMarked, other.toParentMarked);
64
+                LA.matCopy(fromParentMarked, other.fromParentMarked);
65
+            }
66
+        }
67
+        else
68
+        {
69
+            if (other.toParent == null)
70
+//                assert(other.toParent == null);
71
+//                new Exception().printStackTrace();
72
+                System.err.println("null parent: " + other);
73
+        }
74
+        
75
+        /*
76
+        double ident[][] = LA.newMatrix();
77
+        if (bRep == null)
78
+        other.bRep = null;
79
+        else
80
+        other.bRep = new BoundaryRep(bRep, ident);
81
+         */
82
+        // Really new...
83
+        //other.editWindow = null;
84
+        if (name == null)
85
+            other.name = null;
86
+        else
87
+            other.name = new String(name);
88
+
89
+        if (material != null)
90
+        {
91
+            other.material = new cMaterial(material);
92
+        } else
93
+        {
94
+            other.material = null;
95
+        }
96
+
97
+        other.GetTextures().name = GetTextures().name;
98
+        
99
+        CopyExtraMaterial(other);
100
+        
101
+        other.touched = touched;
102
+        other.softtouched = softtouched;
103
+        
104
+        other.random = random;
105
+        other.link2master = Link2Support();
106
+        other.transformcount = transformcount;
107
+        other.marked = marked;
108
+        other.skip = skip;
109
+        other.count = count;
110
+        other.flipV = flipV;
111
+        other.live = live;
112
+        other.rewind = rewind;
113
+        other.hide = hide;
114
+        other.texres = texres;
115
+        other.speedup = speedup;
116
+        other.height = height;
117
+        other.depth = depth;
118
+    }
42119 
43120     int VersionCount()
44121     {
45122         int count = 0;
46123         
47
-        for (int i = versionlist.length; --i >= 0;)
48
-        {
49
-            if (versionlist[i] != null)
50
-                count++;
51
-        }
124
+        if (versionlist != null)
125
+            for (int i = versionlist.length; --i >= 0;)
126
+            {
127
+                if (versionlist[i] != null)
128
+                    count++;
129
+            }
52130         
53131         return count;
54132     }
....@@ -64,6 +142,7 @@
64142                     projectedVertices[i] = new cVector2(); // Others
65143                 }
66144                 projectedVertices[0].x = 100; // bump
145
+                projectedVertices[1].y = 1000; // punchthrough. only for png
67146         }
68147 
69148     void MinMax(cVector minima, cVector maxima)
....@@ -143,7 +222,7 @@
143222             return;
144223 
145224         transientsupport = support;
146
-        transientlink2master = link2master;
225
+        transientlink2master = Link2Support();
147226 
148227         support = null;
149228         link2master = false;
....@@ -190,9 +269,42 @@
190269         }
191270     }
192271 
272
+    boolean HasBigData()
273
+    {
274
+        if (blockloop)
275
+            return false;
276
+
277
+        if (bRep != null)
278
+        {
279
+            return true;
280
+        }
281
+        
282
+        blockloop = true;
283
+        
284
+        for (int i = 0; i < Size(); i++)
285
+        {
286
+            Object3D child = (Object3D) get(i);
287
+            if (child == null)
288
+                continue;
289
+            if (child.HasBigData())
290
+            {
291
+                blockloop = false;
292
+                return true;
293
+            }
294
+        }
295
+        
296
+        blockloop = false;
297
+        return false;
298
+    }
299
+
193300     void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
194301     {
302
+        if (blockloop)
303
+            return;
304
+
195305         Object3D o;
306
+        
307
+        boolean isnew = false;
196308         
197309         if (hashtable.containsKey(GetUUID()))
198310         {
....@@ -206,12 +318,14 @@
206318         }
207319         else
208320         {
321
+            isnew = true;
322
+            
209323             o = new Object3D("copy of " + this.name);
210324 
211325             hashtable.put(GetUUID(), o);
212326         }
213327 
214
-        if (!blockloop)
328
+        //if (!blockloop)
215329         {
216330             blockloop = true;
217331 
....@@ -222,12 +336,15 @@
222336 
223337             blockloop = false;
224338         }
225
-        
226
-        ExtractBigData(o);
339
+
340
+        //if (isnew)
341
+            ExtractBigData(o);
227342     }
228343 
229344     void ExtractBigData(Object3D o)
230345     {
346
+        //System.err.println("ExtractBigData : " + this + " --> " + o);
347
+        
231348         if (o.bRep != null)
232349             Grafreed.Assert(o.bRep == this.bRep);
233350         
....@@ -238,8 +355,8 @@
238355 //            o.bRep.support = null;
239356 //        }
240357         o.selection = this.selection;
241
-        o.versionlist = this.versionlist;
242
-        o.versionindex = this.versionindex;
358
+        //o.versionlist = this.versionlist;
359
+        //o.versionindex = this.versionindex;
243360         
244361         if (this.support != null)
245362         {
....@@ -331,15 +448,15 @@
331448 
332449     void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
333450     {
451
+        if (blockloop)
452
+            return;
453
+
334454         if (!hashtable.containsKey(GetUUID()))
335455             return;
336456 
337457         Object3D o = hashtable.get(GetUUID());
338458 
339459         RestoreBigData(o);
340
-
341
-        if (blockloop)
342
-            return;
343460 
344461         blockloop = true;
345462 
....@@ -355,6 +472,9 @@
355472 
356473     void RestoreBigData(Object3D o)
357474     {
475
+        //System.err.println("RestoreBigData : " + this + " <-- " + o);
476
+        Grafreed.Assert(this.bRep == null);
477
+        
358478         this.bRep = o.bRep;
359479         if (this.support != null && o.transientrep != null)
360480         {
....@@ -363,8 +483,8 @@
363483         
364484         this.selection = o.selection;
365485         
366
-        this.versionlist = o.versionlist;
367
-        this.versionindex = o.versionindex;
486
+        //this.versionlist = o.versionlist;
487
+        //this.versionindex = o.versionindex;
368488 // July 2019        if (this.bRep != null)
369489 //            this.bRep.support = o.transientrep;
370490     //    this.support = o.support;
....@@ -515,7 +635,10 @@
515635     transient boolean keepdontselect;
516636     boolean dontselect = false;
517637     boolean hide = false;
518
-    boolean link2master = false; // performs reset support/master at each frame
638
+    
639
+    boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
640
+    boolean link2support = false; // (cannot rename due to serialization)
641
+    
519642     boolean marked = false; // animation node
520643     boolean skip = false; // centroid issue
521644     boolean skipmocap = false; // mocap data
....@@ -523,6 +646,9 @@
523646     boolean random = false;
524647     boolean speedup = false;
525648     boolean rewind = false;
649
+    
650
+    // Option to sort triangles, e.g. for transparency.
651
+    boolean sort = false;
526652     
527653     float NORMALPUSH = 0;
528654     
....@@ -541,7 +667,7 @@
541667         {
542668             sorted = true;
543669             
544
-            for (int i=0; i<size()-1; i++)
670
+            for (int i=0; i<Size()-1; i++)
545671             {
546672                 Object3D obji = get(i);
547673                 Object3D objj = get(i+1);
....@@ -565,7 +691,7 @@
565691         {
566692             sorted = true;
567693             
568
-            for (int i=0; i<size()-1; i++)
694
+            for (int i=0; i<Size()-1; i++)
569695             {
570696                 Object3D obji = get(i);
571697                 Object3D objj = get(i+1);
....@@ -902,7 +1028,7 @@
9021028     
9031029     void Step()
9041030     {
905
-        // marde pour serialization de Texture
1031
+        // patch pour serialization de Texture
9061032         resetmaxcount();
9071033         resettransformcount();
9081034         resetstep();
....@@ -1016,6 +1142,8 @@
10161142                 (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
10171143                 currentframe != Globals.framecount)
10181144         {
1145
+            Globals.lighttouched = true;
1146
+            
10191147             currentframe = Globals.framecount;
10201148             
10211149 //            System.err.println("transformcount = " + transformcount);
....@@ -1095,24 +1223,28 @@
10951223     {
10961224 //        return true;
10971225         
1098
-        if (material == null || material.multiply)
1099
-            return true;
1226
+//        if (material == null || material.multiply)
1227
+//            return true;
1228
+//        
1229
+//        if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1230
+//            return false;
1231
+//        
1232
+//        // Transparent objects are dynamic because we have to sort the triangles.
1233
+//        return material.opacity > 0.99;
11001234         
1101
-        if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1102
-            return false;
1103
-        
1104
-        // Transparent objects are dynamic because we have to sort the triangles.
1105
-        return material.opacity > 0.99;
1235
+        return !sort;
11061236     }
11071237     
11081238     boolean IsOpaque()
11091239     {
11101240 //        return true;
11111241         
1112
-        if (material == null || material.multiply)
1113
-            return true;
1242
+//        if (material == null || material.multiply)
1243
+//            return true;
1244
+//        
1245
+//        return material.opacity > 0.99;
11141246         
1115
-        return material.opacity > 0.99;
1247
+        return !sort;
11161248     }
11171249     
11181250     Object3D()
....@@ -1190,8 +1322,10 @@
11901322 
11911323         // will share the geometry
11921324         assert (!(this instanceof Composite));
1193
-        return deepCopy(); // Never called for Composite
1194
-
1325
+        
1326
+        Object3D obj = deepCopy(); // Never called for Composite
1327
+        obj.count = 2;
1328
+        return obj;
11951329     }
11961330 
11971331     boolean HasLoops()
....@@ -1199,6 +1333,30 @@
11991333         return false;
12001334     }
12011335     
1336
+    void ResetUUIDs()
1337
+    {
1338
+        if (blockloop)
1339
+        {
1340
+            return;
1341
+        }
1342
+
1343
+        this.uuid = null;
1344
+        
1345
+        blockloop = true;
1346
+
1347
+        for (int i = 0; i < Size(); i++)
1348
+        {
1349
+            Object3D obj = (Object3D) Children().get(i);
1350
+
1351
+            if (obj != null)
1352
+            {
1353
+                obj.ResetUUIDs();
1354
+            }
1355
+        }
1356
+
1357
+        blockloop = false;
1358
+    }
1359
+
12021360     boolean IsInfinite()
12031361     {
12041362         if (blockloop)
....@@ -1269,78 +1427,16 @@
12691427             return;
12701428         
12711429         blockloop = true;
1430
+        
1431
+        other.parent = parent;
1432
+        
12721433         //System.out.println("COPY " + this + " to " + other);
12731434         //new Exception().printStackTrace();
1435
+        deepCopyNode(other);
12741436 
1275
-        other.parent = parent;
1276
-        if (toParent != null)
1277
-        {
1278
-            other.toParent = LA.newMatrix();
1279
-            other.fromParent = LA.newMatrix();
1280
-            LA.matCopy(toParent, other.toParent);
1281
-            LA.matCopy(fromParent, other.fromParent);
1282
-            if (toParentMarked != null)
1283
-            {
1284
-                other.toParentMarked = LA.newMatrix();
1285
-                other.fromParentMarked = LA.newMatrix();
1286
-                LA.matCopy(toParentMarked, other.toParentMarked);
1287
-                LA.matCopy(fromParentMarked, other.fromParentMarked);
1288
-            }
1289
-        }
1290
-        else
1291
-        {
1292
-            if (other.toParent == null)
1293
-//                assert(other.toParent == null);
1294
-//                new Exception().printStackTrace();
1295
-                System.err.println("null parent: " + other);
1296
-        }
1297
-        /*
1298
-        double ident[][] = LA.newMatrix();
1299
-        if (bRep == null)
1300
-        other.bRep = null;
1301
-        else
1302
-        other.bRep = new BoundaryRep(bRep, ident);
1303
-         */
1304
-        // Really new...
13051437         other.bRep = bRep; // Share the geometry
13061438         
13071439         other.support = support; // Share the support
1308
-
1309
-        //other.editWindow = null;
1310
-        if (name == null)
1311
-            other.name = null;
1312
-        else
1313
-            other.name = new String(name);
1314
-
1315
-        if (material != null)
1316
-        {
1317
-            other.material = new cMaterial(material);
1318
-        } else
1319
-        {
1320
-            other.material = null;
1321
-        }
1322
-
1323
-        other.GetTextures().name = GetTextures().name;
1324
-        
1325
-        CopyExtraMaterial(other);
1326
-        
1327
-        other.touched = touched;
1328
-        other.softtouched = softtouched;
1329
-        
1330
-        other.random = random;
1331
-        other.link2master = link2master;
1332
-        other.transformcount = transformcount;
1333
-        other.marked = marked;
1334
-        other.skip = skip;
1335
-        other.count = count;
1336
-        other.flipV = flipV;
1337
-        other.live = live;
1338
-        other.rewind = rewind;
1339
-        other.hide = hide;
1340
-        other.texres = texres;
1341
-        other.speedup = speedup;
1342
-        other.height = height;
1343
-        other.depth = depth;
13441440 
13451441 // aout 2013        if (/*displaylist != -1 &&*/other.displaylist != displaylist)
13461442 //        {
....@@ -1396,17 +1492,24 @@
13961492         if ((mask & GEOMETRY) != 0)
13971493         {
13981494             if (bRep != null)
1399
-                bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1400
-            else
1401
-                assert(other.bRep == null);
1402
-            
1403
-            if (bRep != null)
14041495             {
1496
+                bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
14051497                 CameraPane.RemoveList(bRep.displaylist);
14061498                 bRep.displaylist = 0; // june 2013 -1;
14071499             }
14081500             else
1409
-                bRep = bRep;
1501
+            {
1502
+                //assert(other.bRep == null);
1503
+                bRep = other.bRep;
1504
+            }
1505
+            
1506
+//            if (bRep != null)
1507
+//            {
1508
+//                CameraPane.RemoveList(bRep.displaylist);
1509
+//                bRep.displaylist = 0; // june 2013 -1;
1510
+//            }
1511
+//            else
1512
+//                bRep = bRep;
14101513         }
14111514             
14121515         /* Use a MASK = GEO/MAT
....@@ -3202,7 +3305,10 @@
32023305     {
32033306         if (bRep != null)
32043307         {
3308
+            //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
32053309             bRep.GenerateNormals(crease);
3310
+            if (!bRep.trimmed)
3311
+                bRep.MergeNormals();
32063312             Touch();
32073313         }
32083314     }
....@@ -3313,6 +3419,18 @@
33133419                 obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
33143420             }
33153421         }
3422
+    }
3423
+    
3424
+    public void Scale(float scale)
3425
+    {
3426
+        Object3D obj = this;
3427
+        
3428
+        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
3429
+        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3430
+        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3431
+        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
3432
+        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3433
+        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
33163434     }
33173435     
33183436     public void TextureRatioTransform(int axis)
....@@ -3606,6 +3724,7 @@
36063724         if (bRep != null)
36073725         {
36083726             //bRep.RemoveOneTriangle();
3727
+        System.out.println();
36093728         System.out.println("Reducing " + this);
36103729         if (name != null && name.contains("lockpickstraps"))
36113730             name = name;
....@@ -3936,6 +4055,7 @@
39364055     
39374056     void RevertMeshes()
39384057     {
4058
+        // BLOCKLOOP
39394059         if (this instanceof cMesh)
39404060         {
39414061             ((cMesh)this).Revert();
....@@ -3966,11 +4086,6 @@
39664086             Touch();
39674087         }
39684088         
3969
-        ResetRecur();
3970
-    }
3971
-    
3972
-    void ResetRecur()
3973
-    {
39744089         for (int i = 0; i < size(); i++)
39754090         {
39764091             Object3D child = (Object3D) get(i); // reserve(i);
....@@ -3993,11 +4108,6 @@
39934108         Step();
39944109         Touch();
39954110         
3996
-        StepRecur();
3997
-    }
3998
-    
3999
-    void StepRecur()
4000
-    {
40014111         for (int i = 0; i < size(); i++)
40024112         {
40034113             Object3D child = (Object3D) get(i); // reserve(i);
....@@ -4184,8 +4294,8 @@
41844294         Touch();
41854295     }
41864296     
4187
-    transient cVector min = new cVector();
4188
-    transient cVector max = new cVector();
4297
+    transient cVector min;
4298
+    transient cVector max;
41894299     
41904300     void getBounds(cVector minima, cVector maxima, boolean xform)
41914301     {
....@@ -4201,15 +4311,15 @@
42014311         if (blockloop)
42024312             return;
42034313         
4204
-        if (min == null) // ???
4314
+        if (min == null)
42054315         {
42064316             min = new cVector();
42074317             max = new cVector();
42084318         }
42094319         
4210
-        for (int i = 0; i<size(); i++)
4320
+        for (int i = 0; i<Size(); i++)
42114321         {
4212
-            Object3D child = (Object3D) reserve(i);
4322
+            Object3D child = (Object3D) get(i); //reserve(i);
42134323             if (child == null)
42144324                 continue;
42154325             
....@@ -4228,21 +4338,21 @@
42284338             if (child.hide && !(child instanceof Merge) || child.skip)
42294339             //if (child.hide)
42304340             {
4231
-                release(i);
4341
+                //release(i);
42324342                 continue;
42334343             }
42344344             
42354345                 blockloop = true;
42364346             child.getBounds(min, max, true); // xform);
42374347                 blockloop = false;
4238
-            release(i);
4348
+            //release(i);
42394349             
42404350             MinMax(minima, maxima);
42414351         }
42424352         
42434353         if (bRep != null)
42444354         {
4245
-            bRep.getBounds(minima,maxima,this);
4355
+            bRep.getBounds(minima, maxima, xform?this:null);
42464356         }
42474357 
42484358         if (false) // xform)
....@@ -6051,7 +6161,7 @@
60516161     boolean NeedSupport()
60526162     {
60536163         return
6054
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
6164
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /*live &&*/ support != null
60556165                  // PROBLEM with CROWD!!
60566166                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
60576167     }
....@@ -6074,6 +6184,15 @@
60746184         return live && bRep != null;
60756185     }
60766186     
6187
+    boolean Link2Support()
6188
+    {
6189
+        return link2master || link2support;
6190
+    }
6191
+    
6192
+    static cVector minima = new cVector();
6193
+    static cVector maxima = new cVector();
6194
+    static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
6195
+    
60776196     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
60786197     {
60796198         Invariants(); // june 2013
....@@ -6081,6 +6200,29 @@
60816200         if (support != null)
60826201         {
60836202         //    System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
6203
+        }
6204
+        
6205
+        if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
6206
+        {
6207
+            getBounds(minima, maxima, true);
6208
+            center.x = (minima.x + maxima.x) / 2;
6209
+            center.y = 10000; // (minima.y + maxima.y) / 2;
6210
+            center.z = (minima.z + maxima.z) / 2;
6211
+
6212
+            Ray ray = new Ray(center, new Vector3d(0,-1,0));
6213
+
6214
+            IntersectResult res = new IntersectResult();
6215
+            res.t = Double.POSITIVE_INFINITY;
6216
+
6217
+            if (Grafreed.grafreed.universe.intersect(ray, res))
6218
+            {
6219
+                double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
6220
+                double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
6221
+                double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
6222
+                
6223
+                LA.matTranslate(toParent, 0, resy - minima.y, 0);
6224
+                LA.matInvert(toParent, fromParent);
6225
+            }
60846226         }
60856227         
60866228         if (display.DrawMode() == iCameraPane.SELECTION &&
....@@ -6135,7 +6277,7 @@
61356277             support = support;
61366278         
61376279         boolean usecalllists = !IsDynamic() &&
6138
-                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6280
+                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
61396281         //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
61406282         
61416283         //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
....@@ -6146,7 +6288,8 @@
61466288             bRep.displaylist = 0;
61476289         }
61486290    //     usecalllists &= !(parent instanceof RandomNode);
6149
-   //     usecalllists = false;
6291
+        if (CameraPane.BOXMODE) // Too dynamic
6292
+            usecalllists = false;
61506293 
61516294         if (display.DrawMode() == display.SHADOW)
61526295             //GetBRep() != null)
....@@ -6160,7 +6303,7 @@
61606303         
61616304         if (!selectmode && //display.DrawMode() != display.SELECTION &&
61626305                 //(touched || (bRep != null && bRep.displaylist <= 0)))
6163
-                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
6306
+                ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0)))
61646307         {
61656308             Globals.lighttouched = true;
61666309         } // all panes...
....@@ -6202,8 +6345,8 @@
62026345             Globals.lighttouched = true; // all panes...
62036346         }
62046347 
6205
-        touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
6206
-        //touched = false;
6348
+        //touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
6349
+        touched = false;
62076350 
62086351         if (this instanceof Texture || this instanceof TextureNode)
62096352         {
....@@ -6242,7 +6385,7 @@
62426385         {
62436386             if (display.DrawMode() == iCameraPane.SHADOW)
62446387             {
6245
-                if (!link2master // tricky to cull in shadow mode.
6388
+                if (!Link2Support() // tricky to cull in shadow mode.
62466389                          && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
62476390                 {
62486391                     //System.out.print("CULLED");
....@@ -6304,6 +6447,20 @@
63046447             {
63056448                 drawSelf(display, root, selected, blocked);
63066449             }
6450
+            
6451
+//            if (!(this instanceof Composite))
6452
+//            {
6453
+//                for (int i = 0; i < size(); i++)
6454
+//                {
6455
+//                    Object3D child = (Object3D) reserve(i);
6456
+//                    if (child == null)
6457
+//                        continue;
6458
+//
6459
+//                    child.draw(display, root, selected, blocked);
6460
+//
6461
+//                    release(i);
6462
+//                }
6463
+//            }
63076464         } else
63086465         {
63096466             /*
....@@ -6336,13 +6493,14 @@
63366493     boolean failedPigment = false;
63376494     boolean failedBump = false;
63386495     
6496
+    CameraPane.lastObject = this;
63396497     try
63406498     {
63416499         display.BindPigmentTexture(tex, texres);
63426500     }
63436501     catch (Exception e)
63446502     {
6345
-        System.err.println("FAILED: " + this);
6503
+    //    System.err.println("FAILED: " + this);
63466504         failedPigment = true;
63476505     }
63486506            
....@@ -6373,6 +6531,20 @@
63736531                         display.CallList(bRep.displaylist);
63746532 // june 2013            drawSelf(display, root, selected);
63756533                     }
6534
+                }
6535
+                
6536
+                assert (!(this instanceof Composite));
6537
+                {
6538
+// CRASH MOCAP!!                   for (int i = 0; i < size(); i++)
6539
+//                    {
6540
+//                        Object3D child = (Object3D) reserve(i);
6541
+//                        if (child == null)
6542
+//                            continue;
6543
+//
6544
+//                        child.draw(display, root, selected, blocked);
6545
+//
6546
+//                        release(i);
6547
+//                    }
63766548                 }
63776549             }
63786550 
....@@ -6426,16 +6598,17 @@
64266598 
64276599     void CallList(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
64286600     {
6429
-        if (GetBRep() == null)
6430
-        {
6431
-            drawSelf(display, root, selected, blocked);
6432
-        } else
6601
+        if (GetBRep() != null)
64336602         {
64346603             DrawNode(display, root, selected);
64356604             if (this instanceof BezierPatch)
64366605             {
64376606                 //drawSelf(display, root, selected);
64386607             }
6608
+        }
6609
+        else
6610
+        {
6611
+            drawSelf(display, root, selected, blocked);
64396612         }
64406613     }
64416614 
....@@ -6685,7 +6858,8 @@
66856858 
66866859         //javax.media.opengl.GL gl = display.GetGL();
66876860 
6688
-        if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
6861
+        if (CameraPane.BOXMODE && //!Link2Support()) //
6862
+                                !selected) // || CameraPane.movingcamera)
66896863         {
66906864             int fc = bRep.FaceCount();
66916865             int vc = bRep.VertexCount();
....@@ -6847,7 +7021,7 @@
68477021                         facescompare[k] = new FaceCompare(k);
68487022                     }
68497023                     
6850
-                    center = new cVector();
7024
+                    centertriangle = new cVector();
68517025                 }
68527026                 else
68537027                 {
....@@ -6970,7 +7144,7 @@
69707144          */
69717145     }
69727146 
6973
-    transient cVector center;
7147
+    transient cVector centertriangle;
69747148     
69757149     class FaceCompare implements Comparable
69767150     {
....@@ -6999,14 +7173,14 @@
69997173                 Vertex q = bRep.GetVertex(face.q);
70007174                 Vertex r = bRep.GetVertex(face.r);
70017175 
7002
-                center.set(p);
7003
-                center.add(q);
7004
-                center.add(r);
7005
-                center.mul(1.0/3);
7176
+                centertriangle.set(p);
7177
+                centertriangle.add(q);
7178
+                centertriangle.add(r);
7179
+                centertriangle.mul(1.0/3);
70067180                 
7007
-                center.sub(Globals.theRenderer.EyeCamera().location);
7181
+                centertriangle.sub(Globals.theRenderer.EyeCamera().location);
70087182                 
7009
-                distance = center.dot(center);
7183
+                distance = centertriangle.dot(centertriangle);
70107184             }
70117185             
70127186             return distance;
....@@ -8181,15 +8355,15 @@
81818355         } //  + super.toString();
81828356     //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
81838357         
8184
-//        if (!Globals.ADVANCED)
8185
-//            return objname;
8358
+        if (!Globals.ADVANCED)
8359
+            return objname;
81868360         
8187
-        return objname + " " + System.identityHashCode(this); // + GetUUID()
8361
+        return objname + " " + System.identityHashCode(this) + " " + GetUUID();
81888362     }
81898363 
81908364     public int hashCode()
81918365     {
8192
-        // Fuck Vector...
8366
+        // Do not use Vector...
81938367         return System.identityHashCode(this);
81948368     }
81958369     
....@@ -8429,8 +8603,8 @@
84298603     private static cVector2 qq2 = new cVector2();
84308604     private static cVector2 rr2 = new cVector2();
84318605     private static cVector2 ss2 = new cVector2();
8432
-    private static cVector edge1 = new cVector();
8433
-    private static cVector edge2 = new cVector();
8606
+//    private static cVector edge1 = new cVector();
8607
+//    private static cVector edge2 = new cVector();
84348608     //private static cVector norm = new cVector();
84358609     /*transient private*/ int hitSomething;
84368610     static final int hitCenter = 1;
....@@ -8628,7 +8802,275 @@
86288802 
86298803         Touch();
86308804     }
8805
+    
8806
+    static Vertex s1 = new Vertex();
8807
+    static Vertex s2 = new Vertex();
8808
+    static Vertex s3 = new Vertex();
86318809 
8810
+    boolean intersectMesh(Ray ray, IntersectResult result)
8811
+    {
8812
+        boolean success = false;
8813
+        
8814
+        if (bRep.stripified)
8815
+        {
8816
+            int[] strips = bRep.getRawIndices();
8817
+            
8818
+                // TRIANGLE STRIP ARRAY
8819
+                if (bRep.trimmed)
8820
+                {
8821
+                    float[] v = bRep.getRawVertices();
8822
+
8823
+                    int count3 = 0;
8824
+
8825
+                    if (v.length > 0)
8826
+                    {
8827
+                        for (int i = 0; i < strips.length; i++)
8828
+                        {
8829
+                            s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
8830
+                            count3 += 3;
8831
+                            
8832
+                            s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
8833
+                            count3 += 3;
8834
+                            
8835
+                            for (int j = 0; j < strips[i] - 2; j++)
8836
+                            {
8837
+                                s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
8838
+                                count3 += 3;
8839
+                                
8840
+                                if (j%2 == 0)
8841
+                                      success |= intersectTriangle(ray, result, s1, s2, s3);
8842
+                                else
8843
+                                      success |= intersectTriangle(ray, result, s1, s3, s2);
8844
+
8845
+                                s1.set(s2);
8846
+                                s2.set(s3);
8847
+                            }
8848
+                        }
8849
+                    }
8850
+
8851
+                    assert count3 == v.length;
8852
+                }
8853
+                else // !trimmed
8854
+                {
8855
+                    int count = 0;
8856
+                    for (int i = 0; i < strips.length; i++)
8857
+                    {
8858
+                        Vertex p = bRep.GetVertex(bRep.indices[count++]);
8859
+                        Vertex q = bRep.GetVertex(bRep.indices[count++]);
8860
+                        
8861
+                        for (int j = 0; j < strips[i] - 2; j++)
8862
+                        {
8863
+                            Vertex r = bRep.GetVertex(bRep.indices[count++]);
8864
+
8865
+                            if (j%2 == 0)
8866
+                                  success |= intersectTriangle(ray, result, p, q, r);
8867
+                            else
8868
+                                  success |= intersectTriangle(ray, result, p, r, q);
8869
+                            
8870
+                            p = q;
8871
+                            q = r;
8872
+                        }
8873
+                    }
8874
+                }
8875
+        } else // catch (Error e)
8876
+        {
8877
+            int facecount = bRep.FaceCount();
8878
+            for (int i = 0; i < facecount; i++)
8879
+            {
8880
+                Face face = bRep.GetFace(i);
8881
+
8882
+                Vertex p = bRep.GetVertex(face.p);
8883
+                Vertex q = bRep.GetVertex(face.q);
8884
+                Vertex r = bRep.GetVertex(face.r);
8885
+
8886
+                success |= intersectTriangle(ray, result, p, q, r);
8887
+            }
8888
+        }
8889
+        
8890
+        return success;
8891
+    }
8892
+    
8893
+    static cVector eye = new cVector();
8894
+    static cVector dir = new cVector();
8895
+    
8896
+    transient BBox bbox = null;
8897
+    
8898
+    boolean intersect(Ray ray, IntersectResult result)
8899
+    {
8900
+        double eyex = ray.eyePoint.x;
8901
+        double eyey = ray.eyePoint.y;
8902
+        double eyez = ray.eyePoint.z;
8903
+        
8904
+        double dirx = ray.viewDirection.x;
8905
+        double diry = ray.viewDirection.y;
8906
+        double dirz = ray.viewDirection.z;
8907
+        
8908
+        if (this.fromParent != null && !(this instanceof TextureNode))
8909
+        {
8910
+            eye.x = eyex;
8911
+            eye.y = eyey;
8912
+            eye.z = eyez;
8913
+            dir.x = dirx;
8914
+            dir.y = diry;
8915
+            dir.z = dirz;
8916
+            
8917
+            LA.xformPos(eye, this.fromParent, eye);
8918
+            LA.xformDir(dir, this.fromParent, dir);
8919
+            
8920
+            ray.eyePoint.x = eye.x;
8921
+            ray.eyePoint.y = eye.y;
8922
+            ray.eyePoint.z = eye.z;
8923
+
8924
+            ray.viewDirection.x = dir.x;
8925
+            ray.viewDirection.y = dir.y;
8926
+            ray.viewDirection.z = dir.z;
8927
+        }
8928
+        
8929
+        boolean success = false;
8930
+        
8931
+        boolean touch = false;
8932
+        
8933
+        if (bRep != null && Link2Support())
8934
+        {
8935
+            if (bbox == null)
8936
+            {
8937
+                bbox = new BBox();
8938
+                
8939
+                cVector min = new cVector();
8940
+                cVector max = new cVector();
8941
+                
8942
+                this.getBounds(min, max, true);
8943
+                
8944
+                bbox.min.x = min.x;
8945
+                bbox.min.y = min.y;
8946
+                bbox.min.z = min.z;
8947
+                
8948
+                bbox.max.x = max.x;
8949
+                bbox.max.y = max.y;
8950
+                bbox.max.z = max.z;
8951
+            }
8952
+            
8953
+            if (true) // NOT WORKING bbox.intersect(ray, result))
8954
+            {
8955
+                success |= intersectMesh(ray, result);
8956
+            }
8957
+            else
8958
+            {
8959
+                //this.hide = true;
8960
+                touch = true;
8961
+            }
8962
+        }
8963
+        
8964
+        for (int i=0; i<size(); i++)
8965
+        {
8966
+            Object3D child = (Object3D) reserve(i);
8967
+            
8968
+            if (child == null)
8969
+                continue;
8970
+
8971
+            success |= child.intersect(ray, result);
8972
+            release(i);
8973
+        }
8974
+        
8975
+        ray.eyePoint.x = eyex;
8976
+        ray.eyePoint.y = eyey;
8977
+        ray.eyePoint.z = eyez;
8978
+        
8979
+        ray.viewDirection.x = dirx;
8980
+        ray.viewDirection.y = diry;
8981
+        ray.viewDirection.z = dirz;
8982
+        
8983
+//        if (touch)
8984
+//            this.Touch(); // refresh display list
8985
+            
8986
+        return success;
8987
+    }
8988
+
8989
+    static Vector3d edge1 = new Vector3d();
8990
+    static Vector3d edge2 = new Vector3d();
8991
+    static Vector3d P = new Vector3d();
8992
+    static Vector3d T = new Vector3d();
8993
+    static Vector3d Q = new Vector3d();
8994
+    
8995
+    private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
8996
+    {
8997
+        if (false)
8998
+        {
8999
+            result.t = 0;
9000
+            return true;
9001
+        }
9002
+        
9003
+        /*
9004
+        Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
9005
+        
9006
+        Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
9007
+         */
9008
+
9009
+        // Calculate edges of the triangle
9010
+        edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
9011
+        edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
9012
+
9013
+        // Calculate the determinant (U parameter)
9014
+        P.cross(ray.viewDirection, edge2);
9015
+        double det = edge1.dot(P);
9016
+
9017
+        if (det > -1e-9 && det < 1e-9)
9018
+        {
9019
+            return false;
9020
+        }	// Ray lies in plane of triangle
9021
+
9022
+        double invDet = 1 / det;
9023
+
9024
+        // Calculate distance from vertex1 to ray origin
9025
+        T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
9026
+
9027
+        double U = (T.dot(P)) * invDet;	// Calculate U parameter
9028
+
9029
+        if (U < 0.f || U > 1.f)
9030
+        {
9031
+            return false;
9032
+        }	// Intersection lies outside of the triangle
9033
+
9034
+        // Calculate V parameter
9035
+        Q.cross(T, edge1);
9036
+
9037
+        double V = ray.viewDirection.dot(Q) * invDet;
9038
+
9039
+        if (V < 0.f || (U + V) > 1.f)
9040
+        {
9041
+            return false;
9042
+        }	// Intersection lies outside of the triangle
9043
+
9044
+        double t = edge2.dot(Q) * invDet;
9045
+
9046
+        if (t > 1e-9)	// Triangle and ray intersects
9047
+        {
9048
+            //result.isIntersected = true;
9049
+            //result.id = id;
9050
+
9051
+            if (false) // isShadow)
9052
+            {
9053
+                result.t = t;
9054
+                return true;
9055
+            } else if (t < result.t)
9056
+            {
9057
+                result.object = this;
9058
+
9059
+                result.t = t;
9060
+
9061
+                //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
9062
+                //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
9063
+                //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
9064
+
9065
+                result.n.cross(edge1, edge2);
9066
+                result.n.normalize();
9067
+            }
9068
+            
9069
+            return true;
9070
+        }
9071
+        
9072
+        return false;
9073
+    }
86329074 
86339075     public int Size()
86349076     {