From 6c07be375cbe3c86a4ecfc99d444eda5c12582ba Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 11 Mar 2010 16:46:01 +0000
Subject: [PATCH] Clean up of initialization of statics/use of getenv

---
 include/osgUtil/RenderBin   | 20 --------------------
 src/osg/DisplaySettings.cpp |  3 ---
 src/osg/Geometry.cpp        |  8 --------
 src/osgUtil/RenderBin.cpp   | 21 +++++++++++++--------
 4 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/include/osgUtil/RenderBin b/include/osgUtil/RenderBin
index ae742e6e7..5364afbd6 100644
--- a/include/osgUtil/RenderBin
+++ b/include/osgUtil/RenderBin
@@ -169,26 +169,6 @@ class OSGUTIL_EXPORT RenderBin : public osg::Object
 
 };
 
-/** 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;
-};
-
-
 }
 
 #endif
diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
index 31c10d7f1..63b9f56ba 100644
--- a/src/osg/DisplaySettings.cpp
+++ b/src/osg/DisplaySettings.cpp
@@ -607,6 +607,3 @@ void DisplaySettings::readCommandLine(ArgumentParser& arguments)
     while (arguments.read("--gl-profile-mask", _glContextProfileMask)) {}
 
 }
-
-
-
diff --git a/src/osg/Geometry.cpp b/src/osg/Geometry.cpp
index 785a8df8b..5add99b6b 100644
--- a/src/osg/Geometry.cpp
+++ b/src/osg/Geometry.cpp
@@ -535,14 +535,6 @@ unsigned int Geometry::getPrimitiveSetIndex(const PrimitiveSet* primitiveset) co
 
 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;
-    }
-
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //
     // check to see if fast path can be used.
diff --git a/src/osgUtil/RenderBin.cpp b/src/osgUtil/RenderBin.cpp
index 2637fd775..803b97c58 100644
--- a/src/osgUtil/RenderBin.cpp
+++ b/src/osgUtil/RenderBin.cpp
@@ -30,17 +30,22 @@ class RenderBinPrototypeList : osg::depends_on<OpenThreads::Mutex*, osg::Referen
                                public osg::Referenced, public std::map< std::string, osg::ref_ptr<RenderBin> >
 {
     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()
 {
     static osg::ref_ptr<RenderBinPrototypeList> s_renderBinPrototypeList = new  RenderBinPrototypeList;