From eb181ac84e3a9c55f61320b8a65023bb611a07aa Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 2 Jan 2002 17:01:35 +0000 Subject: [PATCH] Updates in preperation for the third attempt at the 0.8.43 release. --- ChangeLog | 165 +++++++++++------ NEWS | 2 +- doc/doc++/osg/GeoSet.html | 260 +++++++++++++++------------ doc/doc++/osg/LOD.html | 9 +- doc/doc++/osg/for_each_triangle.html | 6 +- doc/doc++/osg/osg.html | 4 +- doc/doc++/osgGLUT/Viewer.html | 142 ++++++--------- 7 files changed, 326 insertions(+), 262 deletions(-) diff --git a/ChangeLog b/ChangeLog index 940f41032..0019bece3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,61 @@ +2002-01-02 10:42 robert + + * src/: Demos/osgtexture/osgtexture.cpp, + osgPlugins/pfb/ConvertFromPerformer.cpp: Updates from Randall + Hopper to fix build under IRIX. + +2002-01-02 06:03 robert + + * src/osgPlugins/lib3ds/: ReaderWriter3DS.cpp, matrix.cpp: A small + bug fix to the matrix dump function (it was primtiing out 5 columns + instead of four). + + Added support for multiplying mesh geometry by the matrix attached + to the Lib3dsMesh structure, however this produces disjointed + models so have to the default mode to bypass this multiplication + code. Will need to revisit this in the future. + +2002-01-02 05:59 robert + + * src/osgUtil/SmoothingVisitor.cpp: Commented out the smoothing of + FLAT_TRIANGLE_STRIP and FLAT_TRIANGLE_FAN since it was causes + problems with any color list which were attached. + +2002-01-02 05:53 robert + + * src/osg/GeoSet_ogl.cpp: Moved the glShadeModel(FLAT/SMOOTH) + outside of the primtitive inner loop to reduce the amount state + changes incurred when using FLAT_ primtives. + +2002-01-02 05:49 robert + + * include/osg/GeoSet: Fixed the orientation of for_each_triangle + cases for QUAD and QUAD_STRIP. + +2001-12-31 18:21 robert + + * include/osgGLUT/Viewer, src/osgGLUT/Viewer.cpp: Removed the + variables which were duplicated in osgGLUT::Viewer and + osgGLUT::Window, standardising on the Window ones, and therefore + removing an unitialized variable that had been introduced. This + caused a crash under WindowsXP due to send invalid values to + glutReshapeWindow. + +2001-12-31 18:16 robert + + * include/osg/LOD: Added a more detailed explanation of how LOD's + work. + +2001-12-30 19:04 robert + + * NEWS, src/osg/Makefile: Updates to NEWS for date of release, and + added include/osg/DisplaySettings and include/osg/LineWidth to the + src/osg/Makefile. + +2001-12-30 15:48 robert + + * ChangeLog: Final update of ChangeLog for the 0.8.43 release. + 2001-12-30 15:03 robert * include/osg/GeoSet: Added osg::GeoSet::FLAT_TRIANGLE_FAN to the @@ -2500,15 +2558,16 @@ doc/osgUtil/ViewState.html, doc/osgUtil/icon1.gif, doc/osgUtil/icon2.gif, doc/osgUtil/index.html, doc/osgUtil/osgUtil.html, doc/osgUtil/osgUtilGetLibraryName.html, - doc/osgUtil/osgUtilGetVersion.html, src/osgPlugins/fly/Makedepend, - src/osgPlugins/fly/Makefile, src/osgPlugins/fly/base.cpp, - src/osgPlugins/fly/fly.cpp, src/osgPlugins/fly/hat.cpp, - src/osgPlugins/fly/hat.h, src/osgPlugins/fly/matrix.cpp, - src/osgPlugins/fly/matrix.h, src/osgPlugins/fly/oldtrees.cpp, - src/osgPlugins/fly/sky.cpp, src/osgPlugins/fly/tank.cpp, - src/osgPlugins/fly/terrain.cpp, src/osgPlugins/fly/terrain_data.h, - src/osgPlugins/fly/trees.cpp, src/osgPlugins/fly/vector.cpp, - src/osgPlugins/fly/vector.h, + doc/osgUtil/osgUtilGetVersion.html, src/Demos/cube/Makedepend, + src/Demos/cube/Makefile, src/Demos/cube/cube.cpp, + src/osgPlugins/fly/Makedepend, src/osgPlugins/fly/Makefile, + src/osgPlugins/fly/base.cpp, src/osgPlugins/fly/fly.cpp, + src/osgPlugins/fly/hat.cpp, src/osgPlugins/fly/hat.h, + src/osgPlugins/fly/matrix.cpp, src/osgPlugins/fly/matrix.h, + src/osgPlugins/fly/oldtrees.cpp, src/osgPlugins/fly/sky.cpp, + src/osgPlugins/fly/tank.cpp, src/osgPlugins/fly/terrain.cpp, + src/osgPlugins/fly/terrain_data.h, src/osgPlugins/fly/trees.cpp, + src/osgPlugins/fly/vector.cpp, src/osgPlugins/fly/vector.h, src/osgPlugins/pfb/osg2pf/ConvertToPerformer.cpp, src/osgPlugins/pfb/osg2pf/ConvertToPerformer.h, src/osgPlugins/pfb/osg2pf/Makedepend, @@ -3132,27 +3191,29 @@ include/osgUtil/IntersectVisitor, include/osgUtil/RenderVisitor, include/osgUtil/SceneView, include/osgUtil/TrackballManipulator, include/osgUtil/Version, src/Makefile, src/Demos/Makefile, - src/Demos/sgv/Makedepend, src/Demos/sgv/Makefile, - src/Demos/sgv/sgv.cpp, src/osg/AlphaFunc.cpp, - src/osg/Billboard.cpp, src/osg/BoundingBox.cpp, - src/osg/BoundingSphere.cpp, src/osg/Camera.cpp, - src/osg/CullFace.cpp, src/osg/DCS.cpp, src/osg/DynamicLibrary.cpp, - src/osg/ExtensionSupported.cpp, src/osg/Field.cpp, - src/osg/FieldReader.cpp, src/osg/FieldReaderIterator.cpp, - src/osg/FileNameUtils.cpp, src/osg/Fog.cpp, src/osg/GeoSet.cpp, - src/osg/GeoSet_ogl.cpp, src/osg/GeoState.cpp, src/osg/Geode.cpp, - src/osg/Group.cpp, src/osg/Image.cpp, src/osg/Input.cpp, - src/osg/LOD.cpp, src/osg/Light.cpp, src/osg/LightSource.cpp, - src/osg/Lighting.cpp, src/osg/Makedepend, src/osg/Makefile, - src/osg/Material.cpp, src/osg/Matrix.cpp, src/osg/Node.cpp, - src/osg/NodeVisitor.cpp, src/osg/Notify.cpp, src/osg/OSG.cpp, - src/osg/Object.cpp, src/osg/Output.cpp, src/osg/Point.cpp, - src/osg/PolygonOffset.cpp, src/osg/Quat.cpp, - src/osg/ReaderWriterOSG.cpp, src/osg/ReaderWriterRGB.cpp, - src/osg/Registry.cpp, src/osg/Scene.cpp, src/osg/Seg.cpp, - src/osg/Sequence.cpp, src/osg/Switch.cpp, src/osg/TexEnv.cpp, - src/osg/TexGen.cpp, src/osg/TexMat.cpp, src/osg/Texture.cpp, - src/osg/Timer.cpp, src/osg/Transparency.cpp, src/osg/Version.cpp, + src/Demos/cube/Makedepend, src/Demos/cube/Makefile, + src/Demos/cube/cube.cpp, src/Demos/sgv/Makedepend, + src/Demos/sgv/Makefile, src/Demos/sgv/sgv.cpp, + src/osg/AlphaFunc.cpp, src/osg/Billboard.cpp, + src/osg/BoundingBox.cpp, src/osg/BoundingSphere.cpp, + src/osg/Camera.cpp, src/osg/CullFace.cpp, src/osg/DCS.cpp, + src/osg/DynamicLibrary.cpp, src/osg/ExtensionSupported.cpp, + src/osg/Field.cpp, src/osg/FieldReader.cpp, + src/osg/FieldReaderIterator.cpp, src/osg/FileNameUtils.cpp, + src/osg/Fog.cpp, src/osg/GeoSet.cpp, src/osg/GeoSet_ogl.cpp, + src/osg/GeoState.cpp, src/osg/Geode.cpp, src/osg/Group.cpp, + src/osg/Image.cpp, src/osg/Input.cpp, src/osg/LOD.cpp, + src/osg/Light.cpp, src/osg/LightSource.cpp, src/osg/Lighting.cpp, + src/osg/Makedepend, src/osg/Makefile, src/osg/Material.cpp, + src/osg/Matrix.cpp, src/osg/Node.cpp, src/osg/NodeVisitor.cpp, + src/osg/Notify.cpp, src/osg/OSG.cpp, src/osg/Object.cpp, + src/osg/Output.cpp, src/osg/Point.cpp, src/osg/PolygonOffset.cpp, + src/osg/Quat.cpp, src/osg/ReaderWriterOSG.cpp, + src/osg/ReaderWriterRGB.cpp, src/osg/Registry.cpp, + src/osg/Scene.cpp, src/osg/Seg.cpp, src/osg/Sequence.cpp, + src/osg/Switch.cpp, src/osg/TexEnv.cpp, src/osg/TexGen.cpp, + src/osg/TexMat.cpp, src/osg/Texture.cpp, src/osg/Timer.cpp, + src/osg/Transparency.cpp, src/osg/Version.cpp, src/osgGLUT/GLUTEventAdapter.cpp, src/osgGLUT/Makedepend, src/osgGLUT/Makefile, src/osgGLUT/Version.cpp, src/osgGLUT/Viewer.cpp, src/osgPlugins/Makefile, @@ -3392,27 +3453,29 @@ include/osgUtil/IntersectVisitor, include/osgUtil/RenderVisitor, include/osgUtil/SceneView, include/osgUtil/TrackballManipulator, include/osgUtil/Version, src/Makefile, src/Demos/Makefile, - src/Demos/sgv/Makedepend, src/Demos/sgv/Makefile, - src/Demos/sgv/sgv.cpp, src/osg/AlphaFunc.cpp, - src/osg/Billboard.cpp, src/osg/BoundingBox.cpp, - src/osg/BoundingSphere.cpp, src/osg/Camera.cpp, - src/osg/CullFace.cpp, src/osg/DCS.cpp, src/osg/DynamicLibrary.cpp, - src/osg/ExtensionSupported.cpp, src/osg/Field.cpp, - src/osg/FieldReader.cpp, src/osg/FieldReaderIterator.cpp, - src/osg/FileNameUtils.cpp, src/osg/Fog.cpp, src/osg/GeoSet.cpp, - src/osg/GeoSet_ogl.cpp, src/osg/GeoState.cpp, src/osg/Geode.cpp, - src/osg/Group.cpp, src/osg/Image.cpp, src/osg/Input.cpp, - src/osg/LOD.cpp, src/osg/Light.cpp, src/osg/LightSource.cpp, - src/osg/Lighting.cpp, src/osg/Makedepend, src/osg/Makefile, - src/osg/Material.cpp, src/osg/Matrix.cpp, src/osg/Node.cpp, - src/osg/NodeVisitor.cpp, src/osg/Notify.cpp, src/osg/OSG.cpp, - src/osg/Object.cpp, src/osg/Output.cpp, src/osg/Point.cpp, - src/osg/PolygonOffset.cpp, src/osg/Quat.cpp, - src/osg/ReaderWriterOSG.cpp, src/osg/ReaderWriterRGB.cpp, - src/osg/Registry.cpp, src/osg/Scene.cpp, src/osg/Seg.cpp, - src/osg/Sequence.cpp, src/osg/Switch.cpp, src/osg/TexEnv.cpp, - src/osg/TexGen.cpp, src/osg/TexMat.cpp, src/osg/Texture.cpp, - src/osg/Timer.cpp, src/osg/Transparency.cpp, src/osg/Version.cpp, + src/Demos/cube/Makedepend, src/Demos/cube/Makefile, + src/Demos/cube/cube.cpp, src/Demos/sgv/Makedepend, + src/Demos/sgv/Makefile, src/Demos/sgv/sgv.cpp, + src/osg/AlphaFunc.cpp, src/osg/Billboard.cpp, + src/osg/BoundingBox.cpp, src/osg/BoundingSphere.cpp, + src/osg/Camera.cpp, src/osg/CullFace.cpp, src/osg/DCS.cpp, + src/osg/DynamicLibrary.cpp, src/osg/ExtensionSupported.cpp, + src/osg/Field.cpp, src/osg/FieldReader.cpp, + src/osg/FieldReaderIterator.cpp, src/osg/FileNameUtils.cpp, + src/osg/Fog.cpp, src/osg/GeoSet.cpp, src/osg/GeoSet_ogl.cpp, + src/osg/GeoState.cpp, src/osg/Geode.cpp, src/osg/Group.cpp, + src/osg/Image.cpp, src/osg/Input.cpp, src/osg/LOD.cpp, + src/osg/Light.cpp, src/osg/LightSource.cpp, src/osg/Lighting.cpp, + src/osg/Makedepend, src/osg/Makefile, src/osg/Material.cpp, + src/osg/Matrix.cpp, src/osg/Node.cpp, src/osg/NodeVisitor.cpp, + src/osg/Notify.cpp, src/osg/OSG.cpp, src/osg/Object.cpp, + src/osg/Output.cpp, src/osg/Point.cpp, src/osg/PolygonOffset.cpp, + src/osg/Quat.cpp, src/osg/ReaderWriterOSG.cpp, + src/osg/ReaderWriterRGB.cpp, src/osg/Registry.cpp, + src/osg/Scene.cpp, src/osg/Seg.cpp, src/osg/Sequence.cpp, + src/osg/Switch.cpp, src/osg/TexEnv.cpp, src/osg/TexGen.cpp, + src/osg/TexMat.cpp, src/osg/Texture.cpp, src/osg/Timer.cpp, + src/osg/Transparency.cpp, src/osg/Version.cpp, src/osgGLUT/GLUTEventAdapter.cpp, src/osgGLUT/Makedepend, src/osgGLUT/Makefile, src/osgGLUT/Version.cpp, src/osgGLUT/Viewer.cpp, src/osgPlugins/Makefile, diff --git a/NEWS b/NEWS index 5d62ed6ee..4ddbe0795 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ OSG News (most significant items from ChangeLog) ================================================ -30th December 2001 - osg-0.8.43.tar.gz +2nd January 2002 - osg-0.8.43.tar.gz >>> Support for TrueType text, Stereo out of the box, and much more. diff --git a/doc/doc++/osg/GeoSet.html b/doc/doc++/osg/GeoSet.html index 790368bb7..23cb86820 100644 --- a/doc/doc++/osg/GeoSet.html +++ b/doc/doc++/osg/GeoSet.html @@ -7,7 +7,7 @@ -

