All: Reformat according to new standard
This commit is contained in:
committed by
Kacper Donat
parent
eafd18dac0
commit
25c3ba7338
@@ -47,17 +47,21 @@ MeshTexture::MeshTexture(const Mesh::MeshObject& mesh, const MeshCore::Material&
|
||||
}
|
||||
}
|
||||
|
||||
void MeshTexture::apply(const Mesh::MeshObject& mesh,
|
||||
const Base::Color& defaultColor,
|
||||
MeshCore::Material& material)
|
||||
void MeshTexture::apply(
|
||||
const Mesh::MeshObject& mesh,
|
||||
const Base::Color& defaultColor,
|
||||
MeshCore::Material& material
|
||||
)
|
||||
{
|
||||
apply(mesh, true, defaultColor, -1.0F, material);
|
||||
}
|
||||
|
||||
void MeshTexture::apply(const Mesh::MeshObject& mesh,
|
||||
const Base::Color& defaultColor,
|
||||
float max_dist,
|
||||
MeshCore::Material& material)
|
||||
void MeshTexture::apply(
|
||||
const Mesh::MeshObject& mesh,
|
||||
const Base::Color& defaultColor,
|
||||
float max_dist,
|
||||
MeshCore::Material& material
|
||||
)
|
||||
{
|
||||
apply(mesh, true, defaultColor, max_dist, material);
|
||||
}
|
||||
@@ -74,11 +78,13 @@ void MeshTexture::apply(const Mesh::MeshObject& mesh, float max_dist, MeshCore::
|
||||
apply(mesh, false, defaultColor, max_dist, material);
|
||||
}
|
||||
|
||||
void MeshTexture::apply(const Mesh::MeshObject& mesh,
|
||||
bool addDefaultColor,
|
||||
const Base::Color& defaultColor,
|
||||
float max_dist,
|
||||
MeshCore::Material& material)
|
||||
void MeshTexture::apply(
|
||||
const Mesh::MeshObject& mesh,
|
||||
bool addDefaultColor,
|
||||
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'
|
||||
@@ -132,8 +138,7 @@ void MeshTexture::apply(const Mesh::MeshObject& mesh,
|
||||
PointIndex index3 = pointMap[it._aulPoints[2]];
|
||||
if (index1 != MeshCore::POINT_INDEX_MAX && index2 != MeshCore::POINT_INDEX_MAX
|
||||
&& index3 != MeshCore::POINT_INDEX_MAX) {
|
||||
std::vector<FacetIndex> found =
|
||||
refPnt2Fac->GetIndices(index1, index2, index3);
|
||||
std::vector<FacetIndex> found = refPnt2Fac->GetIndices(index1, index2, index3);
|
||||
if (found.size() == 1) {
|
||||
diffuseColor.push_back(textureColor[found.front()]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user