From 0355104b8b84cb78560070abd398c82b833aa355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Wed, 12 Jan 2022 10:31:08 +0100 Subject: [PATCH] editor: emitter viscosity slider update; emitter_fluid asset update; --- Content/models/emitter_fluid_50k.wiscene | Bin 1446 -> 8112 bytes Editor/EmitterWindow.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Content/models/emitter_fluid_50k.wiscene b/Content/models/emitter_fluid_50k.wiscene index 1acc9d81e8f5455c250fc69efc462394f7b9aac3..7a891bf1f1fb54379467a6fed080b57c113068cd 100644 GIT binary patch literal 8112 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 diff --git a/Editor/EmitterWindow.cpp b/Editor/EmitterWindow.cpp index 4ebc0db31..2208940d1 100644 --- a/Editor/EmitterWindow.cpp +++ b/Editor/EmitterWindow.cpp @@ -640,7 +640,7 @@ void EmitterWindow::Create(EditorComponent* editor) sph_p0_Slider.SetTooltip("Set the SPH parameter: reference density"); AddWidget(&sph_p0_Slider); - sph_e_Slider.Create(0.1f, 100.0f, 1.0f, 100000, "SPH Viscosity (e): "); + sph_e_Slider.Create(0, 10, 1.0f, 100000, "SPH Viscosity (e): "); sph_e_Slider.SetSize(XMFLOAT2(360, itemheight)); sph_e_Slider.SetPos(XMFLOAT2(x, y += step)); sph_e_Slider.OnSlide([&](wi::gui::EventArgs args) {