fly/flightgear
1
0
Fork 0
Code Activity

Fix the jpg http server

Browse source
This commit is contained in:
fredb 2007-02-10 16:32:21 +00:00
parent 9bb55e78be
commit 9ae7377c95
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Main/renderer.cxx
View file

@ -327,7 +327,7 @@ static GLfloat ground_exp2_punch_through;
// Sky structures // Sky structures
SGSky *thesky; 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<osg::FrameStamp> mFrameStamp = new osg::FrameStamp;
static osg::ref_ptr<SGUpdateVisitor> mUpdateVisitor= new SGUpdateVisitor; static osg::ref_ptr<SGUpdateVisitor> mUpdateVisitor= new SGUpdateVisitor;

6
src/Network/jpg-httpd.cxx
View file

@ -50,8 +50,8 @@
#define __TIMEOUT_COUNT 5 #define __TIMEOUT_COUNT 5
#define __HTTP_GET_STRING "GET " #define __HTTP_GET_STRING "GET "
#include <osg/CameraNode> #include <osgUtil/SceneView>
extern osg::ref_ptr<osg::CameraNode> mSceneCamera; extern osg::ref_ptr<osgUtil::SceneView> sceneView;
SG_USING_STD(string); SG_USING_STD(string);
@ -106,7 +106,7 @@ void HttpdImageChannel :: foundTerminator( void ) {
SG_LOG( SG_IO, SG_DEBUG, "<<<<<<<<< HTTP Request : " << pRequest ); SG_LOG( SG_IO, SG_DEBUG, "<<<<<<<<< HTTP Request : " << pRequest );
double left, right, bottom, top, zNear, zFar; 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 ); JpgFactory->setFrustum( left, right, bottom, top, zNear, zFar );
nImageLen = JpgFactory -> render(); nImageLen = JpgFactory -> render();