X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FAabb.hh;h=d3229bc23f1939f5eea2d68b2a4dc80bf17844c7;hp=83926b3fa47789e19a85ed9124c9bef61bd89fca;hb=a298e820c6866814c1e0b68d6664573e34a0e6af;hpb=2d77fb5fb3480f522658f30af6addd5146530517 diff --git a/src/Moof/Aabb.hh b/src/Moof/Aabb.hh index 83926b3..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_ @@ -35,7 +18,7 @@ #include #include -#include +#include // FIXME this file is quite broken #include #include @@ -43,6 +26,9 @@ namespace Mf { +class Script; + + /** * Axis-aligned Bounding Box */ @@ -55,6 +41,7 @@ struct Aabb : public Cullable, public Drawable, public Shape Vector min; Vector max; + Aabb() {} Aabb(const Vector& a, const Vector& b) @@ -62,16 +49,48 @@ struct Aabb : public Cullable, public Drawable, public Shape 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) { - Vector a(ax, ay, az); - Vector b(bx, by, bz); + Vector a(x1, y1, z1); + Vector b(x2, y2, z2); init(a, b); } - void init(const Vector& a, const Vector& 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]) { @@ -105,19 +124,17 @@ struct Aabb : public Cullable, public Drawable, public Shape } } + Vector getCenter() const { - return Vector((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 { Plane plane; - plane.normal = Vector(0.0, 0.0, 1.0); + plane.normal = Vector3(0.0, 0.0, 1.0); plane.d = cml::dot(-plane.normal, getCenter()); return plane; } @@ -125,7 +142,7 @@ struct Aabb : public Cullable, public Drawable, public Shape Plane getPlaneXZ() const { Plane plane; - plane.normal = Vector(0.0, 1.0, 0.0); + plane.normal = Vector3(0.0, 1.0, 0.0); plane.d = cml::dot(-plane.normal, getCenter()); return plane; } @@ -133,48 +150,78 @@ struct Aabb : public Cullable, public Drawable, public Shape Plane getPlaneYZ() const { Plane plane; - plane.normal = Vector(1.0, 0.0, 0.0); + plane.normal = Vector3(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 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 draw(Scalar alpha = 0.0) const; - bool isVisible(const Frustum& frustum) const; - */ + 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 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 encloseVertices(const Vector vertices[], unsigned count) -{ - min.zero(); - max.zero(); - for (unsigned i = 1; i < count; ++i) + void draw(Scalar alpha = 0.0) const { - min.minimize(vertices[i]); - max.maximize(vertices[i]); + glRect(min[0], min[1], max[0], max[1]); } -} + bool isVisible(const Frustum& frustum) const + { + return true; + } +}; -void draw(Scalar alpha = 0.0) const + +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], @@ -199,7 +246,8 @@ void draw(Scalar alpha = 0.0) const glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); Texture::resetBind(); - glDrawElements(GL_QUADS, sizeof(indices), GL_UNSIGNED_BYTE, indices); + glDrawElements(GL_QUADS, sizeof(indices), GL_UNSIGNED_BYTE, + indices); glEnableClientState(GL_TEXTURE_COORD_ARRAY); //glDisableClientState(GL_VERTEX_ARRAY); @@ -207,16 +255,19 @@ void draw(Scalar alpha = 0.0) const glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } -bool isVisible(const Frustum& frustum) const +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: *************************************************/ -