celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-04 11:35:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Antoine Pilote
2023-07-25 21:33:14 -04:00
parent 8e59072bde
commit 4cdaaacecb
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/src/Windows/EditorInterface.cpp
View File

@@ -251,7 +251,7 @@ namespace Nuake {
ImGui::FocusWindow(ImGui::GetCurrentWindow());
const auto windowPosNuake = Vector2(windowPos.x, windowPos.y);
auto& gbuffer = Engine::GetCurrentScene()->mSceneRenderer->GetGBuffer();
auto& gbuffer = Engine::GetCurrentScene()->m_SceneRenderer->GetGBuffer();
auto pixelPos = Input::GetMousePosition() - windowPosNuake;
pixelPos.y = gbuffer.GetSize().y - pixelPos.y; // imgui coords are inverted on the Y axis
@@ -847,7 +847,7 @@ namespace Nuake {
ImGui::TableNextColumn();
SSR* ssr = scene->mSceneRenderer->mSSR.get();
SSR* ssr = scene->m_SceneRenderer->mSSR.get();
{
// Title
ImGui::Text("SSR RayStep");

20
Nuake/src/Scene/Scene.cpp
View File

@@ -46,8 +46,8 @@ namespace Nuake {
m_Systems.push_back(CreateRef<TransformSystem>(this));
m_Systems.push_back(CreateRef<PhysicsSystem>(this));
mSceneRenderer = new SceneRenderer();
mSceneRenderer->Init();
m_SceneRenderer = new SceneRenderer();
m_SceneRenderer->Init();
}
Scene::~Scene()
@@ -75,9 +75,9 @@ namespace Nuake {
Entity Scene::GetEntityByID(int id)
{
if (_EntitiesIDMap.find(id) != _EntitiesIDMap.end())
if (m_EntitiesIDMap.find(id) != m_EntitiesIDMap.end())
{
return _EntitiesIDMap[id];
return m_EntitiesIDMap[id];
}
auto idView = m_Registry.view<NameComponent>();
@@ -87,7 +87,7 @@ namespace Nuake {
if (nameC.ID == id)
{
auto newEntity = Entity{ e, this };
_EntitiesIDMap[id] = newEntity;
m_EntitiesIDMap[id] = newEntity;
return newEntity;
}
}
@@ -158,14 +158,14 @@ namespace Nuake {
return;
}
mSceneRenderer->BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation);
mSceneRenderer->RenderScene(*this, framebuffer);
m_SceneRenderer->BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation);
m_SceneRenderer->RenderScene(*this, framebuffer);
}
void Scene::Draw(FrameBuffer& framebuffer, const Matrix4& projection, const Matrix4& view)
{
mSceneRenderer->BeginRenderScene(m_EditorCamera->GetPerspective(), m_EditorCamera->GetTransform(), m_EditorCamera->Translation);
mSceneRenderer->RenderScene(*this, framebuffer);
m_SceneRenderer->BeginRenderScene(m_EditorCamera->GetPerspective(), m_EditorCamera->GetTransform(), m_EditorCamera->Translation);
m_SceneRenderer->RenderScene(*this, framebuffer);
}
std::vector<Entity> Scene::GetAllEntities()
@@ -251,7 +251,7 @@ namespace Nuake {
nameComponent.Name = entityName;
nameComponent.ID = id;
_EntitiesIDMap[id] = entity;
m_EntitiesIDMap[id] = entity;
Logger::Log("Entity created with name: " + nameComponent.Name, "scene", LOG_TYPE::VERBOSE);
return entity;

4
Nuake/src/Scene/Scene.h
View File

@@ -37,10 +37,10 @@ namespace Nuake
public:
Ref<EditorCamera> m_EditorCamera;
entt::registry m_Registry;
std::map<uint32_t, Entity> _EntitiesIDMap;
std::map<uint32_t, Entity> m_EntitiesIDMap;
std::string Path = "";
SceneRenderer* mSceneRenderer;
SceneRenderer* m_SceneRenderer;
static Ref<Scene> New();
Scene();