diff --git a/Editor/src/Windows/EditorInterface.cpp b/Editor/src/Windows/EditorInterface.cpp index cd827f3b..92071e85 100644 --- a/Editor/src/Windows/EditorInterface.cpp +++ b/Editor/src/Windows/EditorInterface.cpp @@ -167,7 +167,6 @@ namespace Nuake { tc.SetGlobalRotation(grotation); tc.SetGlobalScale(gscale); tc.SetGlobalTransform(transform); - } } } diff --git a/Nuake/src/Scene/Components/RigidbodyComponent.cpp b/Nuake/src/Scene/Components/RigidbodyComponent.cpp index 3d50bab5..4dd4c3e7 100644 --- a/Nuake/src/Scene/Components/RigidbodyComponent.cpp +++ b/Nuake/src/Scene/Components/RigidbodyComponent.cpp @@ -20,15 +20,12 @@ namespace Nuake { { if (!m_Rigidbody) return; - } void RigidBodyComponent::SyncWithTransform(TransformComponent* tc) { if (!m_Rigidbody) return; - - } void RigidBodyComponent::DrawShape(TransformComponent* tc) @@ -36,7 +33,6 @@ namespace Nuake { } - void RigidBodyComponent::DrawEditor() { } diff --git a/Nuake/src/Scene/Scene.cpp b/Nuake/src/Scene/Scene.cpp index 36a1d8ac..37955360 100644 --- a/Nuake/src/Scene/Scene.cpp +++ b/Nuake/src/Scene/Scene.cpp @@ -148,7 +148,9 @@ namespace Nuake { } if (!cam) + { return; + } mSceneRenderer->BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation); mSceneRenderer->RenderScene(*this, framebuffer); diff --git a/Nuake/src/Scene/Systems/PhysicsSystem.cpp b/Nuake/src/Scene/Systems/PhysicsSystem.cpp index 9095750e..6756506c 100644 --- a/Nuake/src/Scene/Systems/PhysicsSystem.cpp +++ b/Nuake/src/Scene/Systems/PhysicsSystem.cpp @@ -39,48 +39,48 @@ namespace Nuake } } - // character controllers - auto ccview = m_Scene->m_Registry.view(); - for (auto e : ccview) - { - auto [transform, cc] = ccview.get(e); + //// character controllers + //auto ccview = m_Scene->m_Registry.view(); + //for (auto e : ccview) + //{ + // auto [transform, cc] = ccview.get(e); - cc.CharacterController = CreateRef(cc.Height, cc.Radius, cc.Mass, transform.GetLocalPosition()); - Entity ent = Entity({ e, m_Scene }); - cc.CharacterController->SetEntity(ent); + // cc.CharacterController = CreateRef(cc.Height, cc.Radius, cc.Mass, transform.GetLocalPosition()); + // Entity ent = Entity({ e, m_Scene }); + // cc.CharacterController->SetEntity(ent); - PhysicsManager::Get()->RegisterCharacterController(cc.CharacterController); - } + // PhysicsManager::Get()->RegisterCharacterController(cc.CharacterController); + //} - auto bspView = m_Scene->m_Registry.view(); - for (auto e : bspView) - { - auto [transform, brush] = bspView.get(e); + //auto bspView = m_Scene->m_Registry.view(); + //for (auto e : bspView) + //{ + // auto [transform, brush] = bspView.get(e); - if (!brush.IsSolid) - continue; + // if (!brush.IsSolid) + // continue; - for (auto m : brush.Meshes) - { - Ref meshShape = CreateRef(m); - Ref btRigidbody = CreateRef(0.0f, transform.GetGlobalPosition(), meshShape); - btRigidbody->SetEntityID(Entity{ e, m_Scene }); - brush.Rigidbody.push_back(btRigidbody); - PhysicsManager::Get()->RegisterBody(btRigidbody); - } - } + // for (auto m : brush.Meshes) + // { + // Ref meshShape = CreateRef(m); + // Ref btRigidbody = CreateRef(0.0f, transform.GetGlobalPosition(), meshShape); + // btRigidbody->SetEntityID(Entity{ e, m_Scene }); + // brush.Rigidbody.push_back(btRigidbody); + // PhysicsManager::Get()->RegisterBody(btRigidbody); + // } + //} - auto bspTriggerView = m_Scene->m_Registry.view(); - for (auto e : bspTriggerView) - { - auto [transform, brush, trigger] = bspTriggerView.get(e); + //auto bspTriggerView = m_Scene->m_Registry.view(); + //for (auto e : bspTriggerView) + //{ + // auto [transform, brush, trigger] = bspTriggerView.get(e); - Ref meshShape = CreateRef(brush.Meshes[0]); - Ref ghostBody = CreateRef(transform.GetGlobalPosition(), meshShape); - trigger.GhostObject = ghostBody; + // Ref meshShape = CreateRef(brush.Meshes[0]); + // Ref ghostBody = CreateRef(transform.GetGlobalPosition(), meshShape); + // trigger.GhostObject = ghostBody; - PhysicsManager::Get()->RegisterGhostBody(ghostBody); - } + // PhysicsManager::Get()->RegisterGhostBody(ghostBody); + //} return true; } @@ -158,6 +158,5 @@ namespace Nuake void PhysicsSystem::Exit() { PhysicsManager::Get()->Reset(); - } }