blame | history | patch | commit | commitdiff
Normand Briere
2019-07-01 6600d22461ccc1cb602f238a9ffa83cf07dd830e 
 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         }
....@@ -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;
....@@ -15075,9 +15120,9 @@
1507515120             case '_':
1507615121                 kompactbit = 5;
1507715122                 break;
15078
-            case '+':
15079
-                kompactbit = 6;
15080
-                break;
15123
+//            case '+':
15124
+//                kompactbit = 6;
15125
+//                break;
1508115126             case ' ':
1508215127                 ObjEditor.theFrame.ToggleFullScreen();
1508315128                 repaint();
....@@ -15126,8 +15171,9 @@
1512615171             case DELETE:
1512715172                 ClearSelection();
1512815173                 break;
15129
-                /*
1513015174             case '+':
15175
+                
15176
+                /*
1513115177                 //fontsize += 1;
1513215178                 bbzoom *= 2;
1513315179                 repaint();
....@@ -15144,17 +15190,17 @@
1514415190             case '=':
1514515191                 IncDepth();
1514615192                 //fontsize += 1;
15147
-                object.editWindow.refreshContents(true);
15193
+                object.GetWindow().refreshContents(true);
1514815194                 maskbit = 6;
1514915195                 break;
1515015196             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1515115197                 DecDepth();
1515215198                 maskbit = 5;
1515315199                 //if(fontsize > 1) fontsize -= 1;
15154
-                if (object.editWindow == null)
15155
-                    new Exception().printStackTrace();
15156
-                else
15157
-                    object.editWindow.refreshContents(true);
15200
+//                if (object.editWindow == null)
15201
+//                    new Exception().printStackTrace();
15202
+//                else
15203
+                    object.GetWindow().refreshContents(true);
1515815204                 break;
1515915205             case '{':
1516015206                 manipCamera.shaper_fovy /= 1.1;
....@@ -15378,7 +15424,7 @@
1537815424         }
1537915425          */
1538015426 
15381
-        object.editWindow.EditSelection(false);
15427
+        object.GetWindow().EditSelection(false);
1538215428     }
1538315429 
1538415430     void SelectParent()
....@@ -15395,10 +15441,10 @@
1539515441             {
1539615442                 //selectees.remove(i);
1539715443                 System.out.println("select parent of " + elem);
15398
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15444
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1539915445             } else
1540015446             {
15401
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15447
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1540215448             }
1540315449 
1540415450             first = false;
....@@ -15440,12 +15486,12 @@
1544015486                 for (int j = 0; j < group.children.size(); j++)
1544115487                 {
1544215488                     elem = (Object3D) group.children.elementAt(j);
15443
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15489
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1544415490                     first = false;
1544515491                 }
1544615492             } else
1544715493             {
15448
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15494
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1544915495             }
1545015496 
1545115497             first = false;
....@@ -15456,21 +15502,21 @@
1545615502     {
1545715503         //Composite group = (Composite) object;
1545815504         Object3D group = object;
15459
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15505
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1546015506     }
1546115507 
1546215508     void ResetTransform(int mask)
1546315509     {
1546415510         //Composite group = (Composite) object;
1546515511         Object3D group = object;
15466
-        group.editWindow.ResetTransform(mask);
15512
+        group.GetWindow().ResetTransform(mask);
1546715513     }
1546815514 
1546915515     void FlipTransform()
1547015516     {
1547115517         //Composite group = (Composite) object;
1547215518         Object3D group = object;
15473
-        group.editWindow.FlipTransform();
15519
+        group.GetWindow().FlipTransform();
1547415520 //        group.editWindow.ReduceMesh(true);
1547515521     }
1547615522 
....@@ -15478,7 +15524,7 @@
1547815524     {
1547915525         //Composite group = (Composite) object;
1548015526         Object3D group = object;
15481
-        group.editWindow.PrintMemory();
15527
+        group.GetWindow().PrintMemory();
1548215528 //        group.editWindow.ReduceMesh(true);
1548315529     }
1548415530     
....@@ -15486,7 +15532,7 @@
1548615532     {
1548715533         //Composite group = (Composite) object;
1548815534         Object3D group = object;
15489
-        group.editWindow.ResetCentroid();
15535
+        group.GetWindow().ResetCentroid();
1549015536     }
1549115537 
1549215538     void IncDepth()
....@@ -16678,7 +16724,7 @@
1667816724                 }
1667916725                 
1668016726                 if (!movingcamera && !PAINTMODE)
16681
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16727
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1668216728                 
1668316729                 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1668416730                 {
....@@ -16690,17 +16736,17 @@
1669016736                     
1669116737                     group.add(paintobj); // link
1669216738                     
16693
-                    object.editWindow.SnapObject(group);
16739
+                    object.GetWindow().SnapObject(group);
1669416740                     
16695
-                    Object3D folder = object.editWindow.copy;
16741
+                    Object3D folder = object.GetWindow().copy;
1669616742                     
16697
-                    if (object.editWindow.copy.selection.Size() > 0)
16698
-                        folder = object.editWindow.copy.selection.elementAt(0);
16743
+                    if (object.GetWindow().copy.selection.Size() > 0)
16744
+                        folder = object.GetWindow().copy.selection.elementAt(0);
1669916745                     
1670016746                     folder.add(group);
1670116747                     
16702
-                    object.editWindow.ResetModel();
16703
-                    object.editWindow.refreshContents();
16748
+                    object.GetWindow().ResetModel();
16749
+                    object.GetWindow().refreshContents();
1670416750                 }
1670516751                 else
1670616752                     paintcount = 0;
....@@ -16739,6 +16785,11 @@
1673916785                 //System.out.println("objects[color] = " + objects[color]);
1674016786                 //objects[color].Select();
1674116787                 indexcount = 0;
16788
+                    ObjEditor window = object.GetWindow();
16789
+                    if (window != null && deselect)
16790
+                    {
16791
+                        window.Select(null, deselect, true);
16792
+                    }
1674216793                 object.Select(color, deselect);
1674316794             }
1674416795