Tree icons.

Normand Briere

2019-07-01 9079880942d022ee32fd3a543843e132e52deb1a

 CameraPane.java
..
..
@@ -335,14 +335,28 @@
335
335
                     display.options1[2] = material.shadowbias;
336
336
                     display.options1[3] = material.aniso;
337
337
                     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]);
338
343
                     display.options2[0] = material.opacity;
339
344
                     display.options2[1] = material.diffuse;
340
345
                     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]);
341
349
 
342
350
                     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]);
343
354
                     display.options4[0] = material.cameralight/0.2f;
344
355
                     display.options4[1] = material.subsurface;
345
356
                     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]);
346
360
                     
347
361
                  //   if (display.CURRENTANTIALIAS > 0)
348
362
                  //       display.options3[3] /= 4;
..
..
@@ -9366,11 +9380,35 @@
9366
9380
         jy8[3] = 0.5f;
9367
9381
     }
9368
9382
     
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
9370
9384
     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9371
9385
     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9372
9386
     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9373
9387
 
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
+    
9374
9412
     static int imagecount = 0; // movie generation
9375
9413
     
9376
9414
     static int jitter = 0;
..
..
@@ -11480,6 +11518,9 @@
11480
11518
     
11481
11519
     void DrawObject(GL gl, boolean draw)
11482
11520
     {
11521
+        // To clear camera values
11522
+        ResetOptions();
11523
+        
11483
11524
         //System.out.println("DRAW OBJECT " + mouseDown);
11484
11525
 //        DrawMode() = SELECTION;
11485
11526
         //GL gl = getGL();
..
..
@@ -12047,7 +12088,7 @@
12047
12088
             for (int i = tp.size(); --i >= 0;)
12048
12089
             {
12049
12090
                 //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);
12051
12092
             }
12052
12093
 
12053
12094
 
..
..
@@ -13334,9 +13375,10 @@
13334
13375
                 "DP3 " + dest + ".z," + "normals," + "eye;" +
13335
13376
                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13336
13377
                 //"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
13340
13382
                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13341
13383
                 "RCP " + dest + ".w," + dest + ".w;" +
13342
13384
                 //"RSQ " + dest + ".w," + dest + ".w;" +
..
..
@@ -15078,9 +15120,9 @@
15078
15120
             case '_':
15079
15121
                 kompactbit = 5;
15080
15122
                 break;
15081
-            case '+':
15082
-                kompactbit = 6;
15083
-                break;
15123
+//            case '+':
15124
+//                kompactbit = 6;
15125
+//                break;
15084
15126
             case ' ':
15085
15127
                 ObjEditor.theFrame.ToggleFullScreen();
15086
15128
                 repaint();
..
..
@@ -15129,8 +15171,9 @@
15129
15171
             case DELETE:
15130
15172
                 ClearSelection();
15131
15173
                 break;
15132
-                /*
15133
15174
             case '+':
15175
+                
15176
+                /*
15134
15177
                 //fontsize += 1;
15135
15178
                 bbzoom *= 2;
15136
15179
                 repaint();
..
..
@@ -16742,6 +16785,11 @@
16742
16785
                 //System.out.println("objects[color] = " + objects[color]);
16743
16786
                 //objects[color].Select();
16744
16787
                 indexcount = 0;
16788
+                    ObjEditor window = object.GetWindow();
16789
+                    if (window != null && deselect)
16790
+                    {
16791
+                        window.Select(null, deselect, true);
16792
+                    }
16745
16793
                 object.Select(color, deselect);
16746
16794
             }
16747
16795