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

Working 'noshadow' animation

Browse Source
This commit is contained in:
Frederic Bouvier
2012-06-30 16:25:21 +02:00
parent 3fa835d74c
commit 5af8bb7c8e
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/animation.cxx
+4 -8
View File
@@ -378,7 +378,6 @@ SGAnimation::SGAnimation(const SGPropertyNode* configNode,
{ {
_name = configNode->getStringValue("name", ""); _name = configNode->getStringValue("name", "");
_enableHOT = configNode->getBoolValue("enable-hot", true); _enableHOT = configNode->getBoolValue("enable-hot", true);
_disableShadow = configNode->getBoolValue("disable-shadow", false);
std::vector<SGPropertyNode_ptr> objectNames = std::vector<SGPropertyNode_ptr> objectNames =
configNode->getChildren("object-name"); configNode->getChildren("object-name");
for (unsigned i = 0; i < objectNames.size(); ++i) for (unsigned i = 0; i < objectNames.size(); ++i)
@@ -501,10 +500,6 @@ SGAnimation::install(osg::Node& node)
node.setNodeMask( SG_NODEMASK_TERRAIN_BIT | node.getNodeMask()); node.setNodeMask( SG_NODEMASK_TERRAIN_BIT | node.getNodeMask());
else else
node.setNodeMask(~SG_NODEMASK_TERRAIN_BIT & node.getNodeMask()); node.setNodeMask(~SG_NODEMASK_TERRAIN_BIT & node.getNodeMask());
if (!_disableShadow)
node.setNodeMask( SG_NODEMASK_CASTSHADOW_BIT | node.getNodeMask());
else
node.setNodeMask(~SG_NODEMASK_CASTSHADOW_BIT & node.getNodeMask());
} }
osg::Group* osg::Group*
@@ -1825,12 +1820,13 @@ osg::Group*
SGShadowAnimation::createAnimationGroup(osg::Group& parent) SGShadowAnimation::createAnimationGroup(osg::Group& parent)
{ {
SGSharedPtr<SGCondition const> condition = getCondition(); SGSharedPtr<SGCondition const> condition = getCondition();
if (!condition)
return 0;
osg::Group* group = new osg::Group; osg::Group* group = new osg::Group;
group->setName("shadow animation"); group->setName("shadow animation");
group->setUpdateCallback(new UpdateCallback(condition)); if (condition)
group->setUpdateCallback(new UpdateCallback(condition));
else
group->setNodeMask(~SG_NODEMASK_CASTSHADOW_BIT & group->getNodeMask());
parent.addChild(group); parent.addChild(group);
return group; return group;
} }
simgear/scene/model/animation.hxx
-1
View File
@@ -94,7 +94,6 @@ private:
std::list<std::string> _objectNames; std::list<std::string> _objectNames;
std::list<osg::ref_ptr<osg::Node> > _installedAnimations; std::list<osg::ref_ptr<osg::Node> > _installedAnimations;
bool _enableHOT; bool _enableHOT;
bool _disableShadow;
}; };