X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FAabb.hh;h=83926b3fa47789e19a85ed9124c9bef61bd89fca;hp=6a7e064c41116c65e611d6f0ced6c81ed7272942;hb=2d77fb5fb3480f522658f30af6addd5146530517;hpb=64e3c3202d2c1956759fb4da36ca329816c9369a

diff --git a/src/Moof/Aabb.hh b/src/Moof/Aabb.hh
index 6a7e064..83926b3 100644
--- a/src/Moof/Aabb.hh
+++ b/src/Moof/Aabb.hh
@@ -33,6 +33,11 @@
 #include <Moof/Drawable.hh>
 #include <Moof/Math.hh>
 #include <Moof/Plane.hh>
+#include <Moof/Shape.hh>
+
+#include <Moof/Frustum.hh>
+#include <Moof/OpenGL.hh>
+#include <Moof/Texture.hh>
 
 
 namespace Mf {
@@ -42,14 +47,17 @@ namespace Mf {
  * Axis-aligned Bounding Box
  */
 
-struct Aabb : public Cullable, public Drawable
+template <int D = 3>
+struct Aabb : public Cullable, public Drawable, public Shape<D>
 {
-	Vector3 min;
-	Vector3 max;
+	typedef cml::vector< Scalar, cml::fixed<D> >	Vector;
+
+	Vector min;
+	Vector max;
 
 	Aabb() {}
 
-	Aabb(const Vector3& a, const Vector3& b)
+	Aabb(const Vector& a, const Vector& b)
 	{
 		init(a, b);
 	}
@@ -57,13 +65,13 @@ struct Aabb : public Cullable, public Drawable
 	Aabb(Scalar ax, Scalar ay, Scalar az,
 			Scalar bx, Scalar by, Scalar bz)
 	{
-		Vector3 a(ax, ay, az);
-		Vector3 b(bx, by, bz);
+		Vector a(ax, ay, az);
+		Vector b(bx, by, bz);
 
 		init(a, b);
 	}
 
-	void init(const Vector3& a, const Vector3& b)
+	void init(const Vector& a, const Vector& b)
 	{
 		if (a[0] < b[0])
 		{
@@ -97,19 +105,19 @@ struct Aabb : public Cullable, public Drawable
 		}
 	}
 
-	Vector3 getCenter() const
+	Vector getCenter() const
 	{
-		return Vector3((min[0] + max[0]) / 2.0,
+		return Vector((min[0] + max[0]) / 2.0,
 					   (min[1] + max[1]) / 2.0,
 					   (min[2] + max[2]) / 2.0);
 	}
 
-	void getOctant(Aabb& octant, int num) const;
+	//void getOctant(Aabb& octant, int num) const;
 
 	Plane getPlaneXY() const
 	{
 		Plane plane;
-		plane.normal = Vector3(0.0, 0.0, 1.0);
+		plane.normal = Vector(0.0, 0.0, 1.0);
 		plane.d = cml::dot(-plane.normal, getCenter());
 		return plane;
 	}
@@ -117,7 +125,7 @@ struct Aabb : public Cullable, public Drawable
 	Plane getPlaneXZ() const
 	{
 		Plane plane;
-		plane.normal = Vector3(0.0, 1.0, 0.0);
+		plane.normal = Vector(0.0, 1.0, 0.0);
 		plane.d = cml::dot(-plane.normal, getCenter());
 		return plane;
 	}
@@ -125,17 +133,84 @@ struct Aabb : public Cullable, public Drawable
 	Plane getPlaneYZ() const
 	{
 		Plane plane;
-		plane.normal = Vector3(1.0, 0.0, 0.0);
+		plane.normal = Vector(1.0, 0.0, 0.0);
 		plane.d = cml::dot(-plane.normal, getCenter());
 		return plane;
 	}
 
+	/*
 	void getCorners(Vector3 corners[8]) const;
 
 	void encloseVertices(const Vector3 vertices[], unsigned count);
 
 	void draw(Scalar alpha = 0.0) const;
 	bool isVisible(const Frustum& frustum) const;
+	*/
+
+
+void getCorners(Vector corners[8]) const
+{
+	corners[0][0] = min[0]; corners[0][1] = min[1]; corners[0][2] = max[2];
+	corners[1][0] = max[0]; corners[1][1] = min[1]; corners[1][2] = max[2];
+	corners[2][0] = max[0]; corners[2][1] = max[1]; corners[2][2] = max[2];
+	corners[3][0] = min[0]; corners[3][1] = max[1]; corners[3][2] = max[2];
+	corners[4][0] = min[0]; corners[4][1] = min[1]; corners[4][2] = min[2];
+	corners[5][0] = max[0]; corners[5][1] = min[1]; corners[5][2] = min[2];
+	corners[6][0] = max[0]; corners[6][1] = max[1]; corners[6][2] = min[2];
+	corners[7][0] = min[0]; corners[7][1] = max[1]; corners[7][2] = min[2];
+}
+
+
+void encloseVertices(const Vector vertices[], unsigned count)
+{
+	min.zero();
+	max.zero();
+
+	for (unsigned i = 1; i < count; ++i)
+	{
+		min.minimize(vertices[i]);
+		max.maximize(vertices[i]);
+	}
+}
+
+
+void draw(Scalar alpha = 0.0) const
+{
+	Scalar vertices[] = {min[0], min[1], min[2],
+						 min[0], max[1], min[2],
+						 max[0], max[1], min[2],
+						 max[0], min[1], min[2],
+						 min[0], max[1], max[2],
+						 min[0], min[1], max[2],
+						 max[0], min[1], max[2],
+						 max[0], max[1], max[2]};
+
+	GLubyte indices[] = {0, 1, 2, 3,
+						 1, 2, 7, 4,
+						 3, 0, 5, 6,
+						 2, 3, 6, 7,
+						 5, 0, 1, 4,
+						 4, 5, 6, 7};
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+	glVertexPointer(3, GL_SCALAR, 0, vertices);
+
+	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+	Texture::resetBind();
+
+	glDrawElements(GL_QUADS, sizeof(indices), GL_UNSIGNED_BYTE, indices);
+
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+	//glDisableClientState(GL_VERTEX_ARRAY);
+
+	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+}
+
+bool isVisible(const Frustum& frustum) const
+{
+	return frustum.contains(*this);
+}
 };