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         }
....@@ -13375,9 +13375,10 @@
1337513375                 "DP3 " + dest + ".z," + "normals," + "eye;" +
1337613376                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1337713377                 //"MOV " + dest + ".w," + "normal.z;" +
13378
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13379
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13380
-                //"MOV " + dest + ".z," + "params2.w;" + 
13378
+//            "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13379
+//            "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13380
+                
13381
+                "MOV " + dest + ".z," + "params2.w;" + // EXACT
1338113382                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1338213383                 "RCP " + dest + ".w," + dest + ".w;" +
1338313384                 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13942,7 +13943,7 @@
1394213943             
1394313944 // fev 2014???
1394413945             if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13945
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13946
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1394613947             pingthread.StepToTarget(true); // true);
1394713948         }
1394813949     //    if (!LIVE)
....@@ -15119,9 +15120,9 @@
1511915120             case '_':
1512015121                 kompactbit = 5;
1512115122                 break;
15122
-            case '+':
15123
-                kompactbit = 6;
15124
-                break;
15123
+//            case '+':
15124
+//                kompactbit = 6;
15125
+//                break;
1512515126             case ' ':
1512615127                 ObjEditor.theFrame.ToggleFullScreen();
1512715128                 repaint();
....@@ -15170,8 +15171,9 @@
1517015171             case DELETE:
1517115172                 ClearSelection();
1517215173                 break;
15173
-                /*
1517415174             case '+':
15175
+                
15176
+                /*
1517515177                 //fontsize += 1;
1517615178                 bbzoom *= 2;
1517715179                 repaint();
....@@ -15188,17 +15190,17 @@
1518815190             case '=':
1518915191                 IncDepth();
1519015192                 //fontsize += 1;
15191
-                object.editWindow.refreshContents(true);
15193
+                object.GetWindow().refreshContents(true);
1519215194                 maskbit = 6;
1519315195                 break;
1519415196             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1519515197                 DecDepth();
1519615198                 maskbit = 5;
1519715199                 //if(fontsize > 1) fontsize -= 1;
15198
-                if (object.editWindow == null)
15199
-                    new Exception().printStackTrace();
15200
-                else
15201
-                    object.editWindow.refreshContents(true);
15200
+//                if (object.editWindow == null)
15201
+//                    new Exception().printStackTrace();
15202
+//                else
15203
+                    object.GetWindow().refreshContents(true);
1520215204                 break;
1520315205             case '{':
1520415206                 manipCamera.shaper_fovy /= 1.1;
....@@ -15422,7 +15424,7 @@
1542215424         }
1542315425          */
1542415426 
15425
-        object.editWindow.EditSelection(false);
15427
+        object.GetWindow().EditSelection(false);
1542615428     }
1542715429 
1542815430     void SelectParent()
....@@ -15439,10 +15441,10 @@
1543915441             {
1544015442                 //selectees.remove(i);
1544115443                 System.out.println("select parent of " + elem);
15442
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15444
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1544315445             } else
1544415446             {
15445
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15447
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1544615448             }
1544715449 
1544815450             first = false;
....@@ -15484,12 +15486,12 @@
1548415486                 for (int j = 0; j < group.children.size(); j++)
1548515487                 {
1548615488                     elem = (Object3D) group.children.elementAt(j);
15487
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15489
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1548815490                     first = false;
1548915491                 }
1549015492             } else
1549115493             {
15492
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15494
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1549315495             }
1549415496 
1549515497             first = false;
....@@ -15500,21 +15502,21 @@
1550015502     {
1550115503         //Composite group = (Composite) object;
1550215504         Object3D group = object;
15503
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15505
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1550415506     }
1550515507 
1550615508     void ResetTransform(int mask)
1550715509     {
1550815510         //Composite group = (Composite) object;
1550915511         Object3D group = object;
15510
-        group.editWindow.ResetTransform(mask);
15512
+        group.GetWindow().ResetTransform(mask);
1551115513     }
1551215514 
1551315515     void FlipTransform()
1551415516     {
1551515517         //Composite group = (Composite) object;
1551615518         Object3D group = object;
15517
-        group.editWindow.FlipTransform();
15519
+        group.GetWindow().FlipTransform();
1551815520 //        group.editWindow.ReduceMesh(true);
1551915521     }
1552015522 
....@@ -15522,7 +15524,7 @@
1552215524     {
1552315525         //Composite group = (Composite) object;
1552415526         Object3D group = object;
15525
-        group.editWindow.PrintMemory();
15527
+        group.GetWindow().PrintMemory();
1552615528 //        group.editWindow.ReduceMesh(true);
1552715529     }
1552815530     
....@@ -15530,7 +15532,7 @@
1553015532     {
1553115533         //Composite group = (Composite) object;
1553215534         Object3D group = object;
15533
-        group.editWindow.ResetCentroid();
15535
+        group.GetWindow().ResetCentroid();
1553415536     }
1553515537 
1553615538     void IncDepth()
....@@ -16722,7 +16724,7 @@
1672216724                 }
1672316725                 
1672416726                 if (!movingcamera && !PAINTMODE)
16725
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16727
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1672616728                 
1672716729                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1672816730                 {
....@@ -16734,17 +16736,17 @@
1673416736                     
1673516737                     group.add(paintobj); // link
1673616738                     
16737
-                    object.editWindow.SnapObject(group);
16739
+                    object.GetWindow().SnapObject(group);
1673816740                     
16739
-                    Object3D folder = object.editWindow.copy;
16741
+                    Object3D folder = object.GetWindow().copy;
1674016742                     
16741
-                    if (object.editWindow.copy.selection.Size() > 0)
16742
-                        folder = object.editWindow.copy.selection.elementAt(0);
16743
+                    if (object.GetWindow().copy.selection.Size() > 0)
16744
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1674316745                     
1674416746                     folder.add(group);
1674516747                     
16746
-                    object.editWindow.ResetModel();
16747
-                    object.editWindow.refreshContents();
16748
+                    object.GetWindow().ResetModel();
16749
+                    object.GetWindow().refreshContents();
1674816750                 }
1674916751                 else
1675016752                     paintcount = 0;