From 58d584eed26c144b3ca3274acdfd0cc5760ae182 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 6 Dec 2018 11:14:51 +0100 Subject: [PATCH] rug:: cylinder: removed debug, better initial orientation, subdivision done --- rug.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rug.cpp b/rug.cpp index 05f6216c..b486890d 100644 --- a/rug.cpp +++ b/rug.cpp @@ -200,14 +200,12 @@ rugpoint *addRugpoint(hyperpoint h, double dist) { if(euwrap && !bounded) { hyperpoint h1 = eumove(torusconfig::sdx, torusconfig::sdy) * C0; - println(hlog, "h1 = ", h1); h1 /= sqhypot2(h1); if(nonorientable) h1 /= 2; - println(hlog, "-> h1 = ", h1); m->valid = good_shape = true; ld d = h1[0] * h[1] - h1[1] * h[0]; ld a = h[0] * h1[0] + h[1] * h1[1]; - m->flat = hpxyz(cos(a * 2 * M_PI), sin(a * 2 * M_PI), d * 2 * M_PI); + m->flat = hpxyz(d * 2 * M_PI, sin(a * 2 * M_PI), cos(a * 2 * M_PI)); } else if(sphere) { m->valid = good_shape = true; @@ -833,7 +831,7 @@ int divides = 0; bool stop = false; bool subdivide_further() { - if(euwrap) return false; + if(fulltorus) return false; return isize(points) * 4 < vertex_limit; }