X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FFrustum.hh;h=87e654fd12c8c0b4f5cbbe27dcab1152ee954e33;hp=4154f1492cc98316ea72cd82b0c894359dac0010;hb=25aefe01ef7dbdb603c51411e04b0d6a6107684f;hpb=8ad81a8282ce6e9e488a453e6bcd05fbc09715dc diff --git a/src/Moof/Frustum.hh b/src/Moof/Frustum.hh index 4154f14..87e654f 100644 --- a/src/Moof/Frustum.hh +++ b/src/Moof/Frustum.hh @@ -52,11 +52,11 @@ public: } Collision; Frustum() {} - inline Frustum(const Matrix4& modelview, const Matrix4& projection) + Frustum(const Matrix4& modelview, const Matrix4& projection) { init(modelview, projection); } - inline Frustum(const Matrix4& modelview, Scalar fovy, Scalar aspect, + Frustum(const Matrix4& modelview, Scalar fovy, Scalar aspect, Scalar abutting, Scalar distant) { init(modelview, fovy, aspect, abutting, distant); @@ -66,8 +66,8 @@ public: void init(const Matrix4& modelview, Scalar fovy, Scalar aspect, Scalar abutting, Scalar distant); - Collision containsAabb(const Aabb& aabb) const; - Collision containsSphere(const Sphere& sphere) const; + Collision contains(const Aabb& aabb) const; + Collision contains(const Sphere& sphere) const; };