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

some improvements here and there

Browse Source
This commit is contained in:
Turánszki János
2024-06-08 06:14:00 +02:00
parent 6b41ec3b65
commit 99d6cc552e
7 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/HumanoidWindow.cpp
+25 -25
View File
@@ -505,31 +505,6 @@ void HumanoidWindow::RefreshBoneList()
}
}
void HumanoidWindow::Update(const wi::Canvas& canvas, float dt)
{
wi::gui::Window::Update(canvas, dt);
if (lookatMouseCheckBox.GetCheck())
{
Scene& scene = editor->GetCurrentScene();
const CameraComponent& camera = editor->GetCurrentEditorScene().camera;
wi::primitive::Ray ray = editor->pickRay;
for (size_t i = 0; i < scene.humanoids.GetCount(); ++i)
{
HumanoidComponent& humanoid = scene.humanoids[i];
Entity bone = humanoid.bones[size_t(HumanoidComponent::HumanoidBone::Head)];
const TransformComponent* transform = scene.transforms.GetComponent(bone);
if (transform != nullptr)
{
float dist = wi::math::Distance(transform->GetPosition(), ray.origin);
dist = std::min(1.0f, dist);
XMStoreFloat3(&humanoid.lookAt, camera.GetEye() + XMLoadFloat3(&ray.direction) * dist); // look at near plane position
}
}
}
}
void HumanoidWindow::ResizeLayout()
{
wi::gui::Window::ResizeLayout();
@@ -586,3 +561,28 @@ void HumanoidWindow::ResizeLayout()
add_fullwidth(boneList);
}
void HumanoidWindow::UpdateHumanoids()
{
// Update humanoids to look at mouse:
if (lookatMouseCheckBox.GetCheck())
{
Scene& scene = editor->GetCurrentScene();
const CameraComponent& camera = editor->GetCurrentEditorScene().camera;
wi::primitive::Ray ray = editor->pickRay;
for (size_t i = 0; i < scene.humanoids.GetCount(); ++i)
{
HumanoidComponent& humanoid = scene.humanoids[i];
Entity bone = humanoid.bones[size_t(HumanoidComponent::HumanoidBone::Head)];
const TransformComponent* transform = scene.transforms.GetComponent(bone);
if (transform != nullptr)
{
float dist = wi::math::Distance(transform->GetPosition(), ray.origin);
dist = std::min(1.0f, dist);
XMStoreFloat3(&humanoid.lookAt, camera.GetEye() + XMLoadFloat3(&ray.direction) * dist); // look at near plane position
}
}
}
}