celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
antopilo
2023-03-08 20:04:06 -05:00
parent 65df50e722
commit 75cb774caf
4 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,7 +167,6 @@ namespace Nuake {
tc.SetGlobalRotation(grotation);
tc.SetGlobalScale(gscale);
tc.SetGlobalTransform(transform);
}
}
}

4
Nuake/src/Scene/Components/RigidbodyComponent.cpp
View File

@@ -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() {
}

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

@@ -148,7 +148,9 @@ namespace Nuake {
}
if (!cam)
{
return;
}
mSceneRenderer->BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation);
mSceneRenderer->RenderScene(*this, framebuffer);

69
Nuake/src/Scene/Systems/PhysicsSystem.cpp
View File

@@ -39,48 +39,48 @@ namespace Nuake
}
}
// character controllers
auto ccview = m_Scene->m_Registry.view<TransformComponent, CharacterControllerComponent>();
for (auto e : ccview)
{
auto [transform, cc] = ccview.get<TransformComponent, CharacterControllerComponent>(e);
//// character controllers
//auto ccview = m_Scene->m_Registry.view<TransformComponent, CharacterControllerComponent>();
//for (auto e : ccview)
//{
// auto [transform, cc] = ccview.get<TransformComponent, CharacterControllerComponent>(e);
cc.CharacterController = CreateRef<Physics::CharacterController>(cc.Height, cc.Radius, cc.Mass, transform.GetLocalPosition());
Entity ent = Entity({ e, m_Scene });
cc.CharacterController->SetEntity(ent);
// cc.CharacterController = CreateRef<Physics::CharacterController>(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<TransformComponent, BSPBrushComponent>();
for (auto e : bspView)
{
auto [transform, brush] = bspView.get<TransformComponent, BSPBrushComponent>(e);
//auto bspView = m_Scene->m_Registry.view<TransformComponent, BSPBrushComponent>();
//for (auto e : bspView)
//{
// auto [transform, brush] = bspView.get<TransformComponent, BSPBrushComponent>(e);
if (!brush.IsSolid)
continue;
// if (!brush.IsSolid)
// continue;
for (auto m : brush.Meshes)
{
Ref<Physics::MeshShape> meshShape = CreateRef<Physics::MeshShape>(m);
Ref<Physics::RigidBody> btRigidbody = CreateRef<Physics::RigidBody>(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<Physics::MeshShape> meshShape = CreateRef<Physics::MeshShape>(m);
// Ref<Physics::RigidBody> btRigidbody = CreateRef<Physics::RigidBody>(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<TransformComponent, BSPBrushComponent, TriggerZone>();
for (auto e : bspTriggerView)
{
auto [transform, brush, trigger] = bspTriggerView.get<TransformComponent, BSPBrushComponent, TriggerZone>(e);
//auto bspTriggerView = m_Scene->m_Registry.view<TransformComponent, BSPBrushComponent, TriggerZone>();
//for (auto e : bspTriggerView)
//{
// auto [transform, brush, trigger] = bspTriggerView.get<TransformComponent, BSPBrushComponent, TriggerZone>(e);
Ref<Physics::MeshShape> meshShape = CreateRef<Physics::MeshShape>(brush.Meshes[0]);
Ref<GhostObject> ghostBody = CreateRef<GhostObject>(transform.GetGlobalPosition(), meshShape);
trigger.GhostObject = ghostBody;
// Ref<Physics::MeshShape> meshShape = CreateRef<Physics::MeshShape>(brush.Meshes[0]);
// Ref<GhostObject> ghostBody = CreateRef<GhostObject>(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();
}
}