#123 Implement icon axis (Entity) on Editor

skylicht-lab · May 14, 2022 · c8b283b · c8b283b
1 parent af7c2d2
commit c8b283b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 5 deletions.
diff --git a/Assets/Editor/Icon/Editor/16/axis.png b/Assets/Editor/Icon/Editor/16/axis.png
diff --git a/Assets/Editor/Icon/Editor/16/origin_xyz.png b/Assets/Editor/Icon/Editor/16/origin_xyz.png
diff --git a/Assets/Editor/Icon/Editor/32/axis.png b/Assets/Editor/Icon/Editor/32/axis.png
diff --git a/Assets/Editor/Icon/Editor/32/origin_xyz.png b/Assets/Editor/Icon/Editor/32/origin_xyz.png
diff --git a/Projects/Editor/Source/Editor/SpaceController/CPropertyController.cpp b/Projects/Editor/Source/Editor/SpaceController/CPropertyController.cpp
@@ -128,9 +128,6 @@ namespace Skylicht
 				}
 				else if (object->getType() == CSelectObject::Entity)
 				{
-					// Name and icon
-					spaceProperty->setIcon(GUI::ESystemIcon::Poly);
-
 					// Label on Propety
 					std::wstring label = L"Entity: ";
 
@@ -146,6 +143,12 @@ namespace Skylicht
 						CWorldTransformData* worldTransform = entity->getData<CWorldTransformData>();
 						label += CStringImp::convertUTF8ToUnicode(worldTransform->Name.c_str());
 
+						CRenderMeshData* renderData = entity->getData<CRenderMeshData>();
+						if (renderData != NULL)
+							spaceProperty->setIcon(GUI::ESystemIcon::Poly);
+						else
+							spaceProperty->setIcon(GUI::ESystemIcon::Axis);
+
 						// Activator
 						CEditorActivator* activator = CEditorActivator::getInstance();
 

diff --git a/Projects/Editor/Source/Editor/SpaceController/CSceneController.cpp b/Projects/Editor/Source/Editor/SpaceController/CSceneController.cpp
@@ -377,12 +377,18 @@ namespace Skylicht
 			for (CEntity* entity : entities)
 			{
 				CWorldTransformData* worldData = entity->getData<CWorldTransformData>();
+				CRenderMeshData* renderData = entity->getData<CRenderMeshData>();
 
 				CHierachyNode* parentNode = treeNodes[worldData->ParentIndex];
 
 				CHierachyNode* node = parentNode->addChild();
 				node->setName(CStringImp::convertUTF8ToUnicode(worldData->Name.c_str()).c_str());
-				node->setIcon(GUI::ESystemIcon::Poly);
+
+				if (renderData != NULL)
+					node->setIcon(GUI::ESystemIcon::Poly);
+				else
+					node->setIcon(GUI::ESystemIcon::Axis);
+
 				node->setTagData(entity, CHierachyNode::Entity);
 
 				treeNodes[entity->getIndex()] = node;

diff --git a/Projects/Editor/Source/GUI/Theme/CSkylichtTheme.cpp b/Projects/Editor/Source/GUI/Theme/CSkylichtTheme.cpp
@@ -227,6 +227,8 @@ namespace Skylicht
 				addEditorIcon(ESystemIcon::Scale, "tool_scale.png");
 				addEditorIcon(ESystemIcon::ViewSelect, "view_select.png");
 				addEditorIcon(ESystemIcon::ViewHand, "view_hand.png");
+				addEditorIcon(ESystemIcon::Axis, "axis.png");
+				addEditorIcon(ESystemIcon::OriginXYZ, "origin_xyz.png");
 			}
 
 			void CSkylichtTheme::addSystemIcon(ESystemIcon type, const char* name)

diff --git a/Projects/Editor/Source/GUI/Type.h b/Projects/Editor/Source/GUI/Type.h
@@ -501,6 +501,8 @@ namespace Skylicht
 				ObjectRect,
 				ObjectSphere,
 				ObjectTorus,
+				Axis,
+				OriginXYZ,
 				Move,
 				Rotate,
 				Scale,

diff --git a/Projects/Skylicht/Engine/Source/Entity/CEntityHandler.cpp b/Projects/Skylicht/Engine/Source/Entity/CEntityHandler.cpp
@@ -134,7 +134,7 @@ namespace Skylicht
 		for (int i = 0; i < count; i++)
 		{
 			CEntity* entity = entities[i];
-			CWorldTransformData* transformData = entity->addData<CWorldTransformData>();
+			CWorldTransformData* transformData = entity->getData<CWorldTransformData>();
 
 			// assign name
 			if (transformData != NULL && transformData->Name.empty())