simgear/scene/sky/sky.cxx: Include sg_inlines.h with simgear/ prefix as all other...

[simgear.git] / simgear / scene / model / SGClipGroup.cxx

diff --git a/simgear/scene/model/SGClipGroup.cxx b/simgear/scene/model/SGClipGroup.cxx
index 38c09117849712e99482fefc38cf73c6bbca7095..6d2ab7f1920de92c138774f29120f23de8babad8 100644 (file)
--- a/simgear/scene/model/SGClipGroup.cxx
+++ b/simgear/scene/model/SGClipGroup.cxx
@@ -70,8 +70,18 @@ public:
   osg::ref_ptr<osg::RefMatrix> mModelView;
 };
 
-osgUtil::RegisterRenderBinProxy
-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin);
+struct SGClipGroup::ClipBinRegistrar
+{
+    ClipBinRegistrar()
+    {
+        osgUtil::RenderBin
+            ::addRenderBinPrototype("ClipRenderBin",
+                                    new SGClipGroup::ClipRenderBin);
+    }
+    static ClipBinRegistrar registrar;
+};
+
+SGClipGroup::ClipBinRegistrar SGClipGroup::ClipBinRegistrar::registrar;
 
 class SGClipGroup::CullCallback : public osg::NodeCallback {
 public:
@@ -98,11 +108,13 @@ public:
   }
 };
 
+#if 0
 static osg::Vec4d clipPlane(const osg::Vec2& p0, const osg::Vec2& p1)
 {
   osg::Vec2d v(p1[0] - p0[0], p1[1] - p0[1]);
   return osg::Vec4d(v[1], -v[0], 0, v[0]*p0[1] - v[1]*p0[0]);
 }
+#endif
 
 SGClipGroup::SGClipGroup()
 {