DrawCamera view update happens in callbacks

This commit is contained in:
Yousef Khadadeh 2026-04-09 20:44:45 +03:00
parent b565ccefbd
commit 80632bb10b
4 changed files with 29 additions and 6 deletions

View file

@ -29,12 +29,10 @@ void DrawCamera::set_based_on_center(World& w, const WorldVec& newPos, const Wor
} }
void DrawCamera::set_viewing_area(Vector2f viewingAreaNew) { void DrawCamera::set_viewing_area(Vector2f viewingAreaNew) {
if(viewingArea != viewingAreaNew) {
viewingArea = viewingAreaNew; viewingArea = viewingAreaNew;
} float maxDim = std::max(viewingArea.x(), viewingArea.y());
float maxDim = std::max(viewingAreaNew.x(), viewingAreaNew.y());
WorldScalar a = WorldScalar(maxDim * 0.708f) * c.inverseScale; WorldScalar a = WorldScalar(maxDim * 0.708f) * c.inverseScale;
WorldVec center = c.from_space(viewingAreaNew * 0.5f); WorldVec center = c.from_space(viewingArea * 0.5f);
viewingAreaGenerousCollider = SCollision::AABB<WorldScalar>(center - WorldVec{a, a}, center + WorldVec{a, a}); viewingAreaGenerousCollider = SCollision::AABB<WorldScalar>(center - WorldVec{a, a}, center + WorldVec{a, a});
} }
@ -112,6 +110,8 @@ void DrawCamera::update_main(World& w) {
c.rotate_about(smoothMove.endCenter, smoothMove.end.rotation); c.rotate_about(smoothMove.endCenter, smoothMove.end.rotation);
smoothMove.occurring = false; smoothMove.occurring = false;
} }
checks_after_input(w);
} }
else { else {
if(w.main.input.key(InputManager::KEY_CAMERA_ROTATE_COUNTERCLOCKWISE).held && !w.main.input.text.is_accepting_input()) { if(w.main.input.key(InputManager::KEY_CAMERA_ROTATE_COUNTERCLOCKWISE).held && !w.main.input.text.is_accepting_input()) {
@ -122,6 +122,7 @@ void DrawCamera::update_main(World& w) {
}; };
w.drawProg.drawTool->input_mouse_motion_callback(motion); w.drawProg.drawTool->input_mouse_motion_callback(motion);
w.main.g.gui.set_to_layout(); w.main.g.gui.set_to_layout();
checks_after_input(w);
} }
if(w.main.input.key(InputManager::KEY_CAMERA_ROTATE_CLOCKWISE).held && !w.main.input.text.is_accepting_input()) { if(w.main.input.key(InputManager::KEY_CAMERA_ROTATE_CLOCKWISE).held && !w.main.input.text.is_accepting_input()) {
c.rotate_about(c.from_space(w.main.window.size.cast<float>() * 0.5f), w.main.deltaTime); c.rotate_about(c.from_space(w.main.window.size.cast<float>() * 0.5f), w.main.deltaTime);
@ -131,11 +132,17 @@ void DrawCamera::update_main(World& w) {
}; };
w.drawProg.drawTool->input_mouse_motion_callback(motion); w.drawProg.drawTool->input_mouse_motion_callback(motion);
w.main.g.gui.set_to_layout(); w.main.g.gui.set_to_layout();
checks_after_input(w);
} }
} }
}
void DrawCamera::checks_after_input(World& w) {
check_if_scale_up_required(w);
set_viewing_area(w.main.window.size.cast<float>()); set_viewing_area(w.main.window.size.cast<float>());
}
void DrawCamera::check_if_scale_up_required(World& w) {
if(c.inverseScale < WorldScalar(1)) if(c.inverseScale < WorldScalar(1))
w.scale_up_step(); w.scale_up_step();
} }
@ -154,6 +161,8 @@ void DrawCamera::input_mouse_button_on_canvas_callback(World& w, const InputMana
startZoomCameraPos = c.pos; startZoomCameraPos = c.pos;
} }
isAccurateZooming = newIsAccurateZooming; isAccurateZooming = newIsAccurateZooming;
checks_after_input(w);
} }
else else
isAccurateZooming = false; isAccurateZooming = false;
@ -174,9 +183,13 @@ void DrawCamera::input_mouse_motion_callback(World& w, const InputManager::Mouse
WorldScalar mX = static_cast<WorldScalar>(WorldMultiplier(c.inverseScale) / WorldMultiplier(startZoomVal)); WorldScalar mX = static_cast<WorldScalar>(WorldMultiplier(c.inverseScale) / WorldMultiplier(startZoomVal));
c.pos = startZoomMousePos + mVec * mX; c.pos = startZoomMousePos + mVec * mX;
} }
checks_after_input(w);
} }
else if(w.drawProg.controls.middleClickHeld || (w.drawProg.controls.leftClickHeld && w.drawProg.drawTool->get_type() == DrawingProgramToolType::PAN)) else if(w.drawProg.controls.middleClickHeld || (w.drawProg.controls.leftClickHeld && w.drawProg.drawTool->get_type() == DrawingProgramToolType::PAN)) {
c.pos -= c.dir_from_space(motion.move); c.pos -= c.dir_from_space(motion.move);
checks_after_input(w);
}
} }
} }
@ -202,6 +215,8 @@ void DrawCamera::input_mouse_wheel_callback(World& w, const InputManager::MouseW
} }
} }
} }
checks_after_input(w);
} }
} }
@ -236,6 +251,8 @@ void DrawCamera::input_multi_finger_motion_callback(World& w, const InputManager
float rotateAngle = initialAngle - newAngle; float rotateAngle = initialAngle - newAngle;
rotateAngle = std::fmod(rotateAngle + std::numbers::pi, std::numbers::pi * 2.0f) - std::numbers::pi; rotateAngle = std::fmod(rotateAngle + std::numbers::pi, std::numbers::pi * 2.0f) - std::numbers::pi;
c.rotate_about(newCenterWorld, rotateAngle); c.rotate_about(newCenterWorld, rotateAngle);
checks_after_input(w);
} }
} }

View file

@ -56,4 +56,7 @@ class DrawCamera {
CoordSpaceHelper touchInitialC; CoordSpaceHelper touchInitialC;
std::vector<Vector2f> touchInitialPositions; std::vector<Vector2f> touchInitialPositions;
bool isTouchTransforming = false; bool isTouchTransforming = false;
void check_if_scale_up_required(World& w);
void checks_after_input(World& w);
}; };

View file

@ -461,6 +461,8 @@ void MainProgram::input_finger_motion_callback(const InputManager::FingerMotionC
} }
void MainProgram::input_window_resize_callback(const InputManager::WindowResizeCallbackArgs& w) { void MainProgram::input_window_resize_callback(const InputManager::WindowResizeCallbackArgs& w) {
for(auto& wor : worlds)
wor->drawData.cam.set_viewing_area(window.size.cast<float>());
g.window_update(); g.window_update();
post_callback(); post_callback();
} }

View file

@ -60,6 +60,7 @@ World::World(MainProgram& initMain, const CustomEvents::OpenInfiniPaintFileEvent
drawData.rMan = &rMan; drawData.rMan = &rMan;
drawData.main = &main; drawData.main = &main;
drawData.cam.set_viewing_area(main.window.size.cast<float>());
if(worldInfo.isClient) if(worldInfo.isClient)
init_client(worldInfo.netSource); init_client(worldInfo.netSource);