Work around apparent OSG 3.2.0 normal binding bug.

[simgear.git] / simgear / scene / material / Effect.hxx

diff --git a/simgear/scene/material/Effect.hxx b/simgear/scene/material/Effect.hxx
index 59eea81d8027fe18b4d08276d21df493527e9d01..0966dc1aa63e8b7d9bcba911b90e44af12cf4f64 100644 (file)
--- a/simgear/scene/material/Effect.hxx
+++ b/simgear/scene/material/Effect.hxx
@@ -24,6 +24,7 @@
 #include <boost/functional/hash.hpp>
 
 #include <osg/Object>
+#include <osg/observer_ptr>
 #include <osgDB/ReaderWriter>
 
 #include <simgear/props/props.hxx>
@@ -45,7 +46,7 @@ namespace simgear
 {
 class Technique;
 class Effect;
-class SGReaderWriterXMLOptions;
+class SGReaderWriterOptions;
 
 /**
  * Object to be initialized at some point after an effect -- and its
@@ -102,7 +103,7 @@ public:
     /**
      * Build the techniques from the effect properties.
      */
-    bool realizeTechniques(const SGReaderWriterXMLOptions* options = 0);
+    bool realizeTechniques(const SGReaderWriterOptions* options = 0);
     /**
      * Updaters that should be derefed when the effect is
      * deleted. Updaters arrange to be run by listening on properties
@@ -146,7 +147,7 @@ protected:
             bool operator()(const Key& lhs, const Key& rhs) const;
         };
     };
-    typedef std::tr1::unordered_map<Key, osg::ref_ptr<Effect>,
+    typedef std::tr1::unordered_map<Key, osg::observer_ptr<Effect>,
                                     boost::hash<Key>, Key::EqualTo> Cache;
     Cache* getCache()
     {
@@ -157,7 +158,7 @@ protected:
     Cache* _cache;
     friend size_t hash_value(const Key& key);
     friend Effect* makeEffect(SGPropertyNode* prop, bool realizeTechniques,
-                              const SGReaderWriterXMLOptions* options);
+                              const SGReaderWriterOptions* options);
     bool _isRealized;
 };
 // Automatic support for boost hash function
@@ -166,15 +167,17 @@ size_t hash_value(const Effect::Key&);
 
 Effect* makeEffect(const std::string& name,
                    bool realizeTechniques,
-                   const SGReaderWriterXMLOptions* options = 0);
+                   const SGReaderWriterOptions* options);
 
 Effect* makeEffect(SGPropertyNode* prop,
                    bool realizeTechniques,
-                   const SGReaderWriterXMLOptions* options = 0);
+                   const SGReaderWriterOptions* options);
 
 bool makeParametersFromStateSet(SGPropertyNode* paramRoot,
                                 const osg::StateSet* ss);
 
+void clearEffectCache();
+
 namespace effect
 {
 /**