class SG_EXPORT osg::GeoSet

Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates.
+

class SG_EXPORT osg::GeoSet

Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates.Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates.Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates.

Inheritance:

@@ -48,163 +48,163 @@ [more]void computeNumVerts() const
[more]inline const int getNumCoords() const -
get the number of coords required by the defined primitives. +
get the number of coords required by the defined primitives.get the number of coords required by the defined primitives.get the number of coords required by the defined primitives.
[more]inline Vec3* getCoords() -
get a pointer to Vec3 coord array. +
get a pointer to Vec3 coord array.get a pointer to Vec3 coord array.get a pointer to Vec3 coord array.
[more]inline const Vec3* getCoords() const -
get a const pointer to Vec3 coord array. +
get a const pointer to Vec3 coord array.get a const pointer to Vec3 coord array.get a const pointer to Vec3 coord array.
[more]inline const int getNumCoordIndices() const -
get the number of indices required by the defined primitives. +
get the number of indices required by the defined primitives.get the number of indices required by the defined primitives.get the number of indices required by the defined primitives.
[more]inline IndexPointer& getCoordIndices() -
get the coord index array. +
get the coord index array.get the coord index array.get the coord index array.
[more]inline const IndexPointer& getCoordIndices() const -
get the const coord index array. +
get the const coord index array.get the const coord index array.get the const coord index array.
[more]void setCoords( Vec3* cp ) -
set the coords (ie the geometry) of the geoset +
set the coords (ie the geometry) of the geosetset the coords (ie the geometry) of the geosetset the coords (ie the geometry) of the geoset
[more]void setCoords( Vec3* cp, ushort* ci ) -
set the coords (ie the geometry) and ushort indices of the geoset. +
set the coords (ie the geometry) and ushort indices of the geoset.set the coords (ie the geometry) and ushort indices of the geoset.set the coords (ie the geometry) and ushort indices of the geoset.
[more]void setCoords( Vec3* cp, uint* ci ) -
set the coords (ie the geometry) and uint indices of the geoset. +
set the coords (ie the geometry) and uint indices of the geoset.set the coords (ie the geometry) and uint indices of the geoset.set the coords (ie the geometry) and uint indices of the geoset.
[more]void setCoords( Vec3* cp, IndexPointer& ip ) -
set the coords (ie the geometry) and indices of the geoset +
set the coords (ie the geometry) and indices of the geosetset the coords (ie the geometry) and indices of the geosetset the coords (ie the geometry) and indices of the geoset
[more]inline const int getNumNormals() const -
get the number of normals required by the defined primitives and normals binding +
get the number of normals required by the defined primitives and normals bindingget the number of normals required by the defined primitives and normals bindingget the number of normals required by the defined primitives and normals binding
[more]inline Vec3* getNormals() -
get a pointer to Vec3 normal array. +
get a pointer to Vec3 normal array.get a pointer to Vec3 normal array.get a pointer to Vec3 normal array.
[more]inline const Vec3* getNormals() const -
get a const pointer to Vec3 normal array. +
get a const pointer to Vec3 normal array.get a const pointer to Vec3 normal array.get a const pointer to Vec3 normal array.
[more]inline int getNumNormalIndices() const -
get the number of normal indices required by the defined primitives and normals binding +
get the number of normal indices required by the defined primitives and normals bindingget the number of normal indices required by the defined primitives and normals bindingget the number of normal indices required by the defined primitives and normals binding
[more]inline IndexPointer& getNormalIndices() -
get the normal index array. +
get the normal index array.get the normal index array.get the normal index array.
[more]inline const IndexPointer& getNormalIndices() const -
get the const normal index array. +
get the const normal index array.get the const normal index array.get the const normal index array.
[more]void setNormals( Vec3* np ) -
set the normals of the geoset +
set the normals of the geosetset the normals of the geosetset the normals of the geoset
[more]void setNormals( Vec3* np, ushort* ni ) -
set the normals and normal indices of the geoset +
set the normals and normal indices of the geosetset the normals and normal indices of the geosetset the normals and normal indices of the geoset
[more]void setNormals( Vec3* np, uint* ni ) -
set the normals and normal indices of the geoset +
set the normals and normal indices of the geosetset the normals and normal indices of the geosetset the normals and normal indices of the geoset
[more]void setNormals( Vec3* np, IndexPointer& ip ) -
set the normals and normal indices of the geoset +
set the normals and normal indices of the geosetset the normals and normal indices of the geosetset the normals and normal indices of the geoset
[more]void setNormalBinding( const BindingType binding ) -
set the normals binding to the vertices/primitives/overall +
set the normals binding to the vertices/primitives/overallset the normals binding to the vertices/primitives/overallset the normals binding to the vertices/primitives/overall
[more]inline const BindingType getNormalBinding() const
[more]inline const int getNumColors() const -
get the number of colors required by the defined primitives and color binding +
get the number of colors required by the defined primitives and color bindingget the number of colors required by the defined primitives and color bindingget the number of colors required by the defined primitives and color binding
[more]inline Vec4* getColors() -
get a pointer to Vec4 color array. +
get a pointer to Vec4 color array.get a pointer to Vec4 color array.get a pointer to Vec4 color array.
[more]inline const Vec4* getColors() const -
get a pointer to Vec4 color array. +
get a pointer to Vec4 color array.get a pointer to Vec4 color array.get a pointer to Vec4 color array.
[more]inline int getNumColorIndices() const -
get the number of colors indices required by the defined primitives and color binding +
get the number of colors indices required by the defined primitives and color bindingget the number of colors indices required by the defined primitives and color bindingget the number of colors indices required by the defined primitives and color binding
[more]inline IndexPointer& getColorIndices() -
get the color index array. +
get the color index array.get the color index array.get the color index array.
[more]inline const IndexPointer& getColorIndices() const -
get the const color index array. +
get the const color index array.get the const color index array.get the const color index array.
[more]void setColors( Vec4* cp ) -
set the colors of the geoset +
set the colors of the geosetset the colors of the geosetset the colors of the geoset
[more]void setColors( Vec4* cp, ushort* li ) -
set the colors and color indices of the geoset +
set the colors and color indices of the geosetset the colors and color indices of the geosetset the colors and color indices of the geoset
[more]void setColors( Vec4* cp, uint* li ) -
set the colors and color indices of the geoset +
set the colors and color indices of the geosetset the colors and color indices of the geosetset the colors and color indices of the geoset
[more]void setColors( Vec4* cp, IndexPointer& ip ) -
set the colors and color indices of the geoset +
set the colors and color indices of the geosetset the colors and color indices of the geosetset the colors and color indices of the geoset
[more]void setColorBinding( BindingType binding ) -
set the color binding to the vertices/primitives/overall +
set the color binding to the vertices/primitives/overallset the color binding to the vertices/primitives/overallset the color binding to the vertices/primitives/overall
[more]inline BindingType getColorBinding() const
[more]inline const int getNumTextureCoords() const -
get the number of texture coords required by the defined primitives and textures binding +
get the number of texture coords required by the defined primitives and textures bindingget the number of texture coords required by the defined primitives and textures bindingget the number of texture coords required by the defined primitives and textures binding
[more]inline Vec2* getTextureCoords() -
get a pointer to Vec4 color array. +
get a pointer to Vec4 color array.get a pointer to Vec4 color array.get a pointer to Vec4 color array.
[more]inline const Vec2* getTextureCoords() const -
get a pointer to Vec4 color array. +
get a pointer to Vec4 color array.get a pointer to Vec4 color array.get a pointer to Vec4 color array.
[more]inline const int getNumTextureIndices() const -
get the number of texture coord indices required by the defined primitives and texture binding +
get the number of texture coord indices required by the defined primitives and texture bindingget the number of texture coord indices required by the defined primitives and texture bindingget the number of texture coord indices required by the defined primitives and texture binding
[more]inline IndexPointer& getTextureIndices() -
get the texture index array. +
get the texture index array.get the texture index array.get the texture index array.
[more]inline const IndexPointer& getTextureIndices() const -
get the texture index array. +
get the texture index array.get the texture index array.get the texture index array.
[more]void setTextureCoords( Vec2* tc ) -
set the texture coords of the geoset +
set the texture coords of the geosetset the texture coords of the geosetset the texture coords of the geoset
[more]void setTextureCoords( Vec2* tc, ushort* ti ) -
set the texture coords and texture coord indices of the geoset +
set the texture coords and texture coord indices of the geosetset the texture coords and texture coord indices of the geosetset the texture coords and texture coord indices of the geoset
[more]void setTextureCoords( Vec2* tc, uint* ti ) -
set the texture coords and texture coord indices of the geoset +
set the texture coords and texture coord indices of the geosetset the texture coords and texture coord indices of the geosetset the texture coords and texture coord indices of the geoset
[more]void setTextureCoords( Vec2* tc, IndexPointer& ip ) -
set the texture coords and texture indices of the geoset +
set the texture coords and texture indices of the geosetset the texture coords and texture indices of the geosetset the texture coords and texture indices of the geoset
[more]void setTextureBinding( const BindingType binding ) -
set the texture coord binding to the vertices/primitives/overall +
set the texture coord binding to the vertices/primitives/overallset the texture coord binding to the vertices/primitives/overallset the texture coord binding to the vertices/primitives/overall
[more]inline const BindingType getTextureBinding() const
[more]inline const int getNumInterleavedCoords() const -
get the number of texture coords required by the defined primitives and textures binding +
get the number of texture coords required by the defined primitives and textures bindingget the number of texture coords required by the defined primitives and textures bindingget the number of texture coords required by the defined primitives and textures binding
[more]inline void* getInterleavedArray() -
get a pointer to interleaved float array. +
get a pointer to interleaved float array.get a pointer to interleaved float array.get a pointer to interleaved float array.
[more]inline const void* getInterleavedArray() const -
get a const pointer to interleaved float array. +
get a const pointer to interleaved float array.get a const pointer to interleaved float array.get a const pointer to interleaved float array.
[more]inline const int getNumInterleavedIndices() const -
get the number of texture coord indices required by the defined primitives and texture binding +
get the number of texture coord indices required by the defined primitives and texture bindingget the number of texture coord indices required by the defined primitives and texture bindingget the number of texture coord indices required by the defined primitives and texture binding
[more]inline IndexPointer& getInterleavedIndices() -
get the texture index array. +
get the texture index array.get the texture index array.get the texture index array.
[more]inline const IndexPointer& getInterleavedIndices() const -
get the interleaved index array. +
get the interleaved index array.get the interleaved index array.get the interleaved index array.
[more]inline const InterleaveArrayType getInterleavedFormat() const -
get the interleaved array storage format. +
get the interleaved array storage format.get the interleaved array storage format.get the interleaved array storage format.
[more]void setInterleavedArray( const InterleaveArrayType format, float* ia ) -
set the interleaved arrays of the geoset +
set the interleaved arrays of the geosetset the interleaved arrays of the geosetset the interleaved arrays of the geoset
[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, ushort* iai )
@@ -213,27 +213,27 @@ [more]void setInterleavedArray( const InterleaveArrayType format, float* ia, IndexPointer& iai )
[more]virtual void drawImmediateMode(State& state) -
draw geoset directly ignoring an OpenGL display list which could be attached. +
draw geoset directly ignoring an OpenGL display list which could be attached.draw geoset directly ignoring an OpenGL display list which could be attached.draw geoset directly ignoring an OpenGL display list which could be attached.
[more]const bool check() const
[more]void setAttributeDeleteFunctor(AttributeDeleteFunctor* adf) -
set an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
set an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geosetset an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geosetset an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geoset
[more]AttributeDeleteFunctor* getAttributeDeleteFunctor() -
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geosetget the current AttributeDeleteFunction to handle attribute arrays attached to this Geosetget the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset
[more]const AttributeDeleteFunctor* getAttributeDeleteFunctor() const -
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geosetget the current AttributeDeleteFunction to handle attribute arrays attached to this Geosetget the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset
[more]bool getStats(Statistics &) -
Statistics collection for each drawable- 260901 +
Statistics collection for each drawable- 260901Statistics collection for each drawable- 260901Statistics collection for each drawable- 260901
[more]virtual AttributeBitMask suppportsAttributeOperation() const -
return the attributes supported by applyAttrbuteUpdate() as an AttributeBitMask +
return the attributes supported by applyAttrbuteUpdate() as an AttributeBitMaskreturn the attributes supported by applyAttrbuteUpdate() as an AttributeBitMaskreturn the attributes supported by applyAttrbuteUpdate() as an AttributeBitMask
[more]virtual AttributeBitMask applyAttributeOperation(AttributeFunctor& auf) -
return the attributes successully applied in applyAttributeUpdate +
return the attributes successully applied in applyAttributeUpdatereturn the attributes successully applied in applyAttributeUpdatereturn the attributes successully applied in applyAttributeUpdate

