No use of META ("Windows") modifier.

Normand Briere

2019-05-05 1e3de699b037989e8deded5c7830139f97c64136

 CameraPane.java
..
..
@@ -106,7 +106,7 @@
106
106
 static    boolean OEIL = true;
107
107
 static    boolean OEILONCE = false; // do oeilon then oeiloff
108
108
 static    boolean LOOKAT = true;
109
-static    boolean RANDOM = true; // false;
109
+static    boolean SWITCH = true; // false;
110
110
 static    boolean HANDLES = false; // selection doesn't work!!
111
111
 static  boolean PAINTMODE = false;
112
112
 
..
..
@@ -2267,7 +2267,7 @@
2267
2267
 
2268
2268
     void ToggleRandom()
2269
2269
     {
2270
-        RANDOM ^= true;
2270
+        SWITCH ^= true;
2271
2271
     }
2272
2272
 
2273
2273
     void ToggleHandles()
..
..
@@ -8075,12 +8075,16 @@
8075
8075
         {
8076
8076
             String texname = tex;
8077
8077
             
8078
-            String[] split = tex.split("Textures");
8079
-            if (split.length > 1)
8080
-                texname = "/Users/nbriere/Textures" + split[split.length-1];
8081
-            else
8082
-                if (!texname.startsWith("/"))
8083
-                    texname = "/Users/nbriere/Textures/" + texname;
8078
+//            String[] split = tex.split("Textures");
8079
+//            if (split.length > 1)
8080
+//                texname = "/Users/nbriere/Textures" + split[split.length-1];
8081
+//            else
8082
+//                if (!texname.startsWith("/"))
8083
+//                    texname = "/Users/nbriere/Textures/" + texname;
8084
+            if (!new File(tex).exists())
8085
+            {
8086
+                    texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
8087
+            }
8084
8088
             
8085
8089
             if (CACHETEXTURE)
8086
8090
                 texture = textures.get(texname); // TEXTURE CACHE
..
..
@@ -12603,8 +12607,10 @@
12603
12607
             "MAX ndotl.x, ndotl.x, -ndotl.x;" +
12604
12608
                 
12605
12609
                 "SUB temp.x, one.x, ndotl.x;" +
12606
-                "ADD temp.x, temp.x, options2.z;" + // lightsheen
12607
-                "ADD temp.y, one.y, options2.y;" + // sursurface
12610
+                // Tuning for default skin
12611
+                //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12612
+                "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12613
+                "ADD temp.y, one.y, options2.y;" + // subsurface
12608
12614
                 "MUL temp.x, temp.x, temp.y;" +
12609
12615
                                 
12610
12616
                 "MUL saturation, saturation, temp.xxxx;" +
..
..
@@ -12752,7 +12758,7 @@
12752
12758
               "MUL final.y, fragment.texcoord[0].x, c256;" +
12753
12759
               "FLR final.x, final.y;" +
12754
12760
               "SUB final.y, final.y, final.x;" +
12755
-              //"MUL final.x, final.x, c256i;" +
12761
+              "MUL final.x, final.x, c256i;" +
12756
12762
               "MOV final.z, zero.x;" +
12757
12763
               "MOV final.a, one.w;":""
12758
12764
               ) +
..
..
@@ -12760,7 +12766,7 @@
12760
12766
               "MUL final.y, fragment.texcoord[0].y, c256;" +
12761
12767
               "FLR final.x, final.y;" +
12762
12768
               "SUB final.y, final.y, final.x;" +
12763
-              //"MUL final.x, final.x, c256i;" +
12769
+              "MUL final.x, final.x, c256i;" +
12764
12770
               "MOV final.z, zero.x;" +
12765
12771
               "MOV final.a, one.w;":""
12766
12772
               ) +
..
..
@@ -14483,7 +14489,7 @@
14483
14489
         }
14484
14490
         
14485
14491
         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14486
-        if (capsLocked || (modifiers & META) == META)
14492
+        if (capsLocked) // || (modifiers & META) == META)
14487
14493
         {
14488
14494
             mouseMode |= VR; // BACKFORTH;
14489
14495
         }
..
..
@@ -15120,7 +15126,7 @@
15120
15126
     {
15121
15127
         //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15122
15128
         //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15123
-        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
15129
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15124
15130
         {
15125
15131
             mouseMoved(e);
15126
15132
         } else