From e2fcb6ac75fe46c932d29ed056242158c99c1c11 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 7 Jan 2023 19:11:25 +0000
Subject: Tidy shadow map creation
---
gfx/gl/shadowMapper.cpp | 28 ++++++++++++++--------------
gfx/gl/shadowMapper.h | 2 ++
2 files changed, 16 insertions(+), 14 deletions(-)
(limited to 'gfx/gl')
diff --git a/gfx/gl/shadowMapper.cpp b/gfx/gl/shadowMapper.cpp
index 74b7dc0..01043e6 100644
--- a/gfx/gl/shadowMapper.cpp
+++ b/gfx/gl/shadowMapper.cpp
@@ -100,19 +100,14 @@ struct DefinitionsInserter {
ShadowMapper::Definitions & out;
};
-ShadowMapper::Definitions
-ShadowMapper::update(const SceneProvider & scene, const glm::vec3 & dir, const Camera & camera) const
+std::vector<std::array<glm::vec3, 4>>
+ShadowMapper::getBandViewExtents(const Camera & camera, const glm::mat4 & lightView)
{
- glBindFramebuffer(GL_FRAMEBUFFER, depthMapFBO);
- glViewport(0, 0, size.x, size.y);
- glClear(GL_DEPTH_BUFFER_BIT);
- glCullFace(GL_FRONT);
-
std::vector<std::array<glm::vec3, 4>> bandViewExtents;
for (const auto dist : shadowBands) {
const auto extents = camera.extentsAtDist(dist);
- bandViewExtents.emplace_back(extents * [](const auto & e) -> glm::vec3 {
- return e;
+ bandViewExtents.emplace_back(extents * [&lightView](const auto & e) -> glm::vec3 {
+ return lightView * glm::vec4(glm::vec3 {e}, 1);
});
if (std::none_of(extents.begin(), extents.end(), [targetDist = dist * 0.99F](const glm::vec4 & e) {
return e.w > targetDist;
@@ -120,13 +115,18 @@ ShadowMapper::update(const SceneProvider & scene, const glm::vec3 & dir, const C
break;
}
}
+ return bandViewExtents;
+}
+
+ShadowMapper::Definitions
+ShadowMapper::update(const SceneProvider & scene, const glm::vec3 & dir, const Camera & camera) const
+{
+ glBindFramebuffer(GL_FRAMEBUFFER, depthMapFBO);
+ glClear(GL_DEPTH_BUFFER_BIT);
+ glCullFace(GL_FRONT);
const auto lightView = glm::lookAt(camera.getPosition(), camera.getPosition() + dir, up);
- for (auto & band : bandViewExtents) {
- for (auto & e : band) {
- e = lightView * glm::vec4(e, 1);
- }
- }
+ const auto bandViewExtents = getBandViewExtents(camera, lightView);
Definitions out;
std::transform(bandViewExtents.begin(), std::prev(bandViewExtents.end()), std::next(bandViewExtents.begin()),
diff --git a/gfx/gl/shadowMapper.h b/gfx/gl/shadowMapper.h
index bdbd39f..2805d64 100644
--- a/gfx/gl/shadowMapper.h
+++ b/gfx/gl/shadowMapper.h
@@ -48,6 +48,8 @@ public:
}
private:
+ [[nodiscard]] static std::vector<std::array<glm::vec3, 4>> getBandViewExtents(
+ const Camera &, const glm::mat4 & lightView);
glFrameBuffer depthMapFBO;
glTexture depthMap;
glm::ivec2 size;
--
cgit v1.2.3