Merge branch 'billboard-shadows'

1 files changed, 19 insertions, 2 deletions

diff --git a/gfx/gl/shadowMapper.h b/gfx/gl/shadowMapper.h
index 73dadd0..951e29c 100644
--- a/gfx/gl/shadowMapper.h
+++ b/gfx/gl/shadowMapper.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "config/types.h"
+#include "gfx/gl/shadowStenciller.h"
 #include "lib/glArrays.h"
 #include "program.h"
 #include <gfx/models/texture.h>
@@ -10,6 +11,7 @@
 
 class SceneProvider;
 class Camera;
+class LightDirection;
 
 class ShadowMapper {
 public:
@@ -18,20 +20,23 @@ public:
 	static constexpr std::size_t SHADOW_BANDS {4};
 
 	using Definitions = std::vector<glm::mat4x4>;
+	using Sizes = std::vector<RelativePosition3D>;
 
-	[[nodiscard]] Definitions update(const SceneProvider &, const Direction3D & direction, const Camera &) const;
+	[[nodiscard]] Definitions update(const SceneProvider &, const LightDirection & direction, const Camera &) const;
 
 	class ShadowProgram : public Program {
 	public:
 		explicit ShadowProgram(const Shader & vs);
 		explicit ShadowProgram(const Shader & vs, const Shader & gs, const Shader & fs);
 
-		void setView(const std::span<const glm::mat4>, const GlobalPosition3D) const;
+		void setView(const std::span<const glm::mat4x4>, const std::span<const RelativePosition3D>,
+				const GlobalPosition3D) const;
 		void use() const;
 
 	private:
 		RequiredUniformLocation viewProjectionLoc {*this, "viewProjection"};
 		RequiredUniformLocation viewProjectionsLoc {*this, "viewProjections"};
+		UniformLocation sizesLoc {*this, "sizes"};
 		RequiredUniformLocation viewPointLoc {*this, "viewPoint"};
 	};
 
@@ -46,8 +51,19 @@ public:
 		RequiredUniformLocation modelPosLoc {*this, "modelPos"};
 	};
 
+	class StencilShadowProgram : public ShadowProgram {
+	public:
+		StencilShadowProgram();
+		void use(const RelativePosition3D & centre, const float size) const;
+
+	private:
+		RequiredUniformLocation centreLoc {*this, "centre"};
+		RequiredUniformLocation sizeLoc {*this, "size"};
+	};
+
 	ShadowProgram landmess, dynamicPointInst, dynamicPointInstWithTextures;
 	DynamicPoint dynamicPoint;
+	StencilShadowProgram stencilShadowProgram;
 
 	// NOLINTNEXTLINE(hicpp-explicit-conversions)
 	operator GLuint() const
@@ -61,4 +77,5 @@ private:
 	glFrameBuffer depthMapFBO;
 	glTexture depthMap;
 	TextureAbsCoord size;
+	mutable ShadowStenciller shadowStenciller;
 };