Merge branch 'BoxModelCollision' into FrustumCulling

# Conflicts:
#	src/Game/Game.cpp
This commit is contained in:
William Moberg
2016-02-09 15:03:13 +01:00
11 changed files with 73 additions and 50 deletions
+1
View File
@@ -25,6 +25,7 @@ struct EntityWrapper
const std::string Name();
bool HasComponent(const std::string& componentType);
void AttachComponent(const char* componentName);
EntityWrapper Parent();
EntityWrapper FirstChildByName(const std::string& name);
EntityWrapper FirstParentWithComponent(const std::string& componentType);