setop
/
ShapeUp-publicShapeUp
mirror of https://github.com/danielchasehooper/ShapeUp-public
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix !guiSliderDragging &&

This commit is contained in:
flowerpewpew 2024-05-03 21:34:05 +01:00
parent 1bcd3d67ac
commit d5dadec229
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@ -1502,7 +1502,7 @@ int main(void){
static Vector2 mouseDownPosition; static Vector2 mouseDownPosition;
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) mouseDownPosition = GetMousePosition(); if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) mouseDownPosition = GetMousePosition();
if (fabsf(GetMouseWheelMove()) > 0.01 && !guiSliderDragging && mouseAction == CONTROL_NONE ) { if (fabsf(GetMouseWheelMove()) > 0.01 && mouseAction == CONTROL_NONE ) {
Vector2 delta = GetMouseWheelMoveV(); Vector2 delta = GetMouseWheelMoveV();
if (IsKeyDown(KEY_LEFT_ALT)) { if (IsKeyDown(KEY_LEFT_ALT)) {
@ -1516,7 +1516,7 @@ int main(void){
#endif #endif
UpdateCameraPro(&camera, (Vector3){0, -delta.x/10, 0}, Vector3Zero(), 0); UpdateCameraPro(&camera, (Vector3){0, -delta.x/10, 0}, Vector3Zero(), 0);
} }
} else if (IsMouseButtonDown(MOUSE_LEFT_BUTTON) && mouseAction == CONTROL_NONE && Vector2Distance(mouseDownPosition, GetMousePosition()) > 1) { } else if (IsMouseButtonDown(MOUSE_LEFT_BUTTON) && !guiSliderDragging && mouseAction == CONTROL_NONE && Vector2Distance(mouseDownPosition, GetMousePosition()) > 1) {
mouseAction = CONTROL_ROTATE_CAMERA; mouseAction = CONTROL_ROTATE_CAMERA;
} }