Fix skin default.

Normand Briere

2019-05-01 a742f6cebf1d471217d836e07934e5c02c22b6db

 CameraPane.java
..
..
@@ -56,8 +56,6 @@
56
56
     static int CURRENTANTIALIAS = 0; // 1;
57
57
 	/*static*/ boolean RENDERSHADOW = true;
58
58
     /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
-    static boolean ANIMATION = false;
60
-    static String filename;
61
59
     
62
60
     boolean DISPLAYTEXT = false;
63
61
     //boolean REDUCETEXTURE = true;
..
..
@@ -86,7 +84,7 @@
86
84
 static    boolean FULLSCREEN = false;
87
85
 static    boolean SUPPORT = true;
88
86
 static    boolean INERTIA = true;
89
-static    boolean FAST = true; // false;
87
+static    boolean FAST = false;
90
88
 static    boolean SLOWPOSE = false;
91
89
 static    boolean FOOTCONTACT = true;
92
90
 
..
..
@@ -4208,6 +4206,7 @@
4208
4206
     
4209
4207
     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210
4208
     {
4209
+                new Exception().printStackTrace();
4211
4210
         System.exit(0);
4212
4211
         com.sun.opengl.util.texture.Texture texture = null;
4213
4212
 
..
..
@@ -9394,7 +9393,7 @@
9394
9393
             //gl.glFlush();
9395
9394
             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396
9395
 
9397
-            if (ANIMATION && ABORTED)
9396
+            if (Globals.ANIMATION && ABORTED)
9398
9397
             {
9399
9398
     System.err.println("    ABORTED FRAME");
9400
9399
                 break;
..
..
@@ -9424,7 +9423,7 @@
9424
9423
         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425
9424
 
9426
9425
         // save image
9427
-        if (ANIMATION && !ABORTED)
9426
+        if (Globals.ANIMATION && !ABORTED)
9428
9427
         {
9429
9428
             VPwidth = viewport[2];
9430
9429
             VPheight = viewport[3];
..
..
@@ -9535,7 +9534,7 @@
9535
9534
             
9536
9535
 //            imagecount++;
9537
9536
             
9538
-            String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9537
+            String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539
9538
             
9540
9539
             if (!BOXMODE)
9541
9540
             {
..
..
@@ -11259,8 +11258,14 @@
11259
11258
     {
11260
11259
             renderpass++;
11261
11260
 //        System.out.println("Draw object... ");
11261
+        STEP = 1;
11262
11262
         if (FAST) // in case there is no script
11263
-            STEP = 16;
11263
+            STEP = 8;
11264
+            
11265
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11266
+        {
11267
+            STEP *= 4;
11268
+        }
11264
11269
             
11265
11270
         //object.FullInvariants();
11266
11271
         
..
..
@@ -12598,8 +12603,10 @@
12598
12603
             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599
12604
                 
12600
12605
                 "SUB temp.x, one.x, ndotl.x;" +
12601
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602
-                "ADD temp.y, one.y, options2.y;" + // sursurface
12606
+                // Tuning for default skin
12607
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12608
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12609
+                "ADD temp.y, one.y, options2.y;" + // subsurface
12603
12610
                 "MUL temp.x, temp.x, temp.y;" +
12604
12611
                                 
12605
12612
                 "MUL saturation, saturation, temp.xxxx;" +
..
..
@@ -13946,6 +13953,7 @@
13946
13953
         
13947
13954
         public void run()
13948
13955
         {
13956
+                new Exception().printStackTrace();
13949
13957
             System.exit(0);
13950
13958
             for (;;)
13951
13959
             {
..
..
@@ -15144,6 +15152,7 @@
15144
15152
 
15145
15153
     void SelectParent()
15146
15154
     {
15155
+                new Exception().printStackTrace();
15147
15156
         System.exit(0);
15148
15157
         Composite group = (Composite) object;
15149
15158
         java.util.Vector selectees = new java.util.Vector(group.selection);
..
..
@@ -15167,6 +15176,7 @@
15167
15176
 
15168
15177
     void SelectChildren()
15169
15178
     {
15179
+                new Exception().printStackTrace();
15170
15180
         System.exit(0);
15171
15181
         /*
15172
15182
         Composite group = (Composite) object;
..
..
@@ -16280,6 +16290,7 @@
16280
16290
         {
16281
16291
             if (!selection)
16282
16292
             {
16293
+                new Exception().printStackTrace();
16283
16294
                 System.exit(0);
16284
16295
                 return;
16285
16296
             }