From: fredb <fredb>
Date: Sat, 10 Feb 2007 16:32:21 +0000 (+0000)
Subject: Fix the jpg http server
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9ae7377c9529bb3ecdb5b4b26b7d8836ee5322db;p=flightgear.git

Fix the jpg http server
---

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 26d595aee..cfbf94c1f 100644
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -327,7 +327,7 @@ static GLfloat ground_exp2_punch_through;
 // Sky structures
 SGSky *thesky;
 
-static osg::ref_ptr<osgUtil::SceneView> sceneView = new osgUtil::SceneView;
+osg::ref_ptr<osgUtil::SceneView> sceneView = new osgUtil::SceneView;  // This SceneView is used by class FGJpegHttpd ( jpg-httpd.cxx )
 static osg::ref_ptr<osg::FrameStamp> mFrameStamp = new osg::FrameStamp;
 static osg::ref_ptr<SGUpdateVisitor> mUpdateVisitor= new SGUpdateVisitor;
 
diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx
index f8ec01348..0516dd818 100644
--- a/src/Network/jpg-httpd.cxx
+++ b/src/Network/jpg-httpd.cxx
@@ -50,8 +50,8 @@
 #define __TIMEOUT_COUNT             5
 #define __HTTP_GET_STRING           "GET "
 
-#include <osg/CameraNode>
-extern osg::ref_ptr<osg::CameraNode> mSceneCamera;
+#include <osgUtil/SceneView>
+extern osg::ref_ptr<osgUtil::SceneView> sceneView;
 
 SG_USING_STD(string);
 
@@ -106,7 +106,7 @@ void HttpdImageChannel :: foundTerminator( void ) {
         SG_LOG( SG_IO, SG_DEBUG, "<<<<<<<<< HTTP Request : " << pRequest );
 
         double left, right, bottom, top, zNear, zFar;
-        mSceneCamera->getProjectionMatrixAsFrustum( left, right, bottom, top, zNear, zFar );
+        sceneView->getCamera()->getProjectionMatrixAsFrustum( left, right, bottom, top, zNear, zFar );
         JpgFactory->setFrustum( left, right, bottom, top, zNear, zFar );
 
         nImageLen  = JpgFactory -> render();