X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fgeom.h;h=0d8dd003658fa44c4cccbd32dda21586788a04b0;hp=5db1996d09c5743d4a4fa59debaa7db5dc18ee7c;hb=2f5ee2007d258d947f2efab3bf3460479fe34813;hpb=03085a16aa2fef785083fa3921be83015e08b290

diff --git a/src/geom.h b/src/geom.h
index 5db1996..0d8dd00 100644
--- a/src/geom.h
+++ b/src/geom.h
@@ -16,7 +16,17 @@ enum GeomObjectType {
 	GOBJ_DISC
 };
 
+enum {
+	AABOX_PLANE_PX,
+	AABOX_PLANE_NX,
+	AABOX_PLANE_PY,
+	AABOX_PLANE_NY,
+	AABOX_PLANE_PZ,
+	AABOX_PLANE_NZ
+};
+
 class GeomObject;
+class Plane;
 
 struct HitPoint {
 	float dist;			// parametric distance along the ray
@@ -40,8 +50,11 @@ public:
 	virtual bool intersect(const Ray &ray, HitPoint *hit = 0) const = 0;
 	virtual bool contains(const Vec3 &pt) const = 0;
 
-	virtual float distance(const Vec3 &v) const = 0;
-	virtual float signed_distance(const Vec3 &v) const = 0;
+	virtual float distance(const Vec3 &v) const;
+	virtual float signed_distance(const Vec3 &v) const;
+
+	virtual float distance_sq(const Vec3 &v) const = 0;
+	virtual float signed_distance_sq(const Vec3 &v) const = 0;
 };
 
 class Sphere : public GeomObject {
@@ -58,8 +71,8 @@ public:
 	virtual bool intersect(const Ray &ray, HitPoint *hit = 0) const;
 	virtual bool contains(const Vec3 &pt) const;
 
-	virtual float distance(const Vec3 &v) const;
-	virtual float signed_distance(const Vec3 &v) const;
+	virtual float distance_sq(const Vec3 &v) const;
+	virtual float signed_distance_sq(const Vec3 &v) const;
 };
 
 class AABox : public GeomObject {
@@ -73,12 +86,13 @@ public:
 	virtual void invalidate();
 
 	virtual Vec3 get_corner(int idx) const;
+	virtual Plane get_plane(int pidx) const;
 
 	virtual bool intersect(const Ray &ray, HitPoint *hit = 0) const;
 	virtual bool contains(const Vec3 &pt) const;
 
-	virtual float distance(const Vec3 &v) const;
-	virtual float signed_distance(const Vec3 &v) const;
+	virtual float distance_sq(const Vec3 &v) const;
+	virtual float signed_distance_sq(const Vec3 &v) const;
 };
 
 class Box : public AABox {
@@ -99,8 +113,8 @@ public:
 	virtual bool intersect(const Ray &ray, HitPoint *hit = 0) const;
 	virtual bool contains(const Vec3 &pt) const;
 
-	virtual float distance(const Vec3 &v) const;
-	virtual float signed_distance(const Vec3 &v) const;
+	virtual float distance_sq(const Vec3 &v) const;
+	virtual float signed_distance_sq(const Vec3 &v) const;
 };
 
 
@@ -118,6 +132,9 @@ public:
 
 	virtual float distance(const Vec3 &v) const;
 	virtual float signed_distance(const Vec3 &v) const;
+
+	virtual float distance_sq(const Vec3 &v) const;
+	virtual float signed_distance_sq(const Vec3 &v) const;
 };
 
 class Disc : public Plane {
@@ -135,8 +152,8 @@ public:
 	//! true if the projection of pt to the plane is contained within the disc radius
 	virtual bool contains(const Vec3 &pt) const;
 
-	virtual float distance(const Vec3 &v) const;
-	virtual float signed_distance(const Vec3 &v) const;
+	virtual float distance_sq(const Vec3 &v) const;
+	virtual float signed_distance_sq(const Vec3 &v) const;
 };
 
 //! project point to plane
@@ -177,4 +194,7 @@ bool intersect_plane_sphere(Sphere *result, const Plane &p, const Sphere &s);
 //! calculate the intersection of two axis-aligned bounding boxes
 bool intersect_aabox_aabox(AABox *res, const AABox &a, const AABox &b);
 
+//! determine if a sphere and an axis-aligned box collide
+bool collision_sphere_aabox(const Sphere &s, const AABox &b);
+
 #endif	// GEOMOBJ_H_