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

Removed Color TestCode in WeaponSystem

Browse Source
This commit is contained in:
verysecrethero
2016-01-21 16:03:30 +01:00
parent bdebc9de62
commit 7deb32431e
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/Systems/WeaponSystem.h
-1
View File
@@ -33,7 +33,6 @@ private:
IRenderer* m_Renderer; IRenderer* m_Renderer;
std::vector<std::tuple<EntityID, glm::vec2>> m_EShootVector; std::vector<std::tuple<EntityID, glm::vec2>> m_EShootVector;
double m_TestDamageTotal = 0.0;
}; };
#endif #endif
src/Game/Systems/WeaponSystem.cpp
-7
View File
@@ -31,13 +31,6 @@ void WeaponSystem::Update(World* world, double dt)
ePlayerDamage.PlayerDamagedID = somePickData.Entity; ePlayerDamage.PlayerDamagedID = somePickData.Entity;
ePlayerDamage.TypeOfDamage = "Some Weapon"; ePlayerDamage.TypeOfDamage = "Some Weapon";
m_EventBroker->Publish(ePlayerDamage); m_EventBroker->Publish(ePlayerDamage);
//tests:color
m_TestDamageTotal += 0.25f;
if (m_TestDamageTotal > 6.0f) {
m_TestDamageTotal = 0.25f;
}
ComponentWrapper& playerModel = world->GetComponent(somePickData.Entity, "Model");
playerModel["Color"] = glm::vec4(m_TestDamageTotal, 0, 0, 1);
} }
m_EShootVector.erase(m_EShootVector.begin() + i - 1); m_EShootVector.erase(m_EShootVector.begin() + i - 1);
} }