From 15fc312f6d04141739d552b44fe9d056a1c58131 Mon Sep 17 00:00:00 2001 From: Jiaming Guo Date: Fri, 14 Jul 2017 11:21:12 -0500 Subject: [PATCH] fixed modes conflict --- flow.h | 2 +- main.cu | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flow.h b/flow.h index c9cdce5..82c510b 100644 --- a/flow.h +++ b/flow.h @@ -1667,7 +1667,7 @@ namespace stim { /// build main feeder connection // set up main feeder and main port of both input and output - void set_main_feeder(T border = 100.0f) { + void set_main_feeder(T border = 120.0f) { // 0 means outgoing while 1 means incoming stim::vec3 inlet_main_feeder; diff --git a/main.cu b/main.cu index 966358a..92f2ab8 100644 --- a/main.cu +++ b/main.cu @@ -268,7 +268,7 @@ void glut_render() { else flow.glyph(color, subdivision); - flow.glSolidCuboid(flow_direction, subdivision, manufacture, length); + flow.glSolidCuboid(flow_direction && build_inlet_outlet, subdivision, manufacture, length); if (render_direction) flow.glSolidCone(direction_index, scale, subdivision); } @@ -497,6 +497,7 @@ void glut_menu(int value) { build_inlet_outlet = false; manufacture = true; flow_direction = false; // manufacuture mode doesn't need flow direction + redisplay = true; } if (value == 4) { -- libgit2 0.21.4