From 2f64ad2c1070df88f8c16f92ad8f9b5bd1892cf2 Mon Sep 17 00:00:00 2001 From: TheNumbat Date: Wed, 30 Sep 2020 14:05:17 -0400 Subject: [PATCH] change halfedge placement --- CMakeLists.txt | 2 +- src/gui/model.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e4b869..0de7b79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.17) +cmake_minimum_required(VERSION 2.8) # define project diff --git a/src/gui/model.cpp b/src/gui/model.cpp index 98e472d..67b7493 100644 --- a/src/gui/model.cpp +++ b/src/gui/model.cpp @@ -283,11 +283,11 @@ void Model::halfedge_viz(Halfedge_Mesh::HalfedgeRef h, Mat4 &transform) { float v0s = vert_sizes[v_0->id()], v1s = vert_sizes[v_1->id()]; float s = 0.3f * (v0s < v1s ? v0s : v1s); - // Move to center of edge and towards center of face + // Move to center of edge and away from edge Vec3 offset = (v1 - v0) * 0.2f; - Vec3 face = h->face()->center(); + Vec3 face_n = h->face()->normal(); Vec3 avg = 0.5f * (v0 + v1); - offset += (face - avg).unit() * s * 0.2f; + offset += cross(face_n, dir).unit() * s * 0.2f + face_n * s * 0.05f; // Align edge if (dir.y == 1.0f || dir.y == -1.0f) { -- GitLab