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

114
ChangeLog
View File

@@ -1,3 +1,117 @@
2011-06-23 20:09 robert
* include/osgAnimation/Skeleton,
src/OpenThreads/pthreads/PThread.cpp,
src/osgAnimation/Skeleton.cpp, src/osgDB/ExternalFileWriter.cpp,
src/osgManipulator/Dragger.cpp: Merged from svn/trunk changeset
r12628.
Fixed warnings generated by clang,
src/osgAnimation/Skeleton.cpp:25:87: warning: addition of default
argument on redeclaration makes this constructor a copy
constructor [-Wdefault-arg-special-member]
Skeleton::UpdateSkeleton::UpdateSkeleton(const UpdateSkeleton&
us, const osg::CopyOp& copyop= osg::CopyOp::SHALLOW_COPY) :
osg::Object(us, copyop), osg::NodeCallback(us, copyop)
/src/OpenThreads/pthreads/PThread.cpp:1024:15: warning:
comparison of unsigned expression < 0 is always false
[-Wtautological-compare]
if (cpunum<0) return -1;
src/osgDB/ExternalFileWriter.cpp:221:122: warning: expression
result unused [-Wunused-value]
_objects.insert(ObjectsSet::value_type(&obj,
ObjectData(absoluteDestinationPath, relativeDestinationPath,
written))).first;
src/osgManipulator/Dragger.cpp:175:18: warning: using the result
of an assignment as a condition without parentheses
[-Wparentheses]
if (*itr = constraint) return;
src/osgManipulator/Dragger.cpp:187:18: warning: using the result
of an assignment as a condition without parentheses
[-Wparentheses]
if (*itr = constraint)
2011-06-23 20:03 robert
* CMakeLists.txt: Updated release candidate number to 4.
2011-06-23 18:29 robert
* src/osgViewer/GraphicsWindowX11.cpp: Merged from svn/trunk
changeset r12573, Added catch for window manager doesn't set the
window size to full screen.
2011-06-23 18:26 robert
* src/osgPlugins/Inventor/ConvertFromInventor.cpp,
src/osgPlugins/ac/Geode.cpp, src/osgViewer/GraphicsWindowX11.cpp:
Merged from svn/trunk changeset 12625. Warning fixes for:
OpenSceneGraph/src/osgPlugins/Inventor/ConvertFromInventor.cpp:
In member function ?virtual SbBool
SoVRMLImageTextureOsg::readInstance(SoInput*, short unsigned
int)?:
OpenSceneGraph/src/osgPlugins/Inventor/ConvertFromInventor.cpp:1264:16:
warning: variable ?retval? set but not used
[-Wunused-but-set-variable]
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp: In member function
?void ac3d::Geode::ProcessGeometry(std::ostream&, unsigned int)?:
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:806:35: warning:
variable ?fRep_s? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:806:43: warning:
variable ?fRep_t? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:807:35: warning:
variable ?fOffset_s? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:807:46: warning:
variable ?fOffset_t? set but not used [-Wunused-but-set-variable]
OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp: In member
function ?virtual void
osgViewer::GraphicsWindowX11::checkEvents()?:
OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp:1181:10:
warning: variable ?destroyWindowRequested? set but not used
[-Wunused-but-set-variable]
2011-06-23 16:39 robert
* include/osg/OcclusionQueryNode, include/osgViewer/Viewer,
src/osg/OcclusionQueryNode.cpp, src/osgViewer/Viewer.cpp: Merged
from svn/trunk changeset 12623.Fixed virtual method mismtaches
between subclasses and parent classes.
2011-06-23 15:42 robert
* include/osgSim/ShapeAttribute: From Ulrich Hertlein, build fix
for OSX.
2011-06-23 15:39 robert
* src/osgPlugins/zip/ReaderWriterZIP.cpp: Merged from svn/trunk,
changeset 12619, "Added better handling of archives in
ReaderWriterZip::readNode() so that if there is no master file
definition it
loads all the available nodes in the zip archive and returns an
osg::Group containing all the nodes if there is more
than one, or just returns the node if there is just one. Also
implemented this functionality for ReaderWriterZip::readImage()."
2011-06-23 12:25 robert
* AUTHORS.txt, applications/osgversion/Contributors.cpp: Fixed typo
in name
2011-06-23 11:32 robert
* AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS files
2011-06-23 11:32 robert
* applications/osgversion/Contributors.cpp: Fixed name typos
2011-06-23 11:10 robert
* include/osgGA/GUIEventHandler, include/osgManipulator/Dragger,

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>

10
src/osgSim/ShapeAttribute.cpp
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;

2
src/osgWrappers/deprecated-dotosg/osgSim/IO_ShapeAttribute.cpp
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;
}
}