blame | history | patch | commit | commitdiff
Normand Briere
2019-06-27 1807e7752960ac229cddd34b100e92cadbac9459 
 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;
....@@ -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         }
....@@ -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,6 +11518,9 @@
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();
....@@ -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 
....@@ -13840,6 +13882,7 @@
1384013882         else
1384113883         if (evt.getSource() == AAtimer)
1384213884         {
13885
+                    Globals.TIMERRUNNING = false;
1384313886             if (mouseDown)
1384413887             {
1384513888             //new Exception().printStackTrace();
....@@ -13914,6 +13957,7 @@
1391413957             return;
1391513958         
1391613959         AAtimer.restart(); // 
13960
+        Globals.TIMERRUNNING = true;
1391713961 
1391813962 //        waslive = LIVE;
1391913963 //        LIVE = false;
....@@ -14377,7 +14421,8 @@
1437714421                 info.camera = renderCamera;
1437814422                 info.x = x;
1437914423                 info.y = y;
14380
-                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14424
+                object.GetWindow().copy
14425
+                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1438114426             } else
1438214427             {
1438314428                 if (x < startX)
....@@ -14541,9 +14586,9 @@
1454114586         ci.camera = renderCamera;
1454214587         if (!isRenderer)
1454314588         {
14544
-            ObjEditor editWindow = object.editWindow;
14545
-            Object3D copy = editWindow.copy;
14546
-            if (copy.doEditClick(ci, 0))
14589
+            //ObjEditor editWindow = object.editWindow;
14590
+            //Object3D copy = editWindow.copy;
14591
+            if (object.doEditClick(ci, 0))
1454714592             {
1454814593                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1454914594             } else
....@@ -15377,7 +15422,7 @@
1537715422         }
1537815423          */
1537915424 
15380
-        object.editWindow.EditSelection();
15425
+        object.editWindow.EditSelection(false);
1538115426     }
1538215427 
1538315428     void SelectParent()
....@@ -16622,6 +16667,8 @@
1662216667 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
1662316668 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
1662416669                 
16670
+                CreateSelectedPoint();
16671
+                
1662516672                 // Will fit the mesh !!!
1662616673                 selectedpoint.toParent[0][0] = 0.0001;
1662716674                 selectedpoint.toParent[1][1] = 0.0001;
....@@ -16736,6 +16783,11 @@
1673616783                 //System.out.println("objects[color] = " + objects[color]);
1673716784                 //objects[color].Select();
1673816785                 indexcount = 0;
16786
+                    ObjEditor window = object.GetWindow();
16787
+                    if (window != null && deselect)
16788
+                    {
16789
+                        window.Select(null, deselect, true);
16790
+                    }
1673916791                 object.Select(color, deselect);
1674016792             }
1674116793