|
@@ -577,11 +577,14 @@ namespace igl
|
|
|
" label='Light direction' open help='Change the light direction.' ");
|
|
|
|
|
|
|
|
|
- TwAddVarRW(bar, "Toggle Orthographic/Perspective", TW_TYPE_BOOLCPP, &(options.orthographic),
|
|
|
+ TwAddVarRW(bar, "ToggleOrthographic", TW_TYPE_BOOLCPP, &(options.orthographic),
|
|
|
" group='Viewing Options'"
|
|
|
" label='Orthographic view' "
|
|
|
" help='Toggles orthographic / perspective view. Default: perspective.'");
|
|
|
-
|
|
|
+ TwAddVarRW(bar, "Rotation", TW_TYPE_QUAT4F, &(options.trackball_angle),
|
|
|
+ " group='Viewing Options'"
|
|
|
+ " label='Rotation'"
|
|
|
+ " help='Rotates view.'");
|
|
|
TwAddVarCB(bar,"Face-based Normals/Colors", TW_TYPE_BOOLCPP, set_face_based_cb, get_face_based_cb, this,
|
|
|
" group='Draw options'"
|
|
|
" label='Face-based' key=T help='Toggle per face shading/colors.' ");
|
|
@@ -677,6 +680,7 @@ namespace igl
|
|
|
|
|
|
|
|
|
down = false;
|
|
|
+ hack_never_moved = true;
|
|
|
scroll_position = 0.0f;
|
|
|
|
|
|
|
|
@@ -1027,6 +1031,12 @@ namespace igl
|
|
|
|
|
|
bool Viewer::mouse_move(int mouse_x, int mouse_y)
|
|
|
{
|
|
|
+ if(hack_never_moved)
|
|
|
+ {
|
|
|
+ down_mouse_x = mouse_x;
|
|
|
+ down_mouse_y = mouse_y;
|
|
|
+ hack_never_moved = false;
|
|
|
+ }
|
|
|
current_mouse_x = mouse_x;
|
|
|
current_mouse_y = mouse_y;
|
|
|
|
|
@@ -2424,12 +2434,7 @@ namespace igl
|
|
|
__viewer = this;
|
|
|
|
|
|
|
|
|
- glfwSetKeyCallback(window, glfw_key_callback);
|
|
|
- glfwSetCursorPosCallback(window,glfw_mouse_move);
|
|
|
- glfwSetWindowSizeCallback(window,glfw_window_size);
|
|
|
- glfwSetMouseButtonCallback(window,glfw_mouse_press);
|
|
|
- glfwSetScrollCallback(window,glfw_mouse_scroll);
|
|
|
- glfwSetCharCallback(window, glfw_char_callback);
|
|
|
+ glfwSetKeyCallback(window, glfw_key_callback); glfwSetCursorPosCallback(window,glfw_mouse_move); glfwSetWindowSizeCallback(window,glfw_window_size); glfwSetMouseButtonCallback(window,glfw_mouse_press); glfwSetScrollCallback(window,glfw_mouse_scroll); glfwSetCharCallback(window, glfw_char_callback);
|
|
|
|
|
|
|
|
|
int width, height;
|