Commit 15fc312f6d04141739d552b44fe9d056a1c58131
1 parent
0224d2ef
fixed modes conflict
Showing
2 changed files
with
3 additions
and
2 deletions
Show diff stats
| @@ -1667,7 +1667,7 @@ namespace stim { | @@ -1667,7 +1667,7 @@ namespace stim { | ||
| 1667 | 1667 | ||
| 1668 | /// build main feeder connection | 1668 | /// build main feeder connection |
| 1669 | // set up main feeder and main port of both input and output | 1669 | // set up main feeder and main port of both input and output |
| 1670 | - void set_main_feeder(T border = 100.0f) { | 1670 | + void set_main_feeder(T border = 120.0f) { |
| 1671 | 1671 | ||
| 1672 | // 0 means outgoing while 1 means incoming | 1672 | // 0 means outgoing while 1 means incoming |
| 1673 | stim::vec3<T> inlet_main_feeder; | 1673 | stim::vec3<T> inlet_main_feeder; |
main.cu
| @@ -268,7 +268,7 @@ void glut_render() { | @@ -268,7 +268,7 @@ void glut_render() { | ||
| 268 | else | 268 | else |
| 269 | flow.glyph(color, subdivision); | 269 | flow.glyph(color, subdivision); |
| 270 | 270 | ||
| 271 | - flow.glSolidCuboid(flow_direction, subdivision, manufacture, length); | 271 | + flow.glSolidCuboid(flow_direction && build_inlet_outlet, subdivision, manufacture, length); |
| 272 | if (render_direction) | 272 | if (render_direction) |
| 273 | flow.glSolidCone(direction_index, scale, subdivision); | 273 | flow.glSolidCone(direction_index, scale, subdivision); |
| 274 | } | 274 | } |
| @@ -497,6 +497,7 @@ void glut_menu(int value) { | @@ -497,6 +497,7 @@ void glut_menu(int value) { | ||
| 497 | build_inlet_outlet = false; | 497 | build_inlet_outlet = false; |
| 498 | manufacture = true; | 498 | manufacture = true; |
| 499 | flow_direction = false; // manufacuture mode doesn't need flow direction | 499 | flow_direction = false; // manufacuture mode doesn't need flow direction |
| 500 | + redisplay = true; | ||
| 500 | } | 501 | } |
| 501 | 502 | ||
| 502 | if (value == 4) { | 503 | if (value == 4) { |