Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 19:07:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix cpu frustum culling (hacky?)

Browse source
This commit is contained in:
HifiExperiments 2023-11-18 00:25:09 -08:00
parent 4806f901b4
commit 56860bea99
3 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities-renderer/src/RenderableEntityItem.cpp
View file

@ -307,8 +307,7 @@ void EntityRenderer::computeMirrorView(ViewFrustum& viewFrustum) const {
projection[2][2] = c.z + 1.0f; projection[2][2] = c.z + 1.0f;
projection[3][2] = c.w; projection[3][2] = c.w;
viewFrustum.setProjection(projection); viewFrustum.setProjection(projection, true);
viewFrustum.setIsOblique(true);
} }
void EntityRenderer::render(RenderArgs* args) { void EntityRenderer::render(RenderArgs* args) {

56
libraries/shared/src/ViewFrustum.cpp
View file

@ -53,7 +53,7 @@ static const glm::vec4 NDC_VALUES[NUM_FRUSTUM_CORNERS] = {
glm::vec4(-1.0f, 1.0f, 1.0f, 1.0f), glm::vec4(-1.0f, 1.0f, 1.0f, 1.0f),
}; };
void ViewFrustum::setProjection(const glm::mat4& projection) { void ViewFrustum::setProjection(const glm::mat4& projection, bool isOblique) {
_projection = projection; _projection = projection;
glm::mat4 inverseProjection = glm::inverse(projection); glm::mat4 inverseProjection = glm::inverse(projection);
@ -63,16 +63,21 @@ void ViewFrustum::setProjection(const glm::mat4& projection) {
_corners[i] /= _corners[i].w; _corners[i] /= _corners[i].w;
} }
// compute frustum properties // HACK: these calculations aren't correct for our oblique mirror frustums, but we can just reuse the values from the original
_nearClip = -_corners[BOTTOM_LEFT_NEAR].z; // frustum since these values are only used on the CPU.
_farClip = -_corners[BOTTOM_LEFT_FAR].z; if (!isOblique) {
_aspectRatio = (_corners[TOP_RIGHT_NEAR].x - _corners[BOTTOM_LEFT_NEAR].x) / // compute frustum properties
(_corners[TOP_RIGHT_NEAR].y - _corners[BOTTOM_LEFT_NEAR].y); _nearClip = -_corners[BOTTOM_LEFT_NEAR].z;
glm::vec4 top = inverseProjection * vec4(0.0f, 1.0f, -1.0f, 1.0f); _farClip = -_corners[BOTTOM_LEFT_FAR].z;
top /= top.w; _aspectRatio = (_corners[TOP_RIGHT_NEAR].x - _corners[BOTTOM_LEFT_NEAR].x) /
_fieldOfView = abs(glm::degrees(2.0f * abs(glm::angle(vec3(0.0f, 0.0f, -1.0f), glm::normalize(vec3(top)))))); (_corners[TOP_RIGHT_NEAR].y - _corners[BOTTOM_LEFT_NEAR].y);
_height = _corners[TOP_RIGHT_NEAR].y - _corners[BOTTOM_RIGHT_NEAR].y; glm::vec4 top = inverseProjection * vec4(0.0f, 1.0f, -1.0f, 1.0f);
_width = _corners[TOP_RIGHT_NEAR].x - _corners[TOP_LEFT_NEAR].x; top /= top.w;
_fieldOfView = abs(glm::degrees(2.0f * abs(glm::angle(vec3(0.0f, 0.0f, -1.0f), glm::normalize(vec3(top))))));
_height = _corners[TOP_RIGHT_NEAR].y - _corners[BOTTOM_RIGHT_NEAR].y;
_width = _corners[TOP_RIGHT_NEAR].x - _corners[TOP_LEFT_NEAR].x;
}
_isOblique = isOblique;
} }
void ViewFrustum::setProjection(float cameraFov, float cameraAspectRatio, float cameraNearClip, float cameraFarClip) { void ViewFrustum::setProjection(float cameraFov, float cameraAspectRatio, float cameraNearClip, float cameraFarClip) {
@ -109,12 +114,24 @@ void ViewFrustum::calculate() {
// the function set3Points assumes that the points are given in counter clockwise order, assume you // 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 // are inside the frustum, facing the plane. Start with any point, and go counter clockwise for
// three consecutive points // three consecutive points
_planes[TOP_PLANE].set3Points(_cornersWorld[TOP_RIGHT_NEAR], _cornersWorld[TOP_LEFT_NEAR], _cornersWorld[TOP_LEFT_FAR]); if (!_isOblique) {
_planes[BOTTOM_PLANE].set3Points(_cornersWorld[BOTTOM_LEFT_NEAR], _cornersWorld[BOTTOM_RIGHT_NEAR], _cornersWorld[BOTTOM_RIGHT_FAR]); _planes[TOP_PLANE].set3Points(_cornersWorld[TOP_RIGHT_NEAR], _cornersWorld[TOP_LEFT_NEAR], _cornersWorld[TOP_LEFT_FAR]);
_planes[LEFT_PLANE].set3Points(_cornersWorld[BOTTOM_LEFT_NEAR], _cornersWorld[BOTTOM_LEFT_FAR], _cornersWorld[TOP_LEFT_FAR]); _planes[BOTTOM_PLANE].set3Points(_cornersWorld[BOTTOM_LEFT_NEAR], _cornersWorld[BOTTOM_RIGHT_NEAR], _cornersWorld[BOTTOM_RIGHT_FAR]);
_planes[RIGHT_PLANE].set3Points(_cornersWorld[BOTTOM_RIGHT_FAR], _cornersWorld[BOTTOM_RIGHT_NEAR], _cornersWorld[TOP_RIGHT_FAR]); _planes[LEFT_PLANE].set3Points(_cornersWorld[BOTTOM_LEFT_NEAR], _cornersWorld[BOTTOM_LEFT_FAR], _cornersWorld[TOP_LEFT_FAR]);
_planes[NEAR_PLANE].set3Points(_cornersWorld[BOTTOM_RIGHT_NEAR], _cornersWorld[BOTTOM_LEFT_NEAR], _cornersWorld[TOP_LEFT_NEAR]); _planes[RIGHT_PLANE].set3Points(_cornersWorld[BOTTOM_RIGHT_FAR], _cornersWorld[BOTTOM_RIGHT_NEAR], _cornersWorld[TOP_RIGHT_FAR]);
_planes[FAR_PLANE].set3Points(_cornersWorld[BOTTOM_LEFT_FAR], _cornersWorld[BOTTOM_RIGHT_FAR], _cornersWorld[TOP_RIGHT_FAR]); _planes[NEAR_PLANE].set3Points(_cornersWorld[BOTTOM_RIGHT_NEAR], _cornersWorld[BOTTOM_LEFT_NEAR], _cornersWorld[TOP_LEFT_NEAR]);
_planes[FAR_PLANE].set3Points(_cornersWorld[BOTTOM_LEFT_FAR], _cornersWorld[BOTTOM_RIGHT_FAR], _cornersWorld[TOP_RIGHT_FAR]);
} else {
Corners near = getCorners(_nearClip);
Corners far = getCorners(_farClip);
_planes[TOP_PLANE].set3Points(near.topRight, near.topLeft, far.topLeft);
_planes[BOTTOM_PLANE].set3Points(near.bottomLeft, near.bottomRight, far.bottomRight);
_planes[LEFT_PLANE].set3Points(near.bottomLeft, far.bottomLeft, far.topLeft);
_planes[RIGHT_PLANE].set3Points(far.bottomRight, near.bottomRight, far.topRight);
_planes[NEAR_PLANE].set3Points(near.bottomRight, near.bottomLeft, near.topLeft);
_planes[FAR_PLANE].set3Points(far.bottomLeft, far.bottomRight, far.topRight);
}
// Also calculate our projection matrix in case people want to project points... // Also calculate our projection matrix in case people want to project points...
// Projection matrix : Field of View, ratio, display range : near to far // Projection matrix : Field of View, ratio, display range : near to far
@ -208,11 +225,6 @@ bool ViewFrustum::sphereIntersectsFrustum(const glm::vec3& center, float radius)
} }
bool ViewFrustum::boxIntersectsFrustum(const AABox& box) const { bool ViewFrustum::boxIntersectsFrustum(const AABox& box) const {
// FIXME: remove once we fix culling
if (_isOblique) {
return true;
}
// only check against frustum // only check against frustum
for(int i = 0; i < NUM_FRUSTUM_PLANES; i++) { for(int i = 0; i < NUM_FRUSTUM_PLANES; i++) {
const glm::vec3& normal = _planes[i].getNormal(); const glm::vec3& normal = _planes[i].getNormal();

3
libraries/shared/src/ViewFrustum.h
View file

@ -47,11 +47,10 @@ public:
const glm::vec3& getRight() const { return _right; } const glm::vec3& getRight() const { return _right; }
// setters for lens attributes // setters for lens attributes
void setProjection(const glm::mat4 & projection); void setProjection(const glm::mat4& projection, bool isOblique = false);
void setProjection(float cameraFov, float cameraAspectRatio, float cameraNearClip, float cameraFarClip); void setProjection(float cameraFov, float cameraAspectRatio, float cameraNearClip, float cameraFarClip);
void setFocalLength(float focalLength) { _focalLength = focalLength; } void setFocalLength(float focalLength) { _focalLength = focalLength; }
bool isPerspective() const; bool isPerspective() const;
void setIsOblique(bool isOblique) { _isOblique = isOblique; }
// getters for lens attributes // getters for lens attributes
const glm::mat4& getProjection() const { return _projection; } const glm::mat4& getProjection() const { return _projection; }