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 | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 296ba69..66e076a 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -56,8 +56,6 @@
static int CURRENTANTIALIAS = 0; // 1;
/*static*/ boolean RENDERSHADOW = true;
/*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
- static boolean ANIMATION = false;
- static String filename;
boolean DISPLAYTEXT = false;
//boolean REDUCETEXTURE = true;
@@ -86,7 +84,7 @@
static boolean FULLSCREEN = false;
static boolean SUPPORT = true;
static boolean INERTIA = true;
-static boolean FAST = true; // false;
+static boolean FAST = false;
static boolean SLOWPOSE = false;
static boolean FOOTCONTACT = true;
@@ -108,7 +106,7 @@
static boolean OEIL = true;
static boolean OEILONCE = false; // do oeilon then oeiloff
static boolean LOOKAT = true;
-static boolean RANDOM = true; // false;
+static boolean SWITCH = true; // false;
static boolean HANDLES = false; // selection doesn't work!!
static boolean PAINTMODE = false;
@@ -2269,7 +2267,7 @@
void ToggleRandom()
{
- RANDOM ^= true;
+ SWITCH ^= true;
}
void ToggleHandles()
@@ -4208,6 +4206,7 @@
com.sun.opengl.util.texture.Texture CompressTexture2(String name)
{
+ new Exception().printStackTrace();
System.exit(0);
com.sun.opengl.util.texture.Texture texture = null;
@@ -8076,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
@@ -9394,7 +9397,7 @@
//gl.glFlush();
gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
- if (ANIMATION && ABORTED)
+ if (Globals.ANIMATION && ABORTED)
{
System.err.println(" ABORTED FRAME");
break;
@@ -9424,7 +9427,7 @@
setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
// save image
- if (ANIMATION && !ABORTED)
+ if (Globals.ANIMATION && !ABORTED)
{
VPwidth = viewport[2];
VPheight = viewport[3];
@@ -9535,7 +9538,7 @@
// imagecount++;
- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
if (!BOXMODE)
{
@@ -11259,8 +11262,14 @@
{
renderpass++;
// System.out.println("Draw object... ");
+ STEP = 1;
if (FAST) // in case there is no script
- STEP = 16;
+ STEP = 8;
+
+ if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
+ {
+ STEP *= 4;
+ }
//object.FullInvariants();
@@ -12598,8 +12607,10 @@
"MAX ndotl.x, ndotl.x, -ndotl.x;" +
"SUB temp.x, one.x, ndotl.x;" +
- "ADD temp.x, temp.x, options2.z;" + // lightsheen
- "ADD temp.y, one.y, options2.y;" + // sursurface
+ // Tuning for default skin
+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
+ "ADD temp.y, one.y, options2.y;" + // subsurface
"MUL temp.x, temp.x, temp.y;" +
"MUL saturation, saturation, temp.xxxx;" +
@@ -12747,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;":""
) +
@@ -12755,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;":""
) +
@@ -13946,6 +13957,7 @@
public void run()
{
+ new Exception().printStackTrace();
System.exit(0);
for (;;)
{
@@ -14477,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;
}
@@ -15114,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
@@ -15144,6 +15156,7 @@
void SelectParent()
{
+ new Exception().printStackTrace();
System.exit(0);
Composite group = (Composite) object;
java.util.Vector selectees = new java.util.Vector(group.selection);
@@ -15167,6 +15180,7 @@
void SelectChildren()
{
+ new Exception().printStackTrace();
System.exit(0);
/*
Composite group = (Composite) object;
@@ -16280,6 +16294,7 @@
{
if (!selection)
{
+ new Exception().printStackTrace();
System.exit(0);
return;
}
--
Gitblit v1.6.2