From 32c0c33003c3d9592c1c059b1e4776d424935956 Mon Sep 17 00:00:00 2001
From: TheNumbat <mjslater@andrew.cmu.edu>
Date: Sun, 14 Mar 2021 20:28:16 -0400
Subject: [PATCH] fix halfedge edge normals

---
 src/geometry/util.cpp | 5 +++++
 src/geometry/util.h   | 1 +
 src/gui/model.cpp     | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/geometry/util.cpp b/src/geometry/util.cpp
index 7fc74f6..ac06f27 100644
--- a/src/geometry/util.cpp
+++ b/src/geometry/util.cpp
@@ -28,6 +28,11 @@ GL::Mesh cone_mesh(float bradius, float tradius, float height, int sides, bool c
     return Gen::dedup({std::move(cone.verts), std::move(cone.elems)});
 }
 
+GL::Mesh cyl_mesh_disjoint(float radius, float height, int sides) {
+    Gen::Data cone = Gen::cone(radius, radius, height, sides, false);
+    return GL::Mesh(std::move(cone.verts), std::move(cone.elems));
+}
+
 GL::Mesh torus_mesh(float iradius, float oradius, int segments, int sides) {
     Gen::Data torus = Gen::torus(iradius, oradius, segments, sides);
     return Gen::dedup({std::move(torus.verts), std::move(torus.elems)});
diff --git a/src/geometry/util.h b/src/geometry/util.h
index 9110a78..3e7645d 100644
--- a/src/geometry/util.h
+++ b/src/geometry/util.h
@@ -11,6 +11,7 @@ GL::Mesh cube_mesh(float radius);
 GL::Mesh square_mesh(float radius);
 GL::Mesh quad_mesh(float x, float y);
 GL::Mesh cyl_mesh(float radius, float height, int sides = 12, bool cap = true);
+GL::Mesh cyl_mesh_disjoint(float radius, float height, int sides = 12);
 GL::Mesh torus_mesh(float iradius, float oradius, int segments = 48, int sides = 24);
 GL::Mesh sphere_mesh(float r, int subdivsions);
 GL::Mesh hemi_mesh(float r);
diff --git a/src/gui/model.cpp b/src/gui/model.cpp
index 4b53d3c..f8cbdf7 100644
--- a/src/gui/model.cpp
+++ b/src/gui/model.cpp
@@ -13,7 +13,7 @@
 namespace Gui {
 
 Model::Model()
-    : spheres(Util::sphere_mesh(0.05f, 1)), cylinders(Util::cyl_mesh(0.05f, 1.0f)),
+    : spheres(Util::sphere_mesh(0.05f, 1)), cylinders(Util::cyl_mesh_disjoint(0.05f, 1.0f)),
       arrows(Util::arrow_mesh(0.05f, 0.1f, 1.0f)) {
 }
 
-- 
GitLab