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

ocean improvements: extinction, scattering, volumetric light fix

Browse Source
This commit is contained in:
Turánszki János
2024-07-09 08:34:35 +02:00
parent ec8d7afc5c
commit 62bcee63e3
27 changed files with 234 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/WeatherWindow.cpp
+15 -8
View File
@@ -57,6 +57,7 @@ void WeatherWindow::Create(EditorComponent* _editor)
colorComboBox.AddItem("Horizon color");
colorComboBox.AddItem("Zenith color");
colorComboBox.AddItem("Ocean color");
colorComboBox.AddItem("Ocean extinction");
colorComboBox.AddItem("Cloud color 1");
colorComboBox.AddItem("Cloud color 2");
colorComboBox.AddItem("Cloud extinction 1");
@@ -88,18 +89,21 @@ void WeatherWindow::Create(EditorComponent* _editor)
weather.oceanParameters.waterColor = args.color.toFloat4();
break;
case 4:
weather.volumetricCloudParameters.layerFirst.albedo = args.color.toFloat3();
weather.oceanParameters.extinctionColor = args.color.toFloat4();
break;
case 5:
weather.volumetricCloudParameters.layerSecond.albedo = args.color.toFloat3();
weather.volumetricCloudParameters.layerFirst.albedo = args.color.toFloat3();
break;
case 6:
weather.volumetricCloudParameters.layerFirst.extinctionCoefficient = args.color.toFloat3();
weather.volumetricCloudParameters.layerSecond.albedo = args.color.toFloat3();
break;
case 7:
weather.volumetricCloudParameters.layerSecond.extinctionCoefficient = args.color.toFloat3();
weather.volumetricCloudParameters.layerFirst.extinctionCoefficient = args.color.toFloat3();
break;
case 8:
weather.volumetricCloudParameters.layerSecond.extinctionCoefficient = args.color.toFloat3();
break;
case 9:
weather.rain_color = args.color.toFloat4();
break;
}
@@ -1093,18 +1097,21 @@ void WeatherWindow::Update()
colorPicker.SetPickColor(wi::Color::fromFloat4(weather.oceanParameters.waterColor));
break;
case 4:
colorPicker.SetPickColor(wi::Color::fromFloat3(weather.volumetricCloudParameters.layerFirst.albedo));
colorPicker.SetPickColor(wi::Color::fromFloat4(weather.oceanParameters.extinctionColor));
break;
case 5:
colorPicker.SetPickColor(wi::Color::fromFloat3(weather.volumetricCloudParameters.layerSecond.albedo));
colorPicker.SetPickColor(wi::Color::fromFloat3(weather.volumetricCloudParameters.layerFirst.albedo));
break;
case 6:
colorPicker.SetPickColor(wi::Color::fromFloat3(weather.volumetricCloudParameters.layerFirst.extinctionCoefficient));
colorPicker.SetPickColor(wi::Color::fromFloat3(weather.volumetricCloudParameters.layerSecond.albedo));
break;
case 7:
colorPicker.SetPickColor(wi::Color::fromFloat3(weather.volumetricCloudParameters.layerSecond.extinctionCoefficient));
colorPicker.SetPickColor(wi::Color::fromFloat3(weather.volumetricCloudParameters.layerFirst.extinctionCoefficient));
break;
case 8:
colorPicker.SetPickColor(wi::Color::fromFloat3(weather.volumetricCloudParameters.layerSecond.extinctionCoefficient));
break;
case 9:
colorPicker.SetPickColor(wi::Color::fromFloat4(weather.rain_color));
break;
}