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

resurrected mesh wind; added wind paint tool;

Browse Source
This commit is contained in:
turanszkij
2020-04-11 12:35:53 +01:00
parent a2ca7d2bcf
commit ed0b3fed07
16 changed files with 282 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/MaterialWindow.cpp
+13 -2
View File
@@ -14,11 +14,11 @@ MaterialWindow::MaterialWindow(EditorComponent* editor) : GUI(&editor->GetGUI())
assert(GUI && "Invalid GUI!");
materialWindow = new wiWindow(GUI, "Material Window");
materialWindow->SetSize(XMFLOAT2(700, 760));
materialWindow->SetSize(XMFLOAT2(700, 770));
GUI->AddWidget(materialWindow);
float x = 540, y = 0;
float step = 25;
float step = 24;
waterCheckBox = new wiCheckBox("Water: ");
waterCheckBox->SetTooltip("Set material as special water material.");
@@ -100,6 +100,16 @@ MaterialWindow::MaterialWindow(EditorComponent* editor) : GUI(&editor->GetGUI())
});
materialWindow->AddWidget(occlusionSecondaryCheckBox);
windCheckBox = new wiCheckBox("Wind: ");
windCheckBox->SetTooltip("If enabled, vertex wind weights will affect how much wind offset affects the subset.");
windCheckBox->SetPos(XMFLOAT2(670, y += step));
windCheckBox->OnClick([&](wiEventArgs args) {
MaterialComponent* material = wiScene::GetScene().materials.GetComponent(entity);
if (material != nullptr)
material->SetUseWind(args.bValue);
});
materialWindow->AddWidget(windCheckBox);
step = 30;
float hei = 25;
@@ -789,6 +799,7 @@ void MaterialWindow::SetEntity(Entity entity)
specularGlossinessCheckBox->SetCheck(material->IsUsingSpecularGlossinessWorkflow());
occlusionPrimaryCheckBox->SetCheck(material->IsOcclusionEnabled_Primary());
occlusionSecondaryCheckBox->SetCheck(material->IsOcclusionEnabled_Secondary());
windCheckBox->SetCheck(material->IsUsingWind());
normalMapSlider->SetValue(material->normalMapStrength);
roughnessSlider->SetValue(material->roughness);
reflectanceSlider->SetValue(material->reflectance);