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

Cleand up the root Makefile.

Browse Source 
Moved CullVisitor/RenderStage/RenderStageLighting across to managing lights
entirely within RenderStageLighting, and changed the management of modelview
matrices so that RenderLeaf now stores the absolute modelview matrix, rather
than a model matrix as done previously. The later allows RenderLeaf's to do
a glLoadMatrix rather than a glPushMatrix/glMultMatrix/glPopMatrix.
This commit is contained in:
Robert Osfield
2002-02-11 19:51:24 +00:00
parent aeaa31bd2a
commit 386b87d4a0
7 changed files with 37 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/osgUtil/SceneView.cpp
View File

@@ -152,6 +152,12 @@ void SceneView::cull()
_camera->adjustAspectRatio(_viewport->aspectRatio());
// comment out reset of rendergraph since clean is more efficient.
// _rendergraph->reset();
// use clean of the rendergraph rather than reset, as it is able to
// reuse the structure on the rendergraph in the next frame. This
// achieves a certain amount of frame cohereancy of memory allocation.
_rendergraph->clean();
_cullVisitor->reset();
@@ -164,15 +170,17 @@ void SceneView::cull()
_cullVisitor->setTraversalNumber(_frameStamp->getFrameNumber());
}
// comment out reset of rendergraph since clean is more efficient.
// _rendergraph->reset();
// get the camera's modelview
osg::Matrix* modelview = new osg::Matrix(_camera->getModelViewMatrix());
// take a copy of camera, and init it home
osg::Camera* camera = new Camera(*_camera);
camera->home();
// use clean of the rendergraph rather than reset, as it is able to
// reuse the structure on the rendergraph in the next frame. This
// achieves a certain amount of frame cohereancy of memory allocation.
_cullVisitor->setLODBias(_lodBias);
_cullVisitor->setCamera(*_camera);
_cullVisitor->setCamera(*camera);
_cullVisitor->setViewport(_viewport.get());
_cullVisitor->setEarthSky(NULL); // reset earth sky on each frame.
@@ -184,31 +192,34 @@ void SceneView::cull()
_renderStage->reset();
_renderStage->setViewport(_viewport.get());
_renderStage->setCamera(_camera.get());
_renderStage->setCamera(camera);
_renderStage->setClearColor(_backgroundColor);
_renderStage->setLight(_light.get());
switch(_lightingMode)
{
case(HEADLIGHT):
_renderStage->setLightingMode(RenderStageLighting::HEADLIGHT);
_renderStage->addLight(_light.get(),NULL);
break;
case(SKY_LIGHT):
_renderStage->setLightingMode(RenderStageLighting::SKY_LIGHT);
_renderStage->addLight(_light.get(),modelview);
break;
case(NO_SCENEVIEW_LIGHT):
_renderStage->setLightingMode(RenderStageLighting::NO_SCENEVIEW_LIGHT);
break;
}
if (_globalState.valid()) _cullVisitor->pushStateSet(_globalState.get());
_cullVisitor->pushCullViewState(modelview);
// traverse the scene graph to generate the rendergraph.
_sceneData->accept(*_cullVisitor);
if (_globalState.valid()) _cullVisitor->popStateSet();
_cullVisitor->popCullViewState();
// do any state sorting required.