Normalized line ending

Former-commit-id: bd061c48bdc8f0d26159dac3b41017defef5ae1e
2012-09-21 14:24:48 +02:00
parent 4b3772e2d8
commit a73cd1374a
72 changed files with 25415 additions and 25415 deletions
--- a/src/Nazara/Renderer/GLSLShader.hpp
+++ b/src/Nazara/Renderer/GLSLShader.hpp
@@ -1,81 +1,81 @@
-// 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_GLSLSHADER_HPP
-#define NAZARA_GLSLSHADER_HPP
-
-#include <Nazara/Core/ResourceListener.hpp>
-#include <Nazara/Core/String.hpp>
-#include <Nazara/Renderer/OpenGL.hpp>
-#include <Nazara/Renderer/Shader.hpp>
-#include <Nazara/Renderer/ShaderImpl.hpp>
-#include <map>
-
-class NzResource;
-
-class NzGLSLShader : public NzShaderImpl, NzResourceListener
-{
-	public:
-		NzGLSLShader(NzShader* parent);
-		~NzGLSLShader();
-
-		bool Bind();
-		bool BindTextures();
-
-		bool Compile();
-
-		bool Create();
-		void Destroy();
-
-		NzString GetLog() const;
-		nzShaderLanguage GetLanguage() const;
-		NzString GetSourceCode(nzShaderType type) const;
-		int GetUniformLocation(const NzString& name) const;
-
-		bool IsLoaded(nzShaderType type) const;
-
-		bool Load(nzShaderType type, const NzString& source);
-		bool Lock();
-
-		bool SendBoolean(int location, bool value);
-		bool SendDouble(int location, double value);
-		bool SendFloat(int location, float value);
-		bool SendInteger(int location, int value);
-		bool SendMatrix(int location, const NzMatrix4d& matrix);
-		bool SendMatrix(int location, const NzMatrix4f& matrix);
-		bool SendTexture(int location, const NzTexture* texture);
-		bool SendVector(int location, const NzVector2d& vector);
-		bool SendVector(int location, const NzVector2f& vector);
-		bool SendVector(int location, const NzVector3d& vector);
-		bool SendVector(int location, const NzVector3f& vector);
-		bool SendVector(int location, const NzVector4d& vector);
-		bool SendVector(int location, const NzVector4f& vector);
-
-		void Unbind();
-		void Unlock();
-
-	private:
-		void OnResourceCreated(const NzResource* resource, int index) override;
-		void OnResourceDestroy(const NzResource* resource, int index) override;
-		void OnResourceReleased(const NzResource* resource, int index) override;
-
-		struct TextureSlot
-		{
-			bool enabled;
-			bool updated = false;
-			nzUInt8 unit;
-			const NzTexture* texture;
-		};
-
-		mutable std::map<NzString, GLint> m_idCache;
-		std::map<GLint, TextureSlot> m_textures;
-		GLuint m_program;
-		GLuint m_shaders[nzShaderType_Max+1];
-		NzShader* m_parent;
-		NzString m_log;
-};
-
-#endif // NAZARA_GLSLSHADER_HPPs
+// 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_GLSLSHADER_HPP
+#define NAZARA_GLSLSHADER_HPP
+
+#include <Nazara/Core/ResourceListener.hpp>
+#include <Nazara/Core/String.hpp>
+#include <Nazara/Renderer/OpenGL.hpp>
+#include <Nazara/Renderer/Shader.hpp>
+#include <Nazara/Renderer/ShaderImpl.hpp>
+#include <map>
+
+class NzResource;
+
+class NzGLSLShader : public NzShaderImpl, NzResourceListener
+{
+	public:
+		NzGLSLShader(NzShader* parent);
+		~NzGLSLShader();
+
+		bool Bind();
+		bool BindTextures();
+
+		bool Compile();
+
+		bool Create();
+		void Destroy();
+
+		NzString GetLog() const;
+		nzShaderLanguage GetLanguage() const;
+		NzString GetSourceCode(nzShaderType type) const;
+		int GetUniformLocation(const NzString& name) const;
+
+		bool IsLoaded(nzShaderType type) const;
+
+		bool Load(nzShaderType type, const NzString& source);
+		bool Lock();
+
+		bool SendBoolean(int location, bool value);
+		bool SendDouble(int location, double value);
+		bool SendFloat(int location, float value);
+		bool SendInteger(int location, int value);
+		bool SendMatrix(int location, const NzMatrix4d& matrix);
+		bool SendMatrix(int location, const NzMatrix4f& matrix);
+		bool SendTexture(int location, const NzTexture* texture);
+		bool SendVector(int location, const NzVector2d& vector);
+		bool SendVector(int location, const NzVector2f& vector);
+		bool SendVector(int location, const NzVector3d& vector);
+		bool SendVector(int location, const NzVector3f& vector);
+		bool SendVector(int location, const NzVector4d& vector);
+		bool SendVector(int location, const NzVector4f& vector);
+
+		void Unbind();
+		void Unlock();
+
+	private:
+		void OnResourceCreated(const NzResource* resource, int index) override;
+		void OnResourceDestroy(const NzResource* resource, int index) override;
+		void OnResourceReleased(const NzResource* resource, int index) override;
+
+		struct TextureSlot
+		{
+			bool enabled;
+			bool updated = false;
+			nzUInt8 unit;
+			const NzTexture* texture;
+		};
+
+		mutable std::map<NzString, GLint> m_idCache;
+		std::map<GLint, TextureSlot> m_textures;
+		GLuint m_program;
+		GLuint m_shaders[nzShaderType_Max+1];
+		NzShader* m_parent;
+		NzString m_log;
+};
+
+#endif // NAZARA_GLSLSHADER_HPPs