From 91ee66b4c2fc6291dde27318326b14fb0ba64aa6 Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Wed, 12 Sep 2018 20:45:05 +0100 Subject: [PATCH] hair particle update --- Editor/Editor.cpp | 2 +- Editor/HairParticleWindow.cpp | 2 +- Editor/images/hair.dds | Bin 0 -> 65664 bytes WickedEngine/wiHairParticle.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 Editor/images/hair.dds diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp index b0f50d29e..7042662e9 100644 --- a/Editor/Editor.cpp +++ b/Editor/Editor.cpp @@ -950,7 +950,7 @@ void EditorComponent::Load() decalTex = *(Texture2D*)Content.add("images/decal.dds"); forceFieldTex = *(Texture2D*)Content.add("images/forcefield.dds"); emitterTex = *(Texture2D*)Content.add("images/emitter.dds"); - hairTex = *(Texture2D*)Content.add("images/emitter.dds"); + hairTex = *(Texture2D*)Content.add("images/hair.dds"); cameraTex = *(Texture2D*)Content.add("images/camera.dds"); armatureTex = *(Texture2D*)Content.add("images/armature.dds"); } diff --git a/Editor/HairParticleWindow.cpp b/Editor/HairParticleWindow.cpp index 50ffd7e50..45aade731 100644 --- a/Editor/HairParticleWindow.cpp +++ b/Editor/HairParticleWindow.cpp @@ -55,7 +55,7 @@ HairParticleWindow::HairParticleWindow(wiGUI* gui) : GUI(gui) meshComboBox->SetTooltip("Choose an animation clip..."); hairWindow->AddWidget(meshComboBox); - countSlider = new wiSlider(0.1f, 100.0f, 1.0f, 100000, "Particle Count: "); + countSlider = new wiSlider(0, 100000, 1000, 100000, "Particle Count: "); countSlider->SetSize(XMFLOAT2(360, 30)); countSlider->SetPos(XMFLOAT2(x, y += step * 2)); countSlider->OnSlide([&](wiEventArgs args) { diff --git a/Editor/images/hair.dds b/Editor/images/hair.dds new file mode 100644 index 0000000000000000000000000000000000000000..576bb57ec195a6e94cb312f83360043f3126f597 GIT binary patch literal 65664 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 literal 0 HcmV?d00001 diff --git a/WickedEngine/wiHairParticle.cpp b/WickedEngine/wiHairParticle.cpp index b70dd5eab..dabf46df1 100644 --- a/WickedEngine/wiHairParticle.cpp +++ b/WickedEngine/wiHairParticle.cpp @@ -249,7 +249,7 @@ void wiHairParticle::Generate(const MeshComponent& mesh) XMVECTOR P = XMVectorBaryCentric(p0, p1, p2, f, g); XMVECTOR N = XMVectorBaryCentric(n0, n1, n2, f, g); - XMVECTOR T = XMVector3Normalize(XMVectorSubtract(i % 2 == 0 ? p0 : p2, p1)); + XMVECTOR T = XMVector3Normalize(XMVectorSubtract(p0, p1)); XMStoreFloat4(&points[i].posLen, P); points[i].posLen.w = 1.0f;