feat: #47 Add material

skylicht-lab · Jan 12, 2020 · 904a955 · 904a955
1 parent b5588c8
commit 904a955
Show file tree

Hide file tree

Showing 14 changed files with 1,162 additions and 114 deletions.
diff --git a/Projects/Skylicht/Components/Source/LineDraw/CLineDrawData.cpp b/Projects/Skylicht/Components/Source/LineDraw/CLineDrawData.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Material/CShaderManager.h"
+#include "Material/Shader/CShaderManager.h"
 #include "CLineDrawData.h"
 
 namespace Skylicht

diff --git a/Projects/Skylicht/Components/Source/SkyDome/CSkyDomeData.cpp b/Projects/Skylicht/Components/Source/SkyDome/CSkyDomeData.cpp
@@ -24,7 +24,7 @@ This file is part of the "Skylicht Engine".
 
 #include "pch.h"
 #include "CSkyDomeData.h"
-#include "Material/CShaderManager.h"
+#include "Material/Shader/CShaderManager.h"
 
 namespace Skylicht
 {

diff --git a/Projects/Skylicht/Engine/Source/GameObject/CGameObject.h b/Projects/Skylicht/Engine/Source/GameObject/CGameObject.h
@@ -41,7 +41,7 @@ namespace Skylicht
 	public:
 		static long s_objectID;
 		static std::map<long, long> s_mapObjIDOnFileSaved;
-		static bool s_repairIDMode;	
+		static bool s_repairIDMode;
 
 	protected:
 		long m_objectID;
@@ -67,7 +67,7 @@ namespace Skylicht
 		CShaderParams m_shaderParams;
 
 		std::vector<CComponentSystem*> m_components;
-	public:		
+	public:
 		CGameObject(CGameObject *parent, CZone *zone);
 
 		virtual ~CGameObject();
@@ -128,19 +128,24 @@ namespace Skylicht
 		inline void setParent(CGameObject *p)
 		{
 			m_parent = p;
-		}		
-		
+		}
+
 		inline CEntity* getEntity()
 		{
 			return m_entity;
 		}
 
+		inline CShaderParams& getShaderParams()
+		{
+			return m_shaderParams;
+		}
+
 		CEntityManager* getEntityManager();
 
 		CTransform* getTransform();
 
 		CTransformEuler* getTransformEuler();
-		
+
 		inline bool isEnable()
 		{
 			return m_enable;
@@ -179,7 +184,7 @@ namespace Skylicht
 		inline bool isLighting()
 		{
 			return m_lighting;
-		}		
+		}
 
 		inline void setLockObject(bool b)
 		{
@@ -220,14 +225,14 @@ namespace Skylicht
 		{
 			return m_tagDataString.c_str();
 		}
-		
+
 		virtual void updateObject();
 
 		virtual void postUpdateObject();
 
 		virtual void endUpdate();
 
-		virtual void remove();		
+		virtual void remove();
 
 		template<class T>
 		T* addComponent();
@@ -266,7 +271,7 @@ namespace Skylicht
 		m_components.push_back(compSystem);
 
 		compSystem->setOwner(this);
-		compSystem->initComponent();		
+		compSystem->initComponent();
 
 		return newComp;
 	}

diff --git a/Projects/Skylicht/Engine/Source/Graphics2D/CGraphics2D.cpp b/Projects/Skylicht/Engine/Source/Graphics2D/CGraphics2D.cpp
@@ -25,7 +25,7 @@ This file is part of the "Skylicht Engine".
 #include "pch.h"
 
 #include "CGraphics2D.h"
-#include "Material/CShaderManager.h"
+#include "Material/Shader/CShaderManager.h"
 
 #define MAX_VERTICES (128*4)
 #define MAX_INDICES	(128*6)