} 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,
- Scalar near, Scalar far)
+ Frustum(const Matrix4& modelview, Scalar fovy, Scalar aspect,
+ Scalar abutting, Scalar distant)
{
- init(modelview, fovy, aspect, near, far);
+ init(modelview, fovy, aspect, abutting, distant);
}
void init(const Matrix4& modelview, const Matrix4& projection);
- void init(const Matrix4& modelview, Scalar fovy, Scalar aspect, Scalar near,
- Scalar far);
+ 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;
};