diff --git a/includes/xna/common/collision.hpp b/includes/xna/common/collision.hpp index b4872ac..1d49d7b 100644 --- a/includes/xna/common/collision.hpp +++ b/includes/xna/common/collision.hpp @@ -73,6 +73,26 @@ namespace xna { listff det = listff(16, listf(4)); }; + //Describes the intersection between a plane and a bounding volume. + enum class PlaneIntersectionType { + //There is no intersection, and the bounding volume is in the positive half-space of the Plane. + Front, + //There is no intersection, and the bounding volume is in the negative half - space of the Plane. + Back, + //The Plane is intersected. + Intersecting, + }; + + //Indicates the extent to which bounding volumes intersect or contain one another. + enum class ContainmentType { + //Indicates there is no overlap between the bounding volumes. + Disjoint, + //Indicates that one bounding volume completely contains the other. + Contains, + //Indicates that the bounding volumes partially overlap. + Intersects, + }; + //Defines a plane. struct Plane { //The normal vector of the Plane. diff --git a/includes/xna/enumerations.hpp b/includes/xna/enumerations.hpp index 9d993a0..3eff07a 100644 --- a/includes/xna/enumerations.hpp +++ b/includes/xna/enumerations.hpp @@ -93,13 +93,7 @@ namespace xna { Alpha, All, None - }; - - enum class ContainmentType { - Disjoint, - Contains, - Intersects, - }; + }; enum class ComparisonFunction { Never, @@ -187,13 +181,7 @@ namespace xna { //Use the largest available set of graphic features and capabilities to target devices, //such as an Xbox 360 console and a Windows-based computer, that have more enhanced graphic capabilities. HiDef - }; - - enum class PlaneIntersectionType { - Front, - Back, - Intersecting, - }; + }; enum class PlayerIndex {