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
---
Vertex.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/Vertex.java b/Vertex.java
index 87c5cac..9714028 100644
--- a/Vertex.java
+++ b/Vertex.java
@@ -112,7 +112,6 @@
{
//if (normalmode) // pos == null)
// return 0;
-
if (norm == null || !normalmode)
{
return /*pos.*/ super.hashCode();
@@ -129,12 +128,26 @@
Vertex vert = (Vertex) o;
//System.out.println("pos = " + pos + "; vert.pos = " + vert/*.pos*/);
+
+ double tolerance = 0.00001;
+
+ if (!Grafreed.epsequal)
+ tolerance = 0;
- return Math.abs(/*pos.*/x - vert./*pos.*/x) +
- Math.abs(/*pos.*/y - vert./*pos.*/y) +
- Math.abs(/*pos.*/z - vert./*pos.*/z) < 0.00001 && // GraphreeD.epsvertex2 && // WARNING: USE 0.0001 for serial issues
- (GraphreeD.linkUV || Math.abs(s - vert.s) + Math.abs(t - vert.t) < 0.00001)
- ; // GraphreeD.epsvertex2;
+ boolean samepos = Math.abs(/*pos.*/x - vert./*pos.*/x) +
+ Math.abs(/*pos.*/y - vert./*pos.*/y) +
+ Math.abs(/*pos.*/z - vert./*pos.*/z) <= tolerance && // GrafreeD.epsvertex2 && // WARNING: USE 0.0001 for serial issues
+ (Grafreed.linkUV || Math.abs(s - vert.s) + Math.abs(t - vert.t) <= tolerance)
+ ; // GrafreeD.epsvertex2;
+
+ if (samepos && Grafreed.smoothmode)
+ {
+ norm.add(vert.norm);
+ norm.normalize();
+ vert.norm.set(norm);
+ }
+
+ return samepos;
}
/*
public boolean isSame(Object o)
--
Gitblit v1.6.2