X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FAabb.hh;h=6a7e064c41116c65e611d6f0ced6c81ed7272942;hp=457d198495e9a358fd40e304b3236730e501af57;hb=a31d65a998121df0651c57bfb68782e2a07d2e2f;hpb=72d4af22710317acffab861421c4364b1780b6fe diff --git a/src/Moof/Aabb.hh b/src/Moof/Aabb.hh index 457d198..6a7e064 100644 --- a/src/Moof/Aabb.hh +++ b/src/Moof/Aabb.hh @@ -47,7 +47,6 @@ struct Aabb : public Cullable, public Drawable Vector3 min; Vector3 max; - Aabb() {} Aabb(const Vector3& a, const Vector3& b) @@ -64,7 +63,7 @@ struct Aabb : public Cullable, public Drawable init(a, b); } - inline void init(const Vector3& a, const Vector3& b) + void init(const Vector3& a, const Vector3& b) { if (a[0] < b[0]) { @@ -98,7 +97,7 @@ struct Aabb : public Cullable, public Drawable } } - inline Vector3 getCenter() const + Vector3 getCenter() const { return Vector3((min[0] + max[0]) / 2.0, (min[1] + max[1]) / 2.0, @@ -107,7 +106,7 @@ struct Aabb : public Cullable, public Drawable void getOctant(Aabb& octant, int num) const; - inline Plane getPlaneXY() const + Plane getPlaneXY() const { Plane plane; plane.normal = Vector3(0.0, 0.0, 1.0); @@ -115,7 +114,7 @@ struct Aabb : public Cullable, public Drawable return plane; } - inline Plane getPlaneXZ() const + Plane getPlaneXZ() const { Plane plane; plane.normal = Vector3(0.0, 1.0, 0.0); @@ -123,7 +122,7 @@ struct Aabb : public Cullable, public Drawable return plane; } - inline Plane getPlaneYZ() const + Plane getPlaneYZ() const { Plane plane; plane.normal = Vector3(1.0, 0.0, 0.0); @@ -136,7 +135,7 @@ struct Aabb : public Cullable, public Drawable void encloseVertices(const Vector3 vertices[], unsigned count); void draw(Scalar alpha = 0.0) const; - bool isVisible(const Camera& cam) const; + bool isVisible(const Frustum& frustum) const; };