Skip to content
Snippets Groups Projects
Commit 81e98bb0 authored by Alex Laptop's avatar Alex Laptop
Browse files

Make material setting labels unique to avoid ImGui problems

parent 3243ee08
No related branches found
No related tags found
1 merge request!101Path tracing
Pipeline #27264 passed
...@@ -416,6 +416,7 @@ int main(int argc, const char** argv) { ...@@ -416,6 +416,7 @@ int main(int argc, const char** argv) {
clearMeanImage |= ImGui::InputFloat("Sky color multiplier", &skyColorMultiplier); clearMeanImage |= ImGui::InputFloat("Sky color multiplier", &skyColorMultiplier);
if (ImGui::CollapsingHeader("Materials")) { if (ImGui::CollapsingHeader("Materials")) {
for (auto& setting : materialSettings) { for (auto& setting : materialSettings) {
if (ImGui::CollapsingHeader(setting.first.c_str())) { if (ImGui::CollapsingHeader(setting.first.c_str())) {
...@@ -423,15 +424,15 @@ int main(int argc, const char** argv) { ...@@ -423,15 +424,15 @@ int main(int argc, const char** argv) {
float emissionStrength = glm::max(glm::max(glm::max(emission.x, emission.y), emission.z), 1.f); float emissionStrength = glm::max(glm::max(glm::max(emission.x, emission.y), emission.z), 1.f);
glm::vec3 emissionColor = emission / emissionStrength; glm::vec3 emissionColor = emission / emissionStrength;
updateMaterials |= ImGui::ColorEdit3("Emission color", &emissionColor.x); updateMaterials |= ImGui::ColorEdit3((std::string("Emission color ") + setting.first).c_str(), &emissionColor.x);
updateMaterials |= ImGui::InputFloat("Emission strength", &emissionStrength); updateMaterials |= ImGui::InputFloat((std::string("Emission strength ") + setting.first).c_str(), &emissionStrength);
setting.second.emission = emissionStrength * emissionColor; setting.second.emission = emissionStrength * emissionColor;
updateMaterials |= ImGui::ColorEdit3("Albedo color", &setting.second.albedo.x); updateMaterials |= ImGui::ColorEdit3((std::string("Albedo color ") + setting.first).c_str(), &setting.second.albedo.x);
updateMaterials |= ImGui::ColorEdit3("F0", &setting.second.f0.x); updateMaterials |= ImGui::ColorEdit3((std::string("F0 ") + setting.first).c_str(), &setting.second.f0.x);
updateMaterials |= ImGui::DragFloat("ks", &setting.second.ks, 0.01, 0, 1); updateMaterials |= ImGui::DragFloat(( std::string("ks ") + setting.first).c_str(), &setting.second.ks, 0.01, 0, 1);
updateMaterials |= ImGui::DragFloat("roughness", &setting.second.roughness, 0.01, 0, 1); updateMaterials |= ImGui::DragFloat(( std::string("roughness ") + setting.first).c_str(), &setting.second.roughness, 0.01, 0, 1);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment