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

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

View File

@@ -20,19 +20,19 @@
namespace osgSim
{
ShapeAttribute::ShapeAttribute() :
_type(UNKNOW),
_type(UNKNOWN),
_integer(0)
{}
ShapeAttribute::ShapeAttribute(const char * name) :
_name(name),
_type(UNKNOW),
_type(UNKNOWN),
_integer(0)
{}
ShapeAttribute::ShapeAttribute(const char * name, int value) :
_name(name),
_type(INTEGER),
_type(UNKNOWN),
_integer(value)
{}
@@ -98,7 +98,7 @@ void ShapeAttribute::copy(const ShapeAttribute& sa)
_double = sa._double;
break;
}
case UNKNOW:
case UNKNOWN:
default:
{
_integer = 0;
@@ -142,7 +142,7 @@ int ShapeAttribute::compare(const osgSim::ShapeAttribute& sa) const
if (sa._double<_double) return 1;
}
case INTEGER:
case UNKNOW:
case UNKNOWN:
default:
{
if (_integer<sa._integer) return -1;

View File

@@ -85,7 +85,7 @@ bool ShapeAttributeList_writeLocalData(const osg::Object &obj, osgDB::Output &fw
fw.indent()<<"double "<< fw.wrapString(it->getName())<<" "<<it->getDouble() << std::endl;
break;
}
case osgSim::ShapeAttribute::UNKNOW:
case osgSim::ShapeAttribute::UNKNOWN:
default: break;
}
}