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:
@@ -66,7 +66,7 @@ class FrameStatsHandler : public Producer::CameraGroup::StatsHandler, public Pro
|
||||
double x1=0.0, x2=0.0, y1=0.0, y2=0.0;
|
||||
for(unsigned int frame = 0; frame < _fs.size(); frame++ )
|
||||
{
|
||||
CameraGroup::FrameStats fs = _fs[(lindex + frame) % _fs.size()];
|
||||
Producer::CameraGroup::FrameStats fs = _fs[(lindex + frame) % _fs.size()];
|
||||
y1 = 0.0;
|
||||
y2 = y1 + 10;
|
||||
x1 = fs._startOfUpdate - zero;
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef OSG_CAMERA_GROUP_H
|
||||
#define OSG_CAMERA_GROUP_H
|
||||
#ifndef OSGPRODUCER_OSGCAMERAGROUP_H
|
||||
#define OSGPRODUCER_OSGCAMERAGROUP_H 1
|
||||
|
||||
|
||||
#include <Producer/CameraGroup>
|
||||
@@ -23,26 +23,26 @@
|
||||
#include <osg/FrameStamp>
|
||||
#include <osg/DisplaySettings>
|
||||
|
||||
#include <osgProducer/SceneHandler>
|
||||
#include <osgProducer/OsgSceneHandler>
|
||||
|
||||
namespace osgProducer {
|
||||
|
||||
class OSGPRODUCER_EXPORT CameraGroup : public Producer::CameraGroup
|
||||
class OSGPRODUCER_EXPORT OsgCameraGroup : public Producer::CameraGroup
|
||||
{
|
||||
public :
|
||||
|
||||
CameraGroup();
|
||||
OsgCameraGroup();
|
||||
|
||||
CameraGroup(Producer::CameraConfig *cfg);
|
||||
OsgCameraGroup(Producer::CameraConfig *cfg);
|
||||
|
||||
CameraGroup(const std::string& configFile);
|
||||
OsgCameraGroup(const std::string& configFile);
|
||||
|
||||
CameraGroup(osg::ArgumentParser& arguments);
|
||||
OsgCameraGroup(osg::ArgumentParser& arguments);
|
||||
|
||||
virtual ~CameraGroup() {}
|
||||
virtual ~OsgCameraGroup() {}
|
||||
|
||||
|
||||
typedef std::vector <osgProducer::SceneHandler *> SceneHandlerList;
|
||||
typedef std::vector <osgProducer::OsgSceneHandler*> SceneHandlerList;
|
||||
|
||||
|
||||
SceneHandlerList& getSceneHandlerList() { return _shvec;}
|
||||
@@ -11,8 +11,8 @@
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef OSGPRODUCER_SCENEHANDLER
|
||||
#define OSGPRODUCER_SCENEHANDLER 1
|
||||
#ifndef OSGPRODUCER_OSGSCENEHANDLER
|
||||
#define OSGPRODUCER_OSGSCENEHANDLER 1
|
||||
|
||||
#include <osgProducer/Export>
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
namespace osgProducer {
|
||||
|
||||
class OSGPRODUCER_EXPORT SceneHandler : public Producer::Camera::SceneHandler, public osgUtil::SceneView
|
||||
class OSGPRODUCER_EXPORT OsgSceneHandler : public Producer::Camera::SceneHandler, public osgUtil::SceneView
|
||||
{
|
||||
public :
|
||||
|
||||
SceneHandler( osg::DisplaySettings *ds = NULL);
|
||||
OsgSceneHandler( osg::DisplaySettings *ds = NULL);
|
||||
|
||||
/// override the init method to force it be run one at a time.
|
||||
virtual void init();
|
||||
@@ -40,7 +40,7 @@ class OSGPRODUCER_EXPORT SceneHandler : public Producer::Camera::SceneHandler, p
|
||||
|
||||
protected:
|
||||
|
||||
virtual ~SceneHandler() {}
|
||||
virtual ~OsgSceneHandler() {}
|
||||
|
||||
osg::ref_ptr<osg::RefMatrix> mm;
|
||||
osg::ref_ptr<osg::RefMatrix> pm;
|
||||
@@ -23,14 +23,14 @@
|
||||
#include <osgGA/GUIEventHandler>
|
||||
#include <osgGA/KeySwitchCameraManipulator>
|
||||
|
||||
#include <osgProducer/CameraGroup>
|
||||
#include <osgProducer/OsgCameraGroup>
|
||||
#include <osgProducer/KeyboardMouseCallback>
|
||||
|
||||
#include <list>
|
||||
|
||||
namespace osgProducer {
|
||||
|
||||
class OSGPRODUCER_EXPORT Viewer : public CameraGroup, public osgGA::GUIActionAdapter
|
||||
class OSGPRODUCER_EXPORT Viewer : public OsgCameraGroup, public osgGA::GUIActionAdapter
|
||||
{
|
||||
public :
|
||||
|
||||
|
||||
Reference in New Issue
Block a user