Further shader compilation development.

2025-03-22 17:40:08 +01:00
parent e01b8c2e09
commit 510398423a
45 changed files with 1567 additions and 1097 deletions
--- a/include/opengl/shading/uniforms/mesh_uniforms.hpp
+++ b/include/opengl/shading/uniforms/mesh_uniforms.hpp
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "opengl/shader_program_variable.hpp"
+#include <array>
+#include "util/enum_bitfield_operators.hpp"
+
+namespace zgl::shading::uniforms::mesh
+{
+
+enum class flags : std::uint16_t
+{
+	none = 0,
+	mvp_matrix = 1 << 0,
+	model_matrix = 1 << 1,
+	point_size = 1 << 2,
+	color = 1 << 3,
+	tex = 1 << 4,
+	view_pos = 1 << 5,
+	point_light_direction = 1 << 6,
+	point_light_color = 1 << 7,
+	ambient_light_color = 1 << 8,
+	ambient_filter = 1 << 9,
+	diffuse_filter = 1 << 10,
+	specular_filter = 1 << 11,
+	shininess = 1 << 12
+};
+
+constexpr inline auto mvp_matrix = shader_program_variable({ GL_FLOAT_MAT4, 0 }, "mvp_matrix");
+constexpr inline auto model_matrix = shader_program_variable({ GL_FLOAT_MAT4, 1 }, "model_matrix");
+constexpr inline auto point_size = shader_program_variable({ GL_FLOAT, 2 }, "point_size");
+constexpr inline auto tex = shader_program_variable({ GL_SAMPLER_2D, 3 }, "tex");
+constexpr inline auto color = shader_program_variable({ GL_FLOAT_VEC4, 4 }, "color");
+constexpr inline auto view_pos = shader_program_variable({ GL_FLOAT_VEC3, 5 }, "view_pos");
+constexpr inline auto point_light_direction = shader_program_variable({ GL_FLOAT_VEC3, 6 }, "point_light_direction");
+constexpr inline auto point_light_color = shader_program_variable({ GL_FLOAT_VEC3, 7 }, "point_light_color");
+constexpr inline auto ambient_light_color = shader_program_variable({ GL_FLOAT_VEC3, 8 }, "ambient_light_color");
+constexpr inline auto ambient_filter = shader_program_variable({ GL_FLOAT_VEC3, 9 }, "ambient_filter");
+constexpr inline auto diffuse_filter = shader_program_variable({ GL_FLOAT_VEC3, 10 }, "diffuse_filter");
+constexpr inline auto specular_filter = shader_program_variable({ GL_FLOAT_VEC3, 11 }, "specular_filter");
+constexpr inline auto shininess = shader_program_variable({ GL_FLOAT, 12 }, "shininess");
+
+constexpr inline auto all = std::array{
+	mvp_matrix,
+	model_matrix,
+	point_size,
+	color,
+	tex,
+	view_pos,
+	point_light_direction,
+	point_light_color,
+	ambient_light_color,
+	ambient_filter,
+	diffuse_filter,
+	specular_filter,
+	shininess
+};
+
+constexpr inline auto names = std::array{
+	"mvp_matrix",
+	"model_matrix",
+	"point_size",
+	"color",
+	"tex",
+	"view_pos",
+	"point_light_direction",
+	"point_light_color",
+	"ambient_light_color",
+	"ambient_filter",
+	"diffuse_filter",
+	"specular_filter",
+	"shininess"
+};
+}
+
+DEFINE_ENUM_BITFIELD_OPERATORS(zgl::shading::uniforms::mesh::flags)
--- a/include/opengl/shading/uniforms/point_cloud_uniforms.hpp
+++ b/include/opengl/shading/uniforms/point_cloud_uniforms.hpp
@@ -0,0 +1,52 @@
+#pragma once
+
+#include "opengl/shader_program_variable.hpp"
+#include "util/enum_bitfield_operators.hpp"
+#include <array>
+
+namespace zgl::shading::uniforms::point_cloud
+{
+
+enum class flags : std::uint8_t
+{
+	none = 0,
+	mvp_matrix = 1 << 0,
+	point_size = 1 << 1,
+	color = 1 << 2,
+	model_matrix = 1 << 3,
+	camera_position = 1 << 4,
+	rainbow_offset_y = 1 << 5,
+	rainbow_scale_y = 1 << 6
+};
+
+constexpr inline auto mvp_matrix = shader_program_variable({ GL_FLOAT_MAT4, 0 }, "mvp_matrix");
+constexpr inline auto point_size = shader_program_variable({ GL_FLOAT, 1 }, "point_size");
+constexpr inline auto color = shader_program_variable({ GL_FLOAT_VEC4, 2 }, "color");
+constexpr inline auto model_matrix = shader_program_variable({ GL_FLOAT_MAT4, 3 }, "model_matrix");
+constexpr inline auto camera_position = shader_program_variable({ GL_FLOAT_VEC3, 4 }, "camera_position");
+constexpr inline auto rainbow_offset_y = shader_program_variable({ GL_FLOAT, 5 }, "rainbow_offset_y");
+constexpr inline auto rainbow_scale_y = shader_program_variable({ GL_FLOAT, 6 }, "rainbow_scale_y");
+
+constexpr inline auto all = std::array{
+	mvp_matrix,
+	point_size,
+	color,
+	model_matrix,
+	camera_position,
+	rainbow_offset_y,
+	rainbow_scale_y
+};
+
+constexpr inline auto names = std::array{
+	"mvp_matrix",
+	"point_size",
+	"color",
+	"model_matrix",
+	"camera_position",
+	"rainbow_offset_y",
+	"rainbow_scale_y"
+};
+
+}
+
+DEFINE_ENUM_BITFIELD_OPERATORS(zgl::shading::uniforms::point_cloud::flags)