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

Core: Extend Color API

Browse Source 
* Fix issues with alpha value <> transparency
* Use type traits to convert between different color classes (fixes #14515)
This commit is contained in:
wmayer
2024-08-21 22:26:46 +02:00
committed by Chris Hennes
parent 224c25b770
commit ffa3fa5b5a
12 changed files with 494 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Mesh/App/Core/MeshIO.cpp
View File

@@ -525,7 +525,7 @@ bool MeshInput::LoadOFF(std::istream& rstrIn)
str >> std::ws >> a;
// no transparency
if (!str) {
a = 0.0f;
a = 1.0f;
}
if (r > 1.0f || g > 1.0f || b > 1.0f || a > 1.0f) {
@@ -578,7 +578,7 @@ bool MeshInput::LoadOFF(std::istream& rstrIn)
str >> std::ws >> a;
// no transparency
if (!str) {
a = 0.0f;
a = 1.0f;
}
if (r > 1.0f || g > 1.0f || b > 1.0f || a > 1.0f) {

2
src/Mod/Mesh/Gui/ViewProviderCurvature.cpp
View File

@@ -363,7 +363,7 @@ void ViewProviderMeshCurvature::setVertexCurvatureMode(int mode)
for (auto const& value : fValues | boost::adaptors::indexed(0)) {
App::Color c = pcColorBar->getColor(value.value());
diffcol[value.index()].setValue(c.r, c.g, c.b);
transp[value.index()] = c.a;
transp[value.index()] = c.transparency();
}
pcColorMat->diffuseColor.finishEditing();