lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #342 from Renardjojo/fix/mistake_frustum

Browse Source 
Fix mistake and inverte right and left plane
This commit is contained in:
Joey de Vries
2023-01-19 12:39:58 +01:00
committed by GitHub
parent 3da5dfeff0 09d6e1ef64
commit 7b132063c8
1 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
includes/learnopengl/entity.h
View File

@@ -122,19 +122,19 @@ public:
} }
}; };
struct Plan struct Plane
{ {
glm::vec3 normal = { 0.f, 1.f, 0.f }; // unit vector glm::vec3 normal = { 0.f, 1.f, 0.f }; // unit vector
float distance = 0.f; // Distance with origin float distance = 0.f; // Distance with origin
Plan() = default; Plane() = default;
Plan(const glm::vec3& p1, const glm::vec3& norm) Plane(const glm::vec3& p1, const glm::vec3& norm)
: normal(glm::normalize(norm)), : normal(glm::normalize(norm)),
distance(glm::dot(normal, p1)) distance(glm::dot(normal, p1))
{} {}
float getSignedDistanceToPlan(const glm::vec3& point) const float getSignedDistanceToPlane(const glm::vec3& point) const
{ {
return glm::dot(normal, point) - distance; return glm::dot(normal, point) - distance;
} }
@@ -142,30 +142,30 @@ struct Plan
struct Frustum struct Frustum
{ {
Plan topFace; Plane topFace;
Plan bottomFace; Plane bottomFace;
Plan rightFace; Plane rightFace;
Plan leftFace; Plane leftFace;
Plan farFace; Plane farFace;
Plan nearFace; Plane nearFace;
}; };
struct BoundingVolume struct BoundingVolume
{ {
virtual bool isOnFrustum(const Frustum& camFrustum, const Transform& transform) const = 0; virtual bool isOnFrustum(const Frustum& camFrustum, const Transform& transform) const = 0;
virtual bool isOnOrForwardPlan(const Plan& plan) const = 0; virtual bool isOnOrForwardPlane(const Plane& plane) const = 0;
bool isOnFrustum(const Frustum& camFrustum) const bool isOnFrustum(const Frustum& camFrustum) const
{ {
return (isOnOrForwardPlan(camFrustum.leftFace) && return (isOnOrForwardPlane(camFrustum.leftFace) &&
isOnOrForwardPlan(camFrustum.rightFace) && isOnOrForwardPlane(camFrustum.rightFace) &&
isOnOrForwardPlan(camFrustum.topFace) && isOnOrForwardPlane(camFrustum.topFace) &&
isOnOrForwardPlan(camFrustum.bottomFace) && isOnOrForwardPlane(camFrustum.bottomFace) &&
isOnOrForwardPlan(camFrustum.nearFace) && isOnOrForwardPlane(camFrustum.nearFace) &&
isOnOrForwardPlan(camFrustum.farFace)); isOnOrForwardPlane(camFrustum.farFace));
}; };
}; };
@@ -178,9 +178,9 @@ struct Sphere : public BoundingVolume
: BoundingVolume{}, center{ inCenter }, radius{ inRadius } : BoundingVolume{}, center{ inCenter }, radius{ inRadius }
{} {}
bool isOnOrForwardPlan(const Plan& plan) const final bool isOnOrForwardPlane(const Plane& plane) const final
{ {
return plan.getSignedDistanceToPlan(center) > -radius; return plane.getSignedDistanceToPlane(center) > -radius;
} }
bool isOnFrustum(const Frustum& camFrustum, const Transform& transform) const final bool isOnFrustum(const Frustum& camFrustum, const Transform& transform) const final
@@ -198,12 +198,12 @@ struct Sphere : public BoundingVolume
Sphere globalSphere(globalCenter, radius * (maxScale * 0.5f)); Sphere globalSphere(globalCenter, radius * (maxScale * 0.5f));
//Check Firstly the result that have the most chance to faillure to avoid to call all functions. //Check Firstly the result that have the most chance to faillure to avoid to call all functions.
return (globalSphere.isOnOrForwardPlan(camFrustum.leftFace) && return (globalSphere.isOnOrForwardPlane(camFrustum.leftFace) &&
globalSphere.isOnOrForwardPlan(camFrustum.rightFace) && globalSphere.isOnOrForwardPlane(camFrustum.rightFace) &&
globalSphere.isOnOrForwardPlan(camFrustum.farFace) && globalSphere.isOnOrForwardPlane(camFrustum.farFace) &&
globalSphere.isOnOrForwardPlan(camFrustum.nearFace) && globalSphere.isOnOrForwardPlane(camFrustum.nearFace) &&
globalSphere.isOnOrForwardPlan(camFrustum.topFace) && globalSphere.isOnOrForwardPlane(camFrustum.topFace) &&
globalSphere.isOnOrForwardPlan(camFrustum.bottomFace)); globalSphere.isOnOrForwardPlane(camFrustum.bottomFace));
}; };
}; };
@@ -216,11 +216,11 @@ struct SquareAABB : public BoundingVolume
: BoundingVolume{}, center{ inCenter }, extent{ inExtent } : BoundingVolume{}, center{ inCenter }, extent{ inExtent }
{} {}
bool isOnOrForwardPlan(const Plan& plan) const final bool isOnOrForwardPlane(const Plane& plane) const final
{ {
// Compute the projection interval radius of b onto L(t) = b.c + t * p.n // Compute the projection interval radius of b onto L(t) = b.c + t * p.n
const float r = extent * (std::abs(plan.normal.x) + std::abs(plan.normal.y) + std::abs(plan.normal.z)); const float r = extent * (std::abs(plane.normal.x) + std::abs(plane.normal.y) + std::abs(plane.normal.z));
return -r <= plan.getSignedDistanceToPlan(center); return -r <= plane.getSignedDistanceToPlane(center);
} }
bool isOnFrustum(const Frustum& camFrustum, const Transform& transform) const final bool isOnFrustum(const Frustum& camFrustum, const Transform& transform) const final
@@ -247,12 +247,12 @@ struct SquareAABB : public BoundingVolume
const SquareAABB globalAABB(globalCenter, std::max(std::max(newIi, newIj), newIk)); const SquareAABB globalAABB(globalCenter, std::max(std::max(newIi, newIj), newIk));
return (globalAABB.isOnOrForwardPlan(camFrustum.leftFace) && return (globalAABB.isOnOrForwardPlane(camFrustum.leftFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.rightFace) && globalAABB.isOnOrForwardPlane(camFrustum.rightFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.topFace) && globalAABB.isOnOrForwardPlane(camFrustum.topFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.bottomFace) && globalAABB.isOnOrForwardPlane(camFrustum.bottomFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.nearFace) && globalAABB.isOnOrForwardPlane(camFrustum.nearFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.farFace)); globalAABB.isOnOrForwardPlane(camFrustum.farFace));
}; };
}; };
@@ -283,14 +283,14 @@ struct AABB : public BoundingVolume
return vertice; return vertice;
} }
//see https://gdbooks.gitbooks.io/3dcollisions/content/Chapter2/static_aabb_plan.html //see https://gdbooks.gitbooks.io/3dcollisions/content/Chapter2/static_aabb_plane.html
bool isOnOrForwardPlan(const Plan& plan) const final bool isOnOrForwardPlane(const Plane& plane) const final
{ {
// Compute the projection interval radius of b onto L(t) = b.c + t * p.n // Compute the projection interval radius of b onto L(t) = b.c + t * p.n
const float r = extents.x * std::abs(plan.normal.x) + extents.y * std::abs(plan.normal.y) + const float r = extents.x * std::abs(plane.normal.x) + extents.y * std::abs(plane.normal.y) +
extents.z * std::abs(plan.normal.z); extents.z * std::abs(plane.normal.z);
return -r <= plan.getSignedDistanceToPlan(center); return -r <= plane.getSignedDistanceToPlane(center);
} }
bool isOnFrustum(const Frustum& camFrustum, const Transform& transform) const final bool isOnFrustum(const Frustum& camFrustum, const Transform& transform) const final
@@ -317,12 +317,12 @@ struct AABB : public BoundingVolume
const AABB globalAABB(globalCenter, newIi, newIj, newIk); const AABB globalAABB(globalCenter, newIi, newIj, newIk);
return (globalAABB.isOnOrForwardPlan(camFrustum.leftFace) && return (globalAABB.isOnOrForwardPlane(camFrustum.leftFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.rightFace) && globalAABB.isOnOrForwardPlane(camFrustum.rightFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.topFace) && globalAABB.isOnOrForwardPlane(camFrustum.topFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.bottomFace) && globalAABB.isOnOrForwardPlane(camFrustum.bottomFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.nearFace) && globalAABB.isOnOrForwardPlane(camFrustum.nearFace) &&
globalAABB.isOnOrForwardPlan(camFrustum.farFace)); globalAABB.isOnOrForwardPlane(camFrustum.farFace));
}; };
}; };
@@ -335,11 +335,10 @@ Frustum createFrustumFromCamera(const Camera& cam, float aspect, float fovY, flo
frustum.nearFace = { cam.Position + zNear * cam.Front, cam.Front }; frustum.nearFace = { cam.Position + zNear * cam.Front, cam.Front };
frustum.farFace = { cam.Position + frontMultFar, -cam.Front }; frustum.farFace = { cam.Position + frontMultFar, -cam.Front };
frustum.rightFace = { cam.Position, glm::cross(cam.Up, frontMultFar + cam.Right * halfHSide) }; frustum.rightFace = { cam.Position, glm::cross(frontMultFar - cam.Right * halfHSide, cam.Up) };
frustum.leftFace = { cam.Position, glm::cross(frontMultFar - cam.Right * halfHSide, cam.Up) }; frustum.leftFace = { cam.Position, glm::cross(cam.Up, frontMultFar + cam.Right * halfHSide) };
frustum.topFace = { cam.Position, glm::cross(cam.Right, frontMultFar - cam.Up * halfVSide) }; frustum.topFace = { cam.Position, glm::cross(cam.Right, frontMultFar - cam.Up * halfVSide) };
frustum.bottomFace = { cam.Position, glm::cross(frontMultFar + cam.Up * halfVSide, cam.Right) }; frustum.bottomFace = { cam.Position, glm::cross(frontMultFar + cam.Up * halfVSide, cam.Right) };
return frustum; return frustum;
} }