From 84b7304a6ececb61426189e2da87bc0bce2e19ec Mon Sep 17 00:00:00 2001 From: Max Wilfinger <6246609+maxwxyz@users.noreply.github.com> Date: Sun, 18 Feb 2024 03:07:44 +0100 Subject: [PATCH] [Material] Adjust default material appearance (#12380) --- src/App/Material.cpp | 14 +++++++------- .../Resources/Materials/Appearance/Default.FCMat | 8 ++++---- src/Mod/Part/Gui/DlgSettingsObjectColor.ui | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/App/Material.cpp b/src/App/Material.cpp index 3b5b95da1f..c3b80e9153 100644 --- a/src/App/Material.cpp +++ b/src/App/Material.cpp @@ -36,7 +36,7 @@ using namespace App; // Material //=========================================================================== Material::Material() - : shininess{0.2000f} + : shininess{0.9000f} , transparency{} { setType(STEEL); @@ -44,14 +44,14 @@ Material::Material() } Material::Material(const char* MatName) - : shininess{0.2000f} + : shininess{0.9000f} , transparency{} { set(MatName); } Material::Material(const MaterialType MatType) - : shininess{0.2000f} + : shininess{0.9000f} , transparency{} { setType(MatType); @@ -326,11 +326,11 @@ void Material::setType(const MaterialType MatType) case USER_DEFINED: break; default: - ambientColor .set(0.2000f,0.2000f,0.2000f); - diffuseColor .set(0.8000f,0.8000f,0.8000f); - specularColor.set(0.0000f,0.0000f,0.0000f); + ambientColor.set(0.3333f, 0.3333f, 0.3333f); + diffuseColor .set(0.8000f,0.8000f,0.9000f); + specularColor.set(0.5333f, 0.5333f, 0.5333f); emissiveColor.set(0.0000f,0.0000f,0.0000f); - shininess = 0.2000f; + shininess = 0.9000f; transparency = 0.0000f; break; } diff --git a/src/Mod/Material/Resources/Materials/Appearance/Default.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Default.FCMat index e17d466801..1a0661bae4 100644 --- a/src/Mod/Material/Resources/Materials/Appearance/Default.FCMat +++ b/src/Mod/Material/Resources/Materials/Appearance/Default.FCMat @@ -9,9 +9,9 @@ General: AppearanceModels: BasicRendering: UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' - AmbientColor: "(0.2000, 0.2000, 0.2000, 1.0)" - DiffuseColor: "(0.8000, 0.8000, 0.8000, 1.0)" + AmbientColor: "(0.3333, 0.3333, 0.3333, 1.0)" + DiffuseColor: "(0.8000, 0.8000, 0.9000, 1.0)" EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" - Shininess: "0.2000" - SpecularColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.9000" + SpecularColor: "(0.5333, 0.5333, 0.5333, 1.0)" Transparency: "0.0" diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui index 41f58fe78e..2b24f20553 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui @@ -44,7 +44,7 @@ 204 204 - 204 + 230