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         
....@@ -9366,11 +9380,35 @@
93669380         jy8[3] = 0.5f;
93679381     }
93689382     
9369
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9383
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
93709384     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
93719385     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
93729386     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
93739387 
9388
+    void ResetOptions()
9389
+    {
9390
+        options1[0] = 100;
9391
+        options1[1] = 0.025f;
9392
+        options1[2] = 0.01f;
9393
+        options1[3] = 0;
9394
+        options1[4] = 0;
9395
+        
9396
+        options2[0] = 0;
9397
+        options2[1] = 0.75f;
9398
+        options2[2] = 0;
9399
+        options2[3] = 0;
9400
+        
9401
+        options3[0] = 1;
9402
+        options3[1] = 1;
9403
+        options3[2] = 1;
9404
+        options3[3] = 0;
9405
+        
9406
+        options4[0] = 1;
9407
+        options4[1] = 0;
9408
+        options4[2] = 1;
9409
+        options4[3] = 0;
9410
+    }
9411
+    
93749412     static int imagecount = 0; // movie generation
93759413     
93769414     static int jitter = 0;
....@@ -10990,9 +11028,9 @@
1099011028 
1099111029             gl.glMatrixMode(GL.GL_MODELVIEW);
1099211030 
10993
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10994
-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10995
-//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);
1099611034         } else
1099711035         {
1099811036             //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11003,7 +11041,7 @@
1100311041         //System.out.println("BLENDING ON");
1100411042         gl.glEnable(GL.GL_BLEND);
1100511043         gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11006
-
11044
+//        gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1100711045         gl.glMatrixMode(gl.GL_PROJECTION);
1100811046         gl.glLoadIdentity();
1100911047 
....@@ -11480,13 +11518,16 @@
1148011518     
1148111519     void DrawObject(GL gl, boolean draw)
1148211520     {
11521
+        // To clear camera values
11522
+        ResetOptions();
11523
+        
1148311524         //System.out.println("DRAW OBJECT " + mouseDown);
1148411525 //        DrawMode() = SELECTION;
1148511526         //GL gl = getGL();
1148611527         if ((TRACK || SHADOWTRACK) || zoomonce)
1148711528         {
1148811529             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11489
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11530
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1149011531             pingthread.StepToTarget(true); // true);
1149111532        //     zoomonce = false;
1149211533         }
....@@ -12047,7 +12088,7 @@
1204712088             for (int i = tp.size(); --i >= 0;)
1204812089             {
1204912090                 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12050
-                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12091
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1205112092             }
1205212093 
1205312094 
....@@ -13334,9 +13375,10 @@
1333413375                 "DP3 " + dest + ".z," + "normals," + "eye;" +
1333513376                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1333613377                 //"MOV " + dest + ".w," + "normal.z;" +
13337
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13338
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13339
-                //"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
1334013382                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1334113383                 "RCP " + dest + ".w," + dest + ".w;" +
1334213384                 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13901,7 +13943,7 @@
1390113943             
1390213944 // fev 2014???
1390313945             if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13904
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13946
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1390513947             pingthread.StepToTarget(true); // true);
1390613948         }
1390713949     //    if (!LIVE)
....@@ -14255,12 +14297,12 @@
1425514297     void GoDown(int mod)
1425614298     {
1425714299         MODIFIERS |= COMMAND;
14258
-        /*
14300
+        /**/
1425914301         if((mod&SHIFT) == SHIFT)
1426014302         manipCamera.RotatePosition(0, -speed);
1426114303         else
14262
-        manipCamera.BackForth(0, -speed*delta, getWidth());
14263
-         */
14304
+        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14305
+        /**/
1426414306         if ((mod & SHIFT) == SHIFT)
1426514307         {
1426614308             mouseMode = mouseMode; // VR??
....@@ -14276,12 +14318,12 @@
1427614318     void GoUp(int mod)
1427714319     {
1427814320         MODIFIERS |= COMMAND;
14279
-        /*
14321
+        /**/
1428014322         if((mod&SHIFT) == SHIFT)
1428114323         manipCamera.RotatePosition(0, speed);
1428214324         else
14283
-        manipCamera.BackForth(0, speed*delta, getWidth());
14284
-         */
14325
+        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14326
+        /**/
1428514327         if ((mod & SHIFT) == SHIFT)
1428614328         {
1428714329             mouseMode = mouseMode;
....@@ -14297,12 +14339,12 @@
1429714339     void GoLeft(int mod)
1429814340     {
1429914341         MODIFIERS |= COMMAND;
14300
-        /*
14342
+        /**/
1430114343         if((mod&SHIFT) == SHIFT)
14302
-        manipCamera.RotatePosition(speed, 0);
14303
-        else
1430414344         manipCamera.Translate(speed*delta, 0, getWidth());
14305
-         */
14345
+        else
14346
+        manipCamera.RotatePosition(speed, 0);
14347
+        /**/
1430614348         if ((mod & SHIFT) == SHIFT)
1430714349         {
1430814350             mouseMode = mouseMode;
....@@ -14318,12 +14360,12 @@
1431814360     void GoRight(int mod)
1431914361     {
1432014362         MODIFIERS |= COMMAND;
14321
-        /*
14363
+        /**/
1432214364         if((mod&SHIFT) == SHIFT)
14323
-        manipCamera.RotatePosition(-speed, 0);
14324
-        else
1432514365         manipCamera.Translate(-speed*delta, 0, getWidth());
14326
-         */
14366
+        else
14367
+        manipCamera.RotatePosition(-speed, 0);
14368
+        /**/
1432714369         if ((mod & SHIFT) == SHIFT)
1432814370         {
1432914371             mouseMode = mouseMode;
....@@ -14562,7 +14604,8 @@
1456214604         Globals.MOUSEDRAGGED = false;
1456314605         
1456414606         movingcamera = false;
14565
-        X = Y = 0;
14607
+        X = 0; // getBounds().width/2;
14608
+        Y = 0; // getBounds().height/2;
1456614609         //System.out.println("mouseReleased: " + e);
1456714610         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1456814611     }
....@@ -14903,7 +14946,9 @@
1490314946             case 'E' : COMPACT ^= true;
1490414947                 repaint();
1490514948                 break;
14906
-            case 'W' : DEBUGHSB ^= true;
14949
+            case 'W' : // Wide Window (fullscreen)
14950
+                //DEBUGHSB ^= true;
14951
+                ObjEditor.theFrame.ToggleFullScreen();
1490714952                 repaint();
1490814953                 break;
1490914954             case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14929,13 +14974,7 @@
1492914974                 repaint();
1493014975                 break;
1493114976             case 'l':
14932
-                lightMode ^= true;
14933
-                Globals.lighttouched = true;
14934
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14935
-                targetLookAt.set(manipCamera.lookAt);
14936
-                repaint();
14937
-                break;
14938
-            case 'L':
14977
+            //case 'L':
1493914978                 if (lightMode)
1494014979                 {
1494114980                     lightMode = false;
....@@ -15078,11 +15117,14 @@
1507815117             case '_':
1507915118                 kompactbit = 5;
1508015119                 break;
15081
-            case '+':
15082
-                kompactbit = 6;
15083
-                break;
15120
+//            case '+':
15121
+//                kompactbit = 6;
15122
+//                break;
1508415123             case ' ':
15085
-                ObjEditor.theFrame.ToggleFullScreen();
15124
+                lightMode ^= true;
15125
+                Globals.lighttouched = true;
15126
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15127
+                targetLookAt.set(manipCamera.lookAt);
1508615128                 repaint();
1508715129                 break;
1508815130             //case '`' :
....@@ -15129,8 +15171,9 @@
1512915171             case DELETE:
1513015172                 ClearSelection();
1513115173                 break;
15132
-                /*
1513315174             case '+':
15175
+                
15176
+                /*
1513415177                 //fontsize += 1;
1513515178                 bbzoom *= 2;
1513615179                 repaint();
....@@ -15147,17 +15190,17 @@
1514715190             case '=':
1514815191                 IncDepth();
1514915192                 //fontsize += 1;
15150
-                object.editWindow.refreshContents(true);
15193
+                object.GetWindow().refreshContents(true);
1515115194                 maskbit = 6;
1515215195                 break;
1515315196             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1515415197                 DecDepth();
1515515198                 maskbit = 5;
1515615199                 //if(fontsize > 1) fontsize -= 1;
15157
-                if (object.editWindow == null)
15158
-                    new Exception().printStackTrace();
15159
-                else
15160
-                    object.editWindow.refreshContents(true);
15200
+//                if (object.editWindow == null)
15201
+//                    new Exception().printStackTrace();
15202
+//                else
15203
+                    object.GetWindow().refreshContents(true);
1516115204                 break;
1516215205             case '{':
1516315206                 manipCamera.shaper_fovy /= 1.1;
....@@ -15381,7 +15424,7 @@
1538115424         }
1538215425          */
1538315426 
15384
-        object.editWindow.EditSelection(false);
15427
+        object.GetWindow().EditSelection(false);
1538515428     }
1538615429 
1538715430     void SelectParent()
....@@ -15398,10 +15441,10 @@
1539815441             {
1539915442                 //selectees.remove(i);
1540015443                 System.out.println("select parent of " + elem);
15401
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15444
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1540215445             } else
1540315446             {
15404
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15447
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1540515448             }
1540615449 
1540715450             first = false;
....@@ -15443,12 +15486,12 @@
1544315486                 for (int j = 0; j < group.children.size(); j++)
1544415487                 {
1544515488                     elem = (Object3D) group.children.elementAt(j);
15446
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15489
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1544715490                     first = false;
1544815491                 }
1544915492             } else
1545015493             {
15451
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15494
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1545215495             }
1545315496 
1545415497             first = false;
....@@ -15459,21 +15502,21 @@
1545915502     {
1546015503         //Composite group = (Composite) object;
1546115504         Object3D group = object;
15462
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15505
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1546315506     }
1546415507 
1546515508     void ResetTransform(int mask)
1546615509     {
1546715510         //Composite group = (Composite) object;
1546815511         Object3D group = object;
15469
-        group.editWindow.ResetTransform(mask);
15512
+        group.GetWindow().ResetTransform(mask);
1547015513     }
1547115514 
1547215515     void FlipTransform()
1547315516     {
1547415517         //Composite group = (Composite) object;
1547515518         Object3D group = object;
15476
-        group.editWindow.FlipTransform();
15519
+        group.GetWindow().FlipTransform();
1547715520 //        group.editWindow.ReduceMesh(true);
1547815521     }
1547915522 
....@@ -15481,7 +15524,7 @@
1548115524     {
1548215525         //Composite group = (Composite) object;
1548315526         Object3D group = object;
15484
-        group.editWindow.PrintMemory();
15527
+        group.GetWindow().PrintMemory();
1548515528 //        group.editWindow.ReduceMesh(true);
1548615529     }
1548715530     
....@@ -15489,7 +15532,7 @@
1548915532     {
1549015533         //Composite group = (Composite) object;
1549115534         Object3D group = object;
15492
-        group.editWindow.ResetCentroid();
15535
+        group.GetWindow().ResetCentroid();
1549315536     }
1549415537 
1549515538     void IncDepth()
....@@ -15665,6 +15708,7 @@
1566515708                     info.bounds.y += (height - desired) / 2;
1566615709                 }
1566715710             }
15711
+            
1566815712             info.g = gr;
1566915713             info.camera = renderCamera;
1567015714             /* 
....@@ -15674,23 +15718,44 @@
1567415718              */
1567515719             if (!isRenderer)
1567615720             {
15677
-                object.drawEditHandles(info, 0);
15678
-                
15679
-                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)
1568015724                 {
15681
-                    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)
1568215731                     {
15683
-                        case Object3D.hitCenter: gr.setColor(Color.pink);
15684
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685
-                            break;
15686
-                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15687
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688
-                        break;
15689
-                        case Object3D.hitScale: gr.setColor(Color.cyan);
15690
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15691
-                        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;
1569215739                     }
15693
-                    
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
+                    }
1569415759                 }
1569515760             }
1569615761         }
....@@ -16681,7 +16746,7 @@
1668116746                 }
1668216747                 
1668316748                 if (!movingcamera && !PAINTMODE)
16684
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16749
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1668516750                 
1668616751                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1668716752                 {
....@@ -16693,17 +16758,17 @@
1669316758                     
1669416759                     group.add(paintobj); // link
1669516760                     
16696
-                    object.editWindow.SnapObject(group);
16761
+                    object.GetWindow().SnapObject(group);
1669716762                     
16698
-                    Object3D folder = object.editWindow.copy;
16763
+                    Object3D folder = object.GetWindow().copy;
1669916764                     
16700
-                    if (object.editWindow.copy.selection.Size() > 0)
16701
-                        folder = object.editWindow.copy.selection.elementAt(0);
16765
+                    if (object.GetWindow().copy.selection.Size() > 0)
16766
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1670216767                     
1670316768                     folder.add(group);
1670416769                     
16705
-                    object.editWindow.ResetModel();
16706
-                    object.editWindow.refreshContents();
16770
+                    object.GetWindow().ResetModel();
16771
+                    object.GetWindow().refreshContents();
1670716772                 }
1670816773                 else
1670916774                     paintcount = 0;
....@@ -16742,6 +16807,11 @@
1674216807                 //System.out.println("objects[color] = " + objects[color]);
1674316808                 //objects[color].Select();
1674416809                 indexcount = 0;
16810
+                    ObjEditor window = object.GetWindow();
16811
+                    if (window != null && deselect)
16812
+                    {
16813
+                        window.Select(null, deselect, true);
16814
+                    }
1674516815                 object.Select(color, deselect);
1674616816             }
1674716817