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

updated material texture serialization; added sponza test scene; editor updates;

Browse Source
This commit is contained in:
turanszkij
2018-12-20 14:31:48 +01:00
parent c3796d621c
commit 848afcbdc0
82 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/WeatherWindow.cpp
+13 -4
View File
@@ -77,11 +77,20 @@ WeatherWindow::WeatherWindow(wiGUI* gui) : GUI(gui)
windSpeedSlider = new wiSlider(0.001f, 0.2f, 0.1f, 10000, "Wind Speed: ");
windSpeedSlider->SetSize(XMFLOAT2(100, 30));
windSpeedSlider->SetPos(XMFLOAT2(x, y += step));
windSpeedSlider->OnSlide([&](wiEventArgs args) {
GetWeather().windDirection = XMFLOAT3(args.fValue, 0, 0);
});
weatherWindow->AddWidget(windSpeedSlider);
windDirectionSlider = new wiSlider(0, 1, 0, 10000, "Wind Direction: ");
windDirectionSlider->SetSize(XMFLOAT2(100, 30));
windDirectionSlider->SetPos(XMFLOAT2(x, y += step));
windDirectionSlider->OnSlide([&](wiEventArgs args) {
XMMATRIX rot = XMMatrixRotationY(args.fValue * XM_PI * 2);
XMVECTOR dir = XMVectorSet(1, 0, 0, 0);
dir = XMVector3TransformNormal(dir, rot);
dir *= windSpeedSlider->GetValue();
XMStoreFloat3(&GetWeather().windDirection, dir);
});
weatherWindow->AddWidget(windDirectionSlider);
skyButton = new wiButton("Load Sky");
skyButton->SetTooltip("Load a skybox cubemap texture...");
@@ -290,7 +299,7 @@ void WeatherWindow::UpdateFromRenderer()
cloudinessSlider->SetValue(weather.cloudiness);
cloudScaleSlider->SetValue(weather.cloudScale);
cloudSpeedSlider->SetValue(weather.cloudSpeed);
windSpeedSlider->SetValue(weather.windDirection.x);
windSpeedSlider->SetValue(wiMath::Length(weather.windDirection));
}
WeatherComponent& WeatherWindow::GetWeather() const