@@ -247,7 +247,7 @@ [more]struct IndexPointer
[more]struct AttributeDeleteFunctor: public osg::Referenced -
function object which is used to handling the clean up of attribute arrays associated with GeoSet's. +
function object which is used to handling the clean up of attribute arrays associated with GeoSet's.function object which is used to handling the clean up of attribute arrays associated with GeoSet's.function object which is used to handling the clean up of attribute arrays associated with GeoSet's.

@@ -417,6 +417,16 @@ optional binding of normal, color and texture coordinates. Used for representing the visible objects in the scene. State attributes for a GeoSet are maintained in StateSet which the GeoSet maintains a referenced counted pointer to. Both GeoSet's and StateSet's can +be shared for optimal memory usage and graphics performance.Encapsulates OpenGL drawing primitives, geometry and +optional binding of normal, color and texture coordinates. Used +for representing the visible objects in the scene. State attributes +for a GeoSet are maintained in StateSet which the GeoSet maintains +a referenced counted pointer to. Both GeoSet's and StateSet's can +be shared for optimal memory usage and graphics performance.Encapsulates OpenGL drawing primitives, geometry and +optional binding of normal, color and texture coordinates. Used +for representing the visible objects in the scene. State attributes +for a GeoSet are maintained in StateSet which the GeoSet maintains +a referenced counted pointer to. Both GeoSet's and StateSet's can be shared for optimal memory usage and graphics performance.
@@ -689,43 +699,47 @@ be shared for optimal memory usage and graphics performance.
oinline const int getNumCoords() const -
get the number of coords required by the defined primitives. +
get the number of coords required by the defined primitives. get the number of coords required by the defined primitives. get the number of coords required by the defined primitives.

