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

Huge rework of editor and other changes.

Browse Source
This commit is contained in:
antopilo
2022-01-09 16:44:20 -05:00
parent 55ae840678
commit a71bfcbe75
55 changed files with 734 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ namespace Nuake
rigidbody.m_Rigidbody = btRigidbody;
btRigidbody->SetKinematic(rigidbody.IsKinematic);
//btRigidbody->SetKinematic(rigidbody.IsKinematic);
PhysicsManager::Get()->RegisterBody(btRigidbody);
}
@@ -61,16 +61,16 @@ namespace Nuake
{
auto [transform, brush] = bspView.get<TransformComponent, BSPBrushComponent>(e);
if (brush.IsSolid)
if (!brush.IsSolid)
continue;
for (auto m : brush.Meshes)
{
for (auto m : brush.Meshes)
{
Ref<Physics::MeshShape> meshShape = CreateRef<Physics::MeshShape>(m);
Ref<Physics::RigidBody> btRigidbody = CreateRef<Physics::RigidBody>(0.0f, transform.GlobalTranslation, meshShape);
btRigidbody->SetEntityID(Entity{ e, m_Scene });
brush.Rigidbody.push_back(btRigidbody);
PhysicsManager::Get()->RegisterBody(btRigidbody);
}
Ref<Physics::MeshShape> meshShape = CreateRef<Physics::MeshShape>(m);
Ref<Physics::RigidBody> btRigidbody = CreateRef<Physics::RigidBody>(0.0f, transform.GlobalTranslation, meshShape);
btRigidbody->SetEntityID(Entity{ e, m_Scene });
brush.Rigidbody.push_back(btRigidbody);
PhysicsManager::Get()->RegisterBody(btRigidbody);
}
}
@@ -93,8 +93,6 @@ namespace Nuake
if (!Engine::IsPlayMode)
return;
PhysicsManager::Get()->Step(ts);
auto brushes = m_Scene->m_Registry.view<TransformComponent, BSPBrushComponent>();
for (auto e : brushes)
{
@@ -122,7 +120,6 @@ namespace Nuake
}
}
auto bspTriggerView = m_Scene->m_Registry.view<TransformComponent, BSPBrushComponent, TriggerZone>();
for (auto e : bspTriggerView)
{
@@ -156,7 +153,10 @@ namespace Nuake
void PhysicsSystem::FixedUpdate(Timestep ts)
{
if (!Engine::IsPlayMode)
return;
PhysicsManager::Get()->Step(ts);
}
void PhysicsSystem::Exit()