blame | history | patch | commit | commitdiff
Normand Briere
2019-07-01 6600d22461ccc1cb602f238a9ffa83cf07dd830e 
 CameraPane.java
....@@ -2065,7 +2065,7 @@
20652065             //System.err.println("Oeil on");
20662066             OEIL = true;
20672067             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2068
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
20692069             //pingthread.StepToTarget(true);
20702070         }
20712071         
....@@ -11527,7 +11527,7 @@
1152711527         if ((TRACK || SHADOWTRACK) || zoomonce)
1152811528         {
1152911529             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11530
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11530
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1153111531             pingthread.StepToTarget(true); // true);
1153211532        //     zoomonce = false;
1153311533         }
....@@ -13943,7 +13943,7 @@
1394313943             
1394413944 // fev 2014???
1394513945             if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13946
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13946
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1394713947             pingthread.StepToTarget(true); // true);
1394813948         }
1394913949     //    if (!LIVE)
....@@ -15190,17 +15190,17 @@
1519015190             case '=':
1519115191                 IncDepth();
1519215192                 //fontsize += 1;
15193
-                object.editWindow.refreshContents(true);
15193
+                object.GetWindow().refreshContents(true);
1519415194                 maskbit = 6;
1519515195                 break;
1519615196             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1519715197                 DecDepth();
1519815198                 maskbit = 5;
1519915199                 //if(fontsize > 1) fontsize -= 1;
15200
-                if (object.editWindow == null)
15201
-                    new Exception().printStackTrace();
15202
-                else
15203
-                    object.editWindow.refreshContents(true);
15200
+//                if (object.editWindow == null)
15201
+//                    new Exception().printStackTrace();
15202
+//                else
15203
+                    object.GetWindow().refreshContents(true);
1520415204                 break;
1520515205             case '{':
1520615206                 manipCamera.shaper_fovy /= 1.1;
....@@ -15424,7 +15424,7 @@
1542415424         }
1542515425          */
1542615426 
15427
-        object.editWindow.EditSelection(false);
15427
+        object.GetWindow().EditSelection(false);
1542815428     }
1542915429 
1543015430     void SelectParent()
....@@ -15441,10 +15441,10 @@
1544115441             {
1544215442                 //selectees.remove(i);
1544315443                 System.out.println("select parent of " + elem);
15444
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15444
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1544515445             } else
1544615446             {
15447
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15447
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1544815448             }
1544915449 
1545015450             first = false;
....@@ -15486,12 +15486,12 @@
1548615486                 for (int j = 0; j < group.children.size(); j++)
1548715487                 {
1548815488                     elem = (Object3D) group.children.elementAt(j);
15489
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15489
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1549015490                     first = false;
1549115491                 }
1549215492             } else
1549315493             {
15494
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15494
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1549515495             }
1549615496 
1549715497             first = false;
....@@ -15502,21 +15502,21 @@
1550215502     {
1550315503         //Composite group = (Composite) object;
1550415504         Object3D group = object;
15505
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15505
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1550615506     }
1550715507 
1550815508     void ResetTransform(int mask)
1550915509     {
1551015510         //Composite group = (Composite) object;
1551115511         Object3D group = object;
15512
-        group.editWindow.ResetTransform(mask);
15512
+        group.GetWindow().ResetTransform(mask);
1551315513     }
1551415514 
1551515515     void FlipTransform()
1551615516     {
1551715517         //Composite group = (Composite) object;
1551815518         Object3D group = object;
15519
-        group.editWindow.FlipTransform();
15519
+        group.GetWindow().FlipTransform();
1552015520 //        group.editWindow.ReduceMesh(true);
1552115521     }
1552215522 
....@@ -15524,7 +15524,7 @@
1552415524     {
1552515525         //Composite group = (Composite) object;
1552615526         Object3D group = object;
15527
-        group.editWindow.PrintMemory();
15527
+        group.GetWindow().PrintMemory();
1552815528 //        group.editWindow.ReduceMesh(true);
1552915529     }
1553015530     
....@@ -15532,7 +15532,7 @@
1553215532     {
1553315533         //Composite group = (Composite) object;
1553415534         Object3D group = object;
15535
-        group.editWindow.ResetCentroid();
15535
+        group.GetWindow().ResetCentroid();
1553615536     }
1553715537 
1553815538     void IncDepth()
....@@ -16724,7 +16724,7 @@
1672416724                 }
1672516725                 
1672616726                 if (!movingcamera && !PAINTMODE)
16727
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16727
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1672816728                 
1672916729                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1673016730                 {
....@@ -16736,17 +16736,17 @@
1673616736                     
1673716737                     group.add(paintobj); // link
1673816738                     
16739
-                    object.editWindow.SnapObject(group);
16739
+                    object.GetWindow().SnapObject(group);
1674016740                     
16741
-                    Object3D folder = object.editWindow.copy;
16741
+                    Object3D folder = object.GetWindow().copy;
1674216742                     
16743
-                    if (object.editWindow.copy.selection.Size() > 0)
16744
-                        folder = object.editWindow.copy.selection.elementAt(0);
16743
+                    if (object.GetWindow().copy.selection.Size() > 0)
16744
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1674516745                     
1674616746                     folder.add(group);
1674716747                     
16748
-                    object.editWindow.ResetModel();
16749
-                    object.editWindow.refreshContents();
16748
+                    object.GetWindow().ResetModel();
16749
+                    object.GetWindow().refreshContents();
1675016750                 }
1675116751                 else
1675216752                     paintcount = 0;