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

Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok

Browse Source 
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
ViktorLjung
2014-04-27 08:13:57 +02:00
parent 720cf3aa87 f02954a62c
commit 5f3b03fa6d
10 changed files with 21 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameWorld.cpp
+1 -5
View File
@@ -172,7 +172,7 @@ void GameWorld::Initialize()
auto physics = AddComponent<Components::Physics>(cube, "Physics");
physics->Mass = 100;
auto box = AddComponent<Components::Box>(cube, "Box");
auto box = AddComponent<Components::BoxShape>(cube, "BoxShape");
box->Width = 0.5f;
box->Height = 0.5f;
box->Depth = 0.5f;
@@ -199,10 +199,6 @@ void GameWorld::RegisterComponents()
{
m_ComponentFactory.Register("Transform", []() { return new Components::Transform(); });
m_ComponentFactory.Register("Template", []() { return new Components::Template(); });
m_ComponentFactory.Register("Sphere", []() { return new Components::Sphere(); });
m_ComponentFactory.Register("Box", []() { return new Components::Box (); });
m_ComponentFactory.Register("Vehicle", []() { return new Components::Vehicle(); });
m_ComponentFactory.Register("Wheel", []() { return new Components::Wheel(); });
}
void GameWorld::RegisterSystems()