.. | .. |
---|
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 |
---|
.. | .. |
---|
12754 | 12758 | "MUL final.y, fragment.texcoord[0].x, c256;" + |
---|
12755 | 12759 | "FLR final.x, final.y;" + |
---|
12756 | 12760 | "SUB final.y, final.y, final.x;" + |
---|
12757 | | - //"MUL final.x, final.x, c256i;" + |
---|
| 12761 | + "MUL final.x, final.x, c256i;" + |
---|
12758 | 12762 | "MOV final.z, zero.x;" + |
---|
12759 | 12763 | "MOV final.a, one.w;":"" |
---|
12760 | 12764 | ) + |
---|
.. | .. |
---|
12762 | 12766 | "MUL final.y, fragment.texcoord[0].y, c256;" + |
---|
12763 | 12767 | "FLR final.x, final.y;" + |
---|
12764 | 12768 | "SUB final.y, final.y, final.x;" + |
---|
12765 | | - //"MUL final.x, final.x, c256i;" + |
---|
| 12769 | + "MUL final.x, final.x, c256i;" + |
---|
12766 | 12770 | "MOV final.z, zero.x;" + |
---|
12767 | 12771 | "MOV final.a, one.w;":"" |
---|
12768 | 12772 | ) + |
---|
.. | .. |
---|
14485 | 14489 | } |
---|
14486 | 14490 | |
---|
14487 | 14491 | boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); |
---|
14488 | | - if (capsLocked || (modifiers & META) == META) |
---|
| 14492 | + if (capsLocked) // || (modifiers & META) == META) |
---|
14489 | 14493 | { |
---|
14490 | 14494 | mouseMode |= VR; // BACKFORTH; |
---|
14491 | 14495 | } |
---|
.. | .. |
---|
15122 | 15126 | { |
---|
15123 | 15127 | //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton()); |
---|
15124 | 15128 | //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0) |
---|
15125 | | - 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) |
---|
15126 | 15130 | { |
---|
15127 | 15131 | mouseMoved(e); |
---|
15128 | 15132 | } else |
---|