Frustum.hpp   Frustum.hpp 
skipping to change at line 26 skipping to change at line 26
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _FRUSTUM_HPP_ #ifndef _FRUSTUM_HPP_
#define _FRUSTUM_HPP_ #define _FRUSTUM_HPP_
#include <vector> #include <vector>
#include "Plane.hpp" #include "Plane.hpp"
#include "AABB.hpp" #include "GeomMath.hpp"
class Frustum class Frustum
{ {
public: public:
enum Corner enum Corner
{ {
NBL = 0, NBR, NTR, NTL, NBL = 0, NBR, NTR, NTL,
FBL, FBR, FTR, FTL, FBL, FBR, FTR, FTL,
CORNERCOUNT CORNERCOUNT
}; };
skipping to change at line 66 skipping to change at line 66
this->fov = fov; this->fov = fov;
this->aspect = aspect; this->aspect = aspect;
this->zNear = zNear; this->zNear = zNear;
this->zFar = zFar; this->zFar = zFar;
} }
void calcFrustum(Vec3d p, Vec3d l, Vec3d u); void calcFrustum(Vec3d p, Vec3d l, Vec3d u);
const Vec3f &getCorner(Corner corner) const; const Vec3f &getCorner(Corner corner) const;
const Plane &getPlane(FrustumPlane plane) const; const Plane &getPlane(FrustumPlane plane) const;
int pointInFrustum(const Vec3f &p); int pointInFrustum(const Vec3f &p);
int boxInFrustum(const AABB &bbox); int boxInFrustum(const AABBox &bbox);
void drawFrustum() const; void drawFrustum() const;
void saveDrawingCorners(); void saveDrawingCorners();
void resetCorners(); void resetCorners();
float fov; float fov;
float aspect; float aspect;
float zNear; float zNear;
float zFar; float zFar;
Mat4d m; Mat4d m;
AABB bbox; AABBox bbox;
std::vector<Vec3f> drawCorners; std::vector<Vec3f> drawCorners;
AABB drawBbox; AABBox drawBbox;
std::vector<Vec3f> corners; std::vector<Vec3f> corners;
std::vector<Plane*> planes; std::vector<Plane*> planes;
private: private:
}; };
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/