diff --git a/Nuake/src/Scene/Components/BSPBrushComponent.h b/Nuake/src/Scene/Components/BSPBrushComponent.h index c3d046d4..3ab48472 100644 --- a/Nuake/src/Scene/Components/BSPBrushComponent.h +++ b/Nuake/src/Scene/Components/BSPBrushComponent.h @@ -35,19 +35,19 @@ namespace Nuake { { BEGIN_SERIALIZE(); - for (uint32_t i = 0; i < Hulls.size() - 1; i++) - { - json hullPointsJson; + //for (uint32_t i = 0; i < Hulls.size() - 1; i++) + //{ + // json hullPointsJson; - const size_t hullSize = Hulls[i].size(); - for (uint32_t j = 0; j < hullSize; j++) - { - hullPointsJson[j]["x"] = Hulls[i][j].x; - hullPointsJson[j]["y"] = Hulls[i][j].y; - hullPointsJson[j]["z"] = Hulls[i][j].z; - } - j["Hulls"][i] = hullPointsJson; - } + // size_t hullSize = Hulls[i].size(); + // for (uint32_t j = 0; j < hullSize; j++) + // { + // hullPointsJson[j]["x"] = Hulls[i][j].x; + // hullPointsJson[j]["y"] = Hulls[i][j].y; + // hullPointsJson[j]["z"] = Hulls[i][j].z; + // } + // j["Hulls"][i] = hullPointsJson; + //} j["IsSolid"] = IsSolid; END_SERIALIZE(); diff --git a/Nuake/src/Scene/Components/CharacterControllerComponent.h b/Nuake/src/Scene/Components/CharacterControllerComponent.h index f01233a2..95bbccf1 100644 --- a/Nuake/src/Scene/Components/CharacterControllerComponent.h +++ b/Nuake/src/Scene/Components/CharacterControllerComponent.h @@ -31,10 +31,5 @@ namespace Nuake { Mass = j["Mass"]; return true; } - void SyncWithTransform(TransformComponent& tc) - { - - - } }; } diff --git a/Nuake/src/Scene/Systems/PhysicsSystem.cpp b/Nuake/src/Scene/Systems/PhysicsSystem.cpp index dbd4d179..b00eac15 100644 --- a/Nuake/src/Scene/Systems/PhysicsSystem.cpp +++ b/Nuake/src/Scene/Systems/PhysicsSystem.cpp @@ -87,12 +87,14 @@ namespace Nuake } } - const auto characterControllerView = m_Scene->m_Registry.view(); - for (auto e : characterControllerView) - { - auto [transformComponent, characterControllerComponent] = view.get(e); + //const auto characterControllerView = m_Scene->m_Registry.view(); + //for (auto e : characterControllerView) + //{ + // Entity ent = Entity({ e, m_Scene }); + // auto [transformComponent, ccc] = view.get(e); - } + //auto& physicsObject = CreateRef(ccc.); + //} //// character controllers //auto ccview = m_Scene->m_Registry.view(); @@ -173,35 +175,36 @@ namespace Nuake } } - auto bspTriggerView = m_Scene->m_Registry.view(); - for (auto e : bspTriggerView) - { - auto [transform, brush, trigger] = bspTriggerView.get(e); - trigger.GhostObject->ScanOverlap(); + //auto bspTriggerView = m_Scene->m_Registry.view(); + //for (auto e : bspTriggerView) + //{ + // auto [transform, brush, trigger] = bspTriggerView.get(e); + // trigger.GhostObject->ScanOverlap(); - brush.Targets.clear(); - auto targetnameView = m_Scene->m_Registry.view(); - for (auto e2 : targetnameView) - { - auto [ttransform, name] = targetnameView.get(e2); + // brush.Targets.clear(); + // auto targetnameView = m_Scene->m_Registry.view(); + // for (auto e2 : targetnameView) + // { + // auto [ttransform, name] = targetnameView.get(e2); - if (name.Name == brush.target) { - brush.Targets.push_back(Entity{ e2, m_Scene }); - } - } - } + // if (name.Name == brush.target) { + // brush.Targets.push_back(Entity{ e2, m_Scene }); + // } + // } + //} - auto physicGroup = m_Scene->m_Registry.view(); + + /*auto physicGroup = m_Scene->m_Registry.view(); for (auto e : physicGroup) { auto [transform, rb] = physicGroup.get(e); rb.SyncTransformComponent(&m_Scene->m_Registry.get(e)); - } + }*/ - auto ccGroup = m_Scene->m_Registry.view(); - for (auto e : ccGroup) { - auto [transform, rb] = ccGroup.get(e); - rb.SyncWithTransform(m_Scene->m_Registry.get(e)); - } + //auto ccGroup = m_Scene->m_Registry.view(); + //for (auto e : ccGroup) { + // auto [transform, rb] = ccGroup.get(e); + // rb.SyncWithTransform(m_Scene->m_Registry.get(e)); + //} } void PhysicsSystem::FixedUpdate(Timestep ts)