Renamed osgProducer::CameraGroup and SceneHandler to OsgCameraGroup and

OsgSceneHandler to avoid the namespace bug under VS6.

Removed the osgproducer demo (its now been replaced by examples/osgviewer.)
This commit is contained in:
Robert Osfield
2003-02-25 12:28:16 +00:00
parent b32c8c65f3
commit 2f74b2cf7c
16 changed files with 134 additions and 498 deletions

View File

@@ -26,8 +26,8 @@
#include <osgGA/KeySwitchCameraManipulator>
#include <osgGA/StateSetManipulator>
#include <osgProducer/CameraGroup>
#include <osgProducer/SceneHandler>
#include <osgProducer/OsgCameraGroup>
#include <osgProducer/OsgSceneHandler>
#include <osgProducer/KeyboardMouseCallback>
#include <osgProducer/ActionAdapter>
@@ -53,9 +53,9 @@ int main( int argc, char **argv )
// create the camera group.
osgProducer::CameraGroup *cg = configFile.empty() ?
(new osgProducer::CameraGroup()):
(new osgProducer::CameraGroup(configFile));
osgProducer::OsgCameraGroup *cg = configFile.empty() ?
(new osgProducer::OsgCameraGroup()):
(new osgProducer::OsgCameraGroup(configFile));
// set up the maximum number of graphics contexts, before loading the scene graph
// to ensure that texture objects and display buffers are configured to the correct size.

View File

@@ -11,26 +11,14 @@
* OpenSceneGraph Public License for more details.
*/
#include <osgProducer/Viewer>
#include <osgDB/ReadFile>
#include <osgUtil/Optimizer>
#include <osgProducer/Viewer>
#include <osg/Node>
#include <osg/Geode>
#include <osg/Notify>
#include <osg/MatrixTransform>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
#include <osgDB/Registry>
#include <osgDB/ReadFile>
#include <osgGLUT/glut>
#include <osgGLUT/Viewer>
int main( int argc, char **argv )
{
@@ -116,7 +104,7 @@ int main( int argc, char **argv )
viewer.realize(Producer::CameraGroup::ThreadPerCamera);
// set all the sceneview's up so that their left and right add cull masks are set up.
for(osgProducer::CameraGroup::SceneHandlerList::iterator itr=viewer.getSceneHandlerList().begin();
for(osgProducer::OsgCameraGroup::SceneHandlerList::iterator itr=viewer.getSceneHandlerList().begin();
itr!=viewer.getSceneHandlerList().end();
++itr)
{