oinline Vec3* getCoords() -
get a pointer to Vec3 coord array. +
get a pointer to Vec3 coord array. get a pointer to Vec3 coord array. get a pointer to Vec3 coord array.

oinline const Vec3* getCoords() const -
get a const pointer to Vec3 coord array. +
get a const pointer to Vec3 coord array. get a const pointer to Vec3 coord array. get a const pointer to Vec3 coord array.

oinline const int getNumCoordIndices() const -
get the number of indices required by the defined primitives. +
get the number of indices required by the defined primitives. get the number of indices required by the defined primitives. get the number of indices required by the defined primitives.

oinline IndexPointer& getCoordIndices() -
get the coord index array. +
get the coord index array. get the coord index array. get the coord index array.

oinline const IndexPointer& getCoordIndices() const -
get the const coord index array. +
get the const coord index array. get the const coord index array. get the const coord index array.

ovoid setCoords( Vec3* cp ) -
set the coords (ie the geometry) of the geoset +
set the coords (ie the geometry) of the geosetset the coords (ie the geometry) of the geosetset the coords (ie the geometry) of the geoset

ovoid setCoords( Vec3* cp, ushort* ci )
set the coords (ie the geometry) and ushort indices of the geoset. To reduce memory footprint and bandwidth for small datasets it is +recommended the ushort indices are used instead of unit indices.set the coords (ie the geometry) and ushort indices of the geoset. +To reduce memory footprint and bandwidth for small datasets it is +recommended the ushort indices are used instead of unit indices.set the coords (ie the geometry) and ushort indices of the geoset. +To reduce memory footprint and bandwidth for small datasets it is recommended the ushort indices are used instead of unit indices.

