This patch broke the jpeg server, it used the mSceneCamera.
My attached patch changes it to use the mBackGroundCamera.
On Mon, 2007-02-05 at 23:32 -0600, Mathias Froehlich wrote:
> Update of /var/cvs/FlightGear-0.9/source/src/Main
> In directory baron:/tmp/cvs-serv17538/src/Main
>
> Modified Files:
> renderer.cxx
> Log Message:
> Modified Files:
> src/Main/renderer.cxx: Avoid an additional camera.
> Guard the plain OpenGL drawables better.
> This change now requires the new osg tarball or osg cvs.
>
>
Index: Main/renderer.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Main/renderer.cxx,v
retrieving revision 1.75
diff -u -r1.75 renderer.cxx
--- Main/renderer.cxx 6 Feb 2007 05:32:24 -0000 1.75
+++ Main/renderer.cxx 8 Feb 2007 15:30:59 -0000
@@ -334,7 +334,7 @@
static osg::ref_ptr<osg::Group> mRoot = new osg::Group;
static osg::ref_ptr<osg::CameraView> mCameraView = new osg::CameraView;
-static osg::ref_ptr<osg::Camera> mBackGroundCamera = new osg::Camera;
+osg::ref_ptr<osg::Camera> mBackGroundCamera = new osg::Camera;
static osg::ref_ptr<osg::Fog> mFog = new osg::Fog;
static osg::ref_ptr<osg::Fog> mRunwayLightingFog = new osg::Fog;
Index: Network/jpg-httpd.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Network/jpg-httpd.cxx,v
retrieving revision 1.8
diff -u -r1.8 jpg-httpd.cxx
--- Network/jpg-httpd.cxx 16 Dec 2006 17:44:46 -0000 1.8
+++ Network/jpg-httpd.cxx 8 Feb 2007 15:30:59 -0000
@@ -50,8 +50,8 @@
#define __TIMEOUT_COUNT 5
#define __HTTP_GET_STRING "GET "
-#include <osg/CameraNode>
-extern osg::ref_ptr<osg::CameraNode> mSceneCamera;
+#include <osg/Camera>
+extern osg::ref_ptr<osg::Camera> mBackGroundCamera;
SG_USING_STD(string);
@@ -106,7 +106,7 @@
SG_LOG( SG_IO, SG_DEBUG, "<<<<<<<<< HTTP Request : " << pRequest );
double left, right, bottom, top, zNear, zFar;
- mSceneCamera->getProjectionMatrixAsFrustum( left, right, bottom, top, zNear, zFar );
+ mBackGroundCamera->getProjectionMatrixAsFrustum( left, right, bottom, top, zNear, zFar );
JpgFactory->setFrustum( left, right, bottom, top, zNear, zFar );
nImageLen = JpgFactory -> render();
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
