FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed osg::CameraNode to osg::Camera, cleaned up osg::View.

Browse Source 
Added beginnings of new osgViewer::Scene,View,Viewer,CompositeViewer and GraphicsWindowProxy files.
This commit is contained in:
Robert Osfield
2006-11-27 14:52:07 +00:00
parent b82e521444
commit fd2ffeb310
110 changed files with 2257 additions and 1466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgProducer/OsgCameraGroup.cpp
View File

@@ -29,7 +29,6 @@
#define WGL_SAMPLES_ARB 0x2042
#endif
using namespace Producer;
using namespace osgProducer;
static osg::ApplicationUsageProxy OsgCameraGroup_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE, "OSG_PROCESSOR_AFFINITY <mode>", "ON | OFF - Where supported, switch on or off the processor affinity." );
@@ -554,8 +553,8 @@ bool OsgCameraGroup::realize()
sv->setDefaults(_realizeSceneViewOptions);
// note, should really compute the projection and view offsets...
// but not critical as Producer controls the CameraNode matrices via SceneView.
_view->addCamera(sv->getCamera());
// but not critical as Producer controls the osg::Camera matrices via SceneView.
_view->addSlave(sv->getCamera());
sv->setView(_view.get());
if (_renderSurfaceStateMap.count(rs)==0)
@@ -693,7 +692,7 @@ bool OsgCameraGroup::realize()
// disable multi-threading of cameras.
if (_threadModel == Producer::CameraGroup::ThreadPerCamera)
{
std::set<RenderSurface*> renderSurfaceSet;
std::set<Producer::RenderSurface*> renderSurfaceSet;
for( unsigned int i = 0; i < _cfg->getNumberOfCameras(); i++ )
{
Producer::Camera *cam = _cfg->getCamera(i);
@@ -707,7 +706,7 @@ bool OsgCameraGroup::realize()
osg::notify(osg::INFO)<<" threading problems when camera's share a RenderSurface."<<std::endl;
_threadModel = Producer::CameraGroup::SingleThreaded;
}
else if (renderSurfaceSet.size()>1 && RenderSurface::allGLContextsAreShared())
else if (renderSurfaceSet.size()>1 && Producer::RenderSurface::allGLContextsAreShared())
{
// we have multiple RenderSurface, but with share contexts, which is dangerous for multi-threaded usage,
// so need to disable multi-threading to prevent problems.
@@ -811,16 +810,21 @@ void OsgCameraGroup::frame()
double left, right, bottom, top, nearClip, farClip;
getLensParams(left, right, bottom, top, nearClip, farClip);
if (getLensProjectionType()==Camera::Lens::Perspective)
if (!_view->getCamera())
{
_view->setProjectionMatrixAsFrustum(left, right, bottom, top, nearClip, farClip);
_view->setCamera(new osg::Camera);
}
if (getLensProjectionType()==Producer::Camera::Lens::Perspective)
{
_view->getCamera()->setProjectionMatrixAsFrustum(left, right, bottom, top, nearClip, farClip);
}
else
{
_view->setProjectionMatrixAsOrtho(left, right, bottom, top, nearClip, farClip);
_view->getCamera()->setProjectionMatrixAsOrtho(left, right, bottom, top, nearClip, farClip);
}
_view->setViewMatrix(getViewMatrix());
_view->getCamera()->setViewMatrix(getViewMatrix());
}
// the settings in sync.

5
src/osgProducer/Viewer.cpp
View File

@@ -21,10 +21,7 @@
#include <stdio.h>
using namespace Producer;
using namespace osgProducer;
using namespace osg;
#ifdef __APPLE__
#define SINGLE_THREAD_KEYBOARDMOUSE
@@ -60,7 +57,7 @@ public:
traverse(node);
}
NodePath _pathToCoordinateSystemNode;
osg::NodePath _pathToCoordinateSystemNode;
};