@@ -733,67 +747,71 @@ recommended the ushort indices are used instead of unit indices.

ovoid setCoords( Vec3* cp, uint* ci )
set the coords (ie the geometry) and uint indices of the geoset. Unless your data set exceeds 65536 indices prefer ushort indices +over uint indices, only use this unit indices version if necessary.set the coords (ie the geometry) and uint indices of the geoset. +Unless your data set exceeds 65536 indices prefer ushort indices +over uint indices, only use this unit indices version if necessary.set the coords (ie the geometry) and uint indices of the geoset. +Unless your data set exceeds 65536 indices prefer ushort indices over uint indices, only use this unit indices version if necessary.

ovoid setCoords( Vec3* cp, IndexPointer& ip ) -
set the coords (ie the geometry) and indices of the geoset +
set the coords (ie the geometry) and indices of the geosetset the coords (ie the geometry) and indices of the geosetset the coords (ie the geometry) and indices of the geoset

oinline const int getNumNormals() const -
get the number of normals required by the defined primitives and normals binding +
get the number of normals required by the defined primitives and normals bindingget the number of normals required by the defined primitives and normals bindingget the number of normals required by the defined primitives and normals binding

oinline Vec3* getNormals() -
get a pointer to Vec3 normal array. +
get a pointer to Vec3 normal array. get a pointer to Vec3 normal array. get a pointer to Vec3 normal array.

