]> git.mxchange.org Git - flightgear.git/commitdiff
Fix compilation of FGRenderer
authorFrederic Bouvier <fredfgfs01@free.fr>
Sat, 12 May 2012 13:19:11 +0000 (15:19 +0200)
committerFrederic Bouvier <fredfgfs01@free.fr>
Sat, 12 May 2012 13:19:11 +0000 (15:19 +0200)
src/Viewer/renderer.cxx
src/Viewer/renderer.hxx

index 731eefcedeaff936c1d5064464fe0523c7c8f8b2..4884e157e7de3dc52340f3ff629bcc508dd562b5 100644 (file)
@@ -1263,11 +1263,6 @@ osg::Camera* FGRenderer::buildDeferredLightingCamera( CameraInfo* info, osg::Gra
     return camera;
 }
 
-namespace flightgear {
-CameraInfo* buildCameraFromRenderingPipeline(FGRenderingPipeline* rpipe, CameraGroup* cgroup, unsigned flags, osg::Camera* camera,
-                                    const osg::Matrix& view, const osg::Matrix& projection, osg::GraphicsContext* gc);
-}
-
 CameraInfo*
 FGRenderer::buildDeferredPipeline(CameraGroup* cgroup, unsigned flags, osg::Camera* camera,
                                     const osg::Matrix& view,
index adc8ca95b66eba00923386c05b8ef0daf9d27bef..817a1b66b0fef8333b14eb39235d974a15a6ba57 100644 (file)
@@ -157,7 +157,7 @@ protected:
     osg::Camera* buildDefaultDeferredShadowCamera( flightgear::CameraInfo* info, osg::GraphicsContext* gc );
     osg::Camera* buildDefaultDeferredLightingCamera( flightgear::CameraInfo* info, osg::GraphicsContext* gc );
 
-    flightgear::CameraInfo* FGRenderer::buildCameraFromRenderingPipeline(FGRenderingPipeline* rpipe, flightgear::CameraGroup* cgroup, unsigned flags, osg::Camera* camera,
+    flightgear::CameraInfo* buildCameraFromRenderingPipeline(FGRenderingPipeline* rpipe, flightgear::CameraGroup* cgroup, unsigned flags, osg::Camera* camera,
                                         const osg::Matrix& view, const osg::Matrix& projection, osg::GraphicsContext* gc);
 
     void buildBuffers(FGRenderingPipeline* rpipe, flightgear::CameraInfo* info);