BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed CollidableOctreeSystem to FillOctreeSystem.

Browse Source
This commit is contained in:
William Moberg
2016-02-08 14:17:19 +01:00
parent 6610bb974d
commit 11cf85cc73
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Collision/CollidableOctreeSystem.h → include/Engine/Collision/FillOctreeSystem.h
+3 -3
View File
@@ -6,12 +6,12 @@
#include "Collision.h" #include "Collision.h"
#include "EntityAABB.h" #include "EntityAABB.h"
class CollidableOctreeSystem : public ImpureSystem, public PureSystem class FillOctreeSystem : public ImpureSystem, public PureSystem
{ {
public: public:
CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& componentType) FillOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& fillComponentType)
: System(world, eventBroker) : System(world, eventBroker)
, PureSystem(componentType) , PureSystem(fillComponentType)
, m_Octree(octree) , m_Octree(octree)
{ } { }
src/Engine/Collision/CollidableOctreeSystem.cpp → src/Engine/Collision/FillOctreeSystem.cpp
+3 -3
View File
@@ -1,11 +1,11 @@
#include "Collision/CollidableOctreeSystem.h" #include "Collision/FillOctreeSystem.h"
void CollidableOctreeSystem::Update(double dt) void FillOctreeSystem::Update(double dt)
{ {
m_Octree->ClearDynamicObjects(); m_Octree->ClearDynamicObjects();
} }
void CollidableOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) void FillOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
{ {
if (entity.HasComponent("AABB")) { if (entity.HasComponent("AABB")) {
boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity); boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
src/Game/Game.cpp
+3 -3
View File
@@ -1,5 +1,5 @@
#include "Game.h" #include "Game.h"
#include "Collision/CollidableOctreeSystem.h" #include "Collision/FillOctreeSystem.h"
#include "Collision/EntityAABB.h" #include "Collision/EntityAABB.h"
#include "Collision/TriggerSystem.h" #include "Collision/TriggerSystem.h"
#include "Collision/CollisionSystem.h" #include "Collision/CollisionSystem.h"
@@ -93,8 +93,8 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel); m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
// Populate Octree with collidables // Populate Octree with collidables
++updateOrderLevel; ++updateOrderLevel;
m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable"); m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player"); m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel); m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel); m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);