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/OptionsWindow.cpp
+33
View File
@@ -325,6 +325,7 @@ void OptionsWindow::Create(EditorComponent* _editor)
filterCombo.AddItem("Collider " ICON_COLLIDER, (uint64_t)Filter::Collider);
filterCombo.AddItem("Script " ICON_SCRIPT, (uint64_t)Filter::Script);
filterCombo.AddItem("Expression " ICON_EXPRESSION, (uint64_t)Filter::Expression);
filterCombo.AddItem("Humanoid " ICON_HUMANOID, (uint64_t)Filter::Humanoid);
filterCombo.AddItem("Terrain " ICON_TERRAIN, (uint64_t)Filter::Terrain);
filterCombo.SetTooltip("Apply filtering to the Entities");
filterCombo.OnSelect([&](wi::gui::EventArgs args) {
@@ -555,6 +556,18 @@ void OptionsWindow::Create(EditorComponent* _editor)
editor->componentsWnd.weatherWnd.default_sky_horizon = dark_point;
editor->componentsWnd.weatherWnd.default_sky_zenith = theme_color_idle;
if ((Theme)args.userdata == Theme::Bright)
{
editor->inactiveEntityColor = theme_color_focus;
editor->hoveredEntityColor = theme_color_focus;
}
else
{
editor->inactiveEntityColor = theme.font.color;
editor->hoveredEntityColor = theme.font.color;
}
editor->inactiveEntityColor.setA(150);
});
AddWidget(&themeCombo);
@@ -727,6 +740,10 @@ void OptionsWindow::PushToEntityTree(wi::ecs::Entity entity, int level)
{
item.name += ICON_ARMATURE " ";
}
if (scene.humanoids.Contains(entity))
{
item.name += ICON_HUMANOID " ";
}
if (scene.lights.Contains(entity))
{
const LightComponent* light = scene.lights.GetComponent(entity);
@@ -1027,6 +1044,14 @@ void OptionsWindow::RefreshEntityTree()
}
}
if (has_flag(filter, Filter::Humanoid))
{
for (size_t i = 0; i < scene.humanoids.GetCount(); ++i)
{
PushToEntityTree(scene.humanoids.GetEntity(i), 0);
}
}
if (has_flag(filter, Filter::Expression))
{
for (size_t i = 0; i < scene.expressions.GetCount(); ++i)
@@ -1035,6 +1060,14 @@ void OptionsWindow::RefreshEntityTree()
}
}
if (has_flag(filter, Filter::Terrain))
{
for (size_t i = 0; i < scene.terrains.GetCount(); ++i)
{
PushToEntityTree(scene.terrains.GetEntity(i), 0);
}
}
entitytree_added_items.clear();
entitytree_opened_items.clear();
}