#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>
#define __HTTP_GET_STRING "GET "
#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;
}
double left, right, bottom, top, zNear, zFar;
osgViewer::Viewer* viewer = globals->get_renderer()->getViewer();
- if (viewer)
- viewer->getCamera()->getProjectionMatrixAsFrustum(left, right,
- bottom, top,
- zNear, zFar);
- else
- sceneView->getCamera()->getProjectionMatrixAsFrustum(left, right,
- bottom, top,
- zNear, zFar);
+ viewer->getCamera()->getProjectionMatrixAsFrustum(left, right,
+ bottom, top,
+ zNear, zFar);
JpgFactory->setFrustum( left, right, bottom, top, zNear, zFar );
nImageLen = JpgFactory -> render();