diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj index e26551461..b8522bb0a 100755 --- a/projects/VC7.1/FlightGear.vcproj +++ b/projects/VC7.1/FlightGear.vcproj @@ -23,7 +23,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\..\SimGear;"..\..\..\pthreads-w32-2-7-0-release";..\..\src\FDM\JSBSim;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include" - PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;FG_PLIB_JOYSTICK_GETNAME;FG_NEW_ENVIRONMENT;FG_MPLAYER_AS;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;NO_FG_JPEG_SERVER" + PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;FG_PLIB_JOYSTICK_GETNAME;FG_NEW_ENVIRONMENT;FG_MPLAYER_AS;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER" StringPooling="TRUE" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -42,7 +42,7 @@ + + + + diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx index 8b89324fc..6ab18e73f 100644 --- a/src/Main/renderer.cxx +++ b/src/Main/renderer.cxx @@ -330,7 +330,7 @@ static osg::ref_ptr mRoot = new osg::Group; static osg::ref_ptr mCameraView = new osg::CameraView; static osg::ref_ptr mBackGroundCamera = new osg::CameraNode; -static osg::ref_ptr mSceneCamera = new osg::CameraNode; +osg::ref_ptr mSceneCamera = new osg::CameraNode; static osg::ref_ptr mFog = new osg::Fog; static osg::ref_ptr mRunwayLightingFog = new osg::Fog; diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx index 0cc9ee29f..f8ec01348 100644 --- a/src/Network/jpg-httpd.cxx +++ b/src/Network/jpg-httpd.cxx @@ -45,13 +45,13 @@ #include "jpg-httpd.hxx" -//[Leidson<] #define __MAX_HTTP_BLOCK_SIZE 4096 #define __MAX_STRING_SIZE 2048 #define __TIMEOUT_COUNT 5 #define __HTTP_GET_STRING "GET " -//[Leidson>] +#include +extern osg::ref_ptr mSceneCamera; SG_USING_STD(string); @@ -105,6 +105,10 @@ 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 ); + JpgFactory->setFrustum( left, right, bottom, top, zNear, zFar ); + nImageLen = JpgFactory -> render(); nBlockSize = ( nImageLen < __MAX_HTTP_BLOCK_SIZE ? nImageLen : __MAX_HTTP_BLOCK_SIZE );