From c209bbe1cf788c9af3dcffea7667c830170a3f1f Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 01 May 2019 20:30:51 -0400
Subject: [PATCH] Complete advanced mode.
---
CameraPane.java | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 8c8c173..e5811ae 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;
@@ -92,6 +90,8 @@
static int tickcount = 0; // slow pose issue
+static boolean BUTTONLESSWHEEL = false;
+static boolean ZOOMBOXMODE = false;
static boolean BOXMODE = false;
static boolean IMAGEFLIP = false;
static boolean SMOOTHFOCUS = false;
@@ -106,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;
@@ -223,6 +223,11 @@
public boolean IsBoxMode()
{
return BOXMODE;
+ }
+
+ public boolean IsZoomBoxMode()
+ {
+ return ZOOMBOXMODE;
}
public void ClearDepth()
@@ -1612,12 +1617,12 @@
//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
if (!material.multiply)
{
- display.color = color;
+ display.color = material.color;
display.saturation = material.modulation;
}
else
{
- display.color *= color*2;
+ display.color *= material.color*2;
display.saturation *= material.modulation*2;
}
@@ -2170,6 +2175,11 @@
BOXMODE ^= true;
}
+ public void ToggleZoomBoxMode()
+ {
+ ZOOMBOXMODE ^= true;
+ }
+
public void ToggleSmoothFocus()
{
SMOOTHFOCUS ^= true;
@@ -2257,7 +2267,7 @@
void ToggleRandom()
{
- RANDOM ^= true;
+ SWITCH ^= true;
}
void ToggleHandles()
@@ -4196,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;
@@ -9382,7 +9393,7 @@
//gl.glFlush();
gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
- if (ANIMATION && ABORTED)
+ if (Globals.ANIMATION && ABORTED)
{
System.err.println(" ABORTED FRAME");
break;
@@ -9412,7 +9423,7 @@
setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
// save image
- if (ANIMATION && !ABORTED)
+ if (Globals.ANIMATION && !ABORTED)
{
VPwidth = viewport[2];
VPheight = viewport[3];
@@ -9523,7 +9534,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)
{
@@ -11247,8 +11258,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();
@@ -12586,8 +12603,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;" +
@@ -12735,7 +12754,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;":""
) +
@@ -12743,7 +12762,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;":""
) +
@@ -13523,6 +13542,7 @@
//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
+ if (BUTTONLESSWHEEL)
if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
{
return;
@@ -13531,7 +13551,7 @@
boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
// TIMER
- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
{
keepboxmode = BOXMODE;
keepsupport = SUPPORT;
@@ -13748,11 +13768,11 @@
public void mouseDragged(MouseEvent e)
{
+ //System.out.println("mouseDragged: " + e);
if (isRenderer)
movingcamera = true;
//if (drawing)
//return;
- //System.out.println("mouseDragged: " + e);
if ((e.getModifiersEx() & CTRL) != 0
|| (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
{
@@ -13933,6 +13953,7 @@
public void run()
{
+ new Exception().printStackTrace();
System.exit(0);
for (;;)
{
@@ -14287,7 +14308,6 @@
public void mouseMoved(MouseEvent e)
{
//System.out.println("mouseMoved: " + e);
-
if (isRenderer)
return;
@@ -15100,8 +15120,9 @@
protected void processMouseMotionEvent(MouseEvent e)
{
- //System.out.println("processMouseMotionEvent: " + mouseMode);
- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
+ //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)
{
mouseMoved(e);
} else
@@ -15131,6 +15152,7 @@
void SelectParent()
{
+ new Exception().printStackTrace();
System.exit(0);
Composite group = (Composite) object;
java.util.Vector selectees = new java.util.Vector(group.selection);
@@ -15154,6 +15176,7 @@
void SelectChildren()
{
+ new Exception().printStackTrace();
System.exit(0);
/*
Composite group = (Composite) object;
@@ -16267,6 +16290,7 @@
{
if (!selection)
{
+ new Exception().printStackTrace();
System.exit(0);
return;
}
--
Gitblit v1.6.2