oinline const Vec3* getNormals() const -
get a const pointer to Vec3 normal array. +
get a const pointer to Vec3 normal array. get a const pointer to Vec3 normal array. get a const pointer to Vec3 normal array.

oinline int getNumNormalIndices() const -
get the number of normal indices required by the defined primitives and normals binding +
get the number of normal indices required by the defined primitives and normals bindingget the number of normal indices required by the defined primitives and normals bindingget the number of normal indices required by the defined primitives and normals binding

oinline IndexPointer& getNormalIndices() -
get the normal index array. +
get the normal index array. get the normal index array. get the normal index array.

oinline const IndexPointer& getNormalIndices() const -
get the const normal index array. +
get the const normal index array. get the const normal index array. get the const normal index array.

ovoid setNormals( Vec3* np ) -
set the normals of the geoset +
set the normals of the geosetset the normals of the geosetset the normals of the geoset

ovoid setNormals( Vec3* np, ushort* ni ) -
set the normals and normal indices of the geoset +
set the normals and normal indices of the geosetset the normals and normal indices of the geosetset the normals and normal indices of the geoset

ovoid setNormals( Vec3* np, uint* ni ) -
set the normals and normal indices of the geoset +
set the normals and normal indices of the geosetset the normals and normal indices of the geosetset the normals and normal indices of the geoset

ovoid setNormals( Vec3* np, IndexPointer& ip ) -
set the normals and normal indices of the geoset +
set the normals and normal indices of the geosetset the normals and normal indices of the geosetset the normals and normal indices of the geoset

ovoid setNormalBinding( const BindingType binding ) -
set the normals binding to the vertices/primitives/overall +
set the normals binding to the vertices/primitives/overallset the normals binding to the vertices/primitives/overallset the normals binding to the vertices/primitives/overall

@@ -802,57 +820,57 @@ over uint indices, only use this unit indices version if necessary.

oinline const int getNumColors() const -
get the number of colors required by the defined primitives and color binding +
get the number of colors required by the defined primitives and color bindingget the number of colors required by the defined primitives and color bindingget the number of colors required by the defined primitives and color binding

oinline Vec4* getColors() -
get a pointer to Vec4 color array. +
get a pointer to Vec4 color array. get a pointer to Vec4 color array. get a pointer to Vec4 color array.

oinline const Vec4* getColors() const -
get a pointer to Vec4 color array. +
get a pointer to Vec4 color array. get a pointer to Vec4 color array. get a pointer to Vec4 color array.

oinline int getNumColorIndices() const -
get the number of colors indices required by the defined primitives and color binding +
get the number of colors indices required by the defined primitives and color bindingget the number of colors indices required by the defined primitives and color bindingget the number of colors indices required by the defined primitives and color binding

oinline IndexPointer& getColorIndices() -
get the color index array. +
get the color index array. get the color index array. get the color index array.

oinline const IndexPointer& getColorIndices() const -
get the const color index array. +
get the const color index array. get the const color index array. get the const color index array.

ovoid setColors( Vec4* cp ) -
set the colors of the geoset +
set the colors of the geosetset the colors of the geosetset the colors of the geoset

ovoid setColors( Vec4* cp, ushort* li ) -
set the colors and color indices of the geoset +
set the colors and color indices of the geosetset the colors and color indices of the geosetset the colors and color indices of the geoset

ovoid setColors( Vec4* cp, uint* li ) -
set the colors and color indices of the geoset +
set the colors and color indices of the geosetset the colors and color indices of the geosetset the colors and color indices of the geoset

ovoid setColors( Vec4* cp, IndexPointer& ip ) -
set the colors and color indices of the geoset +
set the colors and color indices of the geosetset the colors and color indices of the geosetset the colors and color indices of the geoset

ovoid setColorBinding( BindingType binding ) -
set the color binding to the vertices/primitives/overall +
set the color binding to the vertices/primitives/overallset the color binding to the vertices/primitives/overallset the color binding to the vertices/primitives/overall

@@ -861,57 +879,57 @@ over uint indices, only use this unit indices version if necessary.

oinline const int getNumTextureCoords() const -
get the number of texture coords required by the defined primitives and textures binding +
get the number of texture coords required by the defined primitives and textures bindingget the number of texture coords required by the defined primitives and textures bindingget the number of texture coords required by the defined primitives and textures binding

oinline Vec2* getTextureCoords() -
get a pointer to Vec4 color array. +
get a pointer to Vec4 color array. get a pointer to Vec4 color array. get a pointer to Vec4 color array.

oinline const Vec2* getTextureCoords() const -
get a pointer to Vec4 color array. +
get a pointer to Vec4 color array. get a pointer to Vec4 color array. get a pointer to Vec4 color array.

oinline const int getNumTextureIndices() const -
get the number of texture coord indices required by the defined primitives and texture binding +
get the number of texture coord indices required by the defined primitives and texture bindingget the number of texture coord indices required by the defined primitives and texture bindingget the number of texture coord indices required by the defined primitives and texture binding

