From 1e3de699b037989e8deded5c7830139f97c64136 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 09:25:50 -0400
Subject: [PATCH] No use of META ("Windows") modifier.
---
CameraPane.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index e5811ae..66e076a 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -8075,12 +8075,16 @@
{
String texname = tex;
- String[] split = tex.split("Textures");
- if (split.length > 1)
- texname = "/Users/nbriere/Textures" + split[split.length-1];
- else
- if (!texname.startsWith("/"))
- texname = "/Users/nbriere/Textures/" + texname;
+// String[] split = tex.split("Textures");
+// if (split.length > 1)
+// texname = "/Users/nbriere/Textures" + split[split.length-1];
+// else
+// if (!texname.startsWith("/"))
+// texname = "/Users/nbriere/Textures/" + texname;
+ if (!new File(tex).exists())
+ {
+ texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
+ }
if (CACHETEXTURE)
texture = textures.get(texname); // TEXTURE CACHE
@@ -12754,7 +12758,7 @@
"MUL final.y, fragment.texcoord[0].x, c256;" +
"FLR final.x, final.y;" +
"SUB final.y, final.y, final.x;" +
- //"MUL final.x, final.x, c256i;" +
+ "MUL final.x, final.x, c256i;" +
"MOV final.z, zero.x;" +
"MOV final.a, one.w;":""
) +
@@ -12762,7 +12766,7 @@
"MUL final.y, fragment.texcoord[0].y, c256;" +
"FLR final.x, final.y;" +
"SUB final.y, final.y, final.x;" +
- //"MUL final.x, final.x, c256i;" +
+ "MUL final.x, final.x, c256i;" +
"MOV final.z, zero.x;" +
"MOV final.a, one.w;":""
) +
@@ -14485,7 +14489,7 @@
}
boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
- if (capsLocked || (modifiers & META) == META)
+ if (capsLocked) // || (modifiers & META) == META)
{
mouseMode |= VR; // BACKFORTH;
}
@@ -15122,7 +15126,7 @@
{
//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
{
mouseMoved(e);
} else
--
Gitblit v1.6.2