From 2703a8dcf1ef4745ec313af008a86681276f5a39 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 29 Oct 2019 19:06:23 -0400
Subject: [PATCH] Antialias button.
---
ObjEditor.java | 37 ++++++++++++++++++
Cone.java | 2
BoundaryRep.java | 2
CameraPane.java | 36 +++++++++++------
fullscenes/skullcovebirdeye.png | 0
Camera.java | 5 ++
icons/antialias.png | 0
GroupEditor.java | 9 ++++
8 files changed, 76 insertions(+), 15 deletions(-)
diff --git a/BoundaryRep.java b/BoundaryRep.java
index 7a7b36c..00d774e 100644
--- a/BoundaryRep.java
+++ b/BoundaryRep.java
@@ -2228,7 +2228,7 @@
// if (slow)
// aout 2013
// sept 2013 merde...
- W = 3; // 13;
+ W = 13; // 13;
// POSERATE
if (CameraPane.tickcount > 0 || CameraPane.SLOWPOSE)
diff --git a/Camera.java b/Camera.java
index 0994899..0de6989 100644
--- a/Camera.java
+++ b/Camera.java
@@ -388,6 +388,11 @@
locationBuf.y = location.y * K + locationBuf.y * (1 - K);
lookAtBuf.y = lookAt.y * K + lookAtBuf.y * (1 - K);
+ UP.x = 0 * K + UP.x * (1 - K);
+ UP.y = 1 * K + UP.y * (1 - K);
+ UP.z = 0 * K + UP.z * (1 - K);
+ UP.normalize();
+
if (CameraPane.capsLocked && !CameraPane.ambientOcclusion)
K = 0.1;
diff --git a/CameraPane.java b/CameraPane.java
index 1d52f4a..7120432 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -2249,6 +2249,13 @@
// else
repaint(); // start loop // may 2013
}
+
+ public void ToggleAntialiasing()
+ {
+ CURRENTANTIALIAS = ((CURRENTANTIALIAS != 0) ? 0 : 1);
+ System.out.println("Antialias ACSIZE = " + ACSIZE);
+ System.out.println("CURRENTANTIALIAS = " + CURRENTANTIALIAS);
+ }
public void ToggleSupport()
{
@@ -2294,6 +2301,7 @@
{
IMAGEFLIP ^= true;
}
+
public void ToggleSpeakerMocap()
{
@@ -9642,7 +9650,7 @@
pixdx, pixdy, edx, edy, focus);
}
- static int ACSIZE = 4; // 16;
+ static int ACSIZE = 16; // 16;
static int MAXACSIZE = 256; // 1024;
static float[] jx8 = new float[MAXACSIZE];
static float[] jy8 = new float[MAXACSIZE];
@@ -9676,8 +9684,8 @@
void ResetOptions()
{
options1[0] = 100;
- options1[1] = 0.025f;
- options1[2] = 0.01f;
+ options1[1] = 0.01f; // .025f;
+ options1[2] = 10f;
options1[3] = 0;
options1[4] = 0;
@@ -15724,11 +15732,9 @@
DISPLAYTEXT ^= true;
repaint();
break;
- case 'A':
+ //case 'A':
case 'a':
- CURRENTANTIALIAS = ((CURRENTANTIALIAS != 0) ? 0 : 1);
- System.out.println("Antialias ACSIZE = " + ACSIZE);
- System.out.println("CURRENTANTIALIAS = " + CURRENTANTIALIAS);
+ ToggleAntialiasing();
repaint();
break;
case 'd':
@@ -15832,6 +15838,7 @@
{
//PrintMemory();
ToggleImageFlip();
+ renderCamera.computeTransform();
repaint();
break;
}
@@ -16017,10 +16024,10 @@
case ENTER:
// object.editWindow.ScreenFit(); // Edit();
ToggleLive();
- if (capsLocked)
- {
- Globals.WALK ^= true;
- }
+// if (capsLocked)
+// {
+// Globals.WALK ^= true;
+// }
break;
case DELETE:
ClearSelection();
@@ -16106,8 +16113,11 @@
repaint();
break;
case BACKSPACE:
- enablebackspace = true;
+ // almost working enablebackspace = true;
+ Globals.WALK ^= true;
+ object.Step();
+ object.Touch();
// SwitchCameras(false);
repaint();
break;
@@ -18343,7 +18353,7 @@
private boolean keepshadow;
- static public boolean capsLocked = true; // false; // VR
+ static public boolean capsLocked = false; // VR
static public int indexcount = 0;
/*static*/ cColor vertexOcclusion = new cColor();
diff --git a/Cone.java b/Cone.java
index 3396bc6..3e35b1e 100644
--- a/Cone.java
+++ b/Cone.java
@@ -3,7 +3,7 @@
class Cone extends Biparam implements java.io.Serializable
{
static final long serialVersionUID = -2558098774090336324L; // new
- // -679715043452968126L; // old
+ //-679715043452968126L; // old
Cone()
{
diff --git a/GroupEditor.java b/GroupEditor.java
index e5d255d..fac0d64 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -1112,6 +1112,10 @@
// sevenButton.addActionListener(this);
//
+ oe.toolbarPanel.add(antialiasCB = GetToggleButton("icons/antialias.png", Globals.isLIVE())); //, oe.aConstraints);
+ antialiasCB.setToolTipText("Final render");
+ antialiasCB.addItemListener(this);
+
oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
screenfitButton.setToolTipText("Screen fit");
screenfitButton.addActionListener(this);
@@ -1545,6 +1549,7 @@
}
cToggleButton liveCB;
+ cToggleButton antialiasCB;
cCheckBox supportCB;
cCheckBox localCB;
cCheckBox crowdCB;
@@ -1606,6 +1611,10 @@
{
cameraView.ToggleLive();
refreshContents(false);
+ } else if(e.getSource() == antialiasCB)
+ {
+ cameraView.ToggleAntialiasing();
+ refreshContents(false);
}
else if(e.getSource() == supportCB)
{
diff --git a/ObjEditor.java b/ObjEditor.java
index 1c24b4b..9a57cca 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1899,6 +1899,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = false;
+ Globals.setLIVE(true);
+ Globals.WALK = false;
LoadIt(obj);
}
@@ -1921,6 +1924,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = false;
+ Globals.setLIVE(true);
+ Globals.WALK = false;
LoadIt(obj);
}
@@ -1945,6 +1951,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -1967,6 +1976,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -1991,6 +2003,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -2013,6 +2028,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(true);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -2037,6 +2055,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(true);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -2059,6 +2080,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = false;
LoadIt(obj);
}
@@ -2083,6 +2107,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -2105,6 +2132,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(true);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -2129,6 +2159,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -2151,6 +2184,9 @@
public void Callback(Object obj)
{
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
LoadIt(obj);
}
@@ -4458,6 +4494,7 @@
} else if (event.getSource() == sortCB)
{
copy.sort ^= true;
+ copy.Touch(); // display list issue
objEditor.refreshContents();
return;
} else if (event.getSource() == link2masterCB)
diff --git a/fullscenes/skullcovebirdeye.png b/fullscenes/skullcovebirdeye.png
new file mode 100644
index 0000000..3b27629
--- /dev/null
+++ b/fullscenes/skullcovebirdeye.png
Binary files differ
diff --git a/icons/antialias.png b/icons/antialias.png
new file mode 100644
index 0000000..b91e9c3
--- /dev/null
+++ b/icons/antialias.png
Binary files differ
--
Gitblit v1.6.2