X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Fmodel%2Fmodel.cxx;h=1ea486f0d13afc5b1dae4353c449539f77df3d85;hb=d04cf4d8978866eb80a1639b6d4ddfe387338c77;hp=59f33694956d600a31858e939f93bae7fd17a568;hpb=3cd4c5566f8c418bc9bbb6026072eb0192027993;p=simgear.git diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx index 59f33694..1ea486f0 100644 --- a/simgear/scene/model/model.cxx +++ b/simgear/scene/model/model.cxx @@ -33,6 +33,7 @@ #include #include +#include "SGReaderWriterXMLOptions.hxx" #include "model.hxx" using std::vector; @@ -209,7 +210,7 @@ class MakeEffectVisitor : public SplicingVisitor public: typedef std::map EffectMap; using SplicingVisitor::apply; - MakeEffectVisitor(const osgDB::ReaderWriter::Options* options = 0) + MakeEffectVisitor(const SGReaderWriterXMLOptions* options = 0) : _options(options) { } @@ -225,7 +226,7 @@ public: protected: EffectMap _effectMap; SGPropertyNode_ptr _currentEffectParent; - osg::ref_ptr _options; + osg::ref_ptr _options; }; void MakeEffectVisitor::apply(osg::Group& node) @@ -302,7 +303,7 @@ protected: ref_ptr instantiateEffects(osg::Node* modelGroup, PropertyList& effectProps, - const osgDB::ReaderWriter::Options* options) + const SGReaderWriterXMLOptions* options) { SGPropertyNode_ptr defaultEffectPropRoot; MakeEffectVisitor visitor(options);