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

various updates: editor, wind, hairparticle

Browse Source
This commit is contained in:
turanszkij
2020-04-05 13:10:13 +01:00
parent 1f8c699408
commit 3f219076fb
13 changed files with 77 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/WeatherWindow.cpp
+16 -4
View File
@@ -68,14 +68,22 @@ WeatherWindow::WeatherWindow(wiGUI* gui) : GUI(gui)
});
weatherWindow->AddWidget(cloudSpeedSlider);
windSpeedSlider = new wiSlider(0.0f, 0.2f, 0.0f, 10000, "Wind Speed: ");
windSpeedSlider = new wiSlider(0.0f, 4.0f, 1.0f, 10000, "Wind Speed: ");
windSpeedSlider->SetSize(XMFLOAT2(100, 30));
windSpeedSlider->SetPos(XMFLOAT2(x, y += step));
windSpeedSlider->OnSlide([&](wiEventArgs args) {
UpdateWind();
GetWeather().windSpeed = args.fValue;
});
weatherWindow->AddWidget(windSpeedSlider);
windMagnitudeSlider = new wiSlider(0.0f, 0.2f, 0.0f, 10000, "Wind Magnitude: ");
windMagnitudeSlider->SetSize(XMFLOAT2(100, 30));
windMagnitudeSlider->SetPos(XMFLOAT2(x, y += step));
windMagnitudeSlider->OnSlide([&](wiEventArgs args) {
UpdateWind();
});
weatherWindow->AddWidget(windMagnitudeSlider);
windDirectionSlider = new wiSlider(0, 1, 0, 10000, "Wind Direction: ");
windDirectionSlider->SetSize(XMFLOAT2(100, 30));
windDirectionSlider->SetPos(XMFLOAT2(x, y += step));
@@ -92,7 +100,7 @@ WeatherWindow::WeatherWindow(wiGUI* gui) : GUI(gui)
});
weatherWindow->AddWidget(windWaveSizeSlider);
windRandomnessSlider = new wiSlider(0, 1, 0, 10000, "Wind Randomness: ");
windRandomnessSlider = new wiSlider(0, 10, 5, 10000, "Wind Randomness: ");
windRandomnessSlider->SetSize(XMFLOAT2(100, 30));
windRandomnessSlider->SetPos(XMFLOAT2(x, y += step));
windRandomnessSlider->OnSlide([&](wiEventArgs args) {
@@ -484,6 +492,10 @@ void WeatherWindow::Update()
cloudinessSlider->SetValue(weather.cloudiness);
cloudScaleSlider->SetValue(weather.cloudScale);
cloudSpeedSlider->SetValue(weather.cloudSpeed);
windSpeedSlider->SetValue(weather.windSpeed);
windWaveSizeSlider->SetValue(weather.windWaveSize);
windRandomnessSlider->SetValue(weather.windRandomness);
windMagnitudeSlider->SetValue(XMVectorGetX(XMVector3Length(XMLoadFloat3(&weather.windDirection))));
ambientColorPicker->SetPickColor(wiColor::fromFloat3(weather.ambient));
horizonColorPicker->SetPickColor(wiColor::fromFloat3(weather.horizon));
@@ -529,6 +541,6 @@ void WeatherWindow::UpdateWind()
XMMATRIX rot = XMMatrixRotationY(windDirectionSlider->GetValue() * XM_PI * 2);
XMVECTOR dir = XMVectorSet(1, 0, 0, 0);
dir = XMVector3TransformNormal(dir, rot);
dir *= windSpeedSlider->GetValue();
dir *= windMagnitudeSlider->GetValue();
XMStoreFloat3(&GetWeather().windDirection, dir);
}