material handlers

Author: IvanPleshkov

Sources/Render/Material.cpp

@@ -11,25 +11,16 @@ using namespace RED_LILIUM_NAMESPACE;
 
 Material::Material(ptr<RenderDevice> renderDevice, std::string_view filename)
 	: RedLiliumObject()
-	, m_renderDevice(renderDevice)
-	, m_filename(filename)
-	, m_vertexDeclaration(nullptr)
 {
-	SetShaderProgram(m_renderDevice->GetShaderManager()->GetShaderProgram(filename));
+	SetShaderProgram(renderDevice->GetShaderManager()->GetShaderProgram(filename));
 }
 
 Material::~Material()
 {}
 
-sptr<Material> Material::Create(ptr<RenderDevice> renderDevice, std::string_view filename)
+const std::string& Material::GetName() const
 {
-	return smake<Material>(renderDevice, filename);
-}
-
-ptr<VertexDeclaration> Material::GetVertexDeclaration()
-{
-	RED_LILIUM_ASSERT(m_vertexDeclaration != nullptr);
-	return m_vertexDeclaration;
+	return m_shaderProgram->GetName();
 }
 
 const sptr<ShaderProgram>& Material::GetShaderProgram()
@@ -41,8 +32,6 @@ const sptr<ShaderProgram>& Material::GetShaderProgram()
 void Material::SetShaderProgram(const sptr<ShaderProgram>& shaderProgram)
 {
 	m_shaderProgram = shaderProgram;
-	m_vertexDeclaration = m_shaderProgram->GetVertexDeclaration();
-
 	m_uniforms = shaderProgram->GetUniforms();
 	m_nameToUniform.clear();
 	for (size_t i = 0; i < m_uniforms.size(); i++)

Sources/Render/Material.h

@@ -12,24 +12,64 @@ class Material : public RedLiliumObject
 	Material(ptr<RenderDevice> renderDevice, std::string_view filename);
 	~Material() override;
 
+	template<class T = Material>
+	static sptr<T> Create(ptr<RenderDevice> renderDevice, std::string_view filename)
+	{
+		return smake<T>(renderDevice, filename);
+	}
+
 	template<class T>
 	bool Set(std::string_view name, T& value);
 
-	static sptr<Material> Create(ptr<RenderDevice> renderDevice, std::string_view filename);
+	const std::string& GetName() const;
+
+public:
+	template <class T>
+	struct Handler
+	{
+		Handler(ptr<Material> material, std::string_view name, const T& defaultValue)
+			: m_uniform(nullptr)
+		{
+			auto i = m_nameToUniform.find(name);
+			if (i != m_nameToUniform.end())
+			{
+				m_uniform = &m_uniforms[i->second];
+			}
+		}
 
-/*internal*/ public:
+		Handler& operator=(const T& value)
+		{
+			if (m_uniform != nullptr)
+			{
+				m_uniform->Set(value);
+			}
+			return *this;
+		}
+
+		ptr<Uniform> m_uniform;
+	};
+
+	using Sampler = Handler<sptr<GpuTexture>>;
+	using Float = Handler<sptr<float>>;
+	using Vec2 = Handler<sptr<vec2>>;
+	using Vec3 = Handler<sptr<vec3>>;
+	using Vec4 = Handler<sptr<vec4>>;
+	using Mat2 = Handler<sptr<mat2>>;
+	using Mat3 = Handler<sptr<mat3>>;
+	using Mat4 = Handler<sptr<mat4>>;
+
+RED_LILIUM_INTERNAL:
 	void Use(ptr<RenderContext> context);
-	ptr<VertexDeclaration> GetVertexDeclaration();
 	const sptr<ShaderProgram>& GetShaderProgram();
 
+	template<class T>
+	friend struct Handler;
+
 private:
 	void SetShaderProgram(const sptr<ShaderProgram>& shaderProgram);
 
 	std::vector<Uniform> m_uniforms;
 	std::map<std::string, size_t, std::less<>> m_nameToUniform;
-	ptr<RenderDevice> m_renderDevice;
-	std::string m_filename;
-	ptr<VertexDeclaration> m_vertexDeclaration;
 	sptr<ShaderProgram> m_shaderProgram;
 };
 

Sources/Render/RenderContext.cpp

@@ -25,7 +25,8 @@ void RenderContext::Draw(const sptr<GpuMesh>& mesh, const sptr<Material>& materi
 	UpdateUniformBlocks();
 	material->Use(this);
 
-	ptr<VertexArrayObject> vao = mesh->GetVertexArrayObject(material->GetVertexDeclaration());
+	const sptr<ShaderProgram>& shaderProgram = material->GetShaderProgram();
+	ptr<VertexArrayObject> vao = mesh->GetVertexArrayObject(shaderProgram->GetVertexDeclaration());
 	glBindVertexArray(vao->GetNative());
 	glDrawElements(GL_TRIANGLES, mesh->GetIndicesSize(), GL_UNSIGNED_INT, 0);
 	glBindVertexArray(0);