Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 21:47:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug in definition of frustum planes, and general code cleanup

Browse source 
- Fixed bug in definition of frustum planes, namely making sure the points are
  given in the correct order so that our plane normals point in correct direction
- general code cleanup to match coding standard
This commit is contained in:
ZappoMan 2013-04-21 15:21:03 -07:00
parent 8a150d27b8
commit a02a75f516
2 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
libraries/voxels/src/ViewFrustum.cpp
View file

@ -85,14 +85,23 @@ void ViewFrustum::calculate() {
_nearBottomRight = _nearCenter - (_up * nearHalfHeight) + (_right * nearHalfWidth); _nearBottomRight = _nearCenter - (_up * nearHalfHeight) + (_right * nearHalfWidth);
// compute the six planes // compute the six planes
// the function set3Points assumes that the points // The planes are defined such that the normal points towards the inside of the view frustum.
// are given in counter clockwise order // Testing if an object is inside the view frustum is performed by computing on which side of
_planes[TOPP].set3Points(_nearTopRight,_nearTopLeft,_farTopLeft); // the plane the object resides. This can be done computing the signed distance from the point
_planes[BOTTOMP].set3Points(_nearBottomLeft,_nearBottomRight,_farBottomRight); // to the plane. If it is on the side that the normal is pointing, i.e. the signed distance
_planes[LEFTP].set3Points(_nearTopLeft,_nearBottomLeft,_farBottomLeft); // is positive, then it is on the right side of the respective plane. If an object is on the
_planes[RIGHTP].set3Points(_nearBottomRight,_nearTopRight,_farBottomRight); // right side of all six planes then the object is inside the frustum.
_planes[NEARP].set3Points(_nearTopLeft,_nearTopRight,_nearBottomRight);
_planes[FARP].set3Points(_farTopRight,_farTopLeft,_farBottomLeft); // the function set3Points assumes that the points are given in counter clockwise order, assume you
// are inside the frustum, facing the plane. Start with any point, and go counter clockwise for
// three consecutive points
_planes[TOP_PLANE ].set3Points(_nearTopRight,_nearTopLeft,_farTopLeft);
_planes[BOTTOM_PLANE].set3Points(_nearBottomLeft,_nearBottomRight,_farBottomRight);
_planes[LEFT_PLANE ].set3Points(_nearBottomLeft,_farBottomLeft,_farTopLeft);
_planes[RIGHT_PLANE ].set3Points(_farBottomRight,_nearBottomRight,_nearTopRight);
_planes[NEAR_PLANE ].set3Points(_nearBottomRight,_nearBottomLeft,_nearTopLeft);
_planes[FAR_PLANE ].set3Points(_farBottomLeft,_farBottomRight,_farTopRight);
} }
@ -135,11 +144,26 @@ void ViewFrustum::dump() {
} }
//enum { TOP_PLANE = 0, BOTTOM_PLANE, LEFT_PLANE, RIGHT_PLANE, NEAR_PLANE, FAR_PLANE };
const char* ViewFrustum::debugPlaneName (int plane) const {
switch (plane) {
case TOP_PLANE: return "Top Plane";
case BOTTOM_PLANE: return "Bottom Plane";
case LEFT_PLANE: return "Left Plane";
case RIGHT_PLANE: return "Right Plane";
case NEAR_PLANE: return "Near Plane";
case FAR_PLANE: return "Far Plane";
}
return "Unknown";
}
int ViewFrustum::pointInFrustum(glm::vec3 &p) { int ViewFrustum::pointInFrustum(glm::vec3 &p) {
int result = INSIDE; int result = INSIDE;
for(int i=0; i < 6; i++) { for(int i=0; i < 6; i++) {
if (_planes[i].distance(p) < 0) if (_planes[i].distance(p) < 0) {
return OUTSIDE; return OUTSIDE;
}
} }
return(result); return(result);
} }
@ -160,17 +184,17 @@ int ViewFrustum::sphereInFrustum(glm::vec3 &center, float radius) {
int ViewFrustum::boxInFrustum(AABox &b) { int ViewFrustum::boxInFrustum(AABox &b) {
printf("ViewFrustum::boxInFrustum() box.corner=%f,%f,%f x=%f\n",b.corner.x,b.corner.y,b.corner.z,b.x); printf("ViewFrustum::boxInFrustum() box.corner=%f,%f,%f x=%f\n",b.corner.x,b.corner.y,b.corner.z,b.x);
int result = INSIDE; int result = INSIDE;
for(int i=0; i < 6; i++) { for(int i=0; i < 6; i++) {
printf("plane[%d] -- point(%f,%f,%f) normal(%f,%f,%f) d=%f \n",i, printf("plane[%d] -- point(%f,%f,%f) normal(%f,%f,%f) d=%f \n",i,
_planes[i].point.x, _planes[i].point.y, _planes[i].point.z, _planes[i].getPoint().x, _planes[i].getPoint().y, _planes[i].getPoint().z,
_planes[i].normal.x, _planes[i].normal.y, _planes[i].normal.z, _planes[i].getNormal().x, _planes[i].getNormal().y, _planes[i].getNormal().z,
_planes[i].d _planes[i].getDCoefficient()
); );
glm::vec3 normal = _planes[i].normal; glm::vec3 normal = _planes[i].getNormal();
glm::vec3 boxVertexP = b.getVertexP(normal); glm::vec3 boxVertexP = b.getVertexP(normal);
float planeToBoxVertexPDistance = _planes[i].distance(boxVertexP); float planeToBoxVertexPDistance = _planes[i].distance(boxVertexP);

4
libraries/voxels/src/ViewFrustum.h
View file

@ -45,9 +45,11 @@ private:
glm::vec3 _nearTopRight; glm::vec3 _nearTopRight;
glm::vec3 _nearBottomLeft; glm::vec3 _nearBottomLeft;
glm::vec3 _nearBottomRight; glm::vec3 _nearBottomRight;
enum { TOPP = 0, BOTTOMP, LEFTP, RIGHTP, NEARP, FARP }; enum { TOP_PLANE = 0, BOTTOM_PLANE, LEFT_PLANE, RIGHT_PLANE, NEAR_PLANE, FAR_PLANE };
Plane _planes[6]; // How will this be used? Plane _planes[6]; // How will this be used?
const char* debugPlaneName (int plane) const;
public: public:
// setters for camera attributes // setters for camera attributes
void setPosition (const glm::vec3& p) { _position = p; } void setPosition (const glm::vec3& p) { _position = p; }