blame | history | patch | commit | commitdiff
Normand Briere
2019-07-14 bc829f47837b5a001f911542140b0b8e63c2bb0c 
 Object3D.java
....@@ -24,6 +24,11 @@
2424     
2525     private UUID uuid = UUID.randomUUID();
2626     
27
+    // TEMPORARY for mocap undo. No need to be transient.
28
+    mocap.reader.BVHReader.BVHResult savebvh;
29
+    Object3D saveskeleton;
30
+    //
31
+    
2732     ScriptNode scriptnode;
2833 
2934         void InitOthers()
....@@ -104,125 +109,170 @@
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++)
130
-    {
131
-        Object3D child = (Object3D) get(i);
132
-        if (child == null)
133
-            continue;
134
-        blockloop = true;
135
-        child.SaveSupports();
136
-        blockloop = false;
137
-    }
138
-}
139144 
140
-void RestoreSupports()
141
-{
142
-    if (blockloop)
143
-        return;
145
+    void RestoreSupports()
146
+    {
147
+        if (blockloop)
148
+            return;
144149 
145
-    support = transientsupport;
146
-    link2master = transientlink2master;
147
-    transientsupport = null;
148
-    transientlink2master = false;
149
-    
150
-    if (bRep != null)
151
-    {
152
-        bRep.RestoreSupports();
153
-    }
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
-}
150
+        support = transientsupport;
151
+        link2master = transientlink2master;
152
+        transientsupport = null;
153
+        transientlink2master = false;
165154 
166
-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167
-{
168
-    if (hashtable.containsKey(GetUUID()))
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)
169172     {
173
+        Object3D o;
174
+        
175
+        if (hashtable.containsKey(GetUUID()))
176
+        {
177
+            o = hashtable.get(GetUUID());
178
+
179
+            Grafreed.Assert(this.bRep == o.bRep);
180
+            //if (this.bRep != null)
181
+            //    assert(this.bRep.support == o.transientrep);
182
+            if (this.support != null)
183
+                assert(this.support.bRep == o.transientrep);
184
+        }
185
+        else
186
+        {
187
+            o = new Object3D("copy of " + this.name);
188
+
189
+            hashtable.put(GetUUID(), o);
190
+        }
191
+
192
+        if (!blockloop)
193
+        {
194
+            blockloop = true;
195
+
196
+            for (int i=0; i<Size(); i++)
197
+            {
198
+                get(i).ExtractBigData(hashtable);
199
+            }
200
+
201
+            blockloop = false;
202
+        }
203
+        
204
+        ExtractBigData(o);
205
+    }
206
+
207
+    void ExtractBigData(Object3D o)
208
+    {
209
+        if (o.bRep != null)
210
+            Grafreed.Assert(o.bRep == this.bRep);
211
+        
212
+        o.bRep = this.bRep;
213
+// July 2019       if (this.bRep != null)
214
+//        {
215
+//            o.transientrep = this.bRep.support;
216
+//            o.bRep.support = null;
217
+//        }
218
+        
219
+        if (this.support != null)
220
+        {
221
+            if (o.transientrep != null)
222
+                Grafreed.Assert(o.transientrep == this.support.bRep);
223
+
224
+            o.transientrep = this.support.bRep;
225
+            this.support.bRep = null;
226
+        }
227
+        
228
+        //    o.support = this.support;
229
+        //    o.fileparent = this.fileparent;
230
+        //    if (this.bRep != null)
231
+        //        o.bRep = this.bRep.support;
232
+        
233
+        this.bRep = null;
234
+    //    if (this.bRep != null)
235
+    //        this.bRep.support = null;
236
+    //    this.support = null;
237
+    //    this.fileparent = null;
238
+    }
239
+
240
+    void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
241
+    {
242
+        if (!hashtable.containsKey(GetUUID()))
243
+            return;
244
+
170245         Object3D o = hashtable.get(GetUUID());
171246 
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
-}
247
+        RestoreBigData(o);
205248 
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);
249
+        if (blockloop)
250
+            return;
251
+
252
+        blockloop = true;
253
+
254
+        //hashtable.remove(GetUUID());
255
+
256
+        for (int i=0; i<Size(); i++)
257
+        {
258
+            get(i).RestoreBigData(hashtable);
259
+        }
260
+        
261
+        blockloop = false;
224262     }
225
-}
263
+
264
+    void RestoreBigData(Object3D o)
265
+    {
266
+        this.bRep = o.bRep;
267
+        if (this.support != null && o.transientrep != null)
268
+        {
269
+            this.support.bRep = o.transientrep;
270
+        }
271
+// July 2019        if (this.bRep != null)
272
+//            this.bRep.support = o.transientrep;
273
+    //    this.support = o.support;
274
+    //    this.fileparent = o.fileparent;
275
+    }
226276 
227277 // MOCAP SUPPORT
228278     double tx,ty,tz,rx,ry,rz;
....@@ -547,12 +597,14 @@
547597             toParent = LA.newMatrix();
548598             fromParent = LA.newMatrix();
549599         }
600
+        
550601         if (toParentMarked == null)
551602         {
552603             if (maxcount != 1)
553604             {
554605                 new Exception().printStackTrace();
555606             }
607
+            
556608             toParentMarked = LA.newMatrix();
557609             fromParentMarked = LA.newMatrix();
558610         }
....@@ -863,7 +915,7 @@
863915         
864916         if (marked && Globals.isLIVE() && live &&
865917                 //TEMP21aug2018
866
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
918
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
867919                 currentframe != Globals.framecount)
868920         {
869921             currentframe = Globals.framecount;
....@@ -875,7 +927,8 @@
875927             
876928             boolean changedir = random && Math.random() < 0.01; // && !link2master;
877929 
878
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
930
+            if (transformcount*factor >= maxcount && (rewind || random) ||
931
+                    (step == 1 && changedir))
879932             {
880933                 countdown = 1;
881934                 delay = speedup?8:1;
....@@ -947,6 +1000,7 @@
9471000         if (material == null || material.multiply)
9481001             return true;
9491002         
1003
+        // Transparent objects are dynamic because we have to sort the triangles.
9501004         return material.opacity > 0.99;
9511005     }
9521006     
....@@ -1347,6 +1401,7 @@
13471401                     toParent = LA.newMatrix();
13481402                     fromParent = LA.newMatrix();
13491403                 }
1404
+                
13501405                 LA.matCopy(other.toParent, toParent);
13511406                 LA.matCopy(other.fromParent, fromParent);
13521407                 
....@@ -2368,6 +2423,10 @@
23682423         }
23692424          */
23702425         }
2426
+        else
2427
+        {
2428
+            //((ObjEditor)editWindow).SetupUI2(null);
2429
+        }
23712430     }
23722431 
23732432     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2409,6 +2468,14 @@
24092468         {
24102469             editWindow.refreshContents();
24112470         }
2471
+        else
2472
+        {
2473
+            if (manipWindow != null)
2474
+            {
2475
+                manipWindow.refreshContents();
2476
+            }
2477
+        }
2478
+                
24122479     //if (parent != null)
24132480     //parent.refreshEditWindow();
24142481     }
....@@ -2693,6 +2760,18 @@
26932760         //Touch();
26942761     }
26952762 
2763
+    void GenNormalsMeshS()
2764
+    {
2765
+        selection.GenNormalsMesh();
2766
+//        for (int i=0; i<selection.size(); i++)
2767
+//        {
2768
+//            Object3D selectee = (Object3D) selection.elementAt(i);
2769
+//            selectee.GenNormals(crease);
2770
+//        }
2771
+
2772
+        //Touch();
2773
+    }
2774
+
26962775     void ClearColorsS()
26972776     {
26982777         selection.ClearColors();
....@@ -2824,6 +2903,24 @@
28242903             if (child == null)
28252904                 continue;
28262905             child.GenNormals(crease);
2906
+//            Children().release(i);
2907
+        }
2908
+        blockloop = false;
2909
+    }
2910
+
2911
+    void GenNormalsMesh()
2912
+    {
2913
+        if (blockloop)
2914
+            return;
2915
+        
2916
+        blockloop = true;
2917
+        GenNormalsMesh0();
2918
+        for (int i = 0; i < Children().Size(); i++)
2919
+        {
2920
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2921
+            if (child == null)
2922
+                continue;
2923
+            child.GenNormalsMesh();
28272924 //            Children().release(i);
28282925         }
28292926         blockloop = false;
....@@ -2992,6 +3089,15 @@
29923089         if (bRep != null)
29933090         {
29943091             bRep.GenerateNormals(crease);
3092
+            Touch();
3093
+        }
3094
+    }
3095
+
3096
+    void GenNormalsMesh0()
3097
+    {
3098
+        if (bRep != null)
3099
+        {
3100
+            bRep.GenerateNormalsMesh();
29953101             Touch();
29963102         }
29973103     }
....@@ -3446,7 +3552,8 @@
34463552         if (blockloop)
34473553             return;
34483554         
3449
-        if (marked || (bRep != null && material != null)) // borderline...
3555
+        if (//marked || // does not make sense
3556
+                (bRep != null || material != null)) // borderline...
34503557             live = h;
34513558         
34523559         for (int i = 0; i < Size(); i++)
....@@ -3467,7 +3574,8 @@
34673574             return;
34683575         
34693576         //if (bRep != null)
3470
-        if (marked || (bRep != null && material != null)) // borderline...
3577
+        if (//marked || // does not make sense
3578
+                (bRep != null || material != null)) // borderline...
34713579             link2master = h;
34723580         
34733581         for (int i = 0; i < Size(); i++)
....@@ -3487,7 +3595,8 @@
34873595         if (blockloop)
34883596             return;
34893597         
3490
-        if (marked || (bRep != null && material != null)) // borderline...
3598
+        if (//marked || // does not make sense
3599
+                (bRep != null || material != null)) // borderline...
34913600             hide = h;
34923601         
34933602         for (int i = 0; i < Size(); i++)
....@@ -3507,7 +3616,7 @@
35073616         if (blockloop)
35083617             return;
35093618         
3510
-        if (bRep != null && material != null) // borderline...
3619
+        if (bRep != null || material != null) // borderline...
35113620             marked = h;
35123621         
35133622         for (int i = 0; i < Size(); i++)
....@@ -3517,6 +3626,46 @@
35173626                 continue;
35183627             blockloop = true;
35193628             child.MarkLeaves(h);
3629
+            blockloop = false;
3630
+         //   release(i);
3631
+        }
3632
+    }
3633
+    
3634
+    void RewindLeaves(boolean h)
3635
+    {
3636
+        if (blockloop)
3637
+            return;
3638
+        
3639
+        if (bRep != null || material != null) // borderline...
3640
+            rewind = h;
3641
+        
3642
+        for (int i = 0; i < Size(); i++)
3643
+        {
3644
+            Object3D child = (Object3D) get(i); // reserve(i);
3645
+            if (child == null)
3646
+                continue;
3647
+            blockloop = true;
3648
+            child.RewindLeaves(h);
3649
+            blockloop = false;
3650
+         //   release(i);
3651
+        }
3652
+    }
3653
+    
3654
+    void RandomLeaves(boolean h)
3655
+    {
3656
+        if (blockloop)
3657
+            return;
3658
+        
3659
+        if (bRep != null || material != null) // borderline...
3660
+            random = h;
3661
+        
3662
+        for (int i = 0; i < Size(); i++)
3663
+        {
3664
+            Object3D child = (Object3D) get(i); // reserve(i);
3665
+            if (child == null)
3666
+                continue;
3667
+            blockloop = true;
3668
+            child.RandomLeaves(h);
35203669             blockloop = false;
35213670          //   release(i);
35223671         }
....@@ -4294,6 +4443,55 @@
42944443         }
42954444     }
42964445     
4446
+    void RepairSOV()
4447
+    {
4448
+        if (blockloop)
4449
+            return;
4450
+
4451
+        String texname = this.GetPigmentTexture();
4452
+        
4453
+        if (texname.startsWith("sov"))
4454
+        {
4455
+            String[] s = texname.split("/");
4456
+
4457
+            String[] sname = s[1].split("Color.pn");
4458
+            
4459
+            texname = sname[0];
4460
+            
4461
+            if (sname.length > 1)
4462
+            {
4463
+                texname += "Color.jpg";
4464
+            }
4465
+            
4466
+            this.SetPigmentTexture("sov/" + texname);
4467
+        }
4468
+                
4469
+        texname = this.GetBumpTexture();
4470
+        
4471
+        if (texname.startsWith("sov"))
4472
+        {
4473
+            String[] s = texname.split("/");
4474
+
4475
+            String[] sname = s[1].split("Bump.pn");
4476
+            
4477
+            texname = sname[0];
4478
+            
4479
+            if (sname.length > 1)
4480
+            {
4481
+                texname += "Bump.jpg";
4482
+            }
4483
+            
4484
+            this.SetBumpTexture("sov/" + texname);
4485
+        }
4486
+                
4487
+        for (int i=0; i<Size(); i++)
4488
+        {               
4489
+                blockloop = true;
4490
+            get(i).RepairSOV();
4491
+                blockloop = false;
4492
+        }
4493
+    }
4494
+    
42974495     void RepairTexture()
42984496     {
42994497         if (this instanceof FileObject || blockloop)
....@@ -4808,6 +5006,14 @@
48085006         }
48095007     }
48105008     
5009
+    ObjEditor GetWindow()
5010
+    {
5011
+        if (editWindow != null)
5012
+            return editWindow;
5013
+        
5014
+        return manipWindow;
5015
+    }
5016
+    
48115017     cTreePath Select(int indexcount, boolean deselect)
48125018     {
48135019         if (hide || dontselect)
....@@ -4844,10 +5050,11 @@
48445050                 if (leaf != null)
48455051                 {
48465052                     cTreePath tp = new cTreePath(this, leaf);
4847
-                    if (editWindow != null)
5053
+                    ObjEditor window = GetWindow();
5054
+                    if (window != null)
48485055                     {
48495056                         //System.out.println("editWindow = " + editWindow + " vs " + this);
4850
-                        editWindow.Select(tp, deselect, true);
5057
+                        window.Select(tp, deselect, true);
48515058                     }
48525059 
48535060                     return tp;
....@@ -4864,6 +5071,7 @@
48645071 
48655072             if (child == null)
48665073                 continue;
5074
+            
48675075             if (child.HasTransparency() && child.size() != 0)
48685076             {
48695077                 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4873,9 +5081,10 @@
48735081                 if (leaf != null)
48745082                 {
48755083                     cTreePath tp = new cTreePath(this, leaf);
4876
-                    if (editWindow != null)
5084
+                    ObjEditor window = GetWindow();
5085
+                    if (window != null)
48775086                     {
4878
-                        editWindow.Select(tp, deselect, true);
5087
+                        window.Select(tp, deselect, true);
48795088                     }
48805089 
48815090                     return tp;
....@@ -5517,12 +5726,23 @@
55175726     boolean NeedSupport()
55185727     {
55195728         return
5520
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5729
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55215730                  // PROBLEM with CROWD!!
55225731                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55235732     }
55245733     
55255734     static boolean DEBUG_SELECTION = false;
5735
+    
5736
+    boolean IsLive()
5737
+    {
5738
+        if (live)
5739
+            return true;
5740
+        
5741
+        if (parent == null)
5742
+            return false;
5743
+        
5744
+        return parent.IsLive();
5745
+    }
55265746     
55275747     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55285748     {
....@@ -5585,7 +5805,7 @@
55855805             support = support;
55865806         
55875807         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5588
-        boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5808
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
55895809         
55905810         if (!usecalllists && bRep != null && bRep.displaylist > 0)
55915811         {
....@@ -5605,10 +5825,12 @@
56055825         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
56065826         
56075827         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5828
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5829
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
56095830         {
56105831             Globals.lighttouched = true;
56115832         } // all panes...
5833
+        
56125834         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56135835         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56145836                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5736,6 +5958,7 @@
57365958             if (GetBRep() != null)
57375959             {
57385960                 display.NextIndex();
5961
+                
57395962                 // vertex color conflict : gl.glCallList(list);
57405963                 DrawNode(display, root, selected);
57415964                 if (this instanceof BezierPatch)
....@@ -5776,16 +5999,27 @@
57765999         tex = GetTextures();
57776000     }
57786001 
5779
-    boolean failed = false;
6002
+    boolean failedPigment = false;
6003
+    boolean failedBump = false;
57806004     
57816005     try
57826006     {
5783
-        display.BindTextures(tex, texres);
6007
+        display.BindPigmentTexture(tex, texres);
57846008     }
57856009     catch (Exception e)
57866010     {
57876011         System.err.println("FAILED: " + this);
5788
-        failed = true;
6012
+        failedPigment = true;
6013
+    }
6014
+           
6015
+    try
6016
+    {
6017
+        display.BindBumpTexture(tex, texres);
6018
+    }
6019
+    catch (Exception e)
6020
+    {
6021
+        //System.err.println("FAILED: " + this);
6022
+        failedBump = true;
57896023     }
57906024            
57916025             if (!compiled)
....@@ -5808,8 +6042,11 @@
58086042                 }
58096043             }
58106044 
5811
-    if (!failed)
5812
-        display.ReleaseTextures(tex);
6045
+    if (!failedBump)
6046
+        display.ReleaseBumpTexture(tex);
6047
+
6048
+    if (!failedPigment)
6049
+        display.ReleasePigmentTexture(tex);
58136050 
58146051     display.PopMaterial(this, selected);
58156052         }
....@@ -6182,6 +6419,11 @@
61826419                 // dec 2012
61836420                 new Exception().printStackTrace();
61846421                 return;
6422
+            }
6423
+            
6424
+            if (dontselect)
6425
+            {
6426
+                //bRep.GenerateNormalsMINE();
61856427             }
61866428             
61876429             display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7034,7 +7276,7 @@
70347276             spot.translate(32, 32);
70357277             spotw = spot.x + spot.width;
70367278             spoth = spot.y + spot.height;
7037
-            info.g.setColor(Color.blue);
7279
+            info.g.setColor(Color.cyan);
70387280             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70397281 //            if (CameraPane.Xmin > spot.x)
70407282 //            {
....@@ -7052,11 +7294,12 @@
70527294 //            {
70537295 //                CameraPane.Ymax = spoth;
70547296 //            }
7055
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7297
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7298
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
70577299             spot.translate(0, -32);
7058
-            info.g.setColor(Color.green);
7300
+            info.g.setColor(Color.yellow);
70597301             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7302
+            info.g.setColor(Color.green);
70607303 //            if (CameraPane.Xmin > spot.x)
70617304 //            {
70627305 //                CameraPane.Xmin = spot.x;
....@@ -7073,8 +7316,8 @@
70737316 //            {
70747317 //                CameraPane.Ymax = spoth;
70757318 //            }
7076
-            info.g.drawArc(boundary.x, boundary.y,
7077
-                    boundary.width, boundary.height, 0, 360);
7319
+            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7320
+                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
70787321             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
70797322 //            if (CameraPane.Xmin > boundary.x)
70807323 //            {
....@@ -7374,19 +7617,20 @@
73747617                 switch (info.pane.RenderCamera().viewCode)
73757618                 {
73767619                     case 3: // '\001'
7377
-                        if (modified)
7620
+                        if (modified || opposite)
73787621                         {
73797622                             //LA.matScale(toParent, 1, hScale, vScale);
73807623                             LA.matScale(toParent, totalScale, 1, 1);
73817624                         } // vScale, 1);
73827625                         else
73837626                         {
7627
+                            // EXCEPTION!
73847628                             LA.matScale(toParent, totalScale, totalScale, totalScale);
73857629                         } // vScale, 1);
73867630                         break;
73877631 
73887632                     case 2: // '\002'
7389
-                        if (modified)
7633
+                        if (modified || opposite)
73907634                         {
73917635                             //LA.matScale(toParent, hScale, 1, vScale);
73927636                             LA.matScale(toParent, 1, totalScale, 1);
....@@ -7397,7 +7641,7 @@
73977641                         break;
73987642 
73997643                     case 1: // '\003'
7400
-                        if (modified)
7644
+                        if (modified || opposite)
74017645                         {
74027646                             //LA.matScale(toParent, hScale, vScale, 1);
74037647                             LA.matScale(toParent, 1, 1, totalScale);
....@@ -7617,6 +7861,10 @@
76177861             editWindow = null;
76187862         } // ?
76197863         }
7864
+        else
7865
+        {
7866
+            //editWindow.closeUI();
7867
+        }
76207868     }
76217869     
76227870     boolean root; // patch for edit windows
....@@ -7774,6 +8022,10 @@
77748022     }
77758023     
77768024     transient ObjEditor editWindow;
8025
+    transient ObjEditor manipWindow;
8026
+    
8027
+    transient boolean pinned;
8028
+    
77778029     transient ObjectUI objectUI;
77788030     public static int povDepth = 0;
77798031     private static cVector tbMin = new cVector();