From 8bb03adc1f6450b6ca3e609904b05899cd719e96 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sat, 12 May 2012 15:19:11 +0200 Subject: [PATCH] Fix compilation of FGRenderer --- src/Viewer/renderer.cxx | 5 ----- src/Viewer/renderer.hxx | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Viewer/renderer.cxx b/src/Viewer/renderer.cxx index 731eefced..4884e157e 100644 --- a/src/Viewer/renderer.cxx +++ b/src/Viewer/renderer.cxx @@ -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, diff --git a/src/Viewer/renderer.hxx b/src/Viewer/renderer.hxx index adc8ca95b..817a1b66b 100644 --- a/src/Viewer/renderer.hxx +++ b/src/Viewer/renderer.hxx @@ -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);