diff --git a/src/bakara/renderer/cameras/ortho_camera.cpp b/src/bakara/renderer/cameras/ortho_camera.cpp index f901237..60ec0fe 100644 --- a/src/bakara/renderer/cameras/ortho_camera.cpp +++ b/src/bakara/renderer/cameras/ortho_camera.cpp @@ -8,14 +8,14 @@ namespace Bk { OrthoCamera::OrthoCamera(float left, float right, float bottom, float top) - : projection(Math::ortho(left, right, bottom, top, -1.0f, 1.0f)) + : projection(Math::ortho(left, right, bottom, top, -10.0f, 10.0f)) { RecalculateView(); } void OrthoCamera::SetProjection(float left, float right, float bottom, float top) { - projection = Math::ortho(left, right, bottom, top, -1.0f, 1.0f); + projection = Math::ortho(left, right, bottom, top, -10.0f, 10.0f); viewProjection = projection * view; } diff --git a/src/bakara/renderer/cameras/ortho_camera_controller.h b/src/bakara/renderer/cameras/ortho_camera_controller.h index 0fe27e0..e726714 100644 --- a/src/bakara/renderer/cameras/ortho_camera_controller.h +++ b/src/bakara/renderer/cameras/ortho_camera_controller.h @@ -20,6 +20,8 @@ namespace Bk void SetMoveSpeed(float moveSpeed) { this->moveSpeed = moveSpeed; } void SetRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; } + void SetZoomLevel(float level) { zoomLevel = level; } + void SetPosition(Vec3 cameraPosition) { this->cameraPosition = cameraPosition; } private: float aspectRatio; diff --git a/src/platforms/glfw/glfw_mouse.cpp b/src/platforms/glfw/glfw_mouse.cpp index 5e40279..be53c1e 100644 --- a/src/platforms/glfw/glfw_mouse.cpp +++ b/src/platforms/glfw/glfw_mouse.cpp @@ -6,10 +6,11 @@ namespace Bk { Vec2 Mouse::GetPosition() { - auto* window = static_cast(Application::Get().GetWindow().GetNativeWindow()); + auto& window_handle = Application::Get().GetWindow(); + auto* window = static_cast(window_handle.GetNativeWindow()); double xpos, ypos; glfwGetCursorPos(window, &xpos, &ypos); - return { (float)xpos, (float)ypos }; + return { (float)xpos - (float)window_handle.GetWidth()/2, (float)ypos - (float)window_handle.GetHeight()/2 }; } bool Mouse::ButtonUp(Code button)