Merge branch 'billboard-shadows'

4 files changed, 61 insertions, 8 deletions

diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp
index e7474ca..2eae160 100644
--- a/gfx/models/mesh.cpp
+++ b/gfx/models/mesh.cpp
@@ -1,6 +1,32 @@
 #include "mesh.h"
 
-MeshBase::MeshBase(GLsizei m_numIndices, GLenum mode) : m_numIndices {m_numIndices}, mode {mode} { }
+MeshBase::MeshBase(GLsizei m_numIndices, GLenum mode, const std::vector<RelativePosition3D> & positions) :
+	m_numIndices {m_numIndices}, mode {mode}, dimensions {positions}
+{
+}
+
+MeshBase::Dimensions::Dimensions(const std::span<const RelativePosition3D> positions) :
+	Dimensions {positions, {extents(positions, 0), extents(positions, 1), extents(positions, 2)}}
+{
+}
+
+MeshBase::Dimensions::Dimensions(
+		const std::span<const RelativePosition3D> positions, const std::array<Extents1D, 3> & extents1ds) :
+	minExtent(extents1ds[0].min, extents1ds[1].min, extents1ds[2].min),
+	maxExtent(extents1ds[0].max, extents1ds[1].max, extents1ds[2].max), centre {(minExtent + maxExtent) / 2.0F},
+	size {std::ranges::max(positions | std::views::transform([this](const auto & v) {
+		return glm::distance(v, centre);
+	}))}
+{
+}
+
+MeshBase::Dimensions::Extents1D
+MeshBase::Dimensions::extents(const std::span<const RelativePosition3D> positions, glm::length_t D)
+{
+	return std::ranges::minmax(positions | std::views::transform([D](const auto & v) {
+		return v[D];
+	}));
+}
 
 void
 MeshBase::Draw() const
diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h
index 248cb8f..8791aed 100644
--- a/gfx/models/mesh.h
+++ b/gfx/models/mesh.h
@@ -1,8 +1,10 @@
 #pragma once
 
+#include "config/types.h"
 #include "gfx/gl/vertexArrayObject.h"
 #include <glArrays.h>
 #include <glad/gl.h>
+#include <ranges>
 #include <span>
 #include <stdTypeDefs.h>
 
@@ -10,22 +12,46 @@ class Vertex;
 
 class MeshBase {
 public:
+	class Dimensions {
+	public:
+		using Extents1D = std::ranges::minmax_result<RelativeDistance>;
+		explicit Dimensions(const std::span<const RelativePosition3D>);
+
+		RelativePosition3D minExtent, maxExtent;
+		RelativePosition3D centre;
+		RelativeDistance size;
+
+	private:
+		Dimensions(const std::span<const RelativePosition3D>, const std::array<Extents1D, 3> &);
+		static Extents1D extents(const std::span<const RelativePosition3D>, glm::length_t D);
+	};
+
 	void Draw() const;
 	void DrawInstanced(GLuint vao, GLsizei count, GLuint base = 0) const;
 
+	[[nodiscard]] const Dimensions &
+	getDimensions() const
+	{
+		return dimensions;
+	}
+
 protected:
-	MeshBase(GLsizei m_numIndices, GLenum mode);
+	MeshBase(GLsizei m_numIndices, GLenum mode, const std::vector<RelativePosition3D> &);
 
 	glVertexArray m_vertexArrayObject;
 	glBuffers<2> m_vertexArrayBuffers;
 	GLsizei m_numIndices;
 	GLenum mode;
+	Dimensions dimensions;
 };
 
 template<typename V> class MeshT : public MeshBase, public ConstTypeDefs<MeshT<V>> {
 public:
 	MeshT(const std::span<const V> vertices, const std::span<const unsigned int> indices, GLenum mode = GL_TRIANGLES) :
-		MeshBase {static_cast<GLsizei>(indices.size()), mode}
+		MeshBase {static_cast<GLsizei>(indices.size()), mode,
+				materializeRange(vertices | std::views::transform([](const auto & v) {
+					return static_cast<RelativePosition3D>(v.pos);
+				}))}
 	{
 		VertexArrayObject::data(vertices, m_vertexArrayBuffers[0], GL_ARRAY_BUFFER);
 		VertexArrayObject::data(indices, m_vertexArrayBuffers[1], GL_ARRAY_BUFFER);
diff --git a/gfx/models/texture.cpp b/gfx/models/texture.cpp
index 51223aa..a508421 100644
--- a/gfx/models/texture.cpp
+++ b/gfx/models/texture.cpp
@@ -59,12 +59,13 @@ Texture::bind(GLenum unit) const
 	glBindTexture(type, m_texture);
 }
 
-TextureAbsCoord
+TextureDimensions
 Texture::getSize(const glTexture & texture)
 {
-	TextureAbsCoord size;
+	TextureDimensions size {};
 	glGetTextureLevelParameteriv(texture, 0, GL_TEXTURE_WIDTH, &size.x);
 	glGetTextureLevelParameteriv(texture, 0, GL_TEXTURE_HEIGHT, &size.y);
+	glGetTextureLevelParameteriv(texture, 0, GL_TEXTURE_DEPTH, &size.z);
 	return size;
 }
 
@@ -73,7 +74,7 @@ Texture::save(
 		const glTexture & texture, GLenum format, GLenum type, uint8_t channels, const char * path, uint8_t tgaFormat)
 {
 	const auto size = getSize(texture);
-	const size_t dataSize = (static_cast<size_t>(size.x * size.y * channels));
+	const size_t dataSize = (static_cast<size_t>(size.x * size.y * size.z * channels));
 	const size_t fileSize = dataSize + sizeof(TGAHead);
 
 	filesystem::fh out {path, O_RDWR | O_CREAT, 0660};
@@ -81,7 +82,7 @@ Texture::save(
 	auto tga = out.mmap(fileSize, 0, PROT_WRITE, MAP_SHARED);
 	*tga.get<TGAHead>() = {
 			.format = tgaFormat,
-			.size = size,
+			.size = {size.x, size.y * size.z},
 			.pixelDepth = static_cast<uint8_t>(8 * channels),
 	};
 	glPixelStorei(GL_PACK_ALIGNMENT, 1);
diff --git a/gfx/models/texture.h b/gfx/models/texture.h
index 8cb8128..d8c3b29 100644
--- a/gfx/models/texture.h
+++ b/gfx/models/texture.h
@@ -38,10 +38,10 @@ public:
 	static void saveDepth(const glTexture &, const char * path);
 	static void saveNormal(const glTexture &, const char * path);
 	static void savePosition(const glTexture &, const char * path);
+	static TextureDimensions getSize(const glTexture &);
 
 protected:
 	static void save(const glTexture &, GLenum, GLenum, uint8_t channels, const char * path, uint8_t tgaFormat);
-	static TextureAbsCoord getSize(const glTexture &);
 
 	glTexture m_texture;
 	GLenum type;