Merge remote-tracking branch 'origin/3D-Engine'

Former-commit-id: 1781615fc780accbe6c11d55fd896038d97ffec9
2012-11-29 10:11:30 +01:00
parent f1b1d2c7a2 2e26d52248
commit 0a2e19fa22
27 changed files with 831 additions and 333 deletions
--- a/include/Nazara/Renderer/Material.hpp
+++ b/include/Nazara/Renderer/Material.hpp
@@ -0,0 +1,95 @@
+// Copyright (C) 2012 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Renderer module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#pragma once
+
+#ifndef NAZARA_MATERIAL_HPP
+#define NAZARA_MATERIAL_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/Color.hpp>
+#include <Nazara/Core/ResourceLoader.hpp>
+#include <Nazara/Renderer/Enums.hpp>
+#include <Nazara/Renderer/Texture.hpp>
+
+struct NAZARA_API NzMaterialParams
+{
+	bool loadDiffuseMap = true;
+	bool loadSpecularMap = true;
+
+	bool IsValid() const;
+};
+
+class NzMaterial;
+
+using NzMaterialLoader = NzResourceLoader<NzMaterial, NzMaterialParams>;
+
+class NAZARA_API NzMaterial : public NzResource
+{
+	friend NzMaterialLoader;
+
+	public:
+		NzMaterial();
+		~NzMaterial();
+
+		void EnableAlphaBlending(bool alphaBlending);
+		void EnableZTest(bool zTest);
+		void EnableZWrite(bool zWrite);
+
+		NzColor GetAmbientColor() const;
+		NzColor GetDiffuseColor() const;
+		const NzTexture* GetDiffuseMap() const;
+		nzBlendFunc GetDstAlpha() const;
+		nzFaceCulling GetFaceCulling() const;
+		nzFaceFilling GetFaceFilling() const;
+		float GetShininess() const;
+		NzColor GetSpecularColor() const;
+		const NzTexture* GetSpecularMap() const;
+		nzBlendFunc GetSrcAlpha() const;
+		nzRendererComparison GetZTestCompare() const;
+
+		bool IsAlphaBlendingEnabled() const;
+		bool IsZTestEnabled() const;
+		bool IsZWriteEnabled() const;
+
+		bool LoadFromFile(const NzString& filePath, const NzMaterialParams& params = NzMaterialParams());
+		bool LoadFromMemory(const void* data, std::size_t size, const NzMaterialParams& params = NzMaterialParams());
+		bool LoadFromStream(NzInputStream& stream, const NzMaterialParams& params = NzMaterialParams());
+
+		void Reset();
+
+		void SetAmbientColor(const NzColor& ambient);
+		void SetDiffuseColor(const NzColor& diffuse);
+		void SetDiffuseMap(const NzTexture* map);
+		void SetDstAlpha(nzBlendFunc func);
+		void SetFaceCulling(nzFaceCulling culling);
+		void SetFaceFilling(nzFaceFilling filling);
+		void SetShininess(float shininess);
+		void SetSpecularColor(const NzColor& specular);
+		void SetSpecularMap(const NzTexture* map);
+		void SetSrcAlpha(nzBlendFunc func);
+		void SetZTestCompare(nzRendererComparison compareFunc);
+
+		static const NzMaterial* GetDefault();
+
+	private:
+		nzBlendFunc m_dstAlpha;
+		nzBlendFunc m_srcAlpha;
+		nzFaceCulling m_faceCulling;
+		nzFaceFilling m_faceFilling;
+		nzRendererComparison m_zTestCompareFunc;
+		NzColor m_ambientColor;
+		NzColor m_diffuseColor;
+		NzColor m_specularColor;
+		const NzTexture* m_diffuseMap;
+		const NzTexture* m_specularMap;
+		bool m_alphaBlendingEnabled;
+		bool m_zTestEnabled;
+		bool m_zWriteEnabled;
+		float m_shininess;
+
+		static NzMaterialLoader::LoaderList s_loaders;
+};
+
+#endif // NAZARA_MATERIAL_HPP