BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/AABB.h
	Escape-the-Dawn/Components/Bounds.h
	Escape-the-Dawn/Escape-the-Dawn.vcxproj
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
This commit is contained in:
Adam
2014-03-07 19:17:24 +01:00
parent 566a5c2d93 1f48279bc6
commit 2fa8963e0a
35 changed files with 462 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Components/Bounds.h
+6 -7
View File
@@ -1,5 +1,5 @@
#ifndef Bounds_h__
#define Bounds_h__
#ifndef Components_Bounds_h__
#define Components_Bounds_h__
#include "Component.h"
#include <glm/common.hpp>
@@ -8,13 +8,12 @@
namespace Components
{
struct Bounds : Component
{
struct Bounds : Component
{
//Axis Aligned Bounding Box
glm::vec3 origin;
glm::vec3 volumeVector; //The vector that defines the volume of the BB, it goes from one corner to the opposite one
};
REGISTER_COMPONENT("Bounds", Bounds);
};
}
#endif // !Bounds_h__
#endif // !Components_Bounds_h__