blame | history | patch | commit | commitdiff
Normand Briere
2019-07-01 6600d22461ccc1cb602f238a9ffa83cf07dd830e 
 Object3D.java
....@@ -24,6 +24,11 @@
2424     
2525     private UUID uuid = UUID.randomUUID();
2626     
27
+    // TEMPORARY for mocap undo
28
+    mocap.reader.BVHReader.BVHResult bvh;
29
+    Object3D skeleton;
30
+    //
31
+    
2732     ScriptNode scriptnode;
2833 
2934         void InitOthers()
....@@ -104,117 +109,143 @@
104109     
105110 //    transient boolean reduced; // for morph reduction
106111     
107
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
112
+    transient com.bulletphysics.linearmath.Transform cache; // for fast merge
113
+    transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109114 
110
-transient Object3D transientsupport; // for cloning
111
-transient boolean transientlink2master;
115
+    transient Object3D transientsupport; // for cloning
116
+    transient boolean transientlink2master;
112117 
113
-void SaveSupports()
114
-{
115
-    if (blockloop)
116
-        return;
117
-
118
-    transientsupport = support;
119
-    transientlink2master = link2master;
120
-    
121
-    support = null;
122
-    link2master = false;
123
-    
124
-    if (bRep != null)
118
+    void SaveSupports()
125119     {
126
-        bRep.SaveSupports();
120
+        if (blockloop)
121
+            return;
122
+
123
+        transientsupport = support;
124
+        transientlink2master = link2master;
125
+
126
+        support = null;
127
+        link2master = false;
128
+
129
+        if (bRep != null)
130
+        {
131
+            bRep.SaveSupports();
132
+        }
133
+
134
+        for (int i = 0; i < Size(); i++)
135
+        {
136
+            Object3D child = (Object3D) get(i);
137
+            if (child == null)
138
+                continue;
139
+            blockloop = true;
140
+            child.SaveSupports();
141
+            blockloop = false;
142
+        }
127143     }
128
-    
129
-    for (int i = 0; i < Size(); i++)
144
+
145
+    void RestoreSupports()
130146     {
131
-        Object3D child = (Object3D) get(i);
132
-        if (child == null)
133
-            continue;
147
+        if (blockloop)
148
+            return;
149
+
150
+        support = transientsupport;
151
+        link2master = transientlink2master;
152
+        transientsupport = null;
153
+        transientlink2master = false;
154
+
155
+        if (bRep != null)
156
+        {
157
+            bRep.RestoreSupports();
158
+        }
159
+
160
+        for (int i = 0; i < Size(); i++)
161
+        {
162
+            Object3D child = (Object3D) get(i);
163
+            if (child == null)
164
+                continue;
165
+            blockloop = true;
166
+            child.RestoreSupports();
167
+            blockloop = false;
168
+        }
169
+    }
170
+
171
+    void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172
+    {
173
+        if (hashtable.containsKey(GetUUID()))
174
+        {
175
+            Object3D o = hashtable.get(GetUUID());
176
+
177
+            Grafreed.Assert(this.bRep == o.bRep);
178
+            if (this.bRep != null)
179
+                assert(this.bRep.support == o.transientrep);
180
+
181
+            return;
182
+        }
183
+
184
+        Object3D o = new Object3D("copy of " + this.name);
185
+
186
+        hashtable.put(GetUUID(), o);
187
+
188
+        for (int i=0; i<Size(); i++)
189
+        {
190
+            get(i).ExtractBigData(hashtable);
191
+        }
192
+        
193
+        ExtractBigData(o);
194
+    }
195
+
196
+    void ExtractBigData(Object3D o)
197
+    {
198
+        o.bRep = this.bRep;
199
+        if (this.bRep != null)
200
+        {
201
+            o.transientrep = this.bRep.support;
202
+            o.bRep.support = null;
203
+        }
204
+        
205
+        //    o.support = this.support;
206
+        //    o.fileparent = this.fileparent;
207
+        //    if (this.bRep != null)
208
+        //        o.bRep = this.bRep.support;
209
+        
210
+        this.bRep = null;
211
+    //    if (this.bRep != null)
212
+    //        this.bRep.support = null;
213
+    //    this.support = null;
214
+    //    this.fileparent = null;
215
+    }
216
+
217
+    void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218
+    {
219
+        if (!hashtable.containsKey(GetUUID()))
220
+            return;
221
+
222
+        if (blockloop)
223
+            return;
224
+
134225         blockloop = true;
135
-        child.SaveSupports();
226
+
227
+        Object3D o = hashtable.get(GetUUID());
228
+
229
+        RestoreBigData(o);
230
+
231
+        //hashtable.remove(GetUUID());
232
+
233
+        for (int i=0; i<Size(); i++)
234
+        {
235
+            get(i).RestoreBigData(hashtable);
236
+        }
237
+        
136238         blockloop = false;
137239     }
138
-}
139240 
140
-void RestoreSupports()
141
-{
142
-    if (blockloop)
143
-        return;
144
-
145
-    support = transientsupport;
146
-    link2master = transientlink2master;
147
-    transientsupport = null;
148
-    transientlink2master = false;
149
-    
150
-    if (bRep != null)
241
+    void RestoreBigData(Object3D o)
151242     {
152
-        bRep.RestoreSupports();
243
+        this.bRep = o.bRep;
244
+        if (this.bRep != null)
245
+            this.bRep.support = o.transientrep;
246
+    //    this.support = o.support;
247
+    //    this.fileparent = o.fileparent;
153248     }
154
-    
155
-    for (int i = 0; i < Size(); i++)
156
-    {
157
-        Object3D child = (Object3D) get(i);
158
-        if (child == null)
159
-            continue;
160
-        blockloop = true;
161
-        child.RestoreSupports();
162
-        blockloop = false;
163
-    }
164
-}
165
-
166
-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167
-{
168
-    if (hashtable.containsKey(GetUUID()))
169
-        return;
170
-    
171
-    Object3D o = new Object3D();
172
-    o.bRep = this.bRep;
173
-    if (this.bRep != null)
174
-    {
175
-        o.transientrep = this.bRep.support;
176
-        o.bRep.support = null;
177
-    }
178
-    
179
-//    o.support = this.support;
180
-//    o.fileparent = this.fileparent;
181
-//    if (this.bRep != null)
182
-//        o.bRep = this.bRep.support;
183
-    
184
-    hashtable.put(GetUUID(), o);
185
-    
186
-    this.bRep = null;
187
-//    if (this.bRep != null)
188
-//        this.bRep.support = null;
189
-//    this.support = null;
190
-//    this.fileparent = null;
191
-    
192
-    for (int i=0; i<Size(); i++)
193
-    {
194
-        get(i).ExtractBigData(hashtable);
195
-    }
196
-}
197
-
198
-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199
-{
200
-    if (!hashtable.containsKey(GetUUID()))
201
-        return;
202
-    
203
-    Object3D o = hashtable.get(GetUUID());
204
-    
205
-    this.bRep = o.bRep;
206
-    if (this.bRep != null)
207
-        this.bRep.support = o.transientrep;
208
-//    this.support = o.support;
209
-//    this.fileparent = o.fileparent;
210
-    
211
-    hashtable.remove(GetUUID());
212
-    
213
-    for (int i=0; i<Size(); i++)
214
-    {
215
-        get(i).RestoreBigData(hashtable);
216
-    }
217
-}
218249 
219250 // MOCAP SUPPORT
220251     double tx,ty,tz,rx,ry,rz;
....@@ -539,12 +570,14 @@
539570             toParent = LA.newMatrix();
540571             fromParent = LA.newMatrix();
541572         }
573
+        
542574         if (toParentMarked == null)
543575         {
544576             if (maxcount != 1)
545577             {
546578                 new Exception().printStackTrace();
547579             }
580
+            
548581             toParentMarked = LA.newMatrix();
549582             fromParentMarked = LA.newMatrix();
550583         }
....@@ -855,7 +888,7 @@
855888         
856889         if (marked && Globals.isLIVE() && live &&
857890                 //TEMP21aug2018
858
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
891
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
859892                 currentframe != Globals.framecount)
860893         {
861894             currentframe = Globals.framecount;
....@@ -867,7 +900,8 @@
867900             
868901             boolean changedir = random && Math.random() < 0.01; // && !link2master;
869902 
870
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
903
+            if (transformcount*factor >= maxcount && (rewind || random) ||
904
+                    (step == 1 && changedir))
871905             {
872906                 countdown = 1;
873907                 delay = speedup?8:1;
....@@ -939,6 +973,7 @@
939973         if (material == null || material.multiply)
940974             return true;
941975         
976
+        // Transparent objects are dynamic because we have to sort the triangles.
942977         return material.opacity > 0.99;
943978     }
944979     
....@@ -2360,6 +2395,10 @@
23602395         }
23612396          */
23622397         }
2398
+        else
2399
+        {
2400
+            //((ObjEditor)editWindow).SetupUI2(null);
2401
+        }
23632402     }
23642403 
23652404     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2401,6 +2440,14 @@
24012440         {
24022441             editWindow.refreshContents();
24032442         }
2443
+        else
2444
+        {
2445
+            if (manipWindow != null)
2446
+            {
2447
+                manipWindow.refreshContents();
2448
+            }
2449
+        }
2450
+                
24042451     //if (parent != null)
24052452     //parent.refreshEditWindow();
24062453     }
....@@ -2685,6 +2732,18 @@
26852732         //Touch();
26862733     }
26872734 
2735
+    void GenNormalsMeshS()
2736
+    {
2737
+        selection.GenNormalsMesh();
2738
+//        for (int i=0; i<selection.size(); i++)
2739
+//        {
2740
+//            Object3D selectee = (Object3D) selection.elementAt(i);
2741
+//            selectee.GenNormals(crease);
2742
+//        }
2743
+
2744
+        //Touch();
2745
+    }
2746
+
26882747     void ClearColorsS()
26892748     {
26902749         selection.ClearColors();
....@@ -2816,6 +2875,24 @@
28162875             if (child == null)
28172876                 continue;
28182877             child.GenNormals(crease);
2878
+//            Children().release(i);
2879
+        }
2880
+        blockloop = false;
2881
+    }
2882
+
2883
+    void GenNormalsMesh()
2884
+    {
2885
+        if (blockloop)
2886
+            return;
2887
+        
2888
+        blockloop = true;
2889
+        GenNormalsMesh0();
2890
+        for (int i = 0; i < Children().Size(); i++)
2891
+        {
2892
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2893
+            if (child == null)
2894
+                continue;
2895
+            child.GenNormalsMesh();
28192896 //            Children().release(i);
28202897         }
28212898         blockloop = false;
....@@ -2984,6 +3061,15 @@
29843061         if (bRep != null)
29853062         {
29863063             bRep.GenerateNormals(crease);
3064
+            Touch();
3065
+        }
3066
+    }
3067
+
3068
+    void GenNormalsMesh0()
3069
+    {
3070
+        if (bRep != null)
3071
+        {
3072
+            bRep.GenerateNormalsMesh();
29873073             Touch();
29883074         }
29893075     }
....@@ -3438,7 +3524,8 @@
34383524         if (blockloop)
34393525             return;
34403526         
3441
-        if (marked || (bRep != null && material != null)) // borderline...
3527
+        if (//marked || // does not make sense
3528
+                (bRep != null || material != null)) // borderline...
34423529             live = h;
34433530         
34443531         for (int i = 0; i < Size(); i++)
....@@ -3459,7 +3546,8 @@
34593546             return;
34603547         
34613548         //if (bRep != null)
3462
-        if (marked || (bRep != null && material != null)) // borderline...
3549
+        if (//marked || // does not make sense
3550
+                (bRep != null || material != null)) // borderline...
34633551             link2master = h;
34643552         
34653553         for (int i = 0; i < Size(); i++)
....@@ -3479,7 +3567,8 @@
34793567         if (blockloop)
34803568             return;
34813569         
3482
-        if (marked || (bRep != null && material != null)) // borderline...
3570
+        if (//marked || // does not make sense
3571
+                (bRep != null || material != null)) // borderline...
34833572             hide = h;
34843573         
34853574         for (int i = 0; i < Size(); i++)
....@@ -3499,7 +3588,7 @@
34993588         if (blockloop)
35003589             return;
35013590         
3502
-        if (bRep != null && material != null) // borderline...
3591
+        if (bRep != null || material != null) // borderline...
35033592             marked = h;
35043593         
35053594         for (int i = 0; i < Size(); i++)
....@@ -3509,6 +3598,46 @@
35093598                 continue;
35103599             blockloop = true;
35113600             child.MarkLeaves(h);
3601
+            blockloop = false;
3602
+         //   release(i);
3603
+        }
3604
+    }
3605
+    
3606
+    void RewindLeaves(boolean h)
3607
+    {
3608
+        if (blockloop)
3609
+            return;
3610
+        
3611
+        if (bRep != null || material != null) // borderline...
3612
+            rewind = h;
3613
+        
3614
+        for (int i = 0; i < Size(); i++)
3615
+        {
3616
+            Object3D child = (Object3D) get(i); // reserve(i);
3617
+            if (child == null)
3618
+                continue;
3619
+            blockloop = true;
3620
+            child.RewindLeaves(h);
3621
+            blockloop = false;
3622
+         //   release(i);
3623
+        }
3624
+    }
3625
+    
3626
+    void RandomLeaves(boolean h)
3627
+    {
3628
+        if (blockloop)
3629
+            return;
3630
+        
3631
+        if (bRep != null || material != null) // borderline...
3632
+            random = h;
3633
+        
3634
+        for (int i = 0; i < Size(); i++)
3635
+        {
3636
+            Object3D child = (Object3D) get(i); // reserve(i);
3637
+            if (child == null)
3638
+                continue;
3639
+            blockloop = true;
3640
+            child.RandomLeaves(h);
35123641             blockloop = false;
35133642          //   release(i);
35143643         }
....@@ -4286,6 +4415,55 @@
42864415         }
42874416     }
42884417     
4418
+    void RepairSOV()
4419
+    {
4420
+        if (blockloop)
4421
+            return;
4422
+
4423
+        String texname = this.GetPigmentTexture();
4424
+        
4425
+        if (texname.startsWith("sov"))
4426
+        {
4427
+            String[] s = texname.split("/");
4428
+
4429
+            String[] sname = s[1].split("Color.pn");
4430
+            
4431
+            texname = sname[0];
4432
+            
4433
+            if (sname.length > 1)
4434
+            {
4435
+                texname += "Color.jpg";
4436
+            }
4437
+            
4438
+            this.SetPigmentTexture("sov/" + texname);
4439
+        }
4440
+                
4441
+        texname = this.GetBumpTexture();
4442
+        
4443
+        if (texname.startsWith("sov"))
4444
+        {
4445
+            String[] s = texname.split("/");
4446
+
4447
+            String[] sname = s[1].split("Bump.pn");
4448
+            
4449
+            texname = sname[0];
4450
+            
4451
+            if (sname.length > 1)
4452
+            {
4453
+                texname += "Bump.jpg";
4454
+            }
4455
+            
4456
+            this.SetBumpTexture("sov/" + texname);
4457
+        }
4458
+                
4459
+        for (int i=0; i<Size(); i++)
4460
+        {               
4461
+                blockloop = true;
4462
+            get(i).RepairSOV();
4463
+                blockloop = false;
4464
+        }
4465
+    }
4466
+    
42894467     void RepairTexture()
42904468     {
42914469         if (this instanceof FileObject || blockloop)
....@@ -4800,6 +4978,14 @@
48004978         }
48014979     }
48024980     
4981
+    ObjEditor GetWindow()
4982
+    {
4983
+        if (editWindow != null)
4984
+            return editWindow;
4985
+        
4986
+        return manipWindow;
4987
+    }
4988
+    
48034989     cTreePath Select(int indexcount, boolean deselect)
48044990     {
48054991         if (hide || dontselect)
....@@ -4836,10 +5022,11 @@
48365022                 if (leaf != null)
48375023                 {
48385024                     cTreePath tp = new cTreePath(this, leaf);
4839
-                    if (editWindow != null)
5025
+                    ObjEditor window = GetWindow();
5026
+                    if (window != null)
48405027                     {
48415028                         //System.out.println("editWindow = " + editWindow + " vs " + this);
4842
-                        editWindow.Select(tp, deselect, true);
5029
+                        window.Select(tp, deselect, true);
48435030                     }
48445031 
48455032                     return tp;
....@@ -4856,6 +5043,7 @@
48565043 
48575044             if (child == null)
48585045                 continue;
5046
+            
48595047             if (child.HasTransparency() && child.size() != 0)
48605048             {
48615049                 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4865,9 +5053,10 @@
48655053                 if (leaf != null)
48665054                 {
48675055                     cTreePath tp = new cTreePath(this, leaf);
4868
-                    if (editWindow != null)
5056
+                    ObjEditor window = GetWindow();
5057
+                    if (window != null)
48695058                     {
4870
-                        editWindow.Select(tp, deselect, true);
5059
+                        window.Select(tp, deselect, true);
48715060                     }
48725061 
48735062                     return tp;
....@@ -5509,12 +5698,23 @@
55095698     boolean NeedSupport()
55105699     {
55115700         return
5512
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5701
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55135702                  // PROBLEM with CROWD!!
55145703                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55155704     }
55165705     
55175706     static boolean DEBUG_SELECTION = false;
5707
+    
5708
+    boolean IsLive()
5709
+    {
5710
+        if (live)
5711
+            return true;
5712
+        
5713
+        if (parent == null)
5714
+            return false;
5715
+        
5716
+        return parent.IsLive();
5717
+    }
55185718     
55195719     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55205720     {
....@@ -5577,7 +5777,7 @@
55775777             support = support;
55785778         
55795779         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5580
-        boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5780
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
55815781         
55825782         if (!usecalllists && bRep != null && bRep.displaylist > 0)
55835783         {
....@@ -5597,10 +5797,12 @@
55975797         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
55985798         
55995799         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5800
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5801
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
56015802         {
56025803             Globals.lighttouched = true;
56035804         } // all panes...
5805
+        
56045806         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56055807         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56065808                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5728,6 +5930,7 @@
57285930             if (GetBRep() != null)
57295931             {
57305932                 display.NextIndex();
5933
+                
57315934                 // vertex color conflict : gl.glCallList(list);
57325935                 DrawNode(display, root, selected);
57335936                 if (this instanceof BezierPatch)
....@@ -5768,16 +5971,27 @@
57685971         tex = GetTextures();
57695972     }
57705973 
5771
-    boolean failed = false;
5974
+    boolean failedPigment = false;
5975
+    boolean failedBump = false;
57725976     
57735977     try
57745978     {
5775
-        display.BindTextures(tex, texres);
5979
+        display.BindPigmentTexture(tex, texres);
57765980     }
57775981     catch (Exception e)
57785982     {
57795983         System.err.println("FAILED: " + this);
5780
-        failed = true;
5984
+        failedPigment = true;
5985
+    }
5986
+           
5987
+    try
5988
+    {
5989
+        display.BindBumpTexture(tex, texres);
5990
+    }
5991
+    catch (Exception e)
5992
+    {
5993
+        //System.err.println("FAILED: " + this);
5994
+        failedBump = true;
57815995     }
57825996            
57835997             if (!compiled)
....@@ -5800,8 +6014,11 @@
58006014                 }
58016015             }
58026016 
5803
-    if (!failed)
5804
-        display.ReleaseTextures(tex);
6017
+    if (!failedBump)
6018
+        display.ReleaseBumpTexture(tex);
6019
+
6020
+    if (!failedPigment)
6021
+        display.ReleasePigmentTexture(tex);
58056022 
58066023     display.PopMaterial(this, selected);
58076024         }
....@@ -6174,6 +6391,11 @@
61746391                 // dec 2012
61756392                 new Exception().printStackTrace();
61766393                 return;
6394
+            }
6395
+            
6396
+            if (dontselect)
6397
+            {
6398
+                //bRep.GenerateNormalsMINE();
61776399             }
61786400             
61796401             display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7026,7 +7248,7 @@
70267248             spot.translate(32, 32);
70277249             spotw = spot.x + spot.width;
70287250             spoth = spot.y + spot.height;
7029
-            info.g.setColor(Color.blue);
7251
+            info.g.setColor(Color.cyan);
70307252             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70317253 //            if (CameraPane.Xmin > spot.x)
70327254 //            {
....@@ -7044,11 +7266,12 @@
70447266 //            {
70457267 //                CameraPane.Ymax = spoth;
70467268 //            }
7047
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7269
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7270
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
70497271             spot.translate(0, -32);
7050
-            info.g.setColor(Color.green);
7272
+            info.g.setColor(Color.yellow);
70517273             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7274
+            info.g.setColor(Color.green);
70527275 //            if (CameraPane.Xmin > spot.x)
70537276 //            {
70547277 //                CameraPane.Xmin = spot.x;
....@@ -7366,19 +7589,20 @@
73667589                 switch (info.pane.RenderCamera().viewCode)
73677590                 {
73687591                     case 3: // '\001'
7369
-                        if (modified)
7592
+                        if (modified || opposite)
73707593                         {
73717594                             //LA.matScale(toParent, 1, hScale, vScale);
73727595                             LA.matScale(toParent, totalScale, 1, 1);
73737596                         } // vScale, 1);
73747597                         else
73757598                         {
7599
+                            // EXCEPTION!
73767600                             LA.matScale(toParent, totalScale, totalScale, totalScale);
73777601                         } // vScale, 1);
73787602                         break;
73797603 
73807604                     case 2: // '\002'
7381
-                        if (modified)
7605
+                        if (modified || opposite)
73827606                         {
73837607                             //LA.matScale(toParent, hScale, 1, vScale);
73847608                             LA.matScale(toParent, 1, totalScale, 1);
....@@ -7389,7 +7613,7 @@
73897613                         break;
73907614 
73917615                     case 1: // '\003'
7392
-                        if (modified)
7616
+                        if (modified || opposite)
73937617                         {
73947618                             //LA.matScale(toParent, hScale, vScale, 1);
73957619                             LA.matScale(toParent, 1, 1, totalScale);
....@@ -7609,6 +7833,10 @@
76097833             editWindow = null;
76107834         } // ?
76117835         }
7836
+        else
7837
+        {
7838
+            //editWindow.closeUI();
7839
+        }
76127840     }
76137841     
76147842     boolean root; // patch for edit windows
....@@ -7766,6 +7994,10 @@
77667994     }
77677995     
77687996     transient ObjEditor editWindow;
7997
+    transient ObjEditor manipWindow;
7998
+    
7999
+    transient boolean pinned;
8000
+    
77698001     transient ObjectUI objectUI;
77708002     public static int povDepth = 0;
77718003     private static cVector tbMin = new cVector();