From Ulrich Hertlein, "attached are some minor tweaks:

- fixed typos in osgViewer/ViewerBase
- const-ness in include/osg/View findSlaveIndexForCamera
- supported options for STL reader, fixed return values to reflect proper errors
- supported options for DirectX reader, fixed return values
- normals pseudo-loader: scaling normals to a const (but variable) fraction of the bounding sphere radius
"
This commit is contained in:
Robert Osfield
2008-07-17 13:51:14 +00:00
parent dd9364df0e
commit 4aed0a7eac
7 changed files with 101 additions and 74 deletions

View File

@@ -115,7 +115,7 @@ class OSG_EXPORT View : public virtual osg::Object
bool addSlave(osg::Camera* camera, bool useMastersSceneData=true) { return addSlave(camera, osg::Matrix::identity(), osg::Matrix::identity(), useMastersSceneData); }
bool addSlave(osg::Camera* camera, const osg::Matrix& projectionOffset, const osg::Matrix& viewOffse, bool useMastersSceneData=true);
bool addSlave(osg::Camera* camera, const osg::Matrix& projectionOffset, const osg::Matrix& viewOffset, bool useMastersSceneData=true);
bool removeSlave(unsigned int pos);
@@ -124,7 +124,7 @@ class OSG_EXPORT View : public virtual osg::Object
Slave& getSlave(unsigned int pos) { return _slaves[pos]; }
const Slave& getSlave(unsigned int pos) const { return _slaves[pos]; }
unsigned int findSlaveIndexForCamera(osg::Camera* camera);
unsigned int findSlaveIndexForCamera(osg::Camera* camera) const;
Slave * findSlaveForCamera(osg::Camera* camera);

View File

@@ -98,7 +98,7 @@ class OSGVIEWER_EXPORT ViewerBase : public virtual osg::Object
};
/** Set the position of the end barrier.
* AfterSwapBuffers will may result is slightly higher framerates, by may
* AfterSwapBuffers may result in slightly higher framerates, but may
* lead to inconsistent swapping between different windows.
* BeforeSwapBuffers may lead to slightly lower framerate, but improve consistency in timing of swap buffers,
* especially important if you are likely to consistently break frame.*/