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)
....@@ -15172,6 +15172,7 @@
1517215172                 ClearSelection();
1517315173                 break;
1517415174             case '+':
15175
+                
1517515176                 /*
1517615177                 //fontsize += 1;
1517715178                 bbzoom *= 2;
....@@ -15189,17 +15190,17 @@
1518915190             case '=':
1519015191                 IncDepth();
1519115192                 //fontsize += 1;
15192
-                object.editWindow.refreshContents(true);
15193
+                object.GetWindow().refreshContents(true);
1519315194                 maskbit = 6;
1519415195                 break;
1519515196             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1519615197                 DecDepth();
1519715198                 maskbit = 5;
1519815199                 //if(fontsize > 1) fontsize -= 1;
15199
-                if (object.editWindow == null)
15200
-                    new Exception().printStackTrace();
15201
-                else
15202
-                    object.editWindow.refreshContents(true);
15200
+//                if (object.editWindow == null)
15201
+//                    new Exception().printStackTrace();
15202
+//                else
15203
+                    object.GetWindow().refreshContents(true);
1520315204                 break;
1520415205             case '{':
1520515206                 manipCamera.shaper_fovy /= 1.1;
....@@ -15423,7 +15424,7 @@
1542315424         }
1542415425          */
1542515426 
15426
-        object.editWindow.EditSelection(false);
15427
+        object.GetWindow().EditSelection(false);
1542715428     }
1542815429 
1542915430     void SelectParent()
....@@ -15440,10 +15441,10 @@
1544015441             {
1544115442                 //selectees.remove(i);
1544215443                 System.out.println("select parent of " + elem);
15443
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15444
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1544415445             } else
1544515446             {
15446
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15447
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1544715448             }
1544815449 
1544915450             first = false;
....@@ -15485,12 +15486,12 @@
1548515486                 for (int j = 0; j < group.children.size(); j++)
1548615487                 {
1548715488                     elem = (Object3D) group.children.elementAt(j);
15488
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15489
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1548915490                     first = false;
1549015491                 }
1549115492             } else
1549215493             {
15493
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15494
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1549415495             }
1549515496 
1549615497             first = false;
....@@ -15501,21 +15502,21 @@
1550115502     {
1550215503         //Composite group = (Composite) object;
1550315504         Object3D group = object;
15504
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15505
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1550515506     }
1550615507 
1550715508     void ResetTransform(int mask)
1550815509     {
1550915510         //Composite group = (Composite) object;
1551015511         Object3D group = object;
15511
-        group.editWindow.ResetTransform(mask);
15512
+        group.GetWindow().ResetTransform(mask);
1551215513     }
1551315514 
1551415515     void FlipTransform()
1551515516     {
1551615517         //Composite group = (Composite) object;
1551715518         Object3D group = object;
15518
-        group.editWindow.FlipTransform();
15519
+        group.GetWindow().FlipTransform();
1551915520 //        group.editWindow.ReduceMesh(true);
1552015521     }
1552115522 
....@@ -15523,7 +15524,7 @@
1552315524     {
1552415525         //Composite group = (Composite) object;
1552515526         Object3D group = object;
15526
-        group.editWindow.PrintMemory();
15527
+        group.GetWindow().PrintMemory();
1552715528 //        group.editWindow.ReduceMesh(true);
1552815529     }
1552915530     
....@@ -15531,7 +15532,7 @@
1553115532     {
1553215533         //Composite group = (Composite) object;
1553315534         Object3D group = object;
15534
-        group.editWindow.ResetCentroid();
15535
+        group.GetWindow().ResetCentroid();
1553515536     }
1553615537 
1553715538     void IncDepth()
....@@ -16723,7 +16724,7 @@
1672316724                 }
1672416725                 
1672516726                 if (!movingcamera && !PAINTMODE)
16726
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16727
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1672716728                 
1672816729                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1672916730                 {
....@@ -16735,17 +16736,17 @@
1673516736                     
1673616737                     group.add(paintobj); // link
1673716738                     
16738
-                    object.editWindow.SnapObject(group);
16739
+                    object.GetWindow().SnapObject(group);
1673916740                     
16740
-                    Object3D folder = object.editWindow.copy;
16741
+                    Object3D folder = object.GetWindow().copy;
1674116742                     
16742
-                    if (object.editWindow.copy.selection.Size() > 0)
16743
-                        folder = object.editWindow.copy.selection.elementAt(0);
16743
+                    if (object.GetWindow().copy.selection.Size() > 0)
16744
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1674416745                     
1674516746                     folder.add(group);
1674616747                     
16747
-                    object.editWindow.ResetModel();
16748
-                    object.editWindow.refreshContents();
16748
+                    object.GetWindow().ResetModel();
16749
+                    object.GetWindow().refreshContents();
1674916750                 }
1675016751                 else
1675116752                     paintcount = 0;