From c3d45732a17f3979a3b33ee9480054130977c0cb Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 18 Feb 2016 08:50:06 +0000
Subject: [PATCH] Renamed zero and one to transparentCount and opaqueCount to
 avoid confusion in their meaning and usage.

---
 src/osgPlugins/dae/daeRMaterials.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/osgPlugins/dae/daeRMaterials.cpp b/src/osgPlugins/dae/daeRMaterials.cpp
index 59c16a599..158ca35ef 100644
--- a/src/osgPlugins/dae/daeRMaterials.cpp
+++ b/src/osgPlugins/dae/daeRMaterials.cpp
@@ -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>