blame | history | patch | commit | commitdiff
Normand Briere
2019-07-18 d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1 
 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         
....@@ -11014,9 +11028,9 @@
1101411028 
1101511029             gl.glMatrixMode(GL.GL_MODELVIEW);
1101611030 
11017
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11018
-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11019
-//gl.glEnable(gl.GL_MULTISAMPLE);
11031
+gl.glEnable(gl.GL_POLYGON_SMOOTH);
11032
+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11033
+gl.glEnable(gl.GL_MULTISAMPLE);
1102011034         } else
1102111035         {
1102211036             //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11027,7 +11041,7 @@
1102711041         //System.out.println("BLENDING ON");
1102811042         gl.glEnable(GL.GL_BLEND);
1102911043         gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11030
-
11044
+//        gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1103111045         gl.glMatrixMode(gl.GL_PROJECTION);
1103211046         gl.glLoadIdentity();
1103311047 
....@@ -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)
....@@ -14282,12 +14297,12 @@
1428214297     void GoDown(int mod)
1428314298     {
1428414299         MODIFIERS |= COMMAND;
14285
-        /*
14300
+        /**/
1428614301         if((mod&SHIFT) == SHIFT)
1428714302         manipCamera.RotatePosition(0, -speed);
1428814303         else
14289
-        manipCamera.BackForth(0, -speed*delta, getWidth());
14290
-         */
14304
+        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14305
+        /**/
1429114306         if ((mod & SHIFT) == SHIFT)
1429214307         {
1429314308             mouseMode = mouseMode; // VR??
....@@ -14303,12 +14318,12 @@
1430314318     void GoUp(int mod)
1430414319     {
1430514320         MODIFIERS |= COMMAND;
14306
-        /*
14321
+        /**/
1430714322         if((mod&SHIFT) == SHIFT)
1430814323         manipCamera.RotatePosition(0, speed);
1430914324         else
14310
-        manipCamera.BackForth(0, speed*delta, getWidth());
14311
-         */
14325
+        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14326
+        /**/
1431214327         if ((mod & SHIFT) == SHIFT)
1431314328         {
1431414329             mouseMode = mouseMode;
....@@ -14324,12 +14339,12 @@
1432414339     void GoLeft(int mod)
1432514340     {
1432614341         MODIFIERS |= COMMAND;
14327
-        /*
14342
+        /**/
1432814343         if((mod&SHIFT) == SHIFT)
14329
-        manipCamera.RotatePosition(speed, 0);
14330
-        else
1433114344         manipCamera.Translate(speed*delta, 0, getWidth());
14332
-         */
14345
+        else
14346
+        manipCamera.RotatePosition(speed, 0);
14347
+        /**/
1433314348         if ((mod & SHIFT) == SHIFT)
1433414349         {
1433514350             mouseMode = mouseMode;
....@@ -14345,12 +14360,12 @@
1434514360     void GoRight(int mod)
1434614361     {
1434714362         MODIFIERS |= COMMAND;
14348
-        /*
14363
+        /**/
1434914364         if((mod&SHIFT) == SHIFT)
14350
-        manipCamera.RotatePosition(-speed, 0);
14351
-        else
1435214365         manipCamera.Translate(-speed*delta, 0, getWidth());
14353
-         */
14366
+        else
14367
+        manipCamera.RotatePosition(-speed, 0);
14368
+        /**/
1435414369         if ((mod & SHIFT) == SHIFT)
1435514370         {
1435614371             mouseMode = mouseMode;
....@@ -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     }
....@@ -14930,7 +14946,9 @@
1493014946             case 'E' : COMPACT ^= true;
1493114947                 repaint();
1493214948                 break;
14933
-            case 'W' : DEBUGHSB ^= true;
14949
+            case 'W' : // Wide Window (fullscreen)
14950
+                //DEBUGHSB ^= true;
14951
+                ObjEditor.theFrame.ToggleFullScreen();
1493414952                 repaint();
1493514953                 break;
1493614954             case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14956,13 +14974,7 @@
1495614974                 repaint();
1495714975                 break;
1495814976             case 'l':
14959
-                lightMode ^= true;
14960
-                Globals.lighttouched = true;
14961
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14962
-                targetLookAt.set(manipCamera.lookAt);
14963
-                repaint();
14964
-                break;
14965
-            case 'L':
14977
+            //case 'L':
1496614978                 if (lightMode)
1496714979                 {
1496814980                     lightMode = false;
....@@ -15105,11 +15117,14 @@
1510515117             case '_':
1510615118                 kompactbit = 5;
1510715119                 break;
15108
-            case '+':
15109
-                kompactbit = 6;
15110
-                break;
15120
+//            case '+':
15121
+//                kompactbit = 6;
15122
+//                break;
1511115123             case ' ':
15112
-                ObjEditor.theFrame.ToggleFullScreen();
15124
+                lightMode ^= true;
15125
+                Globals.lighttouched = true;
15126
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15127
+                targetLookAt.set(manipCamera.lookAt);
1511315128                 repaint();
1511415129                 break;
1511515130             //case '`' :
....@@ -15156,8 +15171,9 @@
1515615171             case DELETE:
1515715172                 ClearSelection();
1515815173                 break;
15159
-                /*
1516015174             case '+':
15175
+                
15176
+                /*
1516115177                 //fontsize += 1;
1516215178                 bbzoom *= 2;
1516315179                 repaint();
....@@ -15174,17 +15190,17 @@
1517415190             case '=':
1517515191                 IncDepth();
1517615192                 //fontsize += 1;
15177
-                object.editWindow.refreshContents(true);
15193
+                object.GetWindow().refreshContents(true);
1517815194                 maskbit = 6;
1517915195                 break;
1518015196             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1518115197                 DecDepth();
1518215198                 maskbit = 5;
1518315199                 //if(fontsize > 1) fontsize -= 1;
15184
-                if (object.editWindow == null)
15185
-                    new Exception().printStackTrace();
15186
-                else
15187
-                    object.editWindow.refreshContents(true);
15200
+//                if (object.editWindow == null)
15201
+//                    new Exception().printStackTrace();
15202
+//                else
15203
+                    object.GetWindow().refreshContents(true);
1518815204                 break;
1518915205             case '{':
1519015206                 manipCamera.shaper_fovy /= 1.1;
....@@ -15408,7 +15424,7 @@
1540815424         }
1540915425          */
1541015426 
15411
-        object.editWindow.EditSelection(false);
15427
+        object.GetWindow().EditSelection(false);
1541215428     }
1541315429 
1541415430     void SelectParent()
....@@ -15425,10 +15441,10 @@
1542515441             {
1542615442                 //selectees.remove(i);
1542715443                 System.out.println("select parent of " + elem);
15428
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15444
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1542915445             } else
1543015446             {
15431
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15447
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1543215448             }
1543315449 
1543415450             first = false;
....@@ -15470,12 +15486,12 @@
1547015486                 for (int j = 0; j < group.children.size(); j++)
1547115487                 {
1547215488                     elem = (Object3D) group.children.elementAt(j);
15473
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15489
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1547415490                     first = false;
1547515491                 }
1547615492             } else
1547715493             {
15478
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15494
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1547915495             }
1548015496 
1548115497             first = false;
....@@ -15486,21 +15502,21 @@
1548615502     {
1548715503         //Composite group = (Composite) object;
1548815504         Object3D group = object;
15489
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15505
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1549015506     }
1549115507 
1549215508     void ResetTransform(int mask)
1549315509     {
1549415510         //Composite group = (Composite) object;
1549515511         Object3D group = object;
15496
-        group.editWindow.ResetTransform(mask);
15512
+        group.GetWindow().ResetTransform(mask);
1549715513     }
1549815514 
1549915515     void FlipTransform()
1550015516     {
1550115517         //Composite group = (Composite) object;
1550215518         Object3D group = object;
15503
-        group.editWindow.FlipTransform();
15519
+        group.GetWindow().FlipTransform();
1550415520 //        group.editWindow.ReduceMesh(true);
1550515521     }
1550615522 
....@@ -15508,7 +15524,7 @@
1550815524     {
1550915525         //Composite group = (Composite) object;
1551015526         Object3D group = object;
15511
-        group.editWindow.PrintMemory();
15527
+        group.GetWindow().PrintMemory();
1551215528 //        group.editWindow.ReduceMesh(true);
1551315529     }
1551415530     
....@@ -15516,7 +15532,7 @@
1551615532     {
1551715533         //Composite group = (Composite) object;
1551815534         Object3D group = object;
15519
-        group.editWindow.ResetCentroid();
15535
+        group.GetWindow().ResetCentroid();
1552015536     }
1552115537 
1552215538     void IncDepth()
....@@ -15692,6 +15708,7 @@
1569215708                     info.bounds.y += (height - desired) / 2;
1569315709                 }
1569415710             }
15711
+            
1569515712             info.g = gr;
1569615713             info.camera = renderCamera;
1569715714             /* 
....@@ -15701,23 +15718,44 @@
1570115718              */
1570215719             if (!isRenderer)
1570315720             {
15704
-                object.drawEditHandles(info, 0);
15705
-                
15706
-                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15721
+                Grafreed.Assert(object != null);
15722
+                Grafreed.Assert(object.selection != null);
15723
+                if (object.selection.Size() > 0)
1570715724                 {
15708
-                    switch (object.selection.get(0).hitSomething)
15725
+                    int hitSomething = object.selection.get(0).hitSomething;
15726
+
15727
+                    info.DX = 0;
15728
+                    info.DY = 0;
15729
+                    info.W = 1;
15730
+                    if (hitSomething == Object3D.hitCenter)
1570915731                     {
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;
15732
+                        info.DX = X;
15733
+                        if (X != 0)
15734
+                            info.DX -= info.bounds.width/2;
15735
+
15736
+                        info.DY = Y;
15737
+                        if (Y != 0)
15738
+                            info.DY -= info.bounds.height/2;
1571915739                     }
15720
-                    
15740
+
15741
+                    object.drawEditHandles(info, 0);
15742
+
15743
+                    if (drag && (X != 0 || Y != 0))
15744
+                    {
15745
+                        switch (hitSomething)
15746
+                        {
15747
+                            case Object3D.hitCenter: gr.setColor(Color.pink);
15748
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15749
+                                break;
15750
+                            case Object3D.hitRotate: gr.setColor(Color.yellow);
15751
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15752
+                            break;
15753
+                            case Object3D.hitScale: gr.setColor(Color.cyan);
15754
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15755
+                            break;
15756
+                        }
15757
+
15758
+                    }
1572115759                 }
1572215760             }
1572315761         }
....@@ -16708,7 +16746,7 @@
1670816746                 }
1670916747                 
1671016748                 if (!movingcamera && !PAINTMODE)
16711
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16749
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1671216750                 
1671316751                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1671416752                 {
....@@ -16720,17 +16758,17 @@
1672016758                     
1672116759                     group.add(paintobj); // link
1672216760                     
16723
-                    object.editWindow.SnapObject(group);
16761
+                    object.GetWindow().SnapObject(group);
1672416762                     
16725
-                    Object3D folder = object.editWindow.copy;
16763
+                    Object3D folder = object.GetWindow().copy;
1672616764                     
16727
-                    if (object.editWindow.copy.selection.Size() > 0)
16728
-                        folder = object.editWindow.copy.selection.elementAt(0);
16765
+                    if (object.GetWindow().copy.selection.Size() > 0)
16766
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1672916767                     
1673016768                     folder.add(group);
1673116769                     
16732
-                    object.editWindow.ResetModel();
16733
-                    object.editWindow.refreshContents();
16770
+                    object.GetWindow().ResetModel();
16771
+                    object.GetWindow().refreshContents();
1673416772                 }
1673516773                 else
1673616774                     paintcount = 0;
....@@ -16769,6 +16807,11 @@
1676916807                 //System.out.println("objects[color] = " + objects[color]);
1677016808                 //objects[color].Select();
1677116809                 indexcount = 0;
16810
+                    ObjEditor window = object.GetWindow();
16811
+                    if (window != null && deselect)
16812
+                    {
16813
+                        window.Select(null, deselect, true);
16814
+                    }
1677216815                 object.Select(color, deselect);
1677316816             }
1677416817