diff --git a/ChangeLog b/ChangeLog index 17a46ff80..6e0a8bb2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,50 @@ +2005-11-09 20:30 robert + + * src/osgWrappers/osgTerrain/DataSet.cpp: Updated wrappers + +2005-11-09 20:26 robert + + * examples/osgsimulation/osgsimulation.cpp: Added release and flush + of OpenGL objects after build of the terrain database to prevent + the build graphics context state leaking into the viewers + graphics context set. + +2005-11-09 20:24 robert + + * include/osgTerrain/DataSet, src/osgTerrain/DataSet.cpp: Added a + s/getState() to osgTerrain::DataSet to allow better integration + with applications. + +2005-11-09 17:20 robert + + * applications/osgdem/osgdem.cpp: Added some docs on command line + options. + +2005-11-09 17:19 robert + + * src/osg/ApplicationUsage.cpp: Added writing of commandline + options in getFormatedString when there is no description string. + +2005-11-09 17:08 robert + + * examples/osglightpoint/osglightpoint.cpp: Moved the blink + sequence light points down so they are visible in the default + camera position. + +2005-11-09 17:06 robert + + * examples/osgautotransform/osgautotransform.cpp: Changed the + NO_ROTATION label so it is aligned with the XZ plane to make it + easier to see. + +2005-11-09 15:27 robert + + * NEWS.txt: Quick updates to NEWS. + +2005-11-09 15:19 robert + + * ChangeLog: Updated ChangeLog + 2005-11-09 15:14 robert * src/osgWrappers/osg/AnimationPath.cpp: Updated wrappers. diff --git a/examples/osgvolume/osgvolume.cpp b/examples/osgvolume/osgvolume.cpp index 9de92d1d4..041ae2317 100644 --- a/examples/osgvolume/osgvolume.cpp +++ b/examples/osgvolume/osgvolume.cpp @@ -149,6 +149,8 @@ struct PassThroughTransformFunction struct ProcessRow { + virtual ~ProcessRow() {} + virtual void operator() (unsigned int num, GLenum source_pixelFormat, unsigned char* source, GLenum dest_pixelFormat, unsigned char* dest) const diff --git a/include/osgUtil/SceneView b/include/osgUtil/SceneView index 0a53ae4a0..d770302e3 100644 --- a/include/osgUtil/SceneView +++ b/include/osgUtil/SceneView @@ -98,7 +98,11 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced, public osg::CullSetting /** Get the viewport of the scene view. */ void getViewport(int& x,int& y,int& width,int& height) const { - if (_camera->getViewport()!=0) _camera->getViewport()->getViewport(x,y,width,height); + if (_camera->getViewport()!=0) + _camera->getViewport()->getViewport(x,y,width,height); + else + x = y = width = height = 0; + } /** Set the DisplaySettings. */ diff --git a/src/osg/LOD.cpp b/src/osg/LOD.cpp index af0999481..aa9353d54 100644 --- a/src/osg/LOD.cpp +++ b/src/osg/LOD.cpp @@ -103,8 +103,7 @@ bool LOD::addChild( Node *child ) if (_children.size()>_rangeList.size()) { - float maxRange = !_rangeList.empty()? - maxRange=_rangeList.back().second : 0.0f; + float maxRange = !_rangeList.empty() ? _rangeList.back().second : 0.0f; _rangeList.resize(_children.size(),MinMaxPair(maxRange,maxRange)); } diff --git a/src/osgPlugins/dxf/dxfReader.h b/src/osgPlugins/dxf/dxfReader.h index b7c1811f9..cada8c702 100644 --- a/src/osgPlugins/dxf/dxfReader.h +++ b/src/osgPlugins/dxf/dxfReader.h @@ -76,13 +76,13 @@ public: readerBinary() : readerBase() {} virtual ~readerBinary() {} protected: - virtual bool readGroupCode(std::ifstream& f, int &groupcode) { return false; } - virtual bool readValue(std::ifstream& f, std::string &s) { return false; } - virtual bool readValue(std::ifstream& f, bool &b) { return false; } - virtual bool readValue(std::ifstream& f, unsigned short &s) { return false; } - virtual bool readValue(std::ifstream& f, int &i) { return false; } - virtual bool readValue(std::ifstream& f, long &l) { return false; } - virtual bool readValue(std::ifstream& f, double &d) { return false; } + virtual bool readGroupCode(std::ifstream& /*f*/, int& /*groupcode*/) { return false; } + virtual bool readValue(std::ifstream& /*f*/, std::string& /*s*/) { return false; } + virtual bool readValue(std::ifstream& /*f*/, bool& /*b*/) { return false; } + virtual bool readValue(std::ifstream& /*f*/, unsigned short& /*s*/) { return false; } + virtual bool readValue(std::ifstream& /*f*/, int& /*i*/) { return false; } + virtual bool readValue(std::ifstream& /*f*/, long& /*l*/) { return false; } + virtual bool readValue(std::ifstream& /*f*/, double& /*d*/) { return false; } }; /// dxfReader. gets you through the dxf file, one group code/value pair at a time. diff --git a/src/osgPlugins/geo/osgGeoNodes.h b/src/osgPlugins/geo/osgGeoNodes.h index 888d59d1a..a5d18982d 100644 --- a/src/osgPlugins/geo/osgGeoNodes.h +++ b/src/osgPlugins/geo/osgGeoNodes.h @@ -46,10 +46,11 @@ private: std::string name; bool constrained; // are values limited by min,max }; // a numerical value, may be one of several types + class internalVars { // holds internal variables for whole model public: internalVars() { } - internalVars(const internalVars &iv, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY ) { + internalVars(const internalVars &iv) { vars=iv.vars; } ~internalVars() { }