blame | history | patch | commit | commitdiff
Normand Briere
2019-06-09 79d0f9a45d36656051a77a7b0837aa0318f81ee5 
 Object3D.java
....@@ -300,6 +300,7 @@
300300         }
301301         
302302     boolean live = false;
303
+    boolean dontselect = false;
303304     boolean hide = false;
304305     boolean link2master = false; // performs reset support/master at each frame
305306     boolean marked = false; // animation node
....@@ -774,7 +775,7 @@
774775         if (step == 0)
775776             step = 1;
776777         if (maxcount == 0)
777
-            maxcount = 2048; // 4;
778
+            maxcount = 128; // 2048; // 4;
778779 //        if (acceleration == 0)
779780 //            acceleration = 10;
780781         if (delay == 0) // serial
....@@ -797,7 +798,7 @@
797798         
798799         if (marked && Globals.isLIVE() && live &&
799800                 //TEMP21aug2018
800
-                Globals.DrawMode() == iCameraPane.SHADOW &&
801
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
801802                 currentframe != Globals.framecount)
802803         {
803804             currentframe = Globals.framecount;
....@@ -912,6 +913,11 @@
912913         fromParent = null; // LA.newMatrix();
913914         bRep = null; // new BoundaryRep();
914915 
916
+        if (oname != null && oname.equals("LeftHand"))
917
+        {
918
+            name = oname;
919
+        }
920
+        
915921         /*
916922         float hue = (float)Math.random();
917923         Color col;
....@@ -954,7 +960,7 @@
954960 
955961     public Object clone()
956962     {
957
-        return GrafreeD.clone(this);
963
+        return Grafreed.clone(this);
958964     }
959965 
960966     Object3D copyExpand()
....@@ -1470,7 +1476,7 @@
14701476             BoundaryRep.SEUIL = other.material.cameralight;
14711477 
14721478             // Set default to 0.1
1473
-            BoundaryRep.SEUIL /= 2;
1479
+            BoundaryRep.SEUIL /= 4; // 2;
14741480             System.out.println("SEUIL = " + BoundaryRep.SEUIL);
14751481         }
14761482         
....@@ -1729,7 +1735,7 @@
17291735             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17301736             o.bRep = transientrep;
17311737             if (clone)
1732
-                o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1738
+                o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
17331739             o.CreateMaterial();
17341740             o.SetAttributes(this, -1);
17351741             //parent
....@@ -1742,7 +1748,7 @@
17421748             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17431749             o.bRep = bRep;
17441750             if (clone)
1745
-                o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1751
+                o.bRep = (BoundaryRep) Grafreed.clone(bRep);
17461752             o.CreateMaterial();
17471753             //o.overwriteThis(this, -1);
17481754             o.SetAttributes(this, -1);
....@@ -1829,12 +1835,15 @@
18291835             if (obj.name == null)
18301836                 continue; // can't be a null one
18311837             
1838
+            // Try perfect match first.
18321839             if (n.equals(obj.name))
18331840             {
18341841                 theobj = obj;
18351842                 count++;
18361843             }
18371844         }
1845
+        
1846
+        // not needed: n = n.split(":")[0]; // Poser generates a count
18381847         
18391848     if (count != 1)
18401849         for (int i=Size(); --i>=0;)
....@@ -2477,13 +2486,13 @@
24772486         return retval;
24782487     }
24792488 
2480
-    void doEditDrag(ClickInfo info)
2489
+    void doEditDrag(ClickInfo info, boolean opposite)
24812490     {
24822491         switch (doSomething)
24832492         {
24842493             case 1: // '\001'
24852494                 //super.
2486
-                        doEditDrag0(info);
2495
+                        doEditDrag0(info, opposite);
24872496                 break;
24882497 
24892498             case 2: // '\002'
....@@ -2496,11 +2505,11 @@
24962505                     {
24972506                         //sel.hitSomething = childToDrag.hitSomething;
24982507                         //childToDrag.doEditDrag(info);
2499
-                        sel.doEditDrag(info);
2508
+                        sel.doEditDrag(info, opposite);
25002509                     } else
25012510                     {
25022511                         //super.
2503
-                                doEditDrag0(info);
2512
+                                doEditDrag0(info, opposite);
25042513                     }
25052514                 }
25062515                 break;
....@@ -2983,6 +2992,33 @@
29832992     blockloop = false;
29842993 }
29852994             
2995
+    void TransformChildren()
2996
+    {
2997
+        if (toParent != null)
2998
+        {
2999
+            for (int i=Size(); --i>=0;)
3000
+            {
3001
+                Object3D v = get(i);
3002
+
3003
+                if (v.toParent == null)
3004
+                {
3005
+                    v.toParent = LA.newMatrix();
3006
+                    v.fromParent = LA.newMatrix();
3007
+                }
3008
+
3009
+//                LA.matConcat(v.toParent, toParent, v.toParent);
3010
+//                LA.matConcat(fromParent, v.fromParent, v.fromParent);
3011
+                LA.matConcat(toParent, v.toParent, v.toParent);
3012
+                LA.matConcat(v.fromParent, fromParent, v.fromParent);
3013
+            }
3014
+
3015
+            toParent = null; // LA.matIdentity(toParent);
3016
+            fromParent = null; // LA.matIdentity(fromParent);
3017
+
3018
+            Touch();
3019
+        }
3020
+    }
3021
+    
29863022     void TransformGeometry()
29873023     {
29883024         Object3D obj = this;
....@@ -3204,9 +3240,11 @@
32043240         
32053241         BoundaryRep sup = bRep.support;
32063242         bRep.support = null;
3207
-        BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3243
+        BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
32083244 //            bRep.SplitInTwo(onlyone); // thread...
3209
-            temprep.SplitInTwo(reduction34, onlyone);
3245
+        
3246
+        while(temprep.SplitInTwo(reduction34, onlyone));
3247
+        
32103248             bRep = temprep;
32113249             bRep.support = sup;
32123250             Touch();
....@@ -3728,7 +3766,7 @@
37283766             if (child == null)
37293767                 continue;
37303768             
3731
-            if (GrafreeD.RENDERME > 0)
3769
+            if (Grafreed.RENDERME > 0)
37323770             {
37333771                 if (child instanceof Merge)
37343772                     ((Merge)child).renderme();
....@@ -3879,7 +3917,7 @@
38793917                 if (child == null)
38803918                     continue;
38813919                 
3882
-                if (GrafreeD.RENDERME > 0)
3920
+                if (Grafreed.RENDERME > 0)
38833921                 {
38843922                     if (child instanceof Merge)
38853923                         ((Merge)child).renderme();
....@@ -4074,7 +4112,7 @@
40744112                 if (child == null)
40754113                     continue;
40764114                 
4077
-                if (GrafreeD.RENDERME > 0)
4115
+                if (Grafreed.RENDERME > 0)
40784116                 {
40794117                     if (child instanceof Merge)
40804118                         ((Merge)child).renderme();
....@@ -4681,7 +4719,7 @@
46814719 
46824720     cTreePath SelectLeaf(int indexcount, boolean deselect)
46834721     {
4684
-        if (hide)
4722
+        if (hide || dontselect)
46854723             return null;
46864724         
46874725         if (count <= 0)
....@@ -4707,7 +4745,7 @@
47074745     
47084746     cTreePath Select(int indexcount, boolean deselect)
47094747     {
4710
-        if (hide)
4748
+        if (hide || dontselect)
47114749             return null;
47124750             
47134751         if (count <= 0)
....@@ -5377,9 +5415,9 @@
53775415     boolean NeedSupport()
53785416     {
53795417         return
5380
-                CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
5418
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
53815419                  // PROBLEM with CROWD!!
5382
-                    && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
5420
+                    && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
53835421     }
53845422     
53855423     static boolean DEBUG_SELECTION = false;
....@@ -5394,7 +5432,7 @@
53945432         }
53955433         
53965434         if (display.DrawMode() == iCameraPane.SELECTION &&
5397
-                hide)
5435
+                (hide || dontselect))
53985436             return;
53995437 
54005438         if (name != null && name.contains("sclera"))
....@@ -5636,7 +5674,17 @@
56365674         tex = GetTextures();
56375675     }
56385676 
5639
-    display.BindTextures(tex, texres);
5677
+    boolean failed = false;
5678
+    
5679
+    try
5680
+    {
5681
+        display.BindTextures(tex, texres);
5682
+    }
5683
+    catch (Exception e)
5684
+    {
5685
+        System.err.println("FAILED: " + this);
5686
+        failed = true;
5687
+    }
56405688            
56415689             if (!compiled)
56425690             {
....@@ -5658,7 +5706,8 @@
56585706                 }
56595707             }
56605708 
5661
-    display.ReleaseTextures(tex);
5709
+    if (!failed)
5710
+        display.ReleaseTextures(tex);
56625711 
56635712     display.PopMaterial(this, selected);
56645713         }
....@@ -5787,6 +5836,9 @@
57875836     
57885837     void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57895838     {
5839
+        if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
5840
+            return;
5841
+        
57905842         if (hide)
57915843             return;
57925844         // shadow optimisation
....@@ -5911,6 +5963,9 @@
59115963     {
59125964         if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
59135965             return; // no shadow for transparent objects
5966
+        
5967
+        if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
5968
+            return;
59145969         
59155970         if (hide)
59165971             return;
....@@ -6895,8 +6950,8 @@
68956950 //            {
68966951 //                CameraPane.Ymax = spoth;
68976952 //            }
6898
-            info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899
-            info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6953
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6954
+            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
69006955             spot.translate(0, -32);
69016956             info.g.setColor(Color.green);
69026957             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
....@@ -6951,7 +7006,7 @@
69517006         startX = info.x;
69527007         startY = info.y;
69537008 
6954
-        hitSomething = 0;
7009
+        hitSomething = -1;
69557010         cVector origin = new cVector();
69567011         //LA.xformPos(origin, toParent, origin);
69577012         Rectangle spot = new Rectangle();
....@@ -7012,7 +7067,7 @@
70127067         return true;
70137068     }
70147069 
7015
-    void doEditDrag0(ClickInfo info)
7070
+    void doEditDrag0(ClickInfo info, boolean opposite)
70167071     {
70177072         if (hitSomething == 0)
70187073         {
....@@ -7027,6 +7082,7 @@
70277082         //System.out.println("hitSomething = " + hitSomething);
70287083 
70297084         double scale = 0.005f * info.camera.Distance();
7085
+        
70307086         cVector xlate = new cVector();
70317087         //cVector xlate2 = new cVector();
70327088         switch (hitSomething)
....@@ -7039,7 +7095,7 @@
70397095                 
70407096                 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
70417097                 
7042
-                if (modified)
7098
+                if (modified || opposite)
70437099                 {
70447100                     //assert(false);
70457101                             /*
....@@ -7133,6 +7189,7 @@
71337189 
71347190                 if (modified)
71357191                 {
7192
+                    // Rotate 90 degrees
71367193                     angle /= (Math.PI / 4);
71377194                     angle = Math.floor(angle + 0.5);
71387195                     angle *= (Math.PI / 4);
....@@ -7174,24 +7231,27 @@
71747231 
71757232             case hitScale: // scale
71767233                 double hScale = (double) (info.x - centerPt.x) / 32;
7234
+                double sign = 1;
7235
+                if (hScale < 0)
7236
+                {
7237
+                    sign = -1;
7238
+                }
7239
+                hScale = sign*Math.pow(sign*hScale, scale * 50);
71777240                 if (hScale < 0.01)
71787241                 {
7179
-                    hScale = 0.01;
7242
+                    //hScale = 0.01;
71807243                 }
7181
-                hScale = Math.pow(hScale, scale * 50);
7182
-                if (hScale < 0.01)
7183
-                {
7184
-                    hScale = 0.01;
7185
-                }
7244
+                
71867245                 double vScale = (double) (info.y - centerPt.y) / 32;
7187
-                if (vScale < 0.01)
7246
+                sign = 1;
7247
+                if (vScale < 0)
71887248                 {
7189
-                    vScale = 0.01;
7249
+                    sign = -1;
71907250                 }
7191
-                vScale = Math.pow(vScale, scale * 50);
7251
+                vScale = sign*Math.pow(sign*vScale, scale * 50);
71927252                 if (vScale < 0.01)
71937253                 {
7194
-                    vScale = 0.01;
7254
+                    //vScale = 0.01;
71957255                 }
71967256                 LA.matCopy(startMat, toParent);
71977257                 /**/
....@@ -7202,17 +7262,24 @@
72027262                 }
72037263                 /**/
72047264 
7265
+                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7266
+                        
7267
+                if (totalScale < 0.01)
7268
+                {
7269
+                    totalScale = 0.01;
7270
+                }
7271
+                
72057272                 switch (info.pane.RenderCamera().viewCode)
72067273                 {
72077274                     case 3: // '\001'
72087275                         if (modified)
72097276                         {
72107277                             //LA.matScale(toParent, 1, hScale, vScale);
7211
-                            LA.matScale(toParent, vScale, 1, 1);
7278
+                            LA.matScale(toParent, totalScale, 1, 1);
72127279                         } // vScale, 1);
72137280                         else
72147281                         {
7215
-                            LA.matScale(toParent, vScale, vScale, vScale);
7282
+                            LA.matScale(toParent, totalScale, totalScale, totalScale);
72167283                         } // vScale, 1);
72177284                         break;
72187285 
....@@ -7220,10 +7287,10 @@
72207287                         if (modified)
72217288                         {
72227289                             //LA.matScale(toParent, hScale, 1, vScale);
7223
-                            LA.matScale(toParent, 1, vScale, 1);
7290
+                            LA.matScale(toParent, 1, totalScale, 1);
72247291                         } else
72257292                         {
7226
-                            LA.matScale(toParent, vScale, 1, vScale);
7293
+                            LA.matScale(toParent, totalScale, 1, totalScale);
72277294                         }
72287295                         break;
72297296 
....@@ -7231,10 +7298,10 @@
72317298                         if (modified)
72327299                         {
72337300                             //LA.matScale(toParent, hScale, vScale, 1);
7234
-                            LA.matScale(toParent, 1, 1, vScale);
7301
+                            LA.matScale(toParent, 1, 1, totalScale);
72357302                         } else
72367303                         {
7237
-                            LA.matScale(toParent, vScale, vScale, 1);
7304
+                            LA.matScale(toParent, totalScale, totalScale, 1);
72387305                         }
72397306                         break;
72407307                 }
....@@ -7367,14 +7434,22 @@
73677434         //return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
73687435         //return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
73697436         //return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
7437
+        
7438
+        String objname;
7439
+        
73707440         if (false) //parent != null)
73717441         {
7372
-            return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7442
+            objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
73737443         } else
73747444         {
7375
-            return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /*- 1*/) + ") ")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ +System.identityHashCode(this);
7445
+            objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
73767446         } //  + super.toString();
73777447     //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7448
+        
7449
+        if (!Globals.ADVANCED)
7450
+            return objname;
7451
+        
7452
+        return objname + " " + System.identityHashCode(this);
73787453     }
73797454 
73807455     public int hashCode()
....@@ -7566,7 +7641,7 @@
75667641         {
75677642             assert(bRep != null);
75687643             if (!(support instanceof GenericJoint)) // support.bRep != null)
7569
-                GrafreeD.Assert(support.bRep == bRep.support);
7644
+                Grafreed.Assert(support.bRep == bRep.support);
75707645         }
75717646         else
75727647         {
....@@ -7615,9 +7690,9 @@
76157690     private static cVector edge2 = new cVector();
76167691     //private static cVector norm = new cVector();
76177692     /*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;
7693
+    static final int hitCenter = 1;
7694
+    static final int hitScale = 2;
7695
+    static final int hitRotate = 3;
76217696     /*transient*/ /*private*/ int viewCode; // Now used for transparency cache flag
76227697 	/*transient*/ private Point centerPt;
76237698     /*transient*/ private int startX;