X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FAabb.hh;h=d3229bc23f1939f5eea2d68b2a4dc80bf17844c7;hp=0f7bbb9ff74fa2495e6b6582f2515c3b99f7cef2;hb=a298e820c6866814c1e0b68d6664573e34a0e6af;hpb=25aefe01ef7dbdb603c51411e04b0d6a6107684f diff --git a/src/Moof/Aabb.hh b/src/Moof/Aabb.hh index 0f7bbb9..d3229bc 100644 --- a/src/Moof/Aabb.hh +++ b/src/Moof/Aabb.hh @@ -1,30 +1,13 @@ -/******************************************************************************* - - Copyright (c) 2009, Charles McGarvey - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*******************************************************************************/ +/*] Copyright (c) 2009-2010, Charles McGarvey [************************** +**] All rights reserved. +* +* vi:ts=4 sw=4 tw=75 +* +* Distributable under the terms and conditions of the 2-clause BSD license; +* see the file COPYING for a complete text of the license. +* +**************************************************************************/ #ifndef _MOOF_AABB_HH_ #define _MOOF_AABB_HH_ @@ -33,37 +16,80 @@ #include #include #include +#include + +#include // FIXME this file is quite broken +#include +#include namespace Mf { +class Script; + + /** * Axis-aligned Bounding Box */ -struct Aabb : public Cullable, public Drawable +template +struct Aabb : public Cullable, public Drawable, public Shape { - Vector3 min; - Vector3 max; + typedef cml::vector< Scalar, cml::fixed > Vector; + + Vector min; + Vector max; Aabb() {} - Aabb(const Vector3& a, const Vector3& b) + Aabb(const Vector& a, const Vector& b) { init(a, b); } - Aabb(Scalar ax, Scalar ay, Scalar az, - Scalar bx, Scalar by, Scalar bz) + Aabb(Scalar x1, Scalar y1, Scalar x2, Scalar y2) + { + Vector a(x1, y1); + Vector b(x2, y2); + + init(a, b); + } + + Aabb(Scalar x1, Scalar y1, Scalar z1, Scalar x2, Scalar y2, Scalar z2) { - Vector3 a(ax, ay, az); - Vector3 b(bx, by, bz); + Vector a(x1, y1, z1); + Vector b(x2, y2, z2); init(a, b); } + + void init(const Vector2& a, const Vector2& b) + { + if (a[0] < b[0]) + { + min[0] = a[0]; + max[0] = b[0]; + } + else + { + min[0] = b[0]; + max[0] = a[0]; + } + if (a[1] < b[1]) + { + min[1] = a[1]; + max[1] = b[1]; + } + else + { + min[1] = b[1]; + max[1] = a[1]; + } + } + void init(const Vector3& a, const Vector3& b) { if (a[0] < b[0]) @@ -98,14 +124,12 @@ struct Aabb : public Cullable, public Drawable } } - Vector3 getCenter() const + + Vector getCenter() const { - return Vector3((min[0] + max[0]) / 2.0, - (min[1] + max[1]) / 2.0, - (min[2] + max[2]) / 2.0); + return (min + max) / 2.0; } - void getOctant(Aabb& octant, int num) const; Plane getPlaneXY() const { @@ -131,18 +155,119 @@ struct Aabb : public Cullable, public Drawable return plane; } - void getCorners(Vector3 corners[8]) const; - void encloseVertices(const Vector3 vertices[], unsigned count); + void getCorners(Vector2 corners[4]) const + { + corners[0][0] = min[0]; corners[0][1] = min[1]; + corners[1][0] = max[0]; corners[1][1] = min[1]; + corners[2][0] = max[0]; corners[2][1] = max[1]; + corners[3][0] = min[0]; corners[3][1] = max[1]; + } + + void getCorners(Vector3 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 draw(Scalar alpha = 0.0) const; - bool isVisible(const Frustum& frustum) const; + + 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 + { + glRect(min[0], min[1], max[0], max[1]); + } + + bool isVisible(const Frustum& frustum) const + { + return true; + } }; +void importAabbClass(Script& script); + +template <> +inline void Aabb<3>::draw(Scalar alpha) 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); +} + +template <> +inline bool Aabb<3>::isVisible(const Frustum& frustum) const +{ + return frustum.contains(*this); +} + + +typedef Aabb<2> Aabb2; +typedef Aabb2 Rectangle; +typedef Aabb<3> Aabb3; + + } // namespace Mf #endif // _MOOF_AABB_HH_ -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -