From 79d0f9a45d36656051a77a7b0837aa0318f81ee5 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 09 Jun 2019 11:23:18 -0400
Subject: [PATCH] Undo/redo
---
CameraPane.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 7039da8..9794f67 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -12502,8 +12502,8 @@
// display shadow only (bump == 0)
"SUB temp.x, half.x, shadow.x;" +
- "MOV temp.y, -params6.x;" +
- "SLT temp.z, temp.y, zero.x;" +
+ "MOV temp.y, -params5.z;" + // params6.x;" +
+ "SLT temp.z, temp.y, -one2048th.x;" +
"SUB temp.y, one.x, temp.z;" +
"MUL temp.x, temp.x, temp.y;" +
"KIL temp.x;" +
@@ -12834,7 +12834,7 @@
//once = true;
}
- System.out.print("Program #" + mode + "; length = " + program.length());
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
@@ -12967,12 +12967,16 @@
"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
+
+ // Compare fragment depth in light space with shadowmap.
"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
"SGE temp.y, temp.x, zero.x;" +
- "SUB " + shadow + ".y, one.x, temp.y;" +
+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
+
+ // Reverse comparison
"SUB temp.x, one.x, temp.x;" +
"MUL " + shadow + ".x, temp.x, temp.y;" +
- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
@@ -12986,6 +12990,10 @@
// No shadow for backface
"DP3 temp.x, normal, lightd;" +
"SLT temp.x, temp.x, zero.x;" + // shadoweps
+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
+
+ // No shadow when out of frustrum
+ "SGE temp.x, " + depth + ".z, one.z;" +
"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
"";
}
@@ -14366,6 +14374,7 @@
public void mouseReleased(MouseEvent e)
{
movingcamera = false;
+ X = Y = 0;
//System.out.println("mouseReleased: " + e);
clickEnd(e.getX(), e.getY(), e.getModifiersEx());
}
@@ -15374,7 +15383,9 @@
info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
//Image img = CreateImage(width, height);
//System.out.println("width = " + width + "; height = " + height + "\n");
+
Graphics gr = g; // img.getGraphics();
+
if (!hasMarquee)
{
if (Xmin < Xmax) // !locked)
@@ -15472,14 +15483,28 @@
if (!isRenderer)
{
object.drawEditHandles(info, 0);
+
+ if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
+ {
+ switch (object.selection.get(0).hitSomething)
+ {
+ case Object3D.hitCenter: gr.setColor(Color.pink); break;
+ case Object3D.hitRotate: gr.setColor(Color.green); break;
+ case Object3D.hitScale: gr.setColor(Color.cyan); break;
+ }
+
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
+ }
}
}
+
if (isRenderer)
{
//gr.setColor(Color.black);
//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
}
+
if (hasMarquee)
{
gr.setXORMode(Color.white);
--
Gitblit v1.6.2