feat: #47 Rename world inverse

skylicht-lab · Jan 13, 2020 · 249552f · 249552f
1 parent 61d0be4
commit 249552f
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 38 deletions.
diff --git a/BuildCommand/BuildEmscripten.cmd b/BuildCommand/BuildEmscripten.cmd
@@ -1,5 +1,5 @@
 cd..
-call C:\emsdk\emsdk_env.bat
+call C:\Devtools\emsdk\emsdk_env.bat
 call emcmake cmake -S . -B ./PrjEmscripten
 cd Assets
 python BuildAssetBundles.py

diff --git a/Projects/Skylicht/Engine/Source/Culling/CCullingSystem.cpp b/Projects/Skylicht/Engine/Source/Culling/CCullingSystem.cpp
@@ -57,7 +57,7 @@ namespace Skylicht
 			if (mesh != NULL)
 			{
 				CWorldTransformData *transform = entity->getData<CWorldTransformData>();
-				CWorldInvTransformData *invTransform = entity->getData<CWorldInvTransformData>();
+				CWorldInverseTransformData *invTransform = entity->getData<CWorldInverseTransformData>();
 
 				if (transform != NULL)
 				{
@@ -80,7 +80,7 @@ namespace Skylicht
 		CCullingData **cullings = m_cullings.pointer();
 		CRenderMeshData **meshs = m_meshs.pointer();
 		CWorldTransformData **transforms = m_transforms.pointer();
-		CWorldInvTransformData **invTransforms = m_invTransforms.pointer();
+		CWorldInverseTransformData **invTransforms = m_invTransforms.pointer();
 
 		core::matrix4 invTrans;
 
@@ -90,7 +90,7 @@ namespace Skylicht
 			// get mesh bbox
 			CCullingData *culling = cullings[i];
 			CWorldTransformData *transform = transforms[i];
-			CWorldInvTransformData *invTransform = invTransforms[i];
+			CWorldInverseTransformData *invTransform = invTransforms[i];
 			CRenderMeshData *mesh = meshs[i];
 
 			// transform world bbox

diff --git a/Projects/Skylicht/Engine/Source/Culling/CCullingSystem.h b/Projects/Skylicht/Engine/Source/Culling/CCullingSystem.h
@@ -27,7 +27,7 @@ This file is part of the "Skylicht Engine".
 #include "CCullingData.h"
 #include "Entity/IRenderSystem.h"
 #include "Transform/CWorldTransformData.h"
-#include "Transform/CWorldInvTransformData.h"
+#include "Transform/CWorldInverseTransformData.h"
 #include "RenderMesh/CRenderMeshData.h"
 
 namespace Skylicht
@@ -37,7 +37,7 @@ namespace Skylicht
 	protected:
 		core::array<CCullingData*> m_cullings;
 		core::array<CWorldTransformData*> m_transforms;
-		core::array<CWorldInvTransformData*> m_invTransforms;
+		core::array<CWorldInverseTransformData*> m_invTransforms;
 		core::array<CRenderMeshData*> m_meshs;
 
 	public:

diff --git a/Projects/Skylicht/Engine/Source/Entity/CEntityManager.cpp b/Projects/Skylicht/Engine/Source/Entity/CEntityManager.cpp
@@ -27,7 +27,7 @@ This file is part of the "Skylicht Engine".
 
 #include "Transform/CTransformComponentSystem.h"
 #include "Transform/CWorldTransformSystem.h"
-#include "Transform/CWorldInvTransformSystem.h"
+#include "Transform/CWorldInverseTransformSystem.h"
 #include "RenderMesh/CMeshRenderer.h"
 #include "RenderMesh/CSkinnedMeshRenderer.h"
 #include "RenderMesh/CJointAnimationSystem.h"
@@ -42,7 +42,7 @@ namespace Skylicht
 	{
 		addSystem<CComponentTransformSystem>();
 		addSystem<CWorldTransformSystem>();
-		addSystem<CWorldInvTransformSystem>();
+		addSystem<CWorldInverseTransformSystem>();
 		addSystem<CJointAnimationSystem>();
 		addSystem<CSkinnedMeshSystem>();
 		addRenderSystem<CCullingSystem>();

diff --git a/Projects/Skylicht/Engine/Source/RenderMesh/CJointAnimationSystem.cpp b/Projects/Skylicht/Engine/Source/RenderMesh/CJointAnimationSystem.cpp
@@ -51,7 +51,7 @@ namespace Skylicht
 		if (joint != NULL && joint->RootIndex != 0)
 		{
 			CWorldTransformData *transform = entity->getData<CWorldTransformData>();
-			CWorldInvTransformData *rootInvTransform = entityManager->getEntity(joint->RootIndex)->getData<CWorldInvTransformData>();
+			CWorldInverseTransformData *rootInvTransform = entityManager->getEntity(joint->RootIndex)->getData<CWorldInverseTransformData>();
 
 			if (transform != NULL && rootInvTransform != NULL)
 			{
@@ -71,7 +71,7 @@ namespace Skylicht
 	{
 		CJointData **joints = m_joints.pointer();
 		CWorldTransformData **transforms = m_transforms.pointer();
-		CWorldInvTransformData **rootInvTransform = m_rootInvTransform.pointer();
+		CWorldInverseTransformData **rootInvTransform = m_rootInvTransform.pointer();
 
 		// calc animation matrix for CSkinnedMeshSystem
 		for (u32 i = 0, n = m_joints.size(); i < n; i++)

diff --git a/Projects/Skylicht/Engine/Source/RenderMesh/CJointAnimationSystem.h b/Projects/Skylicht/Engine/Source/RenderMesh/CJointAnimationSystem.h
@@ -26,7 +26,7 @@ This file is part of the "Skylicht Engine".
 
 #include "Entity/IEntitySystem.h"
 #include "Transform/CWorldTransformData.h"
-#include "Transform/CWorldInvTransformData.h"
+#include "Transform/CWorldInverseTransformData.h"
 #include "CJointData.h"
 
 namespace Skylicht
@@ -36,7 +36,7 @@ namespace Skylicht
 	protected:
 		core::array<CJointData*> m_joints;
 		core::array<CWorldTransformData*> m_transforms;
-		core::array<CWorldInvTransformData*> m_rootInvTransform;
+		core::array<CWorldInverseTransformData*> m_rootInvTransform;
 
 	public:
 		CJointAnimationSystem();

diff --git a/Projects/Skylicht/Engine/Source/RenderMesh/CRenderMesh.cpp b/Projects/Skylicht/Engine/Source/RenderMesh/CRenderMesh.cpp
@@ -28,7 +28,7 @@ This file is part of the "Skylicht Engine".
 #include "Entity/CEntityManager.h"
 
 #include "Transform/CWorldTransformData.h"
-#include "Transform/CWorldInvTransformSystem.h"
+#include "Transform/CWorldInverseTransformSystem.h"
 #include "RenderMesh/CRenderMeshData.h"
 #include "RenderMesh/CJointData.h"
 #include "Culling/CCullingData.h"
@@ -121,7 +121,7 @@ namespace Skylicht
 				m_renderers.push_back(spawnRender);
 
 				// add world inv transform for culling system
-				spawnEntity->addData<CWorldInvTransformData>();
+				spawnEntity->addData<CWorldInverseTransformData>();
 			}
 
 			// copy culling data
@@ -181,8 +181,8 @@ namespace Skylicht
 
 				if (addInvData == false)
 				{
-					if (m_root->getData<CWorldInvTransformData>() == NULL)
-						m_root->addData<CWorldInvTransformData>();
+					if (m_root->getData<CWorldInverseTransformData>() == NULL)
+						m_root->addData<CWorldInverseTransformData>();
 					addInvData = true;
 				}
 			}

diff --git a/...urce/Transform/CWorldInvTransformData.cpp → .../Transform/CWorldInverseTransformData.cpp b/...urce/Transform/CWorldInvTransformData.cpp → .../Transform/CWorldInverseTransformData.cpp
@@ -23,15 +23,15 @@ This file is part of the "Skylicht Engine".
 */
 
 #include "pch.h"
-#include "CWorldInvTransformData.h"
+#include "CWorldInverseTransformData.h"
 
 namespace Skylicht
 {
-	CWorldInvTransformData::CWorldInvTransformData()
+	CWorldInverseTransformData::CWorldInverseTransformData()
 	{
 	}
 
-	CWorldInvTransformData::~CWorldInvTransformData()
+	CWorldInverseTransformData::~CWorldInverseTransformData()
 	{
 
 	}

diff --git a/...Source/Transform/CWorldInvTransformData.h → ...ce/Transform/CWorldInverseTransformData.h b/...Source/Transform/CWorldInvTransformData.h → ...ce/Transform/CWorldInverseTransformData.h
@@ -28,15 +28,15 @@ This file is part of the "Skylicht Engine".
 
 namespace Skylicht
 {
-	class CWorldInvTransformData : public IEntityData
+	class CWorldInverseTransformData : public IEntityData
 	{
 	public:
 		core::matrix4 WorldInverse;
 		bool HasChanged;
 
 	public:
-		CWorldInvTransformData();
+		CWorldInverseTransformData();
 
-		virtual ~CWorldInvTransformData();
+		virtual ~CWorldInverseTransformData();
 	};
 }
diff --git a/...ce/Transform/CWorldInvTransformSystem.cpp → ...ransform/CWorldInverseTransformSystem.cpp b/...ce/Transform/CWorldInvTransformSystem.cpp → ...ransform/CWorldInverseTransformSystem.cpp
@@ -23,29 +23,29 @@ This file is part of the "Skylicht Engine".
 */
 
 #include "pch.h"
-#include "CWorldInvTransformSystem.h"
+#include "CWorldInverseTransformSystem.h"
 #include "Entity/CEntityManager.h"
 #include "Transform/CTransform.h"
 
 namespace Skylicht
 {
-	CWorldInvTransformSystem::CWorldInvTransformSystem()
+	CWorldInverseTransformSystem::CWorldInverseTransformSystem()
 	{
 	}
 
-	CWorldInvTransformSystem::~CWorldInvTransformSystem()
+	CWorldInverseTransformSystem::~CWorldInverseTransformSystem()
 	{
 	}
 
-	void CWorldInvTransformSystem::beginQuery()
+	void CWorldInverseTransformSystem::beginQuery()
 	{
 		m_world.set_used(0);
 		m_worldInv.set_used(0);
 	}
 
-	void CWorldInvTransformSystem::onQuery(CEntityManager *entityManager, CEntity *entity)
+	void CWorldInverseTransformSystem::onQuery(CEntityManager *entityManager, CEntity *entity)
 	{
-		CWorldInvTransformData *worldInv = entity->getData<CWorldInvTransformData>();
+		CWorldInverseTransformData *worldInv = entity->getData<CWorldInverseTransformData>();
 		if (worldInv != NULL && worldInv->HasChanged == true)
 		{
 			CWorldTransformData *world = entity->getData<CWorldTransformData>();
@@ -57,15 +57,15 @@ namespace Skylicht
 		}
 	}
 
-	void CWorldInvTransformSystem::init(CEntityManager *entityManager)
+	void CWorldInverseTransformSystem::init(CEntityManager *entityManager)
 	{
 
 	}
 
-	void CWorldInvTransformSystem::update(CEntityManager *entityManager)
+	void CWorldInverseTransformSystem::update(CEntityManager *entityManager)
 	{
 		CWorldTransformData **worlds = m_world.pointer();
-		CWorldInvTransformData **worldInvs = m_worldInv.pointer();
+		CWorldInverseTransformData **worldInvs = m_worldInv.pointer();
 
 		for (u32 i = 0, n = m_world.size(); i < n; i++)
 		{

diff --git a/...urce/Transform/CWorldInvTransformSystem.h → .../Transform/CWorldInverseTransformSystem.h b/...urce/Transform/CWorldInvTransformSystem.h → .../Transform/CWorldInverseTransformSystem.h
@@ -25,21 +25,21 @@ This file is part of the "Skylicht Engine".
 #pragma once
 
 #include "CWorldTransformData.h"
-#include "CWorldInvTransformData.h"
+#include "CWorldInverseTransformData.h"
 #include "Entity/IEntitySystem.h"
 
 namespace Skylicht
 {
-	class CWorldInvTransformSystem : public IEntitySystem
+	class CWorldInverseTransformSystem : public IEntitySystem
 	{
 	protected:
 		core::array<CWorldTransformData*> m_world;
-		core::array<CWorldInvTransformData*> m_worldInv;		
+		core::array<CWorldInverseTransformData*> m_worldInv;		
 
 	public:
-		CWorldInvTransformSystem();
+		CWorldInverseTransformSystem();
 
-		virtual ~CWorldInvTransformSystem();
+		virtual ~CWorldInverseTransformSystem();
 
 		virtual void beginQuery();
 

diff --git a/Projects/Skylicht/Engine/Source/Transform/CWorldTransformSystem.cpp b/Projects/Skylicht/Engine/Source/Transform/CWorldTransformSystem.cpp
@@ -24,7 +24,7 @@ This file is part of the "Skylicht Engine".
 
 #include "pch.h"
 #include "CWorldTransformSystem.h"
-#include "CWorldInvTransformData.h"
+#include "CWorldInverseTransformData.h"
 #include "Entity/CEntityManager.h"
 #include "Transform/CTransform.h"
 
@@ -56,7 +56,7 @@ namespace Skylicht
 		if (t == NULL)
 			return;
 
-		CWorldInvTransformData* tInverse = entity->getData<CWorldInvTransformData>();
+		CWorldInverseTransformData* tInverse = entity->getData<CWorldInverseTransformData>();
 
 		if (t->Depth > m_maxDepth)
 			m_maxDepth = t->Depth;