blame | history | patch | commit | commitdiff
Normand Briere
2019-07-14 bc829f47837b5a001f911542140b0b8e63c2bb0c 
 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;
....@@ -10481,6 +10519,7 @@
1048110519                     ANTIALIAS = 0;
1048210520                     //System.out.println("RESTART");
1048310521                     AAtimer.restart();
10522
+                    Globals.TIMERRUNNING = true;
1048410523                 }
1048510524             }
1048610525         }
....@@ -10989,9 +11028,9 @@
1098911028 
1099011029             gl.glMatrixMode(GL.GL_MODELVIEW);
1099111030 
10992
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993
-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994
-//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);
1099511034         } else
1099611035         {
1099711036             //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11002,7 +11041,7 @@
1100211041         //System.out.println("BLENDING ON");
1100311042         gl.glEnable(GL.GL_BLEND);
1100411043         gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005
-
11044
+//        gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1100611045         gl.glMatrixMode(gl.GL_PROJECTION);
1100711046         gl.glLoadIdentity();
1100811047 
....@@ -11459,7 +11498,7 @@
1145911498 
1146011499     static boolean zoomonce = false;
1146111500     
11462
-    void CreateSelectedPoint()
11501
+    static void CreateSelectedPoint()
1146311502     {
1146411503         if (selectedpoint == null)
1146511504         {
....@@ -11479,13 +11518,16 @@
1147911518     
1148011519     void DrawObject(GL gl, boolean draw)
1148111520     {
11521
+        // To clear camera values
11522
+        ResetOptions();
11523
+        
1148211524         //System.out.println("DRAW OBJECT " + mouseDown);
1148311525 //        DrawMode() = SELECTION;
1148411526         //GL gl = getGL();
1148511527         if ((TRACK || SHADOWTRACK) || zoomonce)
1148611528         {
1148711529             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11488
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11530
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1148911531             pingthread.StepToTarget(true); // true);
1149011532        //     zoomonce = false;
1149111533         }
....@@ -12046,7 +12088,7 @@
1204612088             for (int i = tp.size(); --i >= 0;)
1204712089             {
1204812090                 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12049
-                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12091
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1205012092             }
1205112093 
1205212094 
....@@ -13333,9 +13375,10 @@
1333313375                 "DP3 " + dest + ".z," + "normals," + "eye;" +
1333413376                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1333513377                 //"MOV " + dest + ".w," + "normal.z;" +
13336
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13337
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13338
-                //"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
1333913382                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1334013383                 "RCP " + dest + ".w," + dest + ".w;" +
1334113384                 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13840,6 +13883,7 @@
1384013883         else
1384113884         if (evt.getSource() == AAtimer)
1384213885         {
13886
+                    Globals.TIMERRUNNING = false;
1384313887             if (mouseDown)
1384413888             {
1384513889             //new Exception().printStackTrace();
....@@ -13899,7 +13943,7 @@
1389913943             
1390013944 // fev 2014???
1390113945             if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13902
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13946
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1390313947             pingthread.StepToTarget(true); // true);
1390413948         }
1390513949     //    if (!LIVE)
....@@ -13914,6 +13958,7 @@
1391413958             return;
1391513959         
1391613960         AAtimer.restart(); // 
13961
+        Globals.TIMERRUNNING = true;
1391713962 
1391813963 //        waslive = LIVE;
1391913964 //        LIVE = false;
....@@ -14252,12 +14297,12 @@
1425214297     void GoDown(int mod)
1425314298     {
1425414299         MODIFIERS |= COMMAND;
14255
-        /*
14300
+        /**/
1425614301         if((mod&SHIFT) == SHIFT)
1425714302         manipCamera.RotatePosition(0, -speed);
1425814303         else
14259
-        manipCamera.BackForth(0, -speed*delta, getWidth());
14260
-         */
14304
+        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14305
+        /**/
1426114306         if ((mod & SHIFT) == SHIFT)
1426214307         {
1426314308             mouseMode = mouseMode; // VR??
....@@ -14273,12 +14318,12 @@
1427314318     void GoUp(int mod)
1427414319     {
1427514320         MODIFIERS |= COMMAND;
14276
-        /*
14321
+        /**/
1427714322         if((mod&SHIFT) == SHIFT)
1427814323         manipCamera.RotatePosition(0, speed);
1427914324         else
14280
-        manipCamera.BackForth(0, speed*delta, getWidth());
14281
-         */
14325
+        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14326
+        /**/
1428214327         if ((mod & SHIFT) == SHIFT)
1428314328         {
1428414329             mouseMode = mouseMode;
....@@ -14294,12 +14339,12 @@
1429414339     void GoLeft(int mod)
1429514340     {
1429614341         MODIFIERS |= COMMAND;
14297
-        /*
14342
+        /**/
1429814343         if((mod&SHIFT) == SHIFT)
14299
-        manipCamera.RotatePosition(speed, 0);
14300
-        else
1430114344         manipCamera.Translate(speed*delta, 0, getWidth());
14302
-         */
14345
+        else
14346
+        manipCamera.RotatePosition(speed, 0);
14347
+        /**/
1430314348         if ((mod & SHIFT) == SHIFT)
1430414349         {
1430514350             mouseMode = mouseMode;
....@@ -14315,12 +14360,12 @@
1431514360     void GoRight(int mod)
1431614361     {
1431714362         MODIFIERS |= COMMAND;
14318
-        /*
14363
+        /**/
1431914364         if((mod&SHIFT) == SHIFT)
14320
-        manipCamera.RotatePosition(-speed, 0);
14321
-        else
1432214365         manipCamera.Translate(-speed*delta, 0, getWidth());
14323
-         */
14366
+        else
14367
+        manipCamera.RotatePosition(-speed, 0);
14368
+        /**/
1432414369         if ((mod & SHIFT) == SHIFT)
1432514370         {
1432614371             mouseMode = mouseMode;
....@@ -14377,7 +14422,8 @@
1437714422                 info.camera = renderCamera;
1437814423                 info.x = x;
1437914424                 info.y = y;
14380
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14425
+                object.GetWindow().copy
14426
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1438114427             } else
1438214428             {
1438314429                 if (x < startX)
....@@ -14541,9 +14587,9 @@
1454114587         ci.camera = renderCamera;
1454214588         if (!isRenderer)
1454314589         {
14544
-            ObjEditor editWindow = object.editWindow;
14545
-            Object3D copy = editWindow.copy;
14546
-            if (copy.doEditClick(ci, 0))
14590
+            //ObjEditor editWindow = object.editWindow;
14591
+            //Object3D copy = editWindow.copy;
14592
+            if (object.doEditClick(ci, 0))
1454714593             {
1454814594                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1454914595             } else
....@@ -14558,7 +14604,8 @@
1455814604         Globals.MOUSEDRAGGED = false;
1455914605         
1456014606         movingcamera = false;
14561
-        X = Y = 0;
14607
+        X = 0; // getBounds().width/2;
14608
+        Y = 0; // getBounds().height/2;
1456214609         //System.out.println("mouseReleased: " + e);
1456314610         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1456414611     }
....@@ -14899,7 +14946,9 @@
1489914946             case 'E' : COMPACT ^= true;
1490014947                 repaint();
1490114948                 break;
14902
-            case 'W' : DEBUGHSB ^= true;
14949
+            case 'W' : // Wide Window (fullscreen)
14950
+                //DEBUGHSB ^= true;
14951
+                ObjEditor.theFrame.ToggleFullScreen();
1490314952                 repaint();
1490414953                 break;
1490514954             case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14925,13 +14974,7 @@
1492514974                 repaint();
1492614975                 break;
1492714976             case 'l':
14928
-                lightMode ^= true;
14929
-                Globals.lighttouched = true;
14930
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14931
-                targetLookAt.set(manipCamera.lookAt);
14932
-                repaint();
14933
-                break;
14934
-            case 'L':
14977
+            //case 'L':
1493514978                 if (lightMode)
1493614979                 {
1493714980                     lightMode = false;
....@@ -15074,11 +15117,14 @@
1507415117             case '_':
1507515118                 kompactbit = 5;
1507615119                 break;
15077
-            case '+':
15078
-                kompactbit = 6;
15079
-                break;
15120
+//            case '+':
15121
+//                kompactbit = 6;
15122
+//                break;
1508015123             case ' ':
15081
-                ObjEditor.theFrame.ToggleFullScreen();
15124
+                lightMode ^= true;
15125
+                Globals.lighttouched = true;
15126
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15127
+                targetLookAt.set(manipCamera.lookAt);
1508215128                 repaint();
1508315129                 break;
1508415130             //case '`' :
....@@ -15125,8 +15171,9 @@
1512515171             case DELETE:
1512615172                 ClearSelection();
1512715173                 break;
15128
-                /*
1512915174             case '+':
15175
+                
15176
+                /*
1513015177                 //fontsize += 1;
1513115178                 bbzoom *= 2;
1513215179                 repaint();
....@@ -15143,17 +15190,17 @@
1514315190             case '=':
1514415191                 IncDepth();
1514515192                 //fontsize += 1;
15146
-                object.editWindow.refreshContents(true);
15193
+                object.GetWindow().refreshContents(true);
1514715194                 maskbit = 6;
1514815195                 break;
1514915196             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1515015197                 DecDepth();
1515115198                 maskbit = 5;
1515215199                 //if(fontsize > 1) fontsize -= 1;
15153
-                if (object.editWindow == null)
15154
-                    new Exception().printStackTrace();
15155
-                else
15156
-                    object.editWindow.refreshContents(true);
15200
+//                if (object.editWindow == null)
15201
+//                    new Exception().printStackTrace();
15202
+//                else
15203
+                    object.GetWindow().refreshContents(true);
1515715204                 break;
1515815205             case '{':
1515915206                 manipCamera.shaper_fovy /= 1.1;
....@@ -15377,7 +15424,7 @@
1537715424         }
1537815425          */
1537915426 
15380
-        object.editWindow.EditSelection();
15427
+        object.GetWindow().EditSelection(false);
1538115428     }
1538215429 
1538315430     void SelectParent()
....@@ -15394,10 +15441,10 @@
1539415441             {
1539515442                 //selectees.remove(i);
1539615443                 System.out.println("select parent of " + elem);
15397
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15444
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1539815445             } else
1539915446             {
15400
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15447
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1540115448             }
1540215449 
1540315450             first = false;
....@@ -15439,12 +15486,12 @@
1543915486                 for (int j = 0; j < group.children.size(); j++)
1544015487                 {
1544115488                     elem = (Object3D) group.children.elementAt(j);
15442
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15489
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1544315490                     first = false;
1544415491                 }
1544515492             } else
1544615493             {
15447
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15494
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1544815495             }
1544915496 
1545015497             first = false;
....@@ -15455,21 +15502,21 @@
1545515502     {
1545615503         //Composite group = (Composite) object;
1545715504         Object3D group = object;
15458
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15505
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1545915506     }
1546015507 
1546115508     void ResetTransform(int mask)
1546215509     {
1546315510         //Composite group = (Composite) object;
1546415511         Object3D group = object;
15465
-        group.editWindow.ResetTransform(mask);
15512
+        group.GetWindow().ResetTransform(mask);
1546615513     }
1546715514 
1546815515     void FlipTransform()
1546915516     {
1547015517         //Composite group = (Composite) object;
1547115518         Object3D group = object;
15472
-        group.editWindow.FlipTransform();
15519
+        group.GetWindow().FlipTransform();
1547315520 //        group.editWindow.ReduceMesh(true);
1547415521     }
1547515522 
....@@ -15477,7 +15524,7 @@
1547715524     {
1547815525         //Composite group = (Composite) object;
1547915526         Object3D group = object;
15480
-        group.editWindow.PrintMemory();
15527
+        group.GetWindow().PrintMemory();
1548115528 //        group.editWindow.ReduceMesh(true);
1548215529     }
1548315530     
....@@ -15485,7 +15532,7 @@
1548515532     {
1548615533         //Composite group = (Composite) object;
1548715534         Object3D group = object;
15488
-        group.editWindow.ResetCentroid();
15535
+        group.GetWindow().ResetCentroid();
1548915536     }
1549015537 
1549115538     void IncDepth()
....@@ -15670,23 +15717,42 @@
1567015717              */
1567115718             if (!isRenderer)
1567215719             {
15673
-                object.drawEditHandles(info, 0);
15674
-                
15675
-                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15720
+                if (object.selection.Size() > 0)
1567615721                 {
15677
-                    switch (object.selection.get(0).hitSomething)
15722
+                    int hitSomething = object.selection.get(0).hitSomething;
15723
+
15724
+                    info.DX = 0;
15725
+                    info.DY = 0;
15726
+                    info.W = 1;
15727
+                    if (hitSomething == Object3D.hitCenter)
1567815728                     {
15679
-                        case Object3D.hitCenter: gr.setColor(Color.pink);
15680
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15681
-                            break;
15682
-                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15683
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15684
-                        break;
15685
-                        case Object3D.hitScale: gr.setColor(Color.cyan);
15686
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15687
-                        break;
15729
+                        info.DX = X;
15730
+                        if (X != 0)
15731
+                            info.DX -= info.bounds.width/2;
15732
+
15733
+                        info.DY = Y;
15734
+                        if (Y != 0)
15735
+                            info.DY -= info.bounds.height/2;
1568815736                     }
15689
-                    
15737
+
15738
+                    object.drawEditHandles(info, 0);
15739
+
15740
+                    if (drag && (X != 0 || Y != 0))
15741
+                    {
15742
+                        switch (hitSomething)
15743
+                        {
15744
+                            case Object3D.hitCenter: gr.setColor(Color.pink);
15745
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15746
+                                break;
15747
+                            case Object3D.hitRotate: gr.setColor(Color.yellow);
15748
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15749
+                            break;
15750
+                            case Object3D.hitScale: gr.setColor(Color.cyan);
15751
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15752
+                            break;
15753
+                        }
15754
+
15755
+                    }
1569015756                 }
1569115757             }
1569215758         }
....@@ -16622,6 +16688,8 @@
1662216688 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1662316689 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1662416690                 
16691
+                CreateSelectedPoint();
16692
+                
1662516693                 // Will fit the mesh !!!
1662616694                 selectedpoint.toParent[0][0] = 0.0001;
1662716695                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16675,7 +16743,7 @@
1667516743                 }
1667616744                 
1667716745                 if (!movingcamera && !PAINTMODE)
16678
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16746
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1667916747                 
1668016748                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1668116749                 {
....@@ -16687,17 +16755,17 @@
1668716755                     
1668816756                     group.add(paintobj); // link
1668916757                     
16690
-                    object.editWindow.SnapObject(group);
16758
+                    object.GetWindow().SnapObject(group);
1669116759                     
16692
-                    Object3D folder = object.editWindow.copy;
16760
+                    Object3D folder = object.GetWindow().copy;
1669316761                     
16694
-                    if (object.editWindow.copy.selection.Size() > 0)
16695
-                        folder = object.editWindow.copy.selection.elementAt(0);
16762
+                    if (object.GetWindow().copy.selection.Size() > 0)
16763
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1669616764                     
1669716765                     folder.add(group);
1669816766                     
16699
-                    object.editWindow.ResetModel();
16700
-                    object.editWindow.refreshContents();
16767
+                    object.GetWindow().ResetModel();
16768
+                    object.GetWindow().refreshContents();
1670116769                 }
1670216770                 else
1670316771                     paintcount = 0;
....@@ -16736,6 +16804,11 @@
1673616804                 //System.out.println("objects[color] = " + objects[color]);
1673716805                 //objects[color].Select();
1673816806                 indexcount = 0;
16807
+                    ObjEditor window = object.GetWindow();
16808
+                    if (window != null && deselect)
16809
+                    {
16810
+                        window.Select(null, deselect, true);
16811
+                    }
1673916812                 object.Select(color, deselect);
1674016813             }
1674116814