#include <simgear/compiler.h>
-#include <stdlib.h> // atoi() atof()
+#include <cstdlib> // atoi() atof()
-#include STL_STRING
+#include <cstring>
#include <simgear/debug/logstream.hxx>
#include <simgear/io/iochannel.hxx>
#include <Main/fg_props.hxx>
#include <Main/globals.hxx>
+#include <Main/renderer.hxx>
#include "jpg-httpd.hxx"
#define __TIMEOUT_COUNT 5
#define __HTTP_GET_STRING "GET "
-#include <osg/CameraNode>
-extern osg::ref_ptr<osg::CameraNode> mSceneCamera;
+#include <osgUtil/SceneView>
+#include <osgViewer/Viewer>
+extern osg::ref_ptr<osgUtil::SceneView> sceneView;
-SG_USING_STD(string);
+using std::string;
bool FGJpegHttpd::open() {
bool FGJpegHttpd::process() {
- netChannel::poll();
+ simgear::NetChannel::poll();
return true;
}
SG_LOG( SG_IO, SG_DEBUG, "<<<<<<<<< HTTP Request : " << pRequest );
double left, right, bottom, top, zNear, zFar;
- mSceneCamera->getProjectionMatrixAsFrustum( left, right, bottom, top, zNear, zFar );
+ osgViewer::Viewer* viewer = globals->get_renderer()->getViewer();
+ viewer->getCamera()->getProjectionMatrixAsFrustum(left, right,
+ bottom, top,
+ zNear, zFar);
JpgFactory->setFrustum( left, right, bottom, top, zNear, zFar );
nImageLen = JpgFactory -> render();