FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed zero and one to transparentCount and opaqueCount to avoid confusion in their meaning and usage.

Browse Source
This commit is contained in:
Robert Osfield
2016-02-18 08:50:06 +00:00
parent 89f74b1a56
commit c3d45732a1
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgPlugins/dae/daeRMaterials.cpp
View File

@@ -39,7 +39,7 @@ using namespace ColladaDOM141;
#endif
template <typename T>
void daeReader::getTransparencyCounts(daeDatabase* database, int& zero, int& one) const
void daeReader::getTransparencyCounts(daeDatabase* database, int& transparentCount, int& opaqueCount) const
{
std::vector<T*> constantVec;
database->typeLookup(constantVec);
@@ -51,7 +51,7 @@ void daeReader::getTransparencyCounts(daeDatabase* database, int& zero, int& one
domFx_opaque_enum opaque = pTransparent->getOpaque();
if (opaque == FX_OPAQUE_ENUM_RGB_ZERO)
{
++one;
++opaqueCount;
continue;
}
}
@@ -77,11 +77,11 @@ void daeReader::getTransparencyCounts(daeDatabase* database, int& zero, int& one
if (transparency < 0.01f)
{
++zero;
++transparentCount;
}
else if (transparency > 0.99f)
{
++one;
++opaqueCount;
}
}
@@ -91,13 +91,13 @@ void daeReader::getTransparencyCounts(daeDatabase* database, int& zero, int& one
bool daeReader::findInvertTransparency(daeDatabase* database) const
{
int zero = 0, one = 0;
getTransparencyCounts<domProfile_COMMON::domTechnique::domConstant>(database, zero, one);
getTransparencyCounts<domProfile_COMMON::domTechnique::domLambert>(database, zero, one);
getTransparencyCounts<domProfile_COMMON::domTechnique::domPhong>(database, zero, one);
getTransparencyCounts<domProfile_COMMON::domTechnique::domBlinn>(database, zero, one);
int transparentCount = 0, opaqueCount = 0;
getTransparencyCounts<domProfile_COMMON::domTechnique::domConstant>(database, transparentCount, opaqueCount);
getTransparencyCounts<domProfile_COMMON::domTechnique::domLambert>(database, transparentCount, opaqueCount);
getTransparencyCounts<domProfile_COMMON::domTechnique::domPhong>(database, transparentCount, opaqueCount);
getTransparencyCounts<domProfile_COMMON::domTechnique::domBlinn>(database, transparentCount, opaqueCount);
return zero > one;
return transparentCount > opaqueCount;
}
// <bind_material>