Random buildings - initial commit.

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

diff --git a/simgear/scene/material/Effect.hxx b/simgear/scene/material/Effect.hxx
index 34ab62a0b630b39348d77ecc93900138ce4eea48..0a5ffe2b333008e7c86d3d479528a85576389fc8 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>
@@ -86,9 +87,12 @@ public:
         DEPTH_BUFFER,
         NORMAL_BUFFER,
         DIFFUSE_BUFFER,
-        SPECULAR_BUFFER,
-        EMISSION_BUFFER,
-        LIGHTING_BUFFER
+        SPEC_EMIS_BUFFER,
+        LIGHTING_BUFFER,
+        MIDDLE_BLOOM_BUFFER,
+        BLOOM_BUFFER,
+        AO_BUFFER,
+        SHADOW_BUFFER
     };
 
     // Define what needs to be generated for this effect
@@ -156,7 +160,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()
     {