Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/engine/core/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@ namespace lei3d
m_Renderer.draw(SceneManager::ActiveScene(), *m_SceneView);

Camera& sceneCamera = m_SceneView->ActiveCamera(SceneManager::ActiveScene());
// Maybe enable this in debug mode only?
// if (m_UIActive)
// {
EditorGUI::renderDebugCursor();
// }
m_PrimitiveRenderer.drawAll(sceneCamera);
}

Expand Down
5 changes: 4 additions & 1 deletion src/engine/core/FlyCamera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ namespace lei3d
{
ImGui::SliderFloat("Camera Speed", &m_FlySpeed, MIN_FLY_SPEED, MAX_FLY_SPEED, "%.2f");
ImGui::Checkbox("Use 'Minecraft' Camera Controls: ", &m_UseMinecraftControls);

glm::vec3 pos = this->GetPosition();
ImGui::Text("x: %f, y: %f, z: %f", pos.x, pos.y, pos.z);
}

void FlyCamera::handleForward(float speed)
Expand Down Expand Up @@ -109,4 +112,4 @@ namespace lei3d
void FlyCamera::SetFlySpeed(float speed) {
m_FlySpeed = speed;
}
} // namespace lei3d
} // namespace lei3d
12 changes: 11 additions & 1 deletion src/engine/guitools/EditorGUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,14 @@ namespace lei3d
scene.ShowHeirarchyGUI();
}

} // namespace lei3d
// SUPER JANKY AND SCUFFED! REDO AFTER 2D LINE RENDERING IS IMPLEMENTED
void EditorGUI::renderDebugCursor()
{
PrimitiveRenderer& lineRenderer = Application::GetPrimitiveRenderer();
Camera& camera = Application::GetSceneCamera();
glm::vec3 origin = camera.GetPosition() + camera.GetFront() * 10.f;
lineRenderer.pushLine(Application::GetSceneCamera(), origin, origin + glm::vec3{1,0,0}, glm::vec3{1,0,0}, .01);
lineRenderer.pushLine(Application::GetSceneCamera(), origin, origin + glm::vec3{0,1,0}, glm::vec3{0,1,0}, .01);
lineRenderer.pushLine(Application::GetSceneCamera(), origin, origin + glm::vec3{0,0,1}, glm::vec3{0,0,1}, .01);
}
} // namespace lei3d
3 changes: 2 additions & 1 deletion src/engine/guitools/EditorGUI.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ namespace lei3d

public:
void RenderUI(); // DON"T MAKE THIS CONST
static void renderDebugCursor();
};
} // namespace lei3d
} // namespace lei3d
2 changes: 1 addition & 1 deletion src/engine/rendering/PrimitiveRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ namespace lei3d
{
return m_PrimitiveShader;
}
} // namespace lei3d
} // namespace lei3d