nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

armature window, object window meshID selection (#542)

Browse Source 
* armature window, object window meshID selection

* fixes, default blink applied
This commit is contained in:
Turánszki János
2022-08-29 12:03:30 +02:00
committed by GitHub
parent ac4fc8540d
commit 6a2173f699
11 changed files with 298 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/ComponentsWindow.cpp
+16 -1
View File
@@ -39,6 +39,7 @@ void ComponentsWindow::Create(EditorComponent* _editor)
hierarchyWnd.Create(editor);
cameraComponentWnd.Create(editor);
expressionWnd.Create(editor);
armatureWnd.Create(editor);
newComponentCombo.Create("Add: ");
@@ -299,6 +300,7 @@ void ComponentsWindow::Create(EditorComponent* _editor)
AddWidget(&hierarchyWnd);
AddWidget(&cameraComponentWnd);
AddWidget(&expressionWnd);
AddWidget(&armatureWnd);
materialWnd.SetVisible(false);
weatherWnd.SetVisible(false);
@@ -324,7 +326,7 @@ void ComponentsWindow::Create(EditorComponent* _editor)
hierarchyWnd.SetVisible(false);
cameraComponentWnd.SetVisible(false);
expressionWnd.SetVisible(false);
armatureWnd.SetVisible(false);
SetSize(editor->optionsWnd.GetSize());
}
@@ -679,4 +681,17 @@ void ComponentsWindow::ResizeLayout()
{
expressionWnd.SetVisible(false);
}
if (scene.armatures.Contains(armatureWnd.entity))
{
armatureWnd.SetVisible(true);
armatureWnd.SetPos(pos);
armatureWnd.SetSize(XMFLOAT2(width, armatureWnd.GetScale().y));
pos.y += armatureWnd.GetSize().y;
pos.y += padding;
}
else
{
armatureWnd.SetVisible(false);
}
}