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

added vertex colors feature; fixed tessellation; removed stereogram effect because no longer needed; some refactor; debug bonelines fix;

Browse Source
This commit is contained in:
turanszkij
2019-03-12 19:20:23 +00:00
parent cd290b74f2
commit 197d1175c8
56 changed files with 688 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/MaterialWindow.cpp
+11
View File
@@ -78,6 +78,16 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui)
});
materialWindow->AddWidget(flipNormalMapCheckBox);
useVertexColorsCheckBox = new wiCheckBox("Use vertex colors: ");
useVertexColorsCheckBox->SetTooltip("Enable if you want to render the mesh with vertex colors (must have appropriate vertex buffer)");
useVertexColorsCheckBox->SetPos(XMFLOAT2(570, y += step));
useVertexColorsCheckBox->OnClick([&](wiEventArgs args) {
MaterialComponent* material = wiRenderer::GetScene().materials.GetComponent(entity);
if (material != nullptr)
material->SetUseVertexColors(args.bValue);
});
materialWindow->AddWidget(useVertexColorsCheckBox);
normalMapSlider = new wiSlider(0, 4, 1, 4000, "Normalmap: ");
normalMapSlider->SetTooltip("How much the normal map should distort the face normals (bumpiness).");
normalMapSlider->SetSize(XMFLOAT2(100, 30));
@@ -635,6 +645,7 @@ void MaterialWindow::SetEntity(Entity entity)
planarReflCheckBox->SetCheck(material->HasPlanarReflection());
shadowCasterCheckBox->SetCheck(material->IsCastingShadow());
flipNormalMapCheckBox->SetCheck(material->IsFlipNormalMap());
useVertexColorsCheckBox->SetCheck(material->IsUsingVertexColors());
normalMapSlider->SetValue(material->normalMapStrength);
roughnessSlider->SetValue(material->roughness);
reflectanceSlider->SetValue(material->reflectance);