feat: #47 Fix build error

skylicht-lab · Jan 12, 2020 · b5588c8 · b5588c8
1 parent 4d8a876
commit b5588c8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/Projects/Skylicht/Engine/Source/Material/Shader/CShader.h b/Projects/Skylicht/Engine/Source/Material/Shader/CShader.h
@@ -89,21 +89,21 @@ namespace Skylicht
 			std::string Name;
 			EUniformType Type;
 
-			int			ValueIndex;
-			float		Value[16];
-			int			FloatSize;
-			int			ArraySize;
-			bool		IsMatrix;
+			int	ValueIndex;
+			float Value[16];
+			int FloatSize;
+			int ArraySize;
+			bool IsMatrix;
 
-			int			SizeOfUniform;
+			int SizeOfUniform;
 
-			bool		OpenGL;
-			bool		DirectX;
+			bool OpenGL;
+			bool DirectX;
 
-			int			UniformShaderID;
+			int UniformShaderID;
 
-			float		Min;
-			float		Max;
+			float Min;
+			float Max;
 
 			SUniform()
 			{
@@ -179,9 +179,9 @@ namespace Skylicht
 
 		struct SResource
 		{
-			std::string		Name;
-			EResourceType	Type;
-			std::string		Path;
+			std::string	Name;
+			std::string	Path;
+			EResourceType Type;
 		};
 
 		struct SShader
@@ -197,16 +197,16 @@ namespace Skylicht
 		};
 
 	protected:
-		std::string		m_name;
-		std::string		m_shaderPath;
-		std::string		m_writeDepth;
+		std::string	m_name;
+		std::string	m_shaderPath;
+		std::string	m_writeDepth;
 
-		core::array<SUniform>		m_vsUniforms;
-		core::array<SUniform>		m_fsUniforms;
-		core::array<SUniformUI*>	m_ui;
-		core::array<SResource*>		m_resources;
+		core::array<SUniform> m_vsUniforms;
+		core::array<SUniform> m_fsUniforms;
+		core::array<SUniformUI*> m_ui;
+		core::array<SResource*> m_resources;
 
-		core::array<SAttributeMapping>	m_attributeMapping;
+		core::array<SAttributeMapping> m_attributeMapping;
 
 		SUniform* m_listVSUniforms;
 		SUniform* m_listFSUniforms;
@@ -326,6 +326,7 @@ namespace Skylicht
 		}
 
 	public:
+
 		// shader callback
 		virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData, bool updateTransform);
 

diff --git a/Projects/Skylicht/Engine/Source/MeshManager/CMeshManager.cpp b/Projects/Skylicht/Engine/Source/MeshManager/CMeshManager.cpp
@@ -4,8 +4,8 @@
 
 #include "Importer/Collada/CColladaLoader.h"
 #include "RenderMesh/CRenderMeshData.h"
-#include "Material/CShaderManager.h"
-#include "Material/CShader.h"
+#include "Material/Shader/CShaderManager.h"
+#include "Material/Shader/CShader.h"
 
 namespace Skylicht
 {