blame | history | patch | commit | commitdiff
Normand Briere
2019-06-11 4113164b3be1e50251ac40d6fd65660f0a6c2e63 
 Object3D.java
....@@ -14,11 +14,15 @@
1414 import //weka.core.
1515         matrix.Matrix;
1616 
17
+import java.util.UUID;
18
+
1719 //import net.sourceforge.sizeof.SizeOf;
1820 public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
1921 {
2022     //static final long serialVersionUID = -607422624994562685L;
2123     static final long serialVersionUID = 5022536242724664900L;
24
+    
25
+    private UUID uuid = UUID.randomUUID();
2226     
2327     ScriptNode scriptnode;
2428 
....@@ -156,6 +160,67 @@
156160         blockloop = true;
157161         child.RestoreSupports();
158162         blockloop = false;
163
+    }
164
+}
165
+
166
+void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167
+{
168
+    if (hashtable.containsKey(GetUUID()))
169
+    {
170
+        Object3D o = hashtable.get(GetUUID());
171
+
172
+        assert(this.bRep == o.bRep);
173
+        if (this.bRep != null)
174
+            assert(this.bRep.support == o.transientrep);
175
+        
176
+        return;
177
+    }
178
+    
179
+    Object3D o = new Object3D();
180
+    o.bRep = this.bRep;
181
+    if (this.bRep != null)
182
+    {
183
+        o.transientrep = this.bRep.support;
184
+        o.bRep.support = null;
185
+    }
186
+    
187
+//    o.support = this.support;
188
+//    o.fileparent = this.fileparent;
189
+//    if (this.bRep != null)
190
+//        o.bRep = this.bRep.support;
191
+    
192
+    hashtable.put(GetUUID(), o);
193
+    
194
+    this.bRep = null;
195
+//    if (this.bRep != null)
196
+//        this.bRep.support = null;
197
+//    this.support = null;
198
+//    this.fileparent = null;
199
+    
200
+    for (int i=0; i<Size(); i++)
201
+    {
202
+        get(i).ExtractBigData(hashtable);
203
+    }
204
+}
205
+
206
+void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
207
+{
208
+    if (!hashtable.containsKey(GetUUID()))
209
+        return;
210
+    
211
+    Object3D o = hashtable.get(GetUUID());
212
+    
213
+    this.bRep = o.bRep;
214
+    if (this.bRep != null)
215
+        this.bRep.support = o.transientrep;
216
+//    this.support = o.support;
217
+//    this.fileparent = o.fileparent;
218
+    
219
+    hashtable.remove(GetUUID());
220
+    
221
+    for (int i=0; i<Size(); i++)
222
+    {
223
+        get(i).RestoreBigData(hashtable);
159224     }
160225 }
161226 
....@@ -300,6 +365,7 @@
300365         }
301366         
302367     boolean live = false;
368
+    boolean dontselect = false;
303369     boolean hide = false;
304370     boolean link2master = false; // performs reset support/master at each frame
305371     boolean marked = false; // animation node
....@@ -774,7 +840,7 @@
774840         if (step == 0)
775841             step = 1;
776842         if (maxcount == 0)
777
-            maxcount = 2048; // 4;
843
+            maxcount = 128; // 2048; // 4;
778844 //        if (acceleration == 0)
779845 //            acceleration = 10;
780846         if (delay == 0) // serial
....@@ -797,7 +863,7 @@
797863         
798864         if (marked && Globals.isLIVE() && live &&
799865                 //TEMP21aug2018
800
-                Globals.DrawMode() == iCameraPane.SHADOW &&
866
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
801867                 currentframe != Globals.framecount)
802868         {
803869             currentframe = Globals.framecount;
....@@ -912,6 +978,11 @@
912978         fromParent = null; // LA.newMatrix();
913979         bRep = null; // new BoundaryRep();
914980 
981
+        if (oname != null && oname.equals("LeftHand"))
982
+        {
983
+            name = oname;
984
+        }
985
+        
915986         /*
916987         float hue = (float)Math.random();
917988         Color col;
....@@ -954,7 +1025,7 @@
9541025 
9551026     public Object clone()
9561027     {
957
-        return GrafreeD.clone(this);
1028
+        return Grafreed.clone(this);
9581029     }
9591030 
9601031     Object3D copyExpand()
....@@ -1470,7 +1541,7 @@
14701541             BoundaryRep.SEUIL = other.material.cameralight;
14711542 
14721543             // Set default to 0.1
1473
-            BoundaryRep.SEUIL /= 2;
1544
+            BoundaryRep.SEUIL /= 4; // 2;
14741545             System.out.println("SEUIL = " + BoundaryRep.SEUIL);
14751546         }
14761547         
....@@ -1729,7 +1800,7 @@
17291800             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17301801             o.bRep = transientrep;
17311802             if (clone)
1732
-                o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1803
+                o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17331804             o.CreateMaterial();
17341805             o.SetAttributes(this, -1);
17351806             //parent
....@@ -1742,7 +1813,7 @@
17421813             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17431814             o.bRep = bRep;
17441815             if (clone)
1745
-                o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1816
+                o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17461817             o.CreateMaterial();
17471818             //o.overwriteThis(this, -1);
17481819             o.SetAttributes(this, -1);
....@@ -1829,12 +1900,15 @@
18291900             if (obj.name == null)
18301901                 continue; // can't be a null one
18311902             
1903
+            // Try perfect match first.
18321904             if (n.equals(obj.name))
18331905             {
18341906                 theobj = obj;
18351907                 count++;
18361908             }
18371909         }
1910
+        
1911
+        // not needed: n = n.split(":")[0]; // Poser generates a count
18381912         
18391913     if (count != 1)
18401914         for (int i=Size(); --i>=0;)
....@@ -2477,13 +2551,13 @@
24772551         return retval;
24782552     }
24792553 
2480
-    void doEditDrag(ClickInfo info)
2554
+    void doEditDrag(ClickInfo info, boolean opposite)
24812555     {
24822556         switch (doSomething)
24832557         {
24842558             case 1: // '\001'
24852559                 //super.
2486
-                        doEditDrag0(info);
2560
+                        doEditDrag0(info, opposite);
24872561                 break;
24882562 
24892563             case 2: // '\002'
....@@ -2496,11 +2570,11 @@
24962570                     {
24972571                         //sel.hitSomething = childToDrag.hitSomething;
24982572                         //childToDrag.doEditDrag(info);
2499
-                        sel.doEditDrag(info);
2573
+                        sel.doEditDrag(info, opposite);
25002574                     } else
25012575                     {
25022576                         //super.
2503
-                                doEditDrag0(info);
2577
+                                doEditDrag0(info, opposite);
25042578                     }
25052579                 }
25062580                 break;
....@@ -2983,6 +3057,33 @@
29833057     blockloop = false;
29843058 }
29853059             
3060
+    void TransformChildren()
3061
+    {
3062
+        if (toParent != null)
3063
+        {
3064
+            for (int i=Size(); --i>=0;)
3065
+            {
3066
+                Object3D v = get(i);
3067
+
3068
+                if (v.toParent == null)
3069
+                {
3070
+                    v.toParent = LA.newMatrix();
3071
+                    v.fromParent = LA.newMatrix();
3072
+                }
3073
+
3074
+//                LA.matConcat(v.toParent, toParent, v.toParent);
3075
+//                LA.matConcat(fromParent, v.fromParent, v.fromParent);
3076
+                LA.matConcat(toParent, v.toParent, v.toParent);
3077
+                LA.matConcat(v.fromParent, fromParent, v.fromParent);
3078
+            }
3079
+
3080
+            toParent = null; // LA.matIdentity(toParent);
3081
+            fromParent = null; // LA.matIdentity(fromParent);
3082
+
3083
+            Touch();
3084
+        }
3085
+    }
3086
+    
29863087     void TransformGeometry()
29873088     {
29883089         Object3D obj = this;
....@@ -3204,9 +3305,11 @@
32043305         
32053306         BoundaryRep sup = bRep.support;
32063307         bRep.support = null;
3207
-        BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3308
+        BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32083309 //            bRep.SplitInTwo(onlyone); // thread...
3209
-            temprep.SplitInTwo(reduction34, onlyone);
3310
+        
3311
+        while(temprep.SplitInTwo(reduction34, onlyone));
3312
+        
32103313             bRep = temprep;
32113314             bRep.support = sup;
32123315             Touch();
....@@ -3728,7 +3831,7 @@
37283831             if (child == null)
37293832                 continue;
37303833             
3731
-            if (GrafreeD.RENDERME > 0)
3834
+            if (Grafreed.RENDERME > 0)
37323835             {
37333836                 if (child instanceof Merge)
37343837                     ((Merge)child).renderme();
....@@ -3879,7 +3982,7 @@
38793982                 if (child == null)
38803983                     continue;
38813984                 
3882
-                if (GrafreeD.RENDERME > 0)
3985
+                if (Grafreed.RENDERME > 0)
38833986                 {
38843987                     if (child instanceof Merge)
38853988                         ((Merge)child).renderme();
....@@ -4074,7 +4177,7 @@
40744177                 if (child == null)
40754178                     continue;
40764179                 
4077
-                if (GrafreeD.RENDERME > 0)
4180
+                if (Grafreed.RENDERME > 0)
40784181                 {
40794182                     if (child instanceof Merge)
40804183                         ((Merge)child).renderme();
....@@ -4681,7 +4784,7 @@
46814784 
46824785     cTreePath SelectLeaf(int indexcount, boolean deselect)
46834786     {
4684
-        if (hide)
4787
+        if (hide || dontselect)
46854788             return null;
46864789         
46874790         if (count <= 0)
....@@ -4707,7 +4810,7 @@
47074810     
47084811     cTreePath Select(int indexcount, boolean deselect)
47094812     {
4710
-        if (hide)
4813
+        if (hide || dontselect)
47114814             return null;
47124815             
47134816         if (count <= 0)
....@@ -5333,6 +5436,43 @@
53335436         }
53345437     }
53355438     
5439
+    UUID GetUUID()
5440
+    {
5441
+        if (uuid == null)
5442
+        {
5443
+            // Serial
5444
+            uuid = UUID.randomUUID();
5445
+        }
5446
+        
5447
+        return uuid;
5448
+    }
5449
+    
5450
+    Object3D GetObject(UUID uid)
5451
+    {
5452
+        if (blockloop)
5453
+            return null;
5454
+        
5455
+        if (GetUUID().equals(uid))
5456
+            return this;
5457
+        
5458
+        int nb = Size();
5459
+        for (int i = 0; i < nb; i++)
5460
+        {
5461
+            Object3D child = (Object3D) get(i);
5462
+
5463
+            if (child == null)
5464
+                continue;
5465
+
5466
+            blockloop = true;
5467
+            Object3D obj = child.GetObject(uid);
5468
+            blockloop = false;
5469
+            if (obj != null)
5470
+                return obj;
5471
+        }
5472
+        
5473
+        return null;
5474
+    }
5475
+    
53365476     void SetBumpTexture(String tex)
53375477     {
53385478         if (GetTextures() == null)
....@@ -5377,9 +5517,9 @@
53775517     boolean NeedSupport()
53785518     {
53795519         return
5380
-                CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
5520
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
53815521                  // PROBLEM with CROWD!!
5382
-                    && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5522
+                    && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
53835523     }
53845524     
53855525     static boolean DEBUG_SELECTION = false;
....@@ -5394,7 +5534,7 @@
53945534         }
53955535         
53965536         if (display.DrawMode() == iCameraPane.SELECTION &&
5397
-                hide)
5537
+                (hide || dontselect))
53985538             return;
53995539 
54005540         if (name != null && name.contains("sclera"))
....@@ -5636,7 +5776,17 @@
56365776         tex = GetTextures();
56375777     }
56385778 
5639
-    display.BindTextures(tex, texres);
5779
+    boolean failed = false;
5780
+    
5781
+    try
5782
+    {
5783
+        display.BindTextures(tex, texres);
5784
+    }
5785
+    catch (Exception e)
5786
+    {
5787
+        System.err.println("FAILED: " + this);
5788
+        failed = true;
5789
+    }
56405790            
56415791             if (!compiled)
56425792             {
....@@ -5658,7 +5808,8 @@
56585808                 }
56595809             }
56605810 
5661
-    display.ReleaseTextures(tex);
5811
+    if (!failed)
5812
+        display.ReleaseTextures(tex);
56625813 
56635814     display.PopMaterial(this, selected);
56645815         }
....@@ -5787,6 +5938,9 @@
57875938     
57885939     void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57895940     {
5941
+        if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
5942
+            return;
5943
+        
57905944         if (hide)
57915945             return;
57925946         // shadow optimisation
....@@ -5911,6 +6065,9 @@
59116065     {
59126066         if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
59136067             return; // no shadow for transparent objects
6068
+        
6069
+        if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
6070
+            return;
59146071         
59156072         if (hide)
59166073             return;
....@@ -6895,8 +7052,8 @@
68957052 //            {
68967053 //                CameraPane.Ymax = spoth;
68977054 //            }
6898
-            info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899
-            info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7055
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056
+            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
69007057             spot.translate(0, -32);
69017058             info.g.setColor(Color.green);
69027059             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
....@@ -6951,7 +7108,7 @@
69517108         startX = info.x;
69527109         startY = info.y;
69537110 
6954
-        hitSomething = 0;
7111
+        hitSomething = -1;
69557112         cVector origin = new cVector();
69567113         //LA.xformPos(origin, toParent, origin);
69577114         Rectangle spot = new Rectangle();
....@@ -7012,7 +7169,7 @@
70127169         return true;
70137170     }
70147171 
7015
-    void doEditDrag0(ClickInfo info)
7172
+    void doEditDrag0(ClickInfo info, boolean opposite)
70167173     {
70177174         if (hitSomething == 0)
70187175         {
....@@ -7027,6 +7184,7 @@
70277184         //System.out.println("hitSomething = " + hitSomething);
70287185 
70297186         double scale = 0.005f * info.camera.Distance();
7187
+        
70307188         cVector xlate = new cVector();
70317189         //cVector xlate2 = new cVector();
70327190         switch (hitSomething)
....@@ -7039,7 +7197,7 @@
70397197                 
70407198                 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
70417199                 
7042
-                if (modified)
7200
+                if (modified || opposite)
70437201                 {
70447202                     //assert(false);
70457203                             /*
....@@ -7133,6 +7291,7 @@
71337291 
71347292                 if (modified)
71357293                 {
7294
+                    // Rotate 90 degrees
71367295                     angle /= (Math.PI / 4);
71377296                     angle = Math.floor(angle + 0.5);
71387297                     angle *= (Math.PI / 4);
....@@ -7174,24 +7333,27 @@
71747333 
71757334             case hitScale: // scale
71767335                 double hScale = (double) (info.x - centerPt.x) / 32;
7336
+                double sign = 1;
7337
+                if (hScale < 0)
7338
+                {
7339
+                    sign = -1;
7340
+                }
7341
+                hScale = sign*Math.pow(sign*hScale, scale * 50);
71777342                 if (hScale < 0.01)
71787343                 {
7179
-                    hScale = 0.01;
7344
+                    //hScale = 0.01;
71807345                 }
7181
-                hScale = Math.pow(hScale, scale * 50);
7182
-                if (hScale < 0.01)
7183
-                {
7184
-                    hScale = 0.01;
7185
-                }
7346
+                
71867347                 double vScale = (double) (info.y - centerPt.y) / 32;
7187
-                if (vScale < 0.01)
7348
+                sign = 1;
7349
+                if (vScale < 0)
71887350                 {
7189
-                    vScale = 0.01;
7351
+                    sign = -1;
71907352                 }
7191
-                vScale = Math.pow(vScale, scale * 50);
7353
+                vScale = sign*Math.pow(sign*vScale, scale * 50);
71927354                 if (vScale < 0.01)
71937355                 {
7194
-                    vScale = 0.01;
7356
+                    //vScale = 0.01;
71957357                 }
71967358                 LA.matCopy(startMat, toParent);
71977359                 /**/
....@@ -7202,17 +7364,24 @@
72027364                 }
72037365                 /**/
72047366 
7367
+                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7368
+                        
7369
+                if (totalScale < 0.01)
7370
+                {
7371
+                    totalScale = 0.01;
7372
+                }
7373
+                
72057374                 switch (info.pane.RenderCamera().viewCode)
72067375                 {
72077376                     case 3: // '\001'
72087377                         if (modified)
72097378                         {
72107379                             //LA.matScale(toParent, 1, hScale, vScale);
7211
-                            LA.matScale(toParent, vScale, 1, 1);
7380
+                            LA.matScale(toParent, totalScale, 1, 1);
72127381                         } // vScale, 1);
72137382                         else
72147383                         {
7215
-                            LA.matScale(toParent, vScale, vScale, vScale);
7384
+                            LA.matScale(toParent, totalScale, totalScale, totalScale);
72167385                         } // vScale, 1);
72177386                         break;
72187387 
....@@ -7220,10 +7389,10 @@
72207389                         if (modified)
72217390                         {
72227391                             //LA.matScale(toParent, hScale, 1, vScale);
7223
-                            LA.matScale(toParent, 1, vScale, 1);
7392
+                            LA.matScale(toParent, 1, totalScale, 1);
72247393                         } else
72257394                         {
7226
-                            LA.matScale(toParent, vScale, 1, vScale);
7395
+                            LA.matScale(toParent, totalScale, 1, totalScale);
72277396                         }
72287397                         break;
72297398 
....@@ -7231,10 +7400,10 @@
72317400                         if (modified)
72327401                         {
72337402                             //LA.matScale(toParent, hScale, vScale, 1);
7234
-                            LA.matScale(toParent, 1, 1, vScale);
7403
+                            LA.matScale(toParent, 1, 1, totalScale);
72357404                         } else
72367405                         {
7237
-                            LA.matScale(toParent, vScale, vScale, 1);
7406
+                            LA.matScale(toParent, totalScale, totalScale, 1);
72387407                         }
72397408                         break;
72407409                 }
....@@ -7367,14 +7536,22 @@
73677536         //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
73687537         //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
73697538         //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
7539
+        
7540
+        String objname;
7541
+        
73707542         if (false) //parent != null)
73717543         {
7372
-            return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7544
+            objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
73737545         } else
73747546         {
7375
-            return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
7547
+            objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
73767548         } //  + super.toString();
73777549     //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7550
+        
7551
+        if (!Globals.ADVANCED)
7552
+            return objname;
7553
+        
7554
+        return objname + " " + System.identityHashCode(this);
73787555     }
73797556 
73807557     public int hashCode()
....@@ -7451,7 +7628,7 @@
74517628 	/*transient*/ cVector2[] projectedVertices = new cVector2[0];
74527629         
74537630     Object3D /*Composite*/ parent;
7454
-    Object3D /*Composite*/ fileparent;
7631
+    Object3D /*Composite*/ fileparent; // In the case of FileObject
74557632     
74567633     double[][] toParent; // dynamic matrix
74577634     double[][] fromParent;
....@@ -7566,7 +7743,7 @@
75667743         {
75677744             assert(bRep != null);
75687745             if (!(support instanceof GenericJoint)) // support.bRep != null)
7569
-                GrafreeD.Assert(support.bRep == bRep.support);
7746
+                Grafreed.Assert(support.bRep == bRep.support);
75707747         }
75717748         else
75727749         {
....@@ -7615,9 +7792,9 @@
76157792     private static cVector edge2 = new cVector();
76167793     //private static cVector norm = new cVector();
76177794     /*transient private*/ int hitSomething;
7618
-    private static final int hitCenter = 1;
7619
-    private static final int hitScale = 2;
7620
-    private static final int hitRotate = 3;
7795
+    static final int hitCenter = 1;
7796
+    static final int hitScale = 2;
7797
+    static final int hitRotate = 3;
76217798     /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
76227799 	/*transient*/ private Point centerPt;
76237800     /*transient*/ private int startX;