oinline IndexPointer& getTextureIndices() -
get the texture index array. +
get the texture index array. get the texture index array. get the texture index array.

oinline const IndexPointer& getTextureIndices() const -
get the texture index array. +
get the texture index array. get the texture index array. get the texture index array.

ovoid setTextureCoords( Vec2* tc ) -
set the texture coords of the geoset +
set the texture coords of the geosetset the texture coords of the geosetset the texture coords of the geoset

ovoid setTextureCoords( Vec2* tc, ushort* ti ) -
set the texture coords and texture coord indices of the geoset +
set the texture coords and texture coord indices of the geosetset the texture coords and texture coord indices of the geosetset the texture coords and texture coord indices of the geoset

ovoid setTextureCoords( Vec2* tc, uint* ti ) -
set the texture coords and texture coord indices of the geoset +
set the texture coords and texture coord indices of the geosetset the texture coords and texture coord indices of the geosetset the texture coords and texture coord indices of the geoset

ovoid setTextureCoords( Vec2* tc, IndexPointer& ip ) -
set the texture coords and texture indices of the geoset +
set the texture coords and texture indices of the geosetset the texture coords and texture indices of the geosetset the texture coords and texture indices of the geoset

ovoid setTextureBinding( const BindingType binding ) -
set the texture coord binding to the vertices/primitives/overall +
set the texture coord binding to the vertices/primitives/overallset the texture coord binding to the vertices/primitives/overallset the texture coord binding to the vertices/primitives/overall

@@ -920,42 +938,42 @@ over uint indices, only use this unit indices version if necessary.

oinline const int getNumInterleavedCoords() const -
get the number of texture coords required by the defined primitives and textures binding +
get the number of texture coords required by the defined primitives and textures bindingget the number of texture coords required by the defined primitives and textures bindingget the number of texture coords required by the defined primitives and textures binding

oinline void* getInterleavedArray() -
get a pointer to interleaved float array. +
get a pointer to interleaved float array. get a pointer to interleaved float array. get a pointer to interleaved float array.

oinline const void* getInterleavedArray() const -
get a const pointer to interleaved float array. +
get a const pointer to interleaved float array. get a const pointer to interleaved float array. get a const pointer to interleaved float array.

oinline const int getNumInterleavedIndices() const -
get the number of texture coord indices required by the defined primitives and texture binding +
get the number of texture coord indices required by the defined primitives and texture bindingget the number of texture coord indices required by the defined primitives and texture bindingget the number of texture coord indices required by the defined primitives and texture binding

oinline IndexPointer& getInterleavedIndices() -
get the texture index array. +
get the texture index array. get the texture index array. get the texture index array.

oinline const IndexPointer& getInterleavedIndices() const -
get the interleaved index array. +
get the interleaved index array. get the interleaved index array. get the interleaved index array.

oinline const InterleaveArrayType getInterleavedFormat() const -
get the interleaved array storage format. +
get the interleaved array storage format. get the interleaved array storage format. get the interleaved array storage format.

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia ) -
set the interleaved arrays of the geoset +
set the interleaved arrays of the geosetset the interleaved arrays of the geosetset the interleaved arrays of the geoset

@@ -974,6 +992,10 @@ over uint indices, only use this unit indices version if necessary.

ovirtual void drawImmediateMode(State& state)
draw geoset directly ignoring an OpenGL display list which could be attached. This is the internal draw method which does the drawing itself, +and is the method to override when deriving from GeoSet for user-drawn objects.draw geoset directly ignoring an OpenGL display list which could be attached. +This is the internal draw method which does the drawing itself, +and is the method to override when deriving from GeoSet for user-drawn objects.draw geoset directly ignoring an OpenGL display list which could be attached. +This is the internal draw method which does the drawing itself, and is the method to override when deriving from GeoSet for user-drawn objects.

@@ -987,6 +1009,14 @@ and is the method to override when deriving from GeoSet for user-drawn objects. associated with GeoSet's. A default is provided which assumes that all momory attached to the GeoSet is owned by this GeoSet and can be deleted using delete []. If this is not the cause derive your own AttributeDeleteFunctor +a specify your own memory deletion operation.function object which is used to handling the clean up of attribute arrays +associated with GeoSet's. A default is provided which assumes that all +momory attached to the GeoSet is owned by this GeoSet and can be deleted +using delete []. If this is not the cause derive your own AttributeDeleteFunctor +a specify your own memory deletion operation.function object which is used to handling the clean up of attribute arrays +associated with GeoSet's. A default is provided which assumes that all +momory attached to the GeoSet is owned by this GeoSet and can be deleted +using delete []. If this is not the cause derive your own AttributeDeleteFunctor a specify your own memory deletion operation.

@@ -998,32 +1028,32 @@ a specify your own memory deletion operation.
ovoid setAttributeDeleteFunctor(AttributeDeleteFunctor* adf) -
set an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
set an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geosetset an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geosetset an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geoset

oAttributeDeleteFunctor* getAttributeDeleteFunctor() -
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geosetget the current AttributeDeleteFunction to handle attribute arrays attached to this Geosetget the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset

oconst AttributeDeleteFunctor* getAttributeDeleteFunctor() const -
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geosetget the current AttributeDeleteFunction to handle attribute arrays attached to this Geosetget the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset

obool getStats(Statistics &) -
Statistics collection for each drawable- 260901 +
Statistics collection for each drawable- 260901Statistics collection for each drawable- 260901Statistics collection for each drawable- 260901

ovirtual AttributeBitMask suppportsAttributeOperation() const -
return the attributes supported by applyAttrbuteUpdate() as an AttributeBitMask +
return the attributes supported by applyAttrbuteUpdate() as an AttributeBitMaskreturn the attributes supported by applyAttrbuteUpdate() as an AttributeBitMaskreturn the attributes supported by applyAttrbuteUpdate() as an AttributeBitMask

ovirtual AttributeBitMask applyAttributeOperation(AttributeFunctor& auf) -
return the attributes successully applied in applyAttributeUpdate +
return the attributes successully applied in applyAttributeUpdatereturn the attributes successully applied in applyAttributeUpdatereturn the attributes successully applied in applyAttributeUpdate

