blame | history | patch | commit | commitdiff
Normand Briere
2019-07-07 46dbce888e7c3eff8969f1ddbe22e144410b67f4 
 CameraPane.java
....@@ -335,14 +335,28 @@
335335                     display.options1[2] = material.shadowbias;
336336                     display.options1[3] = material.aniso;
337337                     display.options1[4] = material.anisoV;
338
+//                System.out.println("display.options1[0] " + display.options1[0]);
339
+//                System.out.println("display.options1[1] " + display.options1[1]);
340
+//                System.out.println("display.options1[2] " + display.options1[2]);
341
+//                System.out.println("display.options1[3] " + display.options1[3]);
342
+//                System.out.println("display.options1[4] " + display.options1[4]);
338343                     display.options2[0] = material.opacity;
339344                     display.options2[1] = material.diffuse;
340345                     display.options2[2] = material.factor;
346
+//                System.out.println("display.options2[0] " + display.options2[0]);
347
+//                System.out.println("display.options2[1] " + display.options2[1]);
348
+//                System.out.println("display.options2[2] " + display.options2[2]);
341349 
342350                     cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
351
+//                System.out.println("display.options3[0] " + display.options3[0]);
352
+//                System.out.println("display.options3[1] " + display.options3[1]);
353
+//                System.out.println("display.options3[2] " + display.options3[2]);
343354                     display.options4[0] = material.cameralight/0.2f;
344355                     display.options4[1] = material.subsurface;
345356                     display.options4[2] = material.sheen;
357
+//                System.out.println("display.options4[0] " + display.options4[0]);
358
+//                System.out.println("display.options4[1] " + display.options4[1]);
359
+//                System.out.println("display.options4[2] " + display.options4[2]);
346360                     
347361                  //   if (display.CURRENTANTIALIAS > 0)
348362                  //       display.options3[3] /= 4;
....@@ -2051,7 +2065,7 @@
20512065             //System.err.println("Oeil on");
20522066             OEIL = true;
20532067             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2054
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2068
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
20552069             //pingthread.StepToTarget(true);
20562070         }
20572071         
....@@ -9374,13 +9388,13 @@
93749388     void ResetOptions()
93759389     {
93769390         options1[0] = 100;
9377
-        options1[1] = 0.00001f;
9378
-        options1[2] = 20;
9391
+        options1[1] = 0.025f;
9392
+        options1[2] = 0.01f;
93799393         options1[3] = 0;
93809394         options1[4] = 0;
93819395         
93829396         options2[0] = 0;
9383
-        options2[1] = 1;
9397
+        options2[1] = 0.75f;
93849398         options2[2] = 0;
93859399         options2[3] = 0;
93869400         
....@@ -11513,7 +11527,7 @@
1151311527         if ((TRACK || SHADOWTRACK) || zoomonce)
1151411528         {
1151511529             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11516
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11530
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1151711531             pingthread.StepToTarget(true); // true);
1151811532        //     zoomonce = false;
1151911533         }
....@@ -13361,9 +13375,10 @@
1336113375                 "DP3 " + dest + ".z," + "normals," + "eye;" +
1336213376                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1336313377                 //"MOV " + dest + ".w," + "normal.z;" +
13364
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13365
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13366
-                //"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
1336713382                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1336813383                 "RCP " + dest + ".w," + dest + ".w;" +
1336913384                 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13928,7 +13943,7 @@
1392813943             
1392913944 // fev 2014???
1393013945             if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13931
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13946
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1393213947             pingthread.StepToTarget(true); // true);
1393313948         }
1393413949     //    if (!LIVE)
....@@ -14589,7 +14604,8 @@
1458914604         Globals.MOUSEDRAGGED = false;
1459014605         
1459114606         movingcamera = false;
14592
-        X = Y = 0;
14607
+        X = 0; // getBounds().width/2;
14608
+        Y = 0; // getBounds().height/2;
1459314609         //System.out.println("mouseReleased: " + e);
1459414610         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1459514611     }
....@@ -15105,9 +15121,9 @@
1510515121             case '_':
1510615122                 kompactbit = 5;
1510715123                 break;
15108
-            case '+':
15109
-                kompactbit = 6;
15110
-                break;
15124
+//            case '+':
15125
+//                kompactbit = 6;
15126
+//                break;
1511115127             case ' ':
1511215128                 ObjEditor.theFrame.ToggleFullScreen();
1511315129                 repaint();
....@@ -15156,8 +15172,9 @@
1515615172             case DELETE:
1515715173                 ClearSelection();
1515815174                 break;
15159
-                /*
1516015175             case '+':
15176
+                
15177
+                /*
1516115178                 //fontsize += 1;
1516215179                 bbzoom *= 2;
1516315180                 repaint();
....@@ -15174,17 +15191,17 @@
1517415191             case '=':
1517515192                 IncDepth();
1517615193                 //fontsize += 1;
15177
-                object.editWindow.refreshContents(true);
15194
+                object.GetWindow().refreshContents(true);
1517815195                 maskbit = 6;
1517915196                 break;
1518015197             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1518115198                 DecDepth();
1518215199                 maskbit = 5;
1518315200                 //if(fontsize > 1) fontsize -= 1;
15184
-                if (object.editWindow == null)
15185
-                    new Exception().printStackTrace();
15186
-                else
15187
-                    object.editWindow.refreshContents(true);
15201
+//                if (object.editWindow == null)
15202
+//                    new Exception().printStackTrace();
15203
+//                else
15204
+                    object.GetWindow().refreshContents(true);
1518815205                 break;
1518915206             case '{':
1519015207                 manipCamera.shaper_fovy /= 1.1;
....@@ -15408,7 +15425,7 @@
1540815425         }
1540915426          */
1541015427 
15411
-        object.editWindow.EditSelection(false);
15428
+        object.GetWindow().EditSelection(false);
1541215429     }
1541315430 
1541415431     void SelectParent()
....@@ -15425,10 +15442,10 @@
1542515442             {
1542615443                 //selectees.remove(i);
1542715444                 System.out.println("select parent of " + elem);
15428
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15445
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1542915446             } else
1543015447             {
15431
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15448
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1543215449             }
1543315450 
1543415451             first = false;
....@@ -15470,12 +15487,12 @@
1547015487                 for (int j = 0; j < group.children.size(); j++)
1547115488                 {
1547215489                     elem = (Object3D) group.children.elementAt(j);
15473
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15490
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1547415491                     first = false;
1547515492                 }
1547615493             } else
1547715494             {
15478
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15495
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1547915496             }
1548015497 
1548115498             first = false;
....@@ -15486,21 +15503,21 @@
1548615503     {
1548715504         //Composite group = (Composite) object;
1548815505         Object3D group = object;
15489
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15506
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1549015507     }
1549115508 
1549215509     void ResetTransform(int mask)
1549315510     {
1549415511         //Composite group = (Composite) object;
1549515512         Object3D group = object;
15496
-        group.editWindow.ResetTransform(mask);
15513
+        group.GetWindow().ResetTransform(mask);
1549715514     }
1549815515 
1549915516     void FlipTransform()
1550015517     {
1550115518         //Composite group = (Composite) object;
1550215519         Object3D group = object;
15503
-        group.editWindow.FlipTransform();
15520
+        group.GetWindow().FlipTransform();
1550415521 //        group.editWindow.ReduceMesh(true);
1550515522     }
1550615523 
....@@ -15508,7 +15525,7 @@
1550815525     {
1550915526         //Composite group = (Composite) object;
1551015527         Object3D group = object;
15511
-        group.editWindow.PrintMemory();
15528
+        group.GetWindow().PrintMemory();
1551215529 //        group.editWindow.ReduceMesh(true);
1551315530     }
1551415531     
....@@ -15516,7 +15533,7 @@
1551615533     {
1551715534         //Composite group = (Composite) object;
1551815535         Object3D group = object;
15519
-        group.editWindow.ResetCentroid();
15536
+        group.GetWindow().ResetCentroid();
1552015537     }
1552115538 
1552215539     void IncDepth()
....@@ -15701,23 +15718,42 @@
1570115718              */
1570215719             if (!isRenderer)
1570315720             {
15704
-                object.drawEditHandles(info, 0);
15705
-                
15706
-                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15721
+                if (object.selection.Size() > 0)
1570715722                 {
15708
-                    switch (object.selection.get(0).hitSomething)
15723
+                    int hitSomething = object.selection.get(0).hitSomething;
15724
+
15725
+                    info.DX = 0;
15726
+                    info.DY = 0;
15727
+                    info.W = 1;
15728
+                    if (hitSomething == Object3D.hitCenter)
1570915729                     {
15710
-                        case Object3D.hitCenter: gr.setColor(Color.pink);
15711
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15712
-                            break;
15713
-                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15714
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15715
-                        break;
15716
-                        case Object3D.hitScale: gr.setColor(Color.cyan);
15717
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15718
-                        break;
15730
+                        info.DX = X;
15731
+                        if (X != 0)
15732
+                            info.DX -= info.bounds.width/2;
15733
+
15734
+                        info.DY = Y;
15735
+                        if (Y != 0)
15736
+                            info.DY -= info.bounds.height/2;
1571915737                     }
15720
-                    
15738
+
15739
+                    object.drawEditHandles(info, 0);
15740
+
15741
+                    if (drag && (X != 0 || Y != 0))
15742
+                    {
15743
+                        switch (hitSomething)
15744
+                        {
15745
+                            case Object3D.hitCenter: gr.setColor(Color.pink);
15746
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15747
+                                break;
15748
+                            case Object3D.hitRotate: gr.setColor(Color.yellow);
15749
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15750
+                            break;
15751
+                            case Object3D.hitScale: gr.setColor(Color.cyan);
15752
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15753
+                            break;
15754
+                        }
15755
+
15756
+                    }
1572115757                 }
1572215758             }
1572315759         }
....@@ -16708,7 +16744,7 @@
1670816744                 }
1670916745                 
1671016746                 if (!movingcamera && !PAINTMODE)
16711
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16747
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1671216748                 
1671316749                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1671416750                 {
....@@ -16720,17 +16756,17 @@
1672016756                     
1672116757                     group.add(paintobj); // link
1672216758                     
16723
-                    object.editWindow.SnapObject(group);
16759
+                    object.GetWindow().SnapObject(group);
1672416760                     
16725
-                    Object3D folder = object.editWindow.copy;
16761
+                    Object3D folder = object.GetWindow().copy;
1672616762                     
16727
-                    if (object.editWindow.copy.selection.Size() > 0)
16728
-                        folder = object.editWindow.copy.selection.elementAt(0);
16763
+                    if (object.GetWindow().copy.selection.Size() > 0)
16764
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1672916765                     
1673016766                     folder.add(group);
1673116767                     
16732
-                    object.editWindow.ResetModel();
16733
-                    object.editWindow.refreshContents();
16768
+                    object.GetWindow().ResetModel();
16769
+                    object.GetWindow().refreshContents();
1673416770                 }
1673516771                 else
1673616772                     paintcount = 0;
....@@ -16769,6 +16805,11 @@
1676916805                 //System.out.println("objects[color] = " + objects[color]);
1677016806                 //objects[color].Select();
1677116807                 indexcount = 0;
16808
+                    ObjEditor window = object.GetWindow();
16809
+                    if (window != null && deselect)
16810
+                    {
16811
+                        window.Select(null, deselect, true);
16812
+                    }
1677216813                 object.Select(color, deselect);
1677316814             }
1677416815