Hi Robert,
I had to change this in include/osgSim/ShapeAttribute
Index: include/osgSim/ShapeAttribute
===================================================================
--- include/osgSim/ShapeAttribute (revision 12618)
+++ include/osgSim/ShapeAttribute (working copy)
@@ -96,7 +96,7 @@
* shallow vs deep copying of dynamic data.*/
ShapeAttributeList(const ShapeAttributeList& sal,const osg::CopyOp&
copyop=osg::CopyOp::SHALLOW_COPY):
osg::Object(sal, copyop),
- MixinVector<ShapeAttribute>(sal)
+ osg::MixinVector<ShapeAttribute>(sal)
{
}
Cheers,
/ulrich
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2007 Robert Osfield
*
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
* (at your option) any later version. The full license is in LICENSE file
* included with this distribution, and on the openscenegraph.org website.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGSIM_SHAPEATTRIBUTE
#define OSGSIM_SHAPEATTRIBUTE 1
#include <osg/Object>
#include <osg/MixinVector>
#include <osgSim/Export>
namespace osgSim
{
class OSGSIM_EXPORT ShapeAttribute
{
public:
enum Type
{
UNKNOW,
INTEGER,
DOUBLE,
STRING
};
ShapeAttribute();
ShapeAttribute(const char * name);
ShapeAttribute(const char * name, int value);
ShapeAttribute(const char * name, double value);
/** Note, ShapeAttribute takes a copy of both name and value, the
calling code should manage its own clean up of the original strings.*/
ShapeAttribute(const char * name, const char * value);
ShapeAttribute(const ShapeAttribute & sa);
~ShapeAttribute();
ShapeAttribute& operator = (const ShapeAttribute& sa);
const std::string & getName() const { return _name; }
void setName(const std::string& name) { _name = name; }
const Type getType() const { return _type; }
int getInt() const { return _integer; }
double getDouble() const { return _double; }
const char * getString() const { return _string; }
void setValue(int value) { free(); _type = INTEGER; _integer = value; }
void setValue(double value) { free(); _type = DOUBLE; _double = value; }
void setValue(const char * value);
/** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
int compare(const osgSim::ShapeAttribute& sa) const;
private:
void free();
void copy(const ShapeAttribute& sa);
std::string _name;
Type _type;
union
{
int _integer;
double _double;
char* _string;
};
};
class OSGSIM_EXPORT ShapeAttributeList : public osg::Object, public
osg::MixinVector<ShapeAttribute>
{
public:
META_Object(osgSim, ShapeAttributeList)
ShapeAttributeList():
Object()
{}
/** Copy constructor, optional CopyOp object can be used to control
* shallow vs deep copying of dynamic data.*/
ShapeAttributeList(const ShapeAttributeList& sal,const osg::CopyOp&
copyop=osg::CopyOp::SHALLOW_COPY):
osg::Object(sal, copyop),
osg::MixinVector<ShapeAttribute>(sal)
{
}
/** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
virtual int compare(const osgSim::ShapeAttributeList& sal) const;
protected:
virtual ~ShapeAttributeList() {}
};
}
#endif // ** SHAPEATTRIBUTE_ ** //
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