diff --git a/doc/doc++/osg/LOD.html b/doc/doc++/osg/LOD.html index 60e56fd53..b1e856eae 100644 --- a/doc/doc++/osg/LOD.html +++ b/doc/doc++/osg/LOD.html @@ -248,7 +248,14 @@ depending on distance from eye point. Typical uses are for load balancing - objects further away from the eye point are rendered at a lower level of detail, and at times of high stress on the graphics pipeline lower levels of detail can -also be chosen. +also be chosen. +The children are ordered from most detailed (for close up views) to the least +(see from a distance), and a set of ranges are used to decide which LOD is used +at different view distances, the criteria used is child 'i' is used when +range[i]

diff --git a/doc/doc++/osg/for_each_triangle.html b/doc/doc++/osg/for_each_triangle.html index 98639d180..63a7f3246 100644 --- a/doc/doc++/osg/for_each_triangle.html +++ b/doc/doc++/osg/for_each_triangle.html @@ -7,13 +7,17 @@ -

template<class T> void osg::for_each_triangle

(GeoSet& gset,
  T& op)

Template function for iterating through a GeoSet operating on triangles with templated functor.
+

template<class T> void osg::for_each_triangle

(GeoSet& gset,
  T& op)

Template function for iterating through a GeoSet operating on triangles with templated functor.Template function for iterating through a GeoSet operating on triangles with templated functor.Template function for iterating through a GeoSet operating on triangles with templated functor.

Documentation

Template function for iterating through a GeoSet operating on triangles with templated functor. Function automatically decomposes quads and polygons +into sub triangles which are passed onto functor.Template function for iterating through a GeoSet operating on triangles +with templated functor. Function automatically decomposes quads and polygons +into sub triangles which are passed onto functor.Template function for iterating through a GeoSet operating on triangles +with templated functor. Function automatically decomposes quads and polygons into sub triangles which are passed onto functor.

Alphabetic index HTML hierarchy of classes or Java


diff --git a/doc/doc++/osg/osg.html b/doc/doc++/osg/osg.html index 1097db9d7..b583792c5 100644 --- a/doc/doc++/osg/osg.html +++ b/doc/doc++/osg/osg.html @@ -113,10 +113,10 @@ class SG_EXPORT Geode: public GeoSet: public Drawable -
Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates. +
Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates.Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates.Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates.
template<class T> void for_each_triangle(GeoSet& gset, T& op) -
Template function for iterating through a GeoSet operating on triangles with templated functor. +
Template function for iterating through a GeoSet operating on triangles with templated functor.Template function for iterating through a GeoSet operating on triangles with templated functor.Template function for iterating through a GeoSet operating on triangles with templated functor.
SG_EXPORT extern const bool isGLExtensionSupported(const char* extension)
return true if OpenGL "extension" is supported. diff --git a/doc/doc++/osgGLUT/Viewer.html b/doc/doc++/osgGLUT/Viewer.html index f32501527..3365a05db 100644 --- a/doc/doc++/osgGLUT/Viewer.html +++ b/doc/doc++/osgGLUT/Viewer.html @@ -86,53 +86,37 @@
[more]bool _smallFeatureCullingActive
-[more]int mx +[more]int polymode
-[more]int my +[more]int texture
-[more]int mbutton +[more]int backface
-[more]int polymode +[more]int lighting
-[more]int texture +[more]int flat_shade
-[more]int backface +[more]int _two_sided_lighting
-[more]int lighting +[more]float frRate
-[more]int flat_shade +[more]int _printStats
-[more]int _two_sided_lighting +[more]bool _useDisplayLists
-[more]bool fullscreen +[more]osg::Timer _timer
-[more]int _saved_wx +[more]osg::Timer_t _tickRatePerSecond
-[more]int _saved_wy +[more]osg::Timer_t _initialTick
-[more]int _saved_ww +[more]osg::Timer_t _lastFrameTick
-[more]int _saved_wh +[more]osg::Timer_t _frameTick
-[more]float frRate +[more]osg::ref_ptr<osg::FrameStamp> _frameStamp
-[more]int _printStats -
-[more]bool _useDisplayLists -
-[more]osg::Timer _timer -
-[more]osg::Timer_t _tickRatePerSecond -
-[more]osg::Timer_t _initialTick -
-[more]osg::Timer_t _lastFrameTick -
-[more]osg::Timer_t _frameTick -
-[more]osg::ref_ptr<osg::FrameStamp> _frameStamp -
-[more]osg::ref_ptr<osg::DisplaySettings> _displaySettings +[more]osg::ref_ptr<osg::DisplaySettings> _displaySettings

@@ -155,9 +139,9 @@
[more]void showStats(const unsigned int i)
-[more]osg::Timer_t clockTick() +[more]osg::Timer_t clockTick()
-[more]osg::Timer_t frameTick() +[more]osg::Timer_t frameTick()

@@ -166,7 +150,7 @@
[more]typedef std::vector<ViewportDef> ViewportList ViewportList _viewportList
-[more]struct +[more]struct

@@ -208,6 +192,14 @@ oint _mbutton
obool _fullscreen +
+oint _saved_wx +
+oint _saved_wy +
+oint _saved_ww +
+oint _saved_wh

@@ -422,134 +414,102 @@ only available for backwards compatibility.
obool _smallFeatureCullingActive

- - -

oint mx -

- - -

oint my -

- - -

oint mbutton -

- +

oint polymode

- +

oint texture

- +

oint backface

- +

oint lighting

- +

oint flat_shade

- +

oint _two_sided_lighting

- - -

obool fullscreen -

- - -

oint _saved_wx -

- - -

oint _saved_wy -

- - -

oint _saved_ww -

- - -

oint _saved_wh -

- +

ofloat frRate

- +

oint _printStats

- +

ostruct

- +
ofloat timeApp

- +

ofloat timeCull

- +

ofloat timeDraw

- +

ofloat timeFrame

- +

oosg::Timer_t frameend

- +
obool _useDisplayLists

- +

oosg::Timer _timer

- +

oosg::Timer_t _tickRatePerSecond

- +

oosg::Timer_t _initialTick

- +

oosg::Timer_t _lastFrameTick

- +

oosg::Timer_t _frameTick

- +

oosg::Timer_t clockTick()

- +

oosg::Timer_t frameTick()

- +

oosg::ref_ptr<osg::FrameStamp> _frameStamp

- +

oosg::ref_ptr<osg::DisplaySettings> _displaySettings