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

Base: Move App::Color to Base

Browse Source 
Every basic data type is stored in Base module, color is standing out as
one that does not. Moving it to Base opens possibilities to integrate it
better with the rest of FreeCAD.
This commit is contained in:
Kacper Donat
2025-02-15 22:58:19 +01:00
parent 145af5cddc
commit a72a63232a
215 changed files with 1057 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Mesh/App/MeshTexture.cpp
View File

@@ -47,14 +47,14 @@ MeshTexture::MeshTexture(const Mesh::MeshObject& mesh, const MeshCore::Material&
}
void MeshTexture::apply(const Mesh::MeshObject& mesh,
const App::Color& defaultColor,
const Base::Color& defaultColor,
MeshCore::Material& material)
{
apply(mesh, true, defaultColor, -1.0F, material);
}
void MeshTexture::apply(const Mesh::MeshObject& mesh,
const App::Color& defaultColor,
const Base::Color& defaultColor,
float max_dist,
MeshCore::Material& material)
{
@@ -63,31 +63,31 @@ void MeshTexture::apply(const Mesh::MeshObject& mesh,
void MeshTexture::apply(const Mesh::MeshObject& mesh, MeshCore::Material& material)
{
App::Color defaultColor;
Base::Color defaultColor;
apply(mesh, false, defaultColor, -1.0F, material);
}
void MeshTexture::apply(const Mesh::MeshObject& mesh, float max_dist, MeshCore::Material& material)
{
App::Color defaultColor;
Base::Color defaultColor;
apply(mesh, false, defaultColor, max_dist, material);
}
void MeshTexture::apply(const Mesh::MeshObject& mesh,
bool addDefaultColor,
const App::Color& defaultColor,
const Base::Color& defaultColor,
float max_dist,
MeshCore::Material& material)
{
// copy the color values because the passed material could be the same instance as
// 'materialRefMesh'
std::vector<App::Color> textureColor = materialRefMesh.diffuseColor;
std::vector<Base::Color> textureColor = materialRefMesh.diffuseColor;
material.diffuseColor.clear();
material.binding = MeshCore::MeshIO::OVERALL;
if (kdTree) {
// the points of the current mesh
std::vector<App::Color> diffuseColor;
std::vector<Base::Color> diffuseColor;
const MeshCore::MeshPointArray& points = mesh.getKernel().GetPoints();
const MeshCore::MeshFacetArray& facets = mesh.getKernel().GetFacets();