projects
/
anneal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
got edge bindings right
[anneal.git]
/
src
/
Main.java
diff --git
a/src/Main.java
b/src/Main.java
index
8a6cde6
..
d8e2658
100644
(file)
--- a/
src/Main.java
+++ b/
src/Main.java
@@
-18,7
+18,6
@@
public class Main implements GLEventListener {
public Main(StlFile stlf) {
public Main(StlFile stlf) {
-
Geom.P ltf = geom.newP(-0.2, 0.1, 0.1);
Geom.P mtf = geom.newP( 0.0, 0.1, 0.1);
Geom.P rtf = geom.newP( 0.2, 0.1, 0.1);
Geom.P ltf = geom.newP(-0.2, 0.1, 0.1);
Geom.P mtf = geom.newP( 0.0, 0.1, 0.1);
Geom.P rtf = geom.newP( 0.2, 0.1, 0.1);
@@
-97,16
+96,25
@@
public class Main implements GLEventListener {
if ((t1.p1().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
(t1.p2().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
if ((t1.p1().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
(t1.p2().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
- (t1.p3().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
- t1.bind(t2, 0);
+ (t1.p3().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+ t1.e1().bind(t2.e3());
+ t1.e2().bind(t2.e2());
+ t1.e3().bind(t2.e1());
+ }
if ((t1.p2().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
(t1.p3().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
if ((t1.p2().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
(t1.p3().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
- (t1.p1().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
- t1.bind(t2, 1);
+ (t1.p1().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+ t1.e2().bind(t2.e3());
+ t1.e3().bind(t2.e2());
+ t1.e1().bind(t2.e1());
+ }
if ((t1.p3().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
(t1.p1().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
if ((t1.p3().plus(v).minus(t2.p1()).mag() < Geom.EPSILON) &&
(t1.p1().plus(v).minus(t2.p3()).mag() < Geom.EPSILON) &&
- (t1.p2().plus(v).minus(t2.p2()).mag() < Geom.EPSILON))
- t1.bind(t2, 2);
+ (t1.p2().plus(v).minus(t2.p2()).mag() < Geom.EPSILON)) {
+ t1.e3().bind(t2.e3());
+ t1.e1().bind(t2.e2());
+ t1.e2().bind(t2.e1());
+ }
}
}
}
}
}
}