Permalink
Browse files

fixed : compile problems (missing returnvalues/unused elements/missin…

…g switch cases)

git-svn-id: https://opensg.vrsource.org/svn/trunk@2261 4683daeb-ad0f-0410-a623-93161e962ae5
  • Loading branch information...
1 parent 2dfc32a commit a6f67df6603e34d00a366e0d3c9f1774f74a1fea vossg committed Dec 30, 2009
@@ -225,6 +225,8 @@ ColladaEffect::findDOMParam(const std::string &name) const
{
return surfaceIt->second.surface;
}
+
+ return NULL;
}
/*! Return the loader element for the parameter of the effect (\c <newparam>
@@ -246,6 +248,8 @@ ColladaEffect::findParam(const std::string &name) const
{
return surfaceIt->second.colSurface;
}
+
+ return NULL;
}
ColladaEffect::ColladaEffect(daeElement *elem, ColladaGlobal *global)
@@ -715,8 +719,10 @@ ColladaEffect::handleProfileCommonEmission(
}
else if(texture != NULL)
{
+#if 0
xsNCName texId = texture->getTexture ();
xsNCName tcSemantic = texture->getTexcoord();
+#endif
SWARNING << "ColladaEffect::handleProfileCommonEmission: "
<< "<emission>/<texture> not supported."
@@ -963,9 +969,10 @@ ColladaEffect::handleProfileCommonSpecular(
}
else if(texture != NULL)
{
+#if 0
xsNCName texId = texture->getTexture ();
xsNCName tcSemantic = texture->getTexcoord();
-
+#endif
SWARNING << "ColladaEffect::createInstanceProfileCommon: "
<< "<specular>/<texture> not supported."
<< std::endl;
@@ -1063,7 +1070,7 @@ ColladaEffect::addTexture(
Real32
ColladaEffect::luminance(const Color4f &col)
{
- return (col[0] * 0.212671f + col[1] * 0.71516f, col[2] * 0.072169f);
+ return (col[0] * 0.212671f + col[1] * 0.71516f + col[2] * 0.072169f);
}
OSG_END_NAMESPACE
@@ -118,6 +118,11 @@ ColladaSampler2D::read(void)
case FX_SAMPLER_WRAP_COMMON_BORDER:
_texObj->setWrapS(GL_CLAMP_TO_BORDER);
break;
+ case FX_SAMPLER_WRAP_COMMON_COUNT:
+ SWARNING << "OSGColladaSampler2D::read <wrap_s> "
+ << "FX_SAMPLER_WRAP_COMMON_COUNT not handled"
+ << std::endl;
+ break;
}
}
@@ -145,6 +150,11 @@ ColladaSampler2D::read(void)
case FX_SAMPLER_WRAP_COMMON_BORDER:
_texObj->setWrapT(GL_CLAMP_TO_BORDER);
break;
+ case FX_SAMPLER_WRAP_COMMON_COUNT:
+ SWARNING << "OSGColladaSampler2D::read <wrap_t> "
+ << "FX_SAMPLER_WRAP_COMMON_COUNT not handled"
+ << std::endl;
+ break;
}
}
}
@@ -98,6 +98,12 @@ ColladaSurface::read(void)
case FX_SURFACE_TYPE_ENUM_DEPTH:
readDepth(surface);
break;
+
+ case FX_SURFACE_TYPE_ENUM_COUNT:
+ SWARNING << "ColladaSurface::read FX_SURFACE_TYPE_ENUM_COUNT "
+ << "not handled"
+ << std::endl;
+ break;
}
}

0 comments on commit a6f67df

Please sign in to comment.