Fix import OBJ

Normand Briere

2019-05-05 1e1c7fcdb3d0f8be350c5f6c32b6afa6705168ea

 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
 
..
..
@@ -108,7 +106,7 @@
108
106
 static    boolean OEIL = true;
109
107
 static    boolean OEILONCE = false; // do oeilon then oeiloff
110
108
 static    boolean LOOKAT = true;
111
-static    boolean RANDOM = true; // false;
109
+static    boolean SWITCH = true; // false;
112
110
 static    boolean HANDLES = false; // selection doesn't work!!
113
111
 static  boolean PAINTMODE = false;
114
112
 
..
..
@@ -2269,7 +2267,7 @@
2269
2267
 
2270
2268
     void ToggleRandom()
2271
2269
     {
2272
-        RANDOM ^= true;
2270
+        SWITCH ^= true;
2273
2271
     }
2274
2272
 
2275
2273
     void ToggleHandles()
..
..
@@ -9395,7 +9393,7 @@
9395
9393
             //gl.glFlush();
9396
9394
             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9397
9395
 
9398
-            if (ANIMATION && ABORTED)
9396
+            if (Globals.ANIMATION && ABORTED)
9399
9397
             {
9400
9398
     System.err.println("    ABORTED FRAME");
9401
9399
                 break;
..
..
@@ -9425,7 +9423,7 @@
9425
9423
         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9426
9424
 
9427
9425
         // save image
9428
-        if (ANIMATION && !ABORTED)
9426
+        if (Globals.ANIMATION && !ABORTED)
9429
9427
         {
9430
9428
             VPwidth = viewport[2];
9431
9429
             VPheight = viewport[3];
..
..
@@ -9536,7 +9534,7 @@
9536
9534
             
9537
9535
 //            imagecount++;
9538
9536
             
9539
-            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;
9540
9538
             
9541
9539
             if (!BOXMODE)
9542
9540
             {
..
..
@@ -11260,8 +11258,14 @@
11260
11258
     {
11261
11259
             renderpass++;
11262
11260
 //        System.out.println("Draw object... ");
11261
+        STEP = 1;
11263
11262
         if (FAST) // in case there is no script
11264
-            STEP = 16;
11263
+            STEP = 8;
11264
+            
11265
+        if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11266
+        {
11267
+            STEP *= 4;
11268
+        }
11265
11269
             
11266
11270
         //object.FullInvariants();
11267
11271
         
..
..
@@ -12599,8 +12603,10 @@
12599
12603
             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
12600
12604
                 
12601
12605
                 "SUB temp.x, one.x, ndotl.x;" +
12602
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12603
-                "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
12604
12610
                 "MUL temp.x, temp.x, temp.y;" +
12605
12611
                                 
12606
12612
                 "MUL saturation, saturation, temp.xxxx;" +