FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

warning fixes

Browse Source
This commit is contained in:
torsten
2009-08-20 09:00:12 +00:00
committed by Tim Moore
parent 992a057a1b
commit f043f3d4f9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/scene/material/Effect.cxx
View File

@@ -633,6 +633,8 @@ struct UniformBuilder :public PassAttributeBuilder
case Uniform::SAMPLER_3D:
uniform->set(valProp->getValue<int>());
break;
default: // avoid compiler warning
break;
}
pass->addUniform(uniform.get());
}
@@ -702,7 +704,7 @@ void buildTechnique(Effect* effect, const SGPropertyNode* prop,
TechniquePredParser parser;
parser.setTechnique(tniq);
expression::BindingLayout& layout = parser.getBindingLayout();
int contextLoc = layout.addBinding("__contextId", expression::INT);
/*int contextLoc = */layout.addBinding("__contextId", expression::INT);
SGExpressionb* validExp
= dynamic_cast<SGExpressionb*>(parser.read(predProp
->getChild(0)));

6
simgear/scene/material/makeEffect.cxx
View File

@@ -139,20 +139,20 @@ Effect* makeEffect(SGPropertyNode* prop,
{
// Give default names to techniques and passes
vector<SGPropertyNode_ptr> techniques = prop->getChildren("technique");
for (int i = 0; i < techniques.size(); ++i) {
for (int i = 0; i < (int)techniques.size(); ++i) {
SGPropertyNode* tniqProp = techniques[i].ptr();
if (!tniqProp->hasChild("name"))
setValue(tniqProp->getChild("name", 0, true),
boost::lexical_cast<string>(i));
vector<SGPropertyNode_ptr> passes = tniqProp->getChildren("pass");
for (int j = 0; j < passes.size(); ++j) {
for (int j = 0; j < (int)passes.size(); ++j) {
SGPropertyNode* passProp = passes[j].ptr();
if (!passProp->hasChild("name"))
setValue(passProp->getChild("name", 0, true),
boost::lexical_cast<string>(j));
vector<SGPropertyNode_ptr> texUnits
= passProp->getChildren("texture-unit");
for (int k = 0; k < texUnits.size(); ++k) {
for (int k = 0; k < (int)texUnits.size(); ++k) {
SGPropertyNode* texUnitProp = texUnits[k].ptr();
if (!texUnitProp->hasChild("name"))
setValue(texUnitProp->getChild("name", 0, true),