blame | history | patch | commit | commitdiff
Normand Briere
2019-05-02 c209bbe1cf788c9af3dcffea7667c830170a3f1f 
 CameraPane.java
....@@ -56,8 +56,6 @@
5656     static int CURRENTANTIALIAS = 0; // 1;
5757 	/*static*/ boolean RENDERSHADOW = true;
5858     /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
-    static boolean ANIMATION = false;
60
-    static String filename;
6159     
6260     boolean DISPLAYTEXT = false;
6361     //boolean REDUCETEXTURE = true;
....@@ -86,7 +84,7 @@
8684 static    boolean FULLSCREEN = false;
8785 static    boolean SUPPORT = true;
8886 static    boolean INERTIA = true;
89
-static    boolean FAST = true; // false;
87
+static    boolean FAST = false;
9088 static    boolean SLOWPOSE = false;
9189 static    boolean FOOTCONTACT = true;
9290 
....@@ -108,7 +106,7 @@
108106 static    boolean OEIL = true;
109107 static    boolean OEILONCE = false; // do oeilon then oeiloff
110108 static    boolean LOOKAT = true;
111
-static    boolean RANDOM = true; // false;
109
+static    boolean SWITCH = true; // false;
112110 static    boolean HANDLES = false; // selection doesn't work!!
113111 static  boolean PAINTMODE = false;
114112 
....@@ -2269,7 +2267,7 @@
22692267 
22702268     void ToggleRandom()
22712269     {
2272
-        RANDOM ^= true;
2270
+        SWITCH ^= true;
22732271     }
22742272 
22752273     void ToggleHandles()
....@@ -4208,6 +4206,7 @@
42084206     
42094207     com.sun.opengl.util.texture.Texture CompressTexture2(String name)
42104208     {
4209
+                new Exception().printStackTrace();
42114210         System.exit(0);
42124211         com.sun.opengl.util.texture.Texture texture = null;
42134212 
....@@ -9394,7 +9393,7 @@
93949393             //gl.glFlush();
93959394             gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
93969395 
9397
-            if (ANIMATION && ABORTED)
9396
+            if (Globals.ANIMATION && ABORTED)
93989397             {
93999398     System.err.println("    ABORTED FRAME");
94009399                 break;
....@@ -9424,7 +9423,7 @@
94249423         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
94259424 
94269425         // save image
9427
-        if (ANIMATION && !ABORTED)
9426
+        if (Globals.ANIMATION && !ABORTED)
94289427         {
94299428             VPwidth = viewport[2];
94309429             VPheight = viewport[3];
....@@ -9535,7 +9534,7 @@
95359534             
95369535 //            imagecount++;
95379536             
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;
95399538             
95409539             if (!BOXMODE)
95419540             {
....@@ -11259,8 +11258,14 @@
1125911258     {
1126011259             renderpass++;
1126111260 //        System.out.println("Draw object... ");
11261
+        STEP = 1;
1126211262         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
+        }
1126411269             
1126511270         //object.FullInvariants();
1126611271         
....@@ -12598,8 +12603,10 @@
1259812603             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1259912604                 
1260012605                 "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
1260312610                 "MUL temp.x, temp.x, temp.y;" +
1260412611                                 
1260512612                 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12747,7 +12754,7 @@
1274712754               "MUL final.y, fragment.texcoord[0].x, c256;" +
1274812755               "FLR final.x, final.y;" +
1274912756               "SUB final.y, final.y, final.x;" +
12750
-              "MUL final.x, final.x, c256i;" +
12757
+              //"MUL final.x, final.x, c256i;" +
1275112758               "MOV final.z, zero.x;" +
1275212759               "MOV final.a, one.w;":""
1275312760               ) +
....@@ -12755,7 +12762,7 @@
1275512762               "MUL final.y, fragment.texcoord[0].y, c256;" +
1275612763               "FLR final.x, final.y;" +
1275712764               "SUB final.y, final.y, final.x;" +
12758
-              "MUL final.x, final.x, c256i;" +
12765
+              //"MUL final.x, final.x, c256i;" +
1275912766               "MOV final.z, zero.x;" +
1276012767               "MOV final.a, one.w;":""
1276112768               ) +
....@@ -13946,6 +13953,7 @@
1394613953         
1394713954         public void run()
1394813955         {
13956
+                new Exception().printStackTrace();
1394913957             System.exit(0);
1395013958             for (;;)
1395113959             {
....@@ -15144,6 +15152,7 @@
1514415152 
1514515153     void SelectParent()
1514615154     {
15155
+                new Exception().printStackTrace();
1514715156         System.exit(0);
1514815157         Composite group = (Composite) object;
1514915158         java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -15167,6 +15176,7 @@
1516715176 
1516815177     void SelectChildren()
1516915178     {
15179
+                new Exception().printStackTrace();
1517015180         System.exit(0);
1517115181         /*
1517215182         Composite group = (Composite) object;
....@@ -16280,6 +16290,7 @@
1628016290         {
1628116291             if (!selection)
1628216292             {
16293
+                new Exception().printStackTrace();
1628316294                 System.exit(0);
1628416295                 return;
1628516296             }