Changeset 11202

Timestamp:

03/11/10 17:46:01 (3 years ago)

Author:

robert

Message:

Clean up of initialization of statics/use of getenv

Location:

OpenSceneGraph/trunk

Files:

• include/osgUtil/RenderBin (modified) (1 diff)
• src/osg/DisplaySettings.cpp (modified) (1 diff)
• src/osg/Geometry.cpp (modified) (1 diff)
• src/osgUtil/RenderBin.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgUtil/RenderBin

@@ -170 +170 @@
 };
 
-/** Proxy class for automatic registration of renderbins with the RenderBin prototypelist.*/
-class RegisterRenderBinProxy
-{
-    public:
-        RegisterRenderBinProxy(const std::string& binName,RenderBin* proto)
-        {
-            _rb = proto;
-            RenderBin::addRenderBinPrototype(binName,_rb.get());
-        }
-
-        ~RegisterRenderBinProxy()
-        {
-            RenderBin::removeRenderBinPrototype(_rb.get());
-        }
-        
-    protected:
-        osg::ref_ptr<RenderBin> _rb;
-};
-
-
 }
 

OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp

@@ -608 +608 @@
 
 }
-
-
-

OpenSceneGraph/trunk/src/osg/Geometry.cpp

@@ -536 +536 @@
 bool Geometry::computeFastPathsUsed()
 {
-    static bool s_DisableFastPathInDisplayLists = getenv("OSG_DISABLE_FAST_PATH_IN_DISPLAY_LISTS")!=0;
-    if (_useDisplayList && s_DisableFastPathInDisplayLists)
-    {
-        osg::notify(osg::DEBUG_INFO)<<"Geometry::computeFastPathsUsed() - Disabling fast paths in display lists"<<std::endl;
-        _supportsVertexBufferObjects = _fastPath = false;
-        return _fastPath;
-    }
-
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //

OpenSceneGraph/trunk/src/osgUtil/RenderBin.cpp

@@ -31 +31 @@
 {
     public:
-        RenderBinPrototypeList() {}
+        RenderBinPrototypeList()
+        {
+            add("RenderBin",new RenderBin(RenderBin::getDefaultRenderBinSortMode()));
+            add("StateSortedBin",new RenderBin(RenderBin::SORT_BY_STATE));
+            add("DepthSortedBin",new RenderBin(RenderBin::SORT_BACK_TO_FRONT));
+            add("TraversalOrderBin",new RenderBin(RenderBin::TRAVERSAL_ORDER));
+        }
+
+        void add(const std::string& name, RenderBin* bin)
+        {
+            (*this)[name] = bin;
+        }
+
         ~RenderBinPrototypeList() {}
 };
-
-// register a RenderStage prototype with the RenderBin prototype list.
-RegisterRenderBinProxy s_registerRenderBinProxy("RenderBin",new RenderBin(RenderBin::getDefaultRenderBinSortMode()));
-RegisterRenderBinProxy s_registerStateSortedBinProxy("StateSortedBin",new RenderBin(RenderBin::SORT_BY_STATE));
-RegisterRenderBinProxy s_registerDepthSortedBinProxy("DepthSortedBin",new RenderBin(RenderBin::SORT_BACK_TO_FRONT));
-RegisterRenderBinProxy s_registerTraversalOrderProxy("TraversalOrderBin",new RenderBin(RenderBin::TRAVERSAL_ORDER));
-
 
 static RenderBinPrototypeList* renderBinPrototypeList()