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

VRM humanoid data import (#567)

Browse Source 
* VRMhumanoid data import

* linux fix

* humanoid lookAt

* updates

* mouse look improvement

* head size

* theme color affects picker entity icons

* eye lookat

* blinking more random, collider aabb checks

* improvements

* editor: use humanoid information to improve bone picking
This commit is contained in:
Turánszki János
2022-09-16 15:05:23 +02:00
committed by GitHub
parent 6c69ad82a9
commit 6151fd82e6
25 changed files with 1742 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/ComponentsWindow.cpp
+29 -13
View File
@@ -40,6 +40,7 @@ void ComponentsWindow::Create(EditorComponent* _editor)
cameraComponentWnd.Create(editor);
expressionWnd.Create(editor);
armatureWnd.Create(editor);
humanoidWnd.Create(editor);
terrainWnd.Create(editor);
@@ -316,6 +317,7 @@ void ComponentsWindow::Create(EditorComponent* _editor)
AddWidget(&cameraComponentWnd);
AddWidget(&expressionWnd);
AddWidget(&armatureWnd);
AddWidget(&humanoidWnd);
AddWidget(&terrainWnd);
materialWnd.SetVisible(false);
@@ -343,6 +345,7 @@ void ComponentsWindow::Create(EditorComponent* _editor)
cameraComponentWnd.SetVisible(false);
expressionWnd.SetVisible(false);
armatureWnd.SetVisible(false);
humanoidWnd.SetVisible(false);
terrainWnd.SetVisible(false);
SetSize(editor->optionsWnd.GetSize());
@@ -686,19 +689,6 @@ void ComponentsWindow::ResizeLayout()
scriptWnd.SetVisible(false);
}
if (scene.expressions.Contains(expressionWnd.entity))
{
expressionWnd.SetVisible(true);
expressionWnd.SetPos(pos);
expressionWnd.SetSize(XMFLOAT2(width, expressionWnd.GetScale().y));
pos.y += expressionWnd.GetSize().y;
pos.y += padding;
}
else
{
expressionWnd.SetVisible(false);
}
if (scene.armatures.Contains(armatureWnd.entity))
{
armatureWnd.SetVisible(true);
@@ -712,6 +702,32 @@ void ComponentsWindow::ResizeLayout()
armatureWnd.SetVisible(false);
}
if (scene.humanoids.Contains(humanoidWnd.entity))
{
humanoidWnd.SetVisible(true);
humanoidWnd.SetPos(pos);
humanoidWnd.SetSize(XMFLOAT2(width, humanoidWnd.GetScale().y));
pos.y += humanoidWnd.GetSize().y;
pos.y += padding;
}
else
{
humanoidWnd.SetVisible(false);
}
if (scene.expressions.Contains(expressionWnd.entity))
{
expressionWnd.SetVisible(true);
expressionWnd.SetPos(pos);
expressionWnd.SetSize(XMFLOAT2(width, expressionWnd.GetScale().y));
pos.y += expressionWnd.GetSize().y;
pos.y += padding;
}
else
{
expressionWnd.SetVisible(false);
}
if (scene.terrains.Contains(terrainWnd.entity))
{
terrainWnd.SetVisible(true);