blame | history | patch | commit | commitdiff
Normand Briere
2019-10-01 e8908d5b90d44e43b9da885bc0202fb665a912d0 
 Object3D.java
....@@ -25,21 +25,112 @@
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
+    int tabIndex;
45
+    
4146     ScriptNode scriptnode;
4247 
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
+    }
119
+
120
+    int VersionCount()
121
+    {
122
+        int count = 0;
123
+        
124
+        if (versionlist != null)
125
+            for (int i = versionlist.length; --i >= 0;)
126
+            {
127
+                if (versionlist[i] != null)
128
+                    count++;
129
+            }
130
+        
131
+        return count;
132
+    }
133
+    
43134         void InitOthers()
44135         {
45136                 if (projectedVertices == null || projectedVertices.length <= 2)
....@@ -51,6 +142,7 @@
51142                     projectedVertices[i] = new cVector2(); // Others
52143                 }
53144                 projectedVertices[0].x = 100; // bump
145
+                projectedVertices[1].y = 1000; // punchthrough. only for png
54146         }
55147 
56148     void MinMax(cVector minima, cVector maxima)
....@@ -130,7 +222,7 @@
130222             return;
131223 
132224         transientsupport = support;
133
-        transientlink2master = link2master;
225
+        transientlink2master = Link2Support();
134226 
135227         support = null;
136228         link2master = false;
....@@ -177,9 +269,42 @@
177269         }
178270     }
179271 
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
+
180300     void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
181301     {
302
+        if (blockloop)
303
+            return;
304
+
182305         Object3D o;
306
+        
307
+        boolean isnew = false;
183308         
184309         if (hashtable.containsKey(GetUUID()))
185310         {
....@@ -193,12 +318,14 @@
193318         }
194319         else
195320         {
321
+            isnew = true;
322
+            
196323             o = new Object3D("copy of " + this.name);
197324 
198325             hashtable.put(GetUUID(), o);
199326         }
200327 
201
-        if (!blockloop)
328
+        //if (!blockloop)
202329         {
203330             blockloop = true;
204331 
....@@ -209,12 +336,15 @@
209336 
210337             blockloop = false;
211338         }
212
-        
213
-        ExtractBigData(o);
339
+
340
+        //if (isnew)
341
+            ExtractBigData(o);
214342     }
215343 
216344     void ExtractBigData(Object3D o)
217345     {
346
+        //System.err.println("ExtractBigData : " + this + " --> " + o);
347
+        
218348         if (o.bRep != null)
219349             Grafreed.Assert(o.bRep == this.bRep);
220350         
....@@ -225,8 +355,8 @@
225355 //            o.bRep.support = null;
226356 //        }
227357         o.selection = this.selection;
228
-        o.versionlist = this.versionlist;
229
-        o.versionindex = this.versionindex;
358
+        //o.versionlist = this.versionlist;
359
+        //o.versionindex = this.versionindex;
230360         
231361         if (this.support != null)
232362         {
....@@ -318,15 +448,15 @@
318448 
319449     void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
320450     {
451
+        if (blockloop)
452
+            return;
453
+
321454         if (!hashtable.containsKey(GetUUID()))
322455             return;
323456 
324457         Object3D o = hashtable.get(GetUUID());
325458 
326459         RestoreBigData(o);
327
-
328
-        if (blockloop)
329
-            return;
330460 
331461         blockloop = true;
332462 
....@@ -342,6 +472,9 @@
342472 
343473     void RestoreBigData(Object3D o)
344474     {
475
+        //System.err.println("RestoreBigData : " + this + " <-- " + o);
476
+        Grafreed.Assert(this.bRep == null);
477
+        
345478         this.bRep = o.bRep;
346479         if (this.support != null && o.transientrep != null)
347480         {
....@@ -350,8 +483,8 @@
350483         
351484         this.selection = o.selection;
352485         
353
-        this.versionlist = o.versionlist;
354
-        this.versionindex = o.versionindex;
486
+        //this.versionlist = o.versionlist;
487
+        //this.versionindex = o.versionindex;
355488 // July 2019        if (this.bRep != null)
356489 //            this.bRep.support = o.transientrep;
357490     //    this.support = o.support;
....@@ -502,7 +635,10 @@
502635     transient boolean keepdontselect;
503636     boolean dontselect = false;
504637     boolean hide = false;
505
-    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
+    
506642     boolean marked = false; // animation node
507643     boolean skip = false; // centroid issue
508644     boolean skipmocap = false; // mocap data
....@@ -510,6 +646,9 @@
510646     boolean random = false;
511647     boolean speedup = false;
512648     boolean rewind = false;
649
+    
650
+    // Option to sort triangles, e.g. for transparency.
651
+    boolean sort = false;
513652     
514653     float NORMALPUSH = 0;
515654     
....@@ -528,7 +667,7 @@
528667         {
529668             sorted = true;
530669             
531
-            for (int i=0; i<size()-1; i++)
670
+            for (int i=0; i<Size()-1; i++)
532671             {
533672                 Object3D obji = get(i);
534673                 Object3D objj = get(i+1);
....@@ -552,7 +691,7 @@
552691         {
553692             sorted = true;
554693             
555
-            for (int i=0; i<size()-1; i++)
694
+            for (int i=0; i<Size()-1; i++)
556695             {
557696                 Object3D obji = get(i);
558697                 Object3D objj = get(i+1);
....@@ -568,11 +707,11 @@
568707         }
569708     }
570709     
571
-    int memorysize;
710
+    transient int memorysize; // needs to be transient, dunno why
572711     
573712     int MemorySize()
574713     {
575
-        if (true) // memorysize == 0)
714
+        if (memorysize == 0)
576715         {
577716             try
578717             {
....@@ -687,7 +826,7 @@
687826         {
688827             if (maxcount != 1)
689828             {
690
-                new Exception().printStackTrace();
829
+                //new Exception().printStackTrace();
691830             }
692831             
693832             toParentMarked = LA.newMatrix();
....@@ -889,7 +1028,7 @@
8891028     
8901029     void Step()
8911030     {
892
-        // marde pour serialization de Texture
1031
+        // patch pour serialization de Texture
8931032         resetmaxcount();
8941033         resettransformcount();
8951034         resetstep();
....@@ -1082,24 +1221,28 @@
10821221     {
10831222 //        return true;
10841223         
1085
-        if (material == null || material.multiply)
1086
-            return true;
1224
+//        if (material == null || material.multiply)
1225
+//            return true;
1226
+//        
1227
+//        if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1228
+//            return false;
1229
+//        
1230
+//        // Transparent objects are dynamic because we have to sort the triangles.
1231
+//        return material.opacity > 0.99;
10871232         
1088
-        if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1089
-            return false;
1090
-        
1091
-        // Transparent objects are dynamic because we have to sort the triangles.
1092
-        return material.opacity > 0.99;
1233
+        return !sort;
10931234     }
10941235     
10951236     boolean IsOpaque()
10961237     {
10971238 //        return true;
10981239         
1099
-        if (material == null || material.multiply)
1100
-            return true;
1240
+//        if (material == null || material.multiply)
1241
+//            return true;
1242
+//        
1243
+//        return material.opacity > 0.99;
11011244         
1102
-        return material.opacity > 0.99;
1245
+        return !sort;
11031246     }
11041247     
11051248     Object3D()
....@@ -1177,8 +1320,10 @@
11771320 
11781321         // will share the geometry
11791322         assert (!(this instanceof Composite));
1180
-        return deepCopy(); // Never called for Composite
1181
-
1323
+        
1324
+        Object3D obj = deepCopy(); // Never called for Composite
1325
+        obj.count = 2;
1326
+        return obj;
11821327     }
11831328 
11841329     boolean HasLoops()
....@@ -1186,6 +1331,30 @@
11861331         return false;
11871332     }
11881333     
1334
+    void ResetUUIDs()
1335
+    {
1336
+        if (blockloop)
1337
+        {
1338
+            return;
1339
+        }
1340
+
1341
+        this.uuid = null;
1342
+        
1343
+        blockloop = true;
1344
+
1345
+        for (int i = 0; i < Size(); i++)
1346
+        {
1347
+            Object3D obj = (Object3D) Children().get(i);
1348
+
1349
+            if (obj != null)
1350
+            {
1351
+                obj.ResetUUIDs();
1352
+            }
1353
+        }
1354
+
1355
+        blockloop = false;
1356
+    }
1357
+
11891358     boolean IsInfinite()
11901359     {
11911360         if (blockloop)
....@@ -1256,78 +1425,16 @@
12561425             return;
12571426         
12581427         blockloop = true;
1428
+        
1429
+        other.parent = parent;
1430
+        
12591431         //System.out.println("COPY " + this + " to " + other);
12601432         //new Exception().printStackTrace();
1433
+        deepCopyNode(other);
12611434 
1262
-        other.parent = parent;
1263
-        if (toParent != null)
1264
-        {
1265
-            other.toParent = LA.newMatrix();
1266
-            other.fromParent = LA.newMatrix();
1267
-            LA.matCopy(toParent, other.toParent);
1268
-            LA.matCopy(fromParent, other.fromParent);
1269
-            if (toParentMarked != null)
1270
-            {
1271
-                other.toParentMarked = LA.newMatrix();
1272
-                other.fromParentMarked = LA.newMatrix();
1273
-                LA.matCopy(toParentMarked, other.toParentMarked);
1274
-                LA.matCopy(fromParentMarked, other.fromParentMarked);
1275
-            }
1276
-        }
1277
-        else
1278
-        {
1279
-            if (other.toParent == null)
1280
-//                assert(other.toParent == null);
1281
-//                new Exception().printStackTrace();
1282
-                System.err.println("null parent: " + other);
1283
-        }
1284
-        /*
1285
-        double ident[][] = LA.newMatrix();
1286
-        if (bRep == null)
1287
-        other.bRep = null;
1288
-        else
1289
-        other.bRep = new BoundaryRep(bRep, ident);
1290
-         */
1291
-        // Really new...
12921435         other.bRep = bRep; // Share the geometry
12931436         
12941437         other.support = support; // Share the support
1295
-
1296
-        //other.editWindow = null;
1297
-        if (name == null)
1298
-            other.name = null;
1299
-        else
1300
-            other.name = new String(name);
1301
-
1302
-        if (material != null)
1303
-        {
1304
-            other.material = new cMaterial(material);
1305
-        } else
1306
-        {
1307
-            other.material = null;
1308
-        }
1309
-
1310
-        other.GetTextures().name = GetTextures().name;
1311
-        
1312
-        CopyExtraMaterial(other);
1313
-        
1314
-        other.touched = touched;
1315
-        other.softtouched = softtouched;
1316
-        
1317
-        other.random = random;
1318
-        other.link2master = link2master;
1319
-        other.transformcount = transformcount;
1320
-        other.marked = marked;
1321
-        other.skip = skip;
1322
-        other.count = count;
1323
-        other.flipV = flipV;
1324
-        other.live = live;
1325
-        other.rewind = rewind;
1326
-        other.hide = hide;
1327
-        other.texres = texres;
1328
-        other.speedup = speedup;
1329
-        other.height = height;
1330
-        other.depth = depth;
13311438 
13321439 // aout 2013        if (/*displaylist != -1 &&*/other.displaylist != displaylist)
13331440 //        {
....@@ -1383,17 +1490,24 @@
13831490         if ((mask & GEOMETRY) != 0)
13841491         {
13851492             if (bRep != null)
1386
-                bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
1387
-            else
1388
-                assert(other.bRep == null);
1389
-            
1390
-            if (bRep != null)
13911493             {
1494
+                bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
13921495                 CameraPane.RemoveList(bRep.displaylist);
13931496                 bRep.displaylist = 0; // june 2013 -1;
13941497             }
13951498             else
1396
-                bRep = bRep;
1499
+            {
1500
+                //assert(other.bRep == null);
1501
+                bRep = other.bRep;
1502
+            }
1503
+            
1504
+//            if (bRep != null)
1505
+//            {
1506
+//                CameraPane.RemoveList(bRep.displaylist);
1507
+//                bRep.displaylist = 0; // june 2013 -1;
1508
+//            }
1509
+//            else
1510
+//                bRep = bRep;
13971511         }
13981512             
13991513         /* Use a MASK = GEO/MAT
....@@ -2369,11 +2483,6 @@
23692483             
23702484             InitOthers();
23712485             
2372
-            if (this instanceof Camera)
2373
-            {
2374
-                material.shift = 90;
2375
-            }
2376
-
23772486             material.multiply = multiply;
23782487             
23792488             if (multiply)
....@@ -3194,7 +3303,10 @@
31943303     {
31953304         if (bRep != null)
31963305         {
3306
+            //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
31973307             bRep.GenerateNormals(crease);
3308
+            if (!bRep.trimmed)
3309
+                bRep.MergeNormals();
31983310             Touch();
31993311         }
32003312     }
....@@ -3269,6 +3381,105 @@
32693381     blockloop = false;
32703382 }
32713383             
3384
+    public void ResetTransform(int mask)
3385
+    {
3386
+        Object3D obj = this;
3387
+        
3388
+        if (mask == -1)
3389
+        {
3390
+            if (obj instanceof Camera) // jan 2014
3391
+            {
3392
+                LA.matIdentity(obj.toParent);
3393
+                LA.matIdentity(obj.fromParent);
3394
+            }
3395
+            else
3396
+            {
3397
+                obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3398
+                obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3399
+            }
3400
+            return;
3401
+        }
3402
+        
3403
+        if ((mask&2) != 0) // Scale/rotation
3404
+        {
3405
+            obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3406
+            obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3407
+            obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3408
+            obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3409
+            obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3410
+            obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3411
+        }
3412
+        if ((mask&1) != 0) // Translation
3413
+        {
3414
+            if (obj.toParent != null)
3415
+            {
3416
+                obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3417
+                obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3418
+            }
3419
+        }
3420
+    }
3421
+    
3422
+    public void Scale(int scale)
3423
+    {
3424
+        Object3D obj = this;
3425
+        
3426
+        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
3427
+        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3428
+        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3429
+        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
3430
+        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3431
+        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3432
+    }
3433
+    
3434
+    public void TextureRatioTransform(int axis)
3435
+    {
3436
+        cTexture tex = GetTextures();
3437
+
3438
+        com.sun.opengl.util.texture.TextureData texturedata = null;
3439
+
3440
+        try
3441
+        {
3442
+            texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
3443
+        }
3444
+        catch (Exception e)
3445
+        {
3446
+            System.err.println("FAIL TextureRatio: " + this);
3447
+        }
3448
+        
3449
+        LA.matIdentity(Object3D.mat);
3450
+        Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
3451
+
3452
+        if (toParent == null)
3453
+        {
3454
+            toParent = LA.newMatrix();
3455
+            fromParent = LA.newMatrix();
3456
+        }
3457
+
3458
+        ResetTransform(2);
3459
+        
3460
+        LA.matConcat(Object3D.mat, fromParent, fromParent);
3461
+        LA.matInvert(fromParent, toParent);
3462
+    }
3463
+
3464
+    void TextureRatio(int axis)
3465
+    {
3466
+        if (blockloop)
3467
+            return;
3468
+
3469
+        blockloop = true;
3470
+        
3471
+        TextureRatioTransform(axis);
3472
+        
3473
+        for (int i=Size(); --i>=0;)
3474
+        {
3475
+            Object3D v = get(i);
3476
+
3477
+            v.TextureRatio(axis);
3478
+        }
3479
+
3480
+        blockloop = false;
3481
+    }
3482
+
32723483     void TransformChildren()
32733484     {
32743485         if (toParent != null)
....@@ -3511,6 +3722,7 @@
35113722         if (bRep != null)
35123723         {
35133724             //bRep.RemoveOneTriangle();
3725
+        System.out.println();
35143726         System.out.println("Reducing " + this);
35153727         if (name != null && name.contains("lockpickstraps"))
35163728             name = name;
....@@ -3841,6 +4053,7 @@
38414053     
38424054     void RevertMeshes()
38434055     {
4056
+        // BLOCKLOOP
38444057         if (this instanceof cMesh)
38454058         {
38464059             ((cMesh)this).Revert();
....@@ -3871,11 +4084,6 @@
38714084             Touch();
38724085         }
38734086         
3874
-        ResetRecur();
3875
-    }
3876
-    
3877
-    void ResetRecur()
3878
-    {
38794087         for (int i = 0; i < size(); i++)
38804088         {
38814089             Object3D child = (Object3D) get(i); // reserve(i);
....@@ -3898,11 +4106,6 @@
38984106         Step();
38994107         Touch();
39004108         
3901
-        StepRecur();
3902
-    }
3903
-    
3904
-    void StepRecur()
3905
-    {
39064109         for (int i = 0; i < size(); i++)
39074110         {
39084111             Object3D child = (Object3D) get(i); // reserve(i);
....@@ -4089,8 +4292,8 @@
40894292         Touch();
40904293     }
40914294     
4092
-    transient cVector min = new cVector();
4093
-    transient cVector max = new cVector();
4295
+    transient cVector min;
4296
+    transient cVector max;
40944297     
40954298     void getBounds(cVector minima, cVector maxima, boolean xform)
40964299     {
....@@ -4106,15 +4309,15 @@
41064309         if (blockloop)
41074310             return;
41084311         
4109
-        if (min == null) // ???
4312
+        if (min == null)
41104313         {
41114314             min = new cVector();
41124315             max = new cVector();
41134316         }
41144317         
4115
-        for (int i = 0; i<size(); i++)
4318
+        for (int i = 0; i<Size(); i++)
41164319         {
4117
-            Object3D child = (Object3D) reserve(i);
4320
+            Object3D child = (Object3D) get(i); //reserve(i);
41184321             if (child == null)
41194322                 continue;
41204323             
....@@ -4133,21 +4336,21 @@
41334336             if (child.hide && !(child instanceof Merge) || child.skip)
41344337             //if (child.hide)
41354338             {
4136
-                release(i);
4339
+                //release(i);
41374340                 continue;
41384341             }
41394342             
41404343                 blockloop = true;
41414344             child.getBounds(min, max, true); // xform);
41424345                 blockloop = false;
4143
-            release(i);
4346
+            //release(i);
41444347             
41454348             MinMax(minima, maxima);
41464349         }
41474350         
41484351         if (bRep != null)
41494352         {
4150
-            bRep.getBounds(minima,maxima,this);
4353
+            bRep.getBounds(minima, maxima, xform?this:null);
41514354         }
41524355 
41534356         if (false) // xform)
....@@ -5956,7 +6159,7 @@
59566159     boolean NeedSupport()
59576160     {
59586161         return
5959
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
6162
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /*live &&*/ support != null
59606163                  // PROBLEM with CROWD!!
59616164                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
59626165     }
....@@ -5974,6 +6177,20 @@
59746177         return parent.IsLive();
59756178     }
59766179     
6180
+    boolean IsDynamic()
6181
+    {
6182
+        return live && bRep != null;
6183
+    }
6184
+    
6185
+    boolean Link2Support()
6186
+    {
6187
+        return link2master || link2support;
6188
+    }
6189
+    
6190
+    static cVector minima = new cVector();
6191
+    static cVector maxima = new cVector();
6192
+    static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
6193
+    
59776194     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
59786195     {
59796196         Invariants(); // june 2013
....@@ -5981,6 +6198,29 @@
59816198         if (support != null)
59826199         {
59836200         //    System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
6201
+        }
6202
+        
6203
+        if (live && Link2Support() && support == null && !this.marked) // project on ground
6204
+        {
6205
+            getBounds(minima, maxima, true);
6206
+            center.x = (minima.x + maxima.x) / 2;
6207
+            center.y = 10000; // (minima.y + maxima.y) / 2;
6208
+            center.z = (minima.z + maxima.z) / 2;
6209
+
6210
+            Ray ray = new Ray(center, new Vector3d(0,-1,0));
6211
+
6212
+            IntersectResult res = new IntersectResult();
6213
+            res.t = Double.POSITIVE_INFINITY;
6214
+
6215
+            if (Grafreed.grafreed.universe.intersect(ray, res))
6216
+            {
6217
+                double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
6218
+                double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
6219
+                double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
6220
+                
6221
+                LA.matTranslate(toParent, 0, resy - minima.y, 0);
6222
+                LA.matInvert(toParent, fromParent);
6223
+            }
59846224         }
59856225         
59866226         if (display.DrawMode() == iCameraPane.SELECTION &&
....@@ -6034,7 +6274,8 @@
60346274         if (support != null)
60356275             support = support;
60366276         
6037
-        boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6277
+        boolean usecalllists = !IsDynamic() &&
6278
+                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
60386279         //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
60396280         
60406281         //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
....@@ -6045,7 +6286,8 @@
60456286             bRep.displaylist = 0;
60466287         }
60476288    //     usecalllists &= !(parent instanceof RandomNode);
6048
-   //     usecalllists = false;
6289
+        if (CameraPane.BOXMODE) // Too dynamic
6290
+            usecalllists = false;
60496291 
60506292         if (display.DrawMode() == display.SHADOW)
60516293             //GetBRep() != null)
....@@ -6101,8 +6343,8 @@
61016343             Globals.lighttouched = true; // all panes...
61026344         }
61036345 
6104
-        touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
6105
-        //touched = false;
6346
+        //touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
6347
+        touched = false;
61066348 
61076349         if (this instanceof Texture || this instanceof TextureNode)
61086350         {
....@@ -6141,7 +6383,7 @@
61416383         {
61426384             if (display.DrawMode() == iCameraPane.SHADOW)
61436385             {
6144
-                if (!link2master // tricky to cull in shadow mode.
6386
+                if (!Link2Support() // tricky to cull in shadow mode.
61456387                          && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
61466388                 {
61476389                     //System.out.print("CULLED");
....@@ -6203,6 +6445,20 @@
62036445             {
62046446                 drawSelf(display, root, selected, blocked);
62056447             }
6448
+            
6449
+//            if (!(this instanceof Composite))
6450
+//            {
6451
+//                for (int i = 0; i < size(); i++)
6452
+//                {
6453
+//                    Object3D child = (Object3D) reserve(i);
6454
+//                    if (child == null)
6455
+//                        continue;
6456
+//
6457
+//                    child.draw(display, root, selected, blocked);
6458
+//
6459
+//                    release(i);
6460
+//                }
6461
+//            }
62066462         } else
62076463         {
62086464             /*
....@@ -6235,13 +6491,14 @@
62356491     boolean failedPigment = false;
62366492     boolean failedBump = false;
62376493     
6494
+    CameraPane.lastObject = this;
62386495     try
62396496     {
62406497         display.BindPigmentTexture(tex, texres);
62416498     }
62426499     catch (Exception e)
62436500     {
6244
-        System.err.println("FAILED: " + this);
6501
+    //    System.err.println("FAILED: " + this);
62456502         failedPigment = true;
62466503     }
62476504            
....@@ -6272,6 +6529,20 @@
62726529                         display.CallList(bRep.displaylist);
62736530 // june 2013            drawSelf(display, root, selected);
62746531                     }
6532
+                }
6533
+                
6534
+                assert (!(this instanceof Composite));
6535
+                {
6536
+// CRASH MOCAP!!                   for (int i = 0; i < size(); i++)
6537
+//                    {
6538
+//                        Object3D child = (Object3D) reserve(i);
6539
+//                        if (child == null)
6540
+//                            continue;
6541
+//
6542
+//                        child.draw(display, root, selected, blocked);
6543
+//
6544
+//                        release(i);
6545
+//                    }
62756546                 }
62766547             }
62776548 
....@@ -6325,16 +6596,17 @@
63256596 
63266597     void CallList(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
63276598     {
6328
-        if (GetBRep() == null)
6329
-        {
6330
-            drawSelf(display, root, selected, blocked);
6331
-        } else
6599
+        if (GetBRep() != null)
63326600         {
63336601             DrawNode(display, root, selected);
63346602             if (this instanceof BezierPatch)
63356603             {
63366604                 //drawSelf(display, root, selected);
63376605             }
6606
+        }
6607
+        else
6608
+        {
6609
+            drawSelf(display, root, selected, blocked);
63386610         }
63396611     }
63406612 
....@@ -6584,7 +6856,7 @@
65846856 
65856857         //javax.media.opengl.GL gl = display.GetGL();
65866858 
6587
-        if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
6859
+        if (CameraPane.BOXMODE && !Link2Support()) //selected) // || CameraPane.movingcamera)
65886860         {
65896861             int fc = bRep.FaceCount();
65906862             int vc = bRep.VertexCount();
....@@ -6746,7 +7018,7 @@
67467018                         facescompare[k] = new FaceCompare(k);
67477019                     }
67487020                     
6749
-                    center = new cVector();
7021
+                    centertriangle = new cVector();
67507022                 }
67517023                 else
67527024                 {
....@@ -6869,7 +7141,7 @@
68697141          */
68707142     }
68717143 
6872
-    transient cVector center;
7144
+    transient cVector centertriangle;
68737145     
68747146     class FaceCompare implements Comparable
68757147     {
....@@ -6898,14 +7170,14 @@
68987170                 Vertex q = bRep.GetVertex(face.q);
68997171                 Vertex r = bRep.GetVertex(face.r);
69007172 
6901
-                center.set(p);
6902
-                center.add(q);
6903
-                center.add(r);
6904
-                center.mul(1.0/3);
7173
+                centertriangle.set(p);
7174
+                centertriangle.add(q);
7175
+                centertriangle.add(r);
7176
+                centertriangle.mul(1.0/3);
69057177                 
6906
-                center.sub(Globals.theRenderer.EyeCamera().location);
7178
+                centertriangle.sub(Globals.theRenderer.EyeCamera().location);
69077179                 
6908
-                distance = center.dot(center);
7180
+                distance = centertriangle.dot(centertriangle);
69097181             }
69107182             
69117183             return distance;
....@@ -7716,7 +7988,9 @@
77167988                 
77177989                 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
77187990                 
7719
-                if (modified || opposite)
7991
+                // Modified could snap
7992
+                if (//modified ||
7993
+                        opposite)
77207994                 {
77217995                     //assert(false);
77227996                             /*
....@@ -7810,7 +8084,7 @@
78108084 
78118085                 if (modified)
78128086                 {
7813
-                    // Rotate 90 degrees
8087
+                    // Rotate 45 degrees
78148088                     angle /= (Math.PI / 4);
78158089                     angle = Math.floor(angle + 0.5);
78168090                     angle *= (Math.PI / 4);
....@@ -7896,7 +8170,7 @@
78968170                     case 3: // '\001'
78978171                         if (modified || opposite)
78988172                         {
7899
-                            if (modified && opposite)
8173
+                            if (modified) // && opposite)
79008174                                 LA.matScale(toParent, totalScale, totalScale, totalScale);
79018175                             else
79028176                             //LA.matScale(toParent, 1, hScale, vScale);
....@@ -7912,7 +8186,7 @@
79128186                     case 2: // '\002'
79138187                         if (modified || opposite)
79148188                         {
7915
-                            if (modified && opposite)
8189
+                            if (modified) // && opposite)
79168190                                 LA.matScale(toParent, totalScale, totalScale, totalScale);
79178191                             else
79188192                                 //LA.matScale(toParent, hScale, 1, vScale);
....@@ -7926,7 +8200,7 @@
79268200                     case 1: // '\003'
79278201                         if (modified || opposite)
79288202                         {
7929
-                            if (modified && opposite)
8203
+                            if (modified) // && opposite)
79308204                                 LA.matScale(toParent, totalScale, totalScale, totalScale);
79318205                             else
79328206                                 //LA.matScale(toParent, hScale, vScale, 1);
....@@ -8081,12 +8355,12 @@
80818355         if (!Globals.ADVANCED)
80828356             return objname;
80838357         
8084
-        return objname + " " + System.identityHashCode(this);
8358
+        return objname + " " + System.identityHashCode(this) + " " + GetUUID();
80858359     }
80868360 
80878361     public int hashCode()
80888362     {
8089
-        // Fuck Vector...
8363
+        // Do not use Vector...
80908364         return System.identityHashCode(this);
80918365     }
80928366     
....@@ -8326,8 +8600,8 @@
83268600     private static cVector2 qq2 = new cVector2();
83278601     private static cVector2 rr2 = new cVector2();
83288602     private static cVector2 ss2 = new cVector2();
8329
-    private static cVector edge1 = new cVector();
8330
-    private static cVector edge2 = new cVector();
8603
+//    private static cVector edge1 = new cVector();
8604
+//    private static cVector edge2 = new cVector();
83318605     //private static cVector norm = new cVector();
83328606     /*transient private*/ int hitSomething;
83338607     static final int hitCenter = 1;
....@@ -8525,7 +8799,275 @@
85258799 
85268800         Touch();
85278801     }
8802
+    
8803
+    static Vertex s1 = new Vertex();
8804
+    static Vertex s2 = new Vertex();
8805
+    static Vertex s3 = new Vertex();
85288806 
8807
+    boolean intersectMesh(Ray ray, IntersectResult result)
8808
+    {
8809
+        boolean success = false;
8810
+        
8811
+        if (bRep.stripified)
8812
+        {
8813
+            int[] strips = bRep.getRawIndices();
8814
+            
8815
+                // TRIANGLE STRIP ARRAY
8816
+                if (bRep.trimmed)
8817
+                {
8818
+                    float[] v = bRep.getRawVertices();
8819
+
8820
+                    int count3 = 0;
8821
+
8822
+                    if (v.length > 0)
8823
+                    {
8824
+                        for (int i = 0; i < strips.length; i++)
8825
+                        {
8826
+                            s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
8827
+                            count3 += 3;
8828
+                            
8829
+                            s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
8830
+                            count3 += 3;
8831
+                            
8832
+                            for (int j = 0; j < strips[i] - 2; j++)
8833
+                            {
8834
+                                s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
8835
+                                count3 += 3;
8836
+                                
8837
+                                if (j%2 == 0)
8838
+                                      success |= intersectTriangle(ray, result, s1, s2, s3);
8839
+                                else
8840
+                                      success |= intersectTriangle(ray, result, s1, s3, s2);
8841
+
8842
+                                s1.set(s2);
8843
+                                s2.set(s3);
8844
+                            }
8845
+                        }
8846
+                    }
8847
+
8848
+                    assert count3 == v.length;
8849
+                }
8850
+                else // !trimmed
8851
+                {
8852
+                    int count = 0;
8853
+                    for (int i = 0; i < strips.length; i++)
8854
+                    {
8855
+                        Vertex p = bRep.GetVertex(bRep.indices[count++]);
8856
+                        Vertex q = bRep.GetVertex(bRep.indices[count++]);
8857
+                        
8858
+                        for (int j = 0; j < strips[i] - 2; j++)
8859
+                        {
8860
+                            Vertex r = bRep.GetVertex(bRep.indices[count++]);
8861
+
8862
+                            if (j%2 == 0)
8863
+                                  success |= intersectTriangle(ray, result, p, q, r);
8864
+                            else
8865
+                                  success |= intersectTriangle(ray, result, p, r, q);
8866
+                            
8867
+                            p = q;
8868
+                            q = r;
8869
+                        }
8870
+                    }
8871
+                }
8872
+        } else // catch (Error e)
8873
+        {
8874
+            int facecount = bRep.FaceCount();
8875
+            for (int i = 0; i < facecount; i++)
8876
+            {
8877
+                Face face = bRep.GetFace(i);
8878
+
8879
+                Vertex p = bRep.GetVertex(face.p);
8880
+                Vertex q = bRep.GetVertex(face.q);
8881
+                Vertex r = bRep.GetVertex(face.r);
8882
+
8883
+                success |= intersectTriangle(ray, result, p, q, r);
8884
+            }
8885
+        }
8886
+        
8887
+        return success;
8888
+    }
8889
+    
8890
+    static cVector eye = new cVector();
8891
+    static cVector dir = new cVector();
8892
+    
8893
+    transient BBox bbox = null;
8894
+    
8895
+    boolean intersect(Ray ray, IntersectResult result)
8896
+    {
8897
+        double eyex = ray.eyePoint.x;
8898
+        double eyey = ray.eyePoint.y;
8899
+        double eyez = ray.eyePoint.z;
8900
+        
8901
+        double dirx = ray.viewDirection.x;
8902
+        double diry = ray.viewDirection.y;
8903
+        double dirz = ray.viewDirection.z;
8904
+        
8905
+        if (this.fromParent != null && !(this instanceof TextureNode))
8906
+        {
8907
+            eye.x = eyex;
8908
+            eye.y = eyey;
8909
+            eye.z = eyez;
8910
+            dir.x = dirx;
8911
+            dir.y = diry;
8912
+            dir.z = dirz;
8913
+            
8914
+            LA.xformPos(eye, this.fromParent, eye);
8915
+            LA.xformDir(dir, this.fromParent, dir);
8916
+            
8917
+            ray.eyePoint.x = eye.x;
8918
+            ray.eyePoint.y = eye.y;
8919
+            ray.eyePoint.z = eye.z;
8920
+
8921
+            ray.viewDirection.x = dir.x;
8922
+            ray.viewDirection.y = dir.y;
8923
+            ray.viewDirection.z = dir.z;
8924
+        }
8925
+        
8926
+        boolean success = false;
8927
+        
8928
+        boolean touch = false;
8929
+        
8930
+        if (bRep != null && Link2Support())
8931
+        {
8932
+            if (bbox == null)
8933
+            {
8934
+                bbox = new BBox();
8935
+                
8936
+                cVector min = new cVector();
8937
+                cVector max = new cVector();
8938
+                
8939
+                this.getBounds(min, max, true);
8940
+                
8941
+                bbox.min.x = min.x;
8942
+                bbox.min.y = min.y;
8943
+                bbox.min.z = min.z;
8944
+                
8945
+                bbox.max.x = max.x;
8946
+                bbox.max.y = max.y;
8947
+                bbox.max.z = max.z;
8948
+            }
8949
+            
8950
+            if (true) // NOT WORKING bbox.intersect(ray, result))
8951
+            {
8952
+                success |= intersectMesh(ray, result);
8953
+            }
8954
+            else
8955
+            {
8956
+                //this.hide = true;
8957
+                touch = true;
8958
+            }
8959
+        }
8960
+        
8961
+        for (int i=0; i<size(); i++)
8962
+        {
8963
+            Object3D child = (Object3D) reserve(i);
8964
+            
8965
+            if (child == null)
8966
+                continue;
8967
+
8968
+            success |= child.intersect(ray, result);
8969
+            release(i);
8970
+        }
8971
+        
8972
+        ray.eyePoint.x = eyex;
8973
+        ray.eyePoint.y = eyey;
8974
+        ray.eyePoint.z = eyez;
8975
+        
8976
+        ray.viewDirection.x = dirx;
8977
+        ray.viewDirection.y = diry;
8978
+        ray.viewDirection.z = dirz;
8979
+        
8980
+//        if (touch)
8981
+//            this.Touch(); // refresh display list
8982
+            
8983
+        return success;
8984
+    }
8985
+
8986
+    static Vector3d edge1 = new Vector3d();
8987
+    static Vector3d edge2 = new Vector3d();
8988
+    static Vector3d P = new Vector3d();
8989
+    static Vector3d T = new Vector3d();
8990
+    static Vector3d Q = new Vector3d();
8991
+    
8992
+    private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
8993
+    {
8994
+        if (false)
8995
+        {
8996
+            result.t = 0;
8997
+            return true;
8998
+        }
8999
+        
9000
+        /*
9001
+        Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
9002
+        
9003
+        Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
9004
+         */
9005
+
9006
+        // Calculate edges of the triangle
9007
+        edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
9008
+        edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
9009
+
9010
+        // Calculate the determinant (U parameter)
9011
+        P.cross(ray.viewDirection, edge2);
9012
+        double det = edge1.dot(P);
9013
+
9014
+        if (det > -1e-9 && det < 1e-9)
9015
+        {
9016
+            return false;
9017
+        }	// Ray lies in plane of triangle
9018
+
9019
+        double invDet = 1 / det;
9020
+
9021
+        // Calculate distance from vertex1 to ray origin
9022
+        T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
9023
+
9024
+        double U = (T.dot(P)) * invDet;	// Calculate U parameter
9025
+
9026
+        if (U < 0.f || U > 1.f)
9027
+        {
9028
+            return false;
9029
+        }	// Intersection lies outside of the triangle
9030
+
9031
+        // Calculate V parameter
9032
+        Q.cross(T, edge1);
9033
+
9034
+        double V = ray.viewDirection.dot(Q) * invDet;
9035
+
9036
+        if (V < 0.f || (U + V) > 1.f)
9037
+        {
9038
+            return false;
9039
+        }	// Intersection lies outside of the triangle
9040
+
9041
+        double t = edge2.dot(Q) * invDet;
9042
+
9043
+        if (t > 1e-9)	// Triangle and ray intersects
9044
+        {
9045
+            //result.isIntersected = true;
9046
+            //result.id = id;
9047
+
9048
+            if (false) // isShadow)
9049
+            {
9050
+                result.t = t;
9051
+                return true;
9052
+            } else if (t < result.t)
9053
+            {
9054
+                result.object = this;
9055
+
9056
+                result.t = t;
9057
+
9058
+                //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
9059
+                //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
9060
+                //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
9061
+
9062
+                result.n.cross(edge1, edge2);
9063
+                result.n.normalize();
9064
+            }
9065
+            
9066
+            return true;
9067
+        }
9068
+        
9069
+        return false;
9070
+    }
85299071 
85309072     public int Size()
85319073     {