Skip to content

Commit

Permalink
update sdl3
Browse files Browse the repository at this point in the history
  • Loading branch information
T-rvw committed Oct 10, 2023
1 parent b62e30b commit bb2d203
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
8 changes: 3 additions & 5 deletions Engine/Source/Editor/UILayers/SceneView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,17 +237,15 @@ void SceneView::UpdateToolMenuButtons()
ImGui::PopStyleColor();
}

void SceneView::PickSceneMesh(float regionWidth, float regionHeight)
void SceneView::PickSceneMesh(float screenWidth, float screenHeight)
{
if (m_currentOperation != SelectOperation)
{
return;
}

float screenX = static_cast<float>(m_mouseFixedPositionX - GetWindowPosX());
float screenY = static_cast<float>(m_mouseFixedPositionY - GetWindowPosY());
float screenWidth = static_cast<float>(regionWidth);
float screenHeight = static_cast<float>(regionHeight);
float screenX = m_mouseFixedPositionX - GetWindowPosX();
float screenY = m_mouseFixedPositionY - GetWindowPosY();
if (screenX < 0.0f || screenX > screenWidth ||
screenY < 0.0f || screenY > screenHeight)
{
Expand Down
8 changes: 4 additions & 4 deletions Engine/Source/Editor/UILayers/SceneView.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ class SceneView : public engine::ImGuiBaseLayer

bool IsFirstClick() const { return m_isMouseDownFirstTime; }
bool IsShowMouse() { return m_isMouseShow; }
uint32_t GetMouseFixedPositionX() const { return m_mouseFixedPositionX; }
uint32_t GetMouseFixedPositionY() const { return m_mouseFixedPositionY; }
float GetMouseFixedPositionX() const { return m_mouseFixedPositionX; }
float GetMouseFixedPositionY() const { return m_mouseFixedPositionY; }

void SetCameraController(engine::CameraController* pCameraController) { m_pCameraController = pCameraController; }

Expand Down Expand Up @@ -102,8 +102,8 @@ class SceneView : public engine::ImGuiBaseLayer
engine::RenderTarget* m_pRenderTarget = nullptr;
bool m_isMouseDownFirstTime = true;

int32_t m_mouseFixedPositionX = 0;
int32_t m_mouseFixedPositionY = 0;
float m_mouseFixedPositionX = 0.0f;
float m_mouseFixedPositionY = 0.0f;

engine::CameraController* m_pCameraController = nullptr;
};
Expand Down
5 changes: 3 additions & 2 deletions Engine/Source/Runtime/Window/Window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -303,16 +303,17 @@ void Window::SetWindowIcon(const char* pFilePath) const
//stbi_image_free(pImageData);
}

void Window::SetMouseVisible(bool isVisible, uint32_t x, uint32_t y)
void Window::SetMouseVisible(bool isVisible, float x, float y)
{
SDL_ShowCursor(isVisible);
if (!isVisible)
{
SDL_HideCursor();
SDL_SetRelativeMouseMode(SDL_TRUE);
SDL_WarpMouseInWindow(m_pSDLWindow, x, y);
}
else
{
SDL_ShowCursor();
SDL_SetRelativeMouseMode(SDL_FALSE);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Engine/Source/Runtime/Window/Window.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Window
void SetBordedLess(bool flag);
void SetSize(uint16_t width, uint16_t height);
void SetWindowIcon(const char* pFilePath) const;
void SetMouseVisible(bool isVisible, uint32_t x, uint32_t y);
void SetMouseVisible(bool isVisible, float x, float y);

void Update();

Expand Down
2 changes: 1 addition & 1 deletion Engine/Source/ThirdParty/sdl
Submodule sdl updated 262 files

0 comments on commit bb2d203

Please sign in to comment.