kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Material] Adjust default material appearance (#12380)

Browse Source
This commit is contained in:
Max Wilfinger
2024-02-18 03:07:44 +01:00
committed by GitHub
parent 89dcf9c1d9
commit 84b7304a6e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/App/Material.cpp
View File

@@ -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;
}

8
src/Mod/Material/Resources/Materials/Appearance/Default.FCMat
View File

@@ -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"

2
src/Mod/Part/Gui/DlgSettingsObjectColor.ui
View File

@@ -44,7 +44,7 @@
<color>
<red>204</red>
<green>204</green>
<blue>204</blue>
<blue>230</blue>
</color>
</property>
<property name="prefEntry" stdset="0">