Timeline panel support edit color #1259

timi-liuliang · Jun 10, 2023 · 2a7145e · 2a7145e
1 parent 70ec46b
commit 2a7145e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/engine/modules/anim/anim_timeline.cpp b/engine/modules/anim/anim_timeline.cpp
@@ -513,6 +513,8 @@ namespace Echo
 		{
 		case Variant::Type::Bool:			return AnimProperty::Type::Bool;
 		case Variant::Type::Vector3:		return AnimProperty::Type::Vector3;
+		case Variant::Type::Vector4:		return AnimProperty::Type::Vector4;
+		case Variant::Type::Color:			return AnimProperty::Type::Vector4;
 		case Variant::Type::ResourcePath:	return AnimProperty::Type::String;
 		case Variant::Type::Object:			return AnimProperty::Type::Object;
 		default:							return AnimProperty::Type::Unknown;

diff --git a/engine/modules/anim/editor/TimelinePanel/TimelinePanel.cpp b/engine/modules/anim/editor/TimelinePanel/TimelinePanel.cpp
@@ -441,14 +441,15 @@ namespace Echo
 				Node* node = m_timeline->getNode(text.c_str());
 				if (node)
 				{
+					String nodeRelativePath = node->getNodePathRelativeTo(m_timeline);
 					String propertyName = Editor::instance()->selectAProperty(node);
 					if (!propertyName.empty())
 					{
 						propertyChain.insert(propertyChain.begin(), propertyName);
-						AnimProperty::Type propertyType = m_timeline->getAnimPropertyType(node->getNodePathRelativeTo(m_timeline), propertyChain);
+						AnimProperty::Type propertyType = m_timeline->getAnimPropertyType(nodeRelativePath, propertyChain);
 						if (propertyType != AnimProperty::Type::Unknown)
 						{
-							m_timeline->addProperty(m_currentEditAnim, node->getNodePathRelativeTo(m_timeline), propertyChain, propertyType);
+							m_timeline->addProperty(m_currentEditAnim, nodeRelativePath, propertyChain, propertyType);
 
 							// addNodePropertyToEditor;
 							QTreeWidgetItem* propertyItem = new QTreeWidgetItem;