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

mainly hair particle updates

Browse Source
This commit is contained in:
turanszkij
2018-09-13 18:38:43 +01:00
parent 91ee66b4c2
commit 67f592d5ac
24 changed files with 381 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Editor.cpp
+24
View File
@@ -1694,6 +1694,24 @@ void EditorComponent::Render()
{
wiRenderer::AddRenderableBox(decal->world, XMFLOAT4(0.5f, 0, 0.5f, 0.5f));
}
const EnvironmentProbeComponent* probe = scene.probes.GetComponent(hovered.entity);
if (probe != nullptr)
{
const AABB& aabb = *scene.aabb_probes.GetComponent(hovered.entity);
XMFLOAT4X4 hoverBox;
XMStoreFloat4x4(&hoverBox, aabb.getAsBoxMatrix());
wiRenderer::AddRenderableBox(hoverBox, XMFLOAT4(0.5f, 0.5f, 0.5f, 0.5f));
}
const wiHairParticle* hair = scene.hairs.GetComponent(hovered.entity);
if (hair != nullptr)
{
XMFLOAT4X4 hoverBox;
XMStoreFloat4x4(&hoverBox, hair->aabb.getAsBoxMatrix());
wiRenderer::AddRenderableBox(hoverBox, XMFLOAT4(0, 0.5f, 0, 0.5f));
}
}
}
@@ -1739,6 +1757,12 @@ void EditorComponent::Render()
selectedAABB = AABB::Merge(selectedAABB, aabb);
}
const wiHairParticle* hair = scene.hairs.GetComponent(picked->entity);
if (hair != nullptr)
{
selectedAABB = AABB::Merge(selectedAABB, hair->aabb);
}
}
}