- Update OsgGraph

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6131 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 1ec2df46ddbef667bdb0924c54a8d2df96be99af
Former-commit-id: e3c43bc04961646610f4f37a718340c7e558aeae

src/modules/graphic/osggraph/Viewer/OsgGraphicsWindow.cpp

@@ -26,7 +26,7 @@
 #include <osg/DeleteHandler>
 #include <osg/Version>
 
-namespace OSGUtil
+namespace OSGUtil
 {
 
 OsgGraphicsWindowSDL2::~OsgGraphicsWindowSDL2()
@@ -67,6 +67,7 @@ bool OsgGraphicsWindowSDL2::setWindowDecorationImplementation(bool flag)
     if(!m_Window) return false;
 
     SDL_SetWindowBordered(m_Window, flag ? SDL_TRUE : SDL_FALSE);
+
     return true;
 }
 
@@ -96,7 +97,8 @@ void OsgGraphicsWindowSDL2::setCursor(MouseCursor mouseCursor)
 
 void OsgGraphicsWindowSDL2::init()
 {
-    if(m_Valid) return;
+    if(m_Valid)
+        return;
 
     if(!_traits.valid())
         return;
@@ -224,4 +226,4 @@ void OsgGraphicsWindowSDL2::raiseWindow()
     SDL_RaiseWindow(m_Window);
 }
 
-}
+}

src/modules/graphic/osggraph/Viewer/OsgScreens.cpp

@@ -19,6 +19,8 @@
 
 #include <tgfclient.h>
 
+#include <stdexcept>
+
 #include <osgViewer/Viewer>
 #include <osgViewer/GraphicsWindow>
 #include <osg/GraphicsContext>
@@ -29,15 +31,12 @@
 #if SDL_MAJOR_VERSION >= 2
 #include "OsgGraphicsWindow.h"
 #endif
+
 #include "OsgDebugHUD.h"
 #include "OsgReflectionMapping.h"
 #include "OsgMain.h"
 #include "OsgCar.h"
 
-//#if SDL_MAJOR_VERSION >= 2
-//extern SDL_Window* 	GfuiWindow;
-//#endif
-
 SDScreens::SDScreens() :
     root(NULL),
     mirrorScene(NULL),
@@ -62,21 +61,18 @@ public:
     }
 };
 
-
 void SDScreens::Init(int x,int y, int width, int height, osg::ref_ptr<osg::Node> m_sceneroot, osg::Vec3f fogcolor)
 {
     //intialising main screen
 
     viewer = new osgViewer::Viewer;
 #if SDL_MAJOR_VERSION < 2
-    //viewer->setThreadingModel(osgViewer::Viewer::CullThreadPerCameraDrawThreadPerContext);
-    //SDView * view = new SDView(viewer->getCamera(),0,0, m_Winw, m_Winh, mirrorCam.get());
-    //osg::ref_ptr<osgViewer::GraphicsWindowEmbedded> gw = viewer->setUpViewerAsEmbeddedInWindow(0, 0, m_Winw, m_Winh);
-    //viewer->getCamera()->setViewport(new osg::Viewport(0, 0, m_Winw, m_Winh));
-    //viewer->getCamera()->setGraphicsContext(gw);
     osg::ref_ptr<osgViewer::GraphicsWindowEmbedded> gw = viewer->setUpViewerAsEmbeddedInWindow(0, 0, width, height);
-    viewer->getCamera()->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-    viewer->getCamera()->setPreDrawCallback(new CameraDrawnCallback);
+    osg::ref_ptr<osg::Camera> Camera = viewer->getCamera();
+    //Camera->setGraphicsContext(gw);
+    //Camera->setViewport(new osg::Viewport(0, 0, width, height));
+    Camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
+    Camera->setPreDrawCallback(new CameraDrawnCallback);
 #else
     SDL_Window* GfuiWindow = GfScrGetMainWindow();
 	viewer->setThreadingModel(osgViewer::Viewer::CullThreadPerCameraDrawThreadPerContext);
@@ -86,16 +82,24 @@ void SDScreens::Init(int x,int y, int width, int height, osg::ref_ptr<osg::Node>
 	traits->windowName = SDL_GetWindowTitle(GfuiWindow);
     traits->windowDecoration = !(SDL_GetWindowFlags(GfuiWindow)&SDL_WINDOW_BORDERLESS);
     traits->screenNum = SDL_GetWindowDisplayIndex(GfuiWindow);
+    traits->red = 8;
+    traits->green = 8;
+    traits->blue = 8;
+    traits->alpha = 0; // set to 0 to stop ScreenCaptureHandler reading the alpha channel
+    traits->depth = 24;
+    traits->stencil = 8;
     traits->vsync = true;
     traits->doubleBuffer = true;
     traits->inheritedWindowData = new OSGUtil::OsgGraphicsWindowSDL2::WindowData(GfuiWindow);
 
-	osg::ref_ptr<OSGUtil::OsgGraphicsWindowSDL2> gw = new OSGUtil::OsgGraphicsWindowSDL2(traits);
+    osg::ref_ptr<OSGUtil::OsgGraphicsWindowSDL2> gw = new OSGUtil::OsgGraphicsWindowSDL2(traits.get());
+    viewer->getCamera()->setGraphicsContext(gw);
+    viewer->getCamera()->setViewport(new osg::Viewport(0, 0, width, height));
 	viewer->getCamera()->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
     viewer->getCamera()->setPreDrawCallback(new CameraDrawnCallback);
 
-    if(!gw->valid()) throw 
-		std::runtime_error("Failed to create GraphicsContext");
+    if(!gw->valid())
+        throw std::runtime_error("Failed to create GraphicsContext");
 #endif
 
     osg::ref_ptr<osg::Camera> mirrorCam = new osg::Camera;

src/modules/graphic/osggraph/Viewer/OsgView.cpp

@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include <osg/Camera>
+
 #include <tgfclient.h>
 #include <graphic.h>