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

Merge pull request #19636 from kadet1090/color-in-base

Browse Source 
Base: Move App::Color to Base
This commit is contained in:
Chris Hennes
2025-03-02 16:36:40 -06:00
committed by GitHub
parent f2a8bc92af 97de3de68f
commit 1a2070c36f
216 changed files with 1121 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Part/Gui/ViewProviderExt.cpp
View File

@@ -292,14 +292,14 @@ void ViewProviderPartExt::onChanged(const App::Property* prop)
pcPointStyle->pointSize = PointSize.getValue();
}
else if (prop == &LineColor) {
const App::Color& c = LineColor.getValue();
const Base::Color& c = LineColor.getValue();
pcLineMaterial->diffuseColor.setValue(c.r,c.g,c.b);
if (c != LineMaterial.getValue().diffuseColor)
LineMaterial.setDiffuseColor(c);
LineColorArray.setValue(LineColor.getValue());
}
else if (prop == &PointColor) {
const App::Color& c = PointColor.getValue();
const Base::Color& c = PointColor.getValue();
pcPointMaterial->diffuseColor.setValue(c.r,c.g,c.b);
if (c != PointMaterial.getValue().diffuseColor)
PointMaterial.setDiffuseColor(c);
@@ -335,7 +335,7 @@ void ViewProviderPartExt::onChanged(const App::Property* prop)
}
else if (prop == &_diffuseColor) {
// Used to load the old DiffuseColor values asynchronously
std::vector<App::Color> colors = _diffuseColor.getValues();
std::vector<Base::Color> colors = _diffuseColor.getValues();
std::vector<float> transparencies;
transparencies.resize(static_cast<int>(colors.size()));
for (int i = 0; i < static_cast<int>(colors.size()); i++) {
@@ -658,8 +658,8 @@ void ViewProviderPartExt::setHighlightedFaces(const App::PropertyMaterialList& a
setHighlightedFaces(appearance.getValues());
}
std::map<std::string,App::Color> ViewProviderPartExt::getElementColors(const char *element) const {
std::map<std::string,App::Color> ret;
std::map<std::string,Base::Color> ViewProviderPartExt::getElementColors(const char *element) const {
std::map<std::string,Base::Color> ret;
if(!element || !element[0]) {
auto color = ShapeAppearance.getDiffuseColor();
@@ -753,7 +753,7 @@ void ViewProviderPartExt::unsetHighlightedFaces()
Transparency.touch();
}
void ViewProviderPartExt::setHighlightedEdges(const std::vector<App::Color>& colors)
void ViewProviderPartExt::setHighlightedEdges(const std::vector<Base::Color>& colors)
{
if (getObject() && getObject()->testStatus(App::ObjectStatus::TouchOnColorChange))
getObject()->touch(true);
@@ -790,7 +790,7 @@ void ViewProviderPartExt::unsetHighlightedEdges()
LineMaterial.touch();
}
void ViewProviderPartExt::setHighlightedPoints(const std::vector<App::Color>& colors)
void ViewProviderPartExt::setHighlightedPoints(const std::vector<Base::Color>& colors)
{
if (getObject() && getObject()->testStatus(App::ObjectStatus::TouchOnColorChange))
getObject()->touch(true);