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

Merge branch 'timoore/effects-anim-rebase' into next

Browse Source
This commit is contained in:
Tim Moore
2010-03-11 08:46:22 +01:00
parent 1f37095087 60ab1ab83e
commit fabcb021cb
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/Effect.cxx
+1 -2
View File
@@ -829,8 +829,7 @@ struct UniformBuilder :public PassAttributeBuilder
return; return;
const SGPropertyNode* nameProp = prop->getChild("name"); const SGPropertyNode* nameProp = prop->getChild("name");
const SGPropertyNode* typeProp = prop->getChild("type"); const SGPropertyNode* typeProp = prop->getChild("type");
const SGPropertyNode* valProp const SGPropertyNode* valProp = prop->getChild("value");
= getEffectPropertyChild(effect, prop, "value");
string name; string name;
Uniform::Type uniformType = Uniform::FLOAT; Uniform::Type uniformType = Uniform::FLOAT;
if (nameProp) { if (nameProp) {
simgear/scene/material/EffectBuilder.hxx
+1 -1
View File
@@ -594,7 +594,7 @@ initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
if (valProp->nChildren() == 0) { if (valProp->nChildren() == 0) {
setter(obj, valProp->getValue<OSGParamType>()); setter(obj, valProp->getValue<OSGParamType>());
} else { } else {
std::string propName = getGlobalProperty(prop, options); std::string propName = getGlobalProperty(valProp, options);
ScalarChangeListener<OSGParamType, ObjType, F>* listener ScalarChangeListener<OSGParamType, ObjType, F>* listener
= new ScalarChangeListener<OSGParamType, ObjType, F>(obj, setter, = new ScalarChangeListener<OSGParamType, ObjType, F>(obj, setter,
propName); propName);