添加组件圆,添加可视化碰撞器渲染
This commit is contained in:
@ -96,7 +96,6 @@ namespace Hazel
|
||||
break;
|
||||
}
|
||||
|
||||
// Renderer2D::BeginScene(m_CameraController.GetCamera());
|
||||
|
||||
auto [mx, my] = ImGui::GetMousePos();
|
||||
mx -= m_ViewPortBounds[0].x;
|
||||
@ -104,8 +103,8 @@ namespace Hazel
|
||||
const glm::vec2 viewPortSize = m_ViewPortBounds[1] - m_ViewPortBounds[0];
|
||||
my = viewPortSize.y - my;
|
||||
|
||||
int mouseX = (int)mx;
|
||||
int mouseY = (int)my;
|
||||
const int mouseX = (int)mx;
|
||||
const int mouseY = (int)my;
|
||||
|
||||
if (mouseX >= 0 && mouseY >= 0 && mouseX < m_ViewPortSize.x && mouseY < m_ViewPortSize.y)
|
||||
{
|
||||
@ -117,11 +116,54 @@ namespace Hazel
|
||||
// Renderer2D::DrawQuad({0, -0.5f}, {1.0f, 1.0f}, {0.8f, 0.2f, 0.2f, 1.0f});
|
||||
// Renderer2D::DrawQuad({-1, 0}, {1, 1}, m_LogoTexture);
|
||||
// Renderer2D::DrawQuad({1, 0}, {1, 1}, m_CheckerBoardTexture);
|
||||
OnOverLayRender();
|
||||
|
||||
// Renderer2D::EndScene();
|
||||
m_FrameBuffer->UnBind();
|
||||
}
|
||||
|
||||
void EditorLayer::OnOverLayRender()
|
||||
{
|
||||
|
||||
if (m_SceneState == SceneState::Play)
|
||||
{
|
||||
Entity camera = m_ActiveScene->GetPrimaryCameraEntity();
|
||||
Renderer2D::BeginScene(camera.GetComponent<CameraComponent>().Camera, camera.GetComponent<TransformComponent>().GetTransform());
|
||||
}else
|
||||
{
|
||||
Renderer2D::BeginScene(m_EditorCamera);
|
||||
}
|
||||
|
||||
if (m_ShowPhysicsColliders)
|
||||
{
|
||||
// box collider
|
||||
auto bcview = m_ActiveScene->GetAllEntitiesWith<TransformComponent, BoxCollider2DComponent>();
|
||||
for (auto entity : bcview)
|
||||
{
|
||||
auto [tc, bc2D] = bcview.get<TransformComponent, BoxCollider2DComponent>(entity);
|
||||
glm::vec3 translation = tc.Translation + glm::vec3(bc2D.Offset, 0.001f);
|
||||
glm::vec3 scale = tc.Scale * glm::vec3(bc2D.Size * 2.0f, 1.0f);
|
||||
|
||||
glm::mat4 transform = glm::translate(glm::mat4(1.0f), translation) * glm::rotate(
|
||||
glm::mat4(1.0f), tc.Rotation.z, glm::vec3(0.0f, 0.0f, 1.0f)) * glm::scale(glm::mat4(1.0f), scale);
|
||||
Renderer2D::DrawRect(transform, glm::vec4(0.2, 1.0f, 0.2f, 1.0f));
|
||||
}
|
||||
|
||||
// circle collider
|
||||
auto ccview = m_ActiveScene->GetAllEntitiesWith<TransformComponent, CircleCollider2DComponent>();
|
||||
for (auto entity : ccview)
|
||||
{
|
||||
auto [tc, cc2D] = ccview.get<TransformComponent, CircleCollider2DComponent>(entity);
|
||||
glm::vec3 translation = tc.Translation + glm::vec3(cc2D.Offset, 0.001f);
|
||||
glm::vec3 scale = tc.Scale * glm::vec3(cc2D.Radius * 2.0f);
|
||||
|
||||
glm::mat4 transform = glm::translate(glm::mat4(1.0f), translation) * glm::scale(glm::mat4(1.0f), scale);
|
||||
Renderer2D::DrawCircle(transform, glm::vec4(0.2, 1.0f, 0.2f, 1.0f), Renderer2D::GetLineWidth() * 0.01f);
|
||||
}
|
||||
}
|
||||
Renderer2D::EndScene();
|
||||
}
|
||||
|
||||
void EditorLayer::OnImGuiRender()
|
||||
{
|
||||
static bool showDockspace = true;
|
||||
@ -229,12 +271,25 @@ namespace Hazel
|
||||
|
||||
ImGui::Separator();
|
||||
|
||||
auto editorCameraPos = m_EditorCamera.GetPosition();
|
||||
ImGui::Text("Editor Camera(%.3f, %.3f, %.3f)", editorCameraPos.x, editorCameraPos.y, editorCameraPos.z);
|
||||
ImGui::Text("Editor Camera Distance: %f", m_EditorCamera.GetDistance());
|
||||
|
||||
float lineWidth = Renderer2D::GetLineWidth();
|
||||
if (ImGui::DragFloat("LineWidth", &lineWidth, 0.01f, 0.0f, 10.0f))
|
||||
{
|
||||
Renderer2D::SetLineWidth(lineWidth);
|
||||
}
|
||||
// std::string name = "none";
|
||||
// if (m_HoveredEntity)
|
||||
// name = m_HoveredEntity.GetComponent<TagComponent>().Tag;
|
||||
|
||||
// ImGui::Text("Hovered Entity: %s", name.c_str());
|
||||
|
||||
ImGui::Separator();
|
||||
|
||||
ImGui::Checkbox("Show Colliders", &m_ShowPhysicsColliders);
|
||||
|
||||
ImGui::End();
|
||||
}
|
||||
|
||||
@ -464,11 +519,12 @@ namespace Hazel
|
||||
#define SHORTCUT_CTRL_D (SDL_KMOD_CTRL + SDLK_D)
|
||||
|
||||
|
||||
const auto mod = SDL_GetModState();
|
||||
const auto ctrl = (mod & SDL_KMOD_CTRL) ? SDL_KMOD_CTRL : 0;
|
||||
const auto shift = (mod & SDL_KMOD_SHIFT) ? SDL_KMOD_SHIFT : 0;
|
||||
if (e.key.down && e.key.repeat == 0)
|
||||
{
|
||||
const auto mod = SDL_GetModState();
|
||||
const auto ctrl = (mod & SDL_KMOD_CTRL) ? SDL_KMOD_CTRL : 0;
|
||||
const auto shift = (mod & SDL_KMOD_SHIFT) ? SDL_KMOD_SHIFT : 0;
|
||||
|
||||
switch (ctrl + shift + e.key.key)
|
||||
{
|
||||
case SHORTCUT_EXIT:
|
||||
@ -539,7 +595,6 @@ namespace Hazel
|
||||
|
||||
}
|
||||
|
||||
|
||||
ImGui::PopStyleVar(2);
|
||||
ImGui::PopStyleColor(3);
|
||||
ImGui::End();
|
||||
|
||||
Reference in New Issue
Block a user