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

Merged from svn/trunk changeset 12636, "While we're on osgSim/ShapeAttribute, here's a fix that fixes the 'UNKNOW' typo and some

Browse Source 
doxygen"
This commit is contained in:
Robert Osfield
2011-06-24 08:33:58 +00:00
parent cb627520a7
commit 3660e3a3c3
4 changed files with 136 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/osgSim/ShapeAttribute
View File

@@ -25,10 +25,10 @@ namespace osgSim
class OSGSIM_EXPORT ShapeAttribute
{
public:
/// ShapeAttribute data type.
enum Type
{
UNKNOW,
UNKNOWN,
INTEGER,
DOUBLE,
STRING
@@ -55,17 +55,31 @@ class OSGSIM_EXPORT ShapeAttribute
inline bool operator != (const osgSim::ShapeAttribute& sa) const { return compare(sa)!=0; }
inline bool operator < (const osgSim::ShapeAttribute& sa) const { return compare(sa)<0; }
/// Get the attribute name.
const std::string & getName() const { return _name; }
/// Set the attribute name.
void setName(const std::string& name) { _name = name; }
/// Get the attribute data type.
const Type getType() const { return _type; }
/// Get the attribute data as an int.
int getInt() const { return _integer; }
/// Get the attribute data as a double.
double getDouble() const { return _double; }
/// Get the attribute data as a string.
const char * getString() const { return _string; }
/// Set an integer attribute data.
void setValue(int value) { free(); _type = INTEGER; _integer = value; }
/// Set a double attribute data.
void setValue(double value) { free(); _type = DOUBLE; _double = value; }
/// Set a string attribute data.
void setValue(const char * value);
@@ -83,8 +97,6 @@ class OSGSIM_EXPORT ShapeAttribute
double _double;
char* _string;
};
};
class OSGSIM_EXPORT ShapeAttributeList : public osg::Object, public osg::MixinVector<ShapeAttribute>