From c3f9e6eed715175255276752b98ff0402a0413ed Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 16 Apr 2024 19:38:39 +0200 Subject: [PATCH] Part: Support of material colors in settings --- src/Mod/Part/Gui/DlgSettingsObjectColor.cpp | 8 + src/Mod/Part/Gui/DlgSettingsObjectColor.ui | 165 ++++++++++++++++++-- 2 files changed, 159 insertions(+), 14 deletions(-) diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp index cf4ae774c3..f9ce22a357 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp @@ -51,8 +51,12 @@ void DlgSettingsObjectColor::saveSettings() { // Part ui->DefaultShapeColor->onSave(); + ui->DefaultAmbientColor->onSave(); + ui->DefaultEmissiveColor->onSave(); + ui->DefaultSpecularColor->onSave(); ui->checkRandomColor->onSave(); ui->DefaultShapeTransparency->onSave(); + ui->DefaultShapeShininess->onSave(); ui->DefaultShapeLineColor->onSave(); ui->DefaultShapeLineWidth->onSave(); ui->DefaultShapeVertexColor->onSave(); @@ -68,8 +72,12 @@ void DlgSettingsObjectColor::loadSettings() { // Part ui->DefaultShapeColor->onRestore(); + ui->DefaultAmbientColor->onRestore(); + ui->DefaultEmissiveColor->onRestore(); + ui->DefaultSpecularColor->onRestore(); ui->checkRandomColor->onRestore(); ui->DefaultShapeTransparency->onRestore(); + ui->DefaultShapeShininess->onRestore(); ui->DefaultShapeLineColor->onRestore(); ui->DefaultShapeLineWidth->onRestore(); ui->DefaultShapeVertexColor->onRestore(); diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui index 2b24f20553..4df39794cc 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui @@ -72,6 +72,105 @@ + + + + 182 + 0 + + + + Ambient shape color + + + + + + + The default ambient color for new shapes + + + + 85 + 85 + 85 + + + + DefaultAmbientColor + + + View + + + + + + + + 182 + 0 + + + + Emissive shape color + + + + + + + The default emissive color for new shapes + + + + 0 + 0 + 0 + + + + DefaultEmissiveColor + + + View + + + + + + + + 182 + 0 + + + + Specular shape color + + + + + + + The default specular color for new shapes + + + + 136 + 136 + 136 + + + + DefaultSpecularColor + + + View + + + + @@ -84,7 +183,7 @@ - + The default transparency for new shapes @@ -106,7 +205,45 @@ - + + + + + 182 + 0 + + + + Shape shininess + + + + + + + The default shininess for new shapes + + + % + + + 100 + + + 90 + + + 5 + + + DefaultShapeShininess + + + View + + + + @@ -119,7 +256,7 @@ - + The default line color for new shapes @@ -139,7 +276,7 @@ - + @@ -152,7 +289,7 @@ - + The default line thickness for new shapes @@ -174,7 +311,7 @@ - + @@ -187,7 +324,7 @@ - + The default color for new vertices @@ -207,7 +344,7 @@ - + @@ -220,7 +357,7 @@ - + The default size for new vertices @@ -242,7 +379,7 @@ - + @@ -255,7 +392,7 @@ - + The color of bounding boxes in the 3D view @@ -275,7 +412,7 @@ - + @@ -288,7 +425,7 @@ - + The font size of bounding boxes in the 3D view @@ -316,7 +453,7 @@ - +