diff --git a/doc/doc++/osg/State.html b/doc/doc++/osg/State.html
index 8fa636079..6ba76a053 100644
--- a/doc/doc++/osg/State.html
+++ b/doc/doc++/osg/State.html
@@ -64,335 +64,351 @@
![[more]](icon1.gif)
void apply()
Apply the state
-inline bool applyMode(StateAttribute::GLMode mode, bool enabled)
+inline void setGlobalDefaultModeValue(StateAttribute::GLMode mode, bool enabled)
+
+inline bool getGlobalDefaultModeValue(StateAttribute::GLMode mode)
+
+inline bool applyMode(StateAttribute::GLMode mode, bool enabled)
Apply an OpenGL mode if required.
-inline bool applyTextureMode(unsigned int unit, StateAttribute::GLMode mode, bool enabled)
+inline void setGlobalDefaultTextureModeValue(unsigned int unit, StateAttribute::GLMode mode, bool enabled)
-inline bool applyAttribute(const StateAttribute* attribute)
+inline bool getGlobalDefaultTextureModeValue(unsigned int unit, StateAttribute::GLMode mode)
+
+inline bool applyTextureMode(unsigned int unit, StateAttribute::GLMode mode, bool enabled)
+
+inline void setGlobalDefaultAttribute(const StateAttribute* attribute)
+
+inline const StateAttribute* getGlobalDefaultAttribute(StateAttribute::Type type)
+
+inline bool applyAttribute(const StateAttribute* attribute)
Apply an attribute if required.
-inline bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute)
+inline void setGlobalDefaultTextureAttribute(unsigned int unit, const StateAttribute* attribute)
-void haveAppliedMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
+inline const StateAttribute* getGlobalDefaultTextureAttribute(unsigned int unit, StateAttribute::Type type)
+
+inline bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute)
+
+void haveAppliedMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
Mode has been set externally, update state to reflect this setting
-void haveAppliedMode(StateAttribute::GLMode mode)
+void haveAppliedMode(StateAttribute::GLMode mode)
Mode has been set externally, therefore dirty the associated mode in osg::State so it is applied on next call to osg::State::apply()
-void haveAppliedAttribute(const StateAttribute* attribute)
+void haveAppliedAttribute(const StateAttribute* attribute)
Attribute has been applied externally, update state to reflect this setting
-void haveAppliedAttribute(StateAttribute::Type type)
+void haveAppliedAttribute(StateAttribute::Type type)
Attribute has been applied externally, and therefore this attribute type has been dirtied and will need to be re-appplied on next osg::Stateapply().
-bool getLastAppliedMode(StateAttribute::GLMode mode) const
+bool getLastAppliedMode(StateAttribute::GLMode mode) const
Get whether the current specified mode is enabled (true) or disabled (false)
-const StateAttribute* getLastAppliedAttribute(StateAttribute::Type type) const
+const StateAttribute* getLastAppliedAttribute(StateAttribute::Type type) const
Get the current specified attribute, return NULL is one has not yet been applied
-void haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
+void haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
texture Mode has been set externally, update state to reflect this setting
-void haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode)
+void haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode)
texture Mode has been set externally, therefore dirty the associated mode in osg::State so it is applied on next call to osg::State::apply()
-void haveAppliedTextureAttribute(unsigned int unit, const StateAttribute* attribute)
+void haveAppliedTextureAttribute(unsigned int unit, const StateAttribute* attribute)
texture Attribute has been applied externally, update state to reflect this setting
-void haveAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type)
+void haveAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type)
texture Attribute has been applied externally, and therefore this attribute type has been dirtied and will need to be re-appplied on next osg::Stateapply().
-bool getLastAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode) const
+bool getLastAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode) const
Get whether the current specified texture mode is enabled (true) or disabled (false)
-const StateAttribute* getLastAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type) const
+const StateAttribute* getLastAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type) const
Get the current specified texture attribute, return NULL is one has not yet been applied
-void dirtyAllModes()
+void dirtyAllModes()
Dirty the modes previously applied in osg::State
-void dirtyAllAttributes()
+void dirtyAllAttributes()
Dirty the modes attributes previously applied in osg::State
-void disableAllVertexArrays()
+void disableAllVertexArrays()
disable the vertex, normal, color, tex coords, secenday color, fog coord and index arrays
-void dirtyAllVertexArrays()
+void dirtyAllVertexArrays()
dirty the vertex, normal, color, tex coords, secenday color, fog coord and index arrays
-void setInterleavedArrays( GLenum format, GLsizei stride, const GLvoid* pointer)
+void setInterleavedArrays( GLenum format, GLsizei stride, const GLvoid* pointer)
Wrapper around glInterleavedArrays().
-inline void setVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
+inline void setVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_VERTEX_ARRAY);glVertexPointer(); note, only updates values that change
-inline void disableVertexPointer()
+inline void disableVertexPointer()
wrapper glDisableClientState(GL_VERTEX_ARRAY).
-inline void dirtyVertexPointer()
+inline void dirtyVertexPointer()
-inline void setNormalPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
+inline void setNormalPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_NORMAL_ARRAY);glNormalPointer(); note, only updates values that change
-inline void disableNormalPointer()
+inline void disableNormalPointer()
wrapper around glDisableClientState(GL_NORMAL_ARRAY); note, only updates values that change
-inline void dirtyNormalPointer()
+inline void dirtyNormalPointer()
-inline void setColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
+inline void setColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_COLOR_ARRAY);glColorPointer(); note, only updates values that change
-inline void disableColorPointer()
+inline void disableColorPointer()
wrapper around glDisableClientState(GL_COLOR_ARRAY); note, only updates values that change
-inline void dirtyColorPointer()
+inline void dirtyColorPointer()
-inline bool isSecondaryColorSupported() const
+inline bool isSecondaryColorSupported() const
-void setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
+void setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_SECONDARY_COLOR_ARRAY);glSecondayColorPointer(); note, only updates values that change
-inline void disableSecondaryColorPointer()
+inline void disableSecondaryColorPointer()
wrapper around glDisableClientState(GL_SECONDARY_COLOR_ARRAY); note, only updates values that change
-inline void dirtySecondaryColorPointer()
+inline void dirtySecondaryColorPointer()
-inline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
+inline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_INDEX_ARRAY);glIndexPointer(); note, only updates values that change
-inline void disableIndexPointer()
+inline void disableIndexPointer()
wrapper around glDisableClientState(GL_INDEX_ARRAY); note, only updates values that change
-inline void dirtyIndexPointer()
+inline void dirtyIndexPointer()
-inline bool isFogCoordSupported() const
+inline bool isFogCoordSupported() const
-void setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
+void setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_FOG_COORDINATE_ARRAY);glFogCoordPointer(); note, only updates values that change
-inline void disableFogCoordPointer()
+inline void disableFogCoordPointer()
wrapper around glDisableClientState(GL_FOG_COORDINATE_ARRAY); note, only updates values that change
-inline void dirtyFogCoordPointer()
+inline void dirtyFogCoordPointer()
-inline void setTexCoordPointer( unsigned int unit, GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
+inline void setTexCoordPointer( unsigned int unit, GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_TEXTURE_COORD_ARRAY);glTexCoordPointer(); note, only updates values that change
-inline void disableTexCoordPointer( unsigned int unit )
+inline void disableTexCoordPointer( unsigned int unit )
wrapper around glDisableClientState(GL_TEXTURE_COORD_ARRAY); note, only updates values that change
-inline void dirtyTexCoordPointer( unsigned int unit )
+inline void dirtyTexCoordPointer( unsigned int unit )
-inline void disableTexCoordPointersAboveAndIncluding( unsigned int unit )
+inline void disableTexCoordPointersAboveAndIncluding( unsigned int unit )
-inline void dirtyTexCoordPointersAboveAndIncluding( unsigned int unit )
+inline void dirtyTexCoordPointersAboveAndIncluding( unsigned int unit )
-bool setClientActiveTextureUnit( unsigned int unit )
+bool setClientActiveTextureUnit( unsigned int unit )
set the current tex coord array texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
-bool setActiveTextureUnit( unsigned int unit )
+bool setActiveTextureUnit( unsigned int unit )
set the current texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
-void setVertexAttribPointer( unsigned int index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr )
+void setVertexAttribPointer( unsigned int index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableVertexAttribArrayARB(index);glVertexAttribPointerARB(); note, only updates values that change
-void disableVertexAttribPointer( unsigned int index )
+void disableVertexAttribPointer( unsigned int index )
wrapper around DisableVertexAttribArrayARB(index); note, only updates values that change
-void disableVertexAttribPointersAboveAndIncluding( unsigned int index )
+void disableVertexAttribPointersAboveAndIncluding( unsigned int index )
-inline void dirtyVertexAttribPointersAboveAndIncluding( unsigned int index )
+inline void dirtyVertexAttribPointersAboveAndIncluding( unsigned int index )
-bool isVertexBufferObjectSupported() const
+bool isVertexBufferObjectSupported() const
-inline void setContextID(unsigned int contextID)
+inline void setContextID(unsigned int contextID)
Set the current OpenGL context uniqueID.
-inline unsigned int getContextID() const
+inline unsigned int getContextID() const
Get the current OpenGL context unique ID
-inline void setFrameStamp(FrameStamp* fs)
+inline void setFrameStamp(FrameStamp* fs)
Set the frame stamp for the current frame
-inline const FrameStamp* getFrameStamp() const
+inline const FrameStamp* getFrameStamp() const
Set the frame stamp for the current frame
-inline void setDisplaySettings(DisplaySettings* vs)
+inline void setDisplaySettings(DisplaySettings* vs)
Set the DisplaySettings.
-inline const DisplaySettings* getDisplaySettings() const
+inline const DisplaySettings* getDisplaySettings() const
Get the DisplaySettings
-void setAbortRenderingPtr(bool* abortPtr)
+void setAbortRenderingPtr(bool* abortPtr)
Set flag for early termination of the draw traversal
-bool getAbortRendering() const
+bool getAbortRendering() const
Get flag for early termination of the draw traversal, if true steps should be taken to complete rendering early
-void setReportGLErrors(bool flag)
+void setReportGLErrors(bool flag)
-bool getReportGLErrors() const
+bool getReportGLErrors() const
-bool checkGLErrors(const char* str) const
+bool checkGLErrors(const char* str) const
-bool checkGLErrors(StateAttribute::GLMode mode) const
+bool checkGLErrors(StateAttribute::GLMode mode) const
-bool checkGLErrors(const StateAttribute* attribute) const
+bool checkGLErrors(const StateAttribute* attribute) const
-inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-inline void applyModeMap(ModeMap& modeMap)
+inline void applyModeMap(ModeMap& modeMap)
-inline void applyAttributeMap(AttributeMap& attributeMap)
+inline void applyAttributeMap(AttributeMap& attributeMap)
Public
-
-typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair
+typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair
-
-typedef std::vector<AttributePair> AttributeVec
+typedef std::vector<AttributePair> AttributeVec
-
-typedef std::vector<StateAttribute::GLModeValue> ValueVec
+typedef std::vector<StateAttribute::GLModeValue> ValueVec
Protected Classes
-
-struct ModeStack
+struct ModeStack
-
-struct AttributeStack
+struct AttributeStack
-
-struct EnabledArrayPair
+struct EnabledArrayPair
Protected Fields
-
-unsigned int _contextID
+unsigned int _contextID
-
-ref_ptr<FrameStamp> _frameStamp
+ref_ptr<FrameStamp> _frameStamp
-
-ref_ptr<const RefMatrix> _identity
+ref_ptr<const RefMatrix> _identity
-
-ref_ptr<const RefMatrix> _initialViewMatrix
+ref_ptr<const RefMatrix> _initialViewMatrix
-
-ref_ptr<const RefMatrix> _projection
+ref_ptr<const RefMatrix> _projection
-
-ref_ptr<const RefMatrix> _modelView
+ref_ptr<const RefMatrix> _modelView
-
-Matrix _initialInverseViewMatrix
+Matrix _initialInverseViewMatrix
-
-ref_ptr<DisplaySettings> _displaySettings
+ref_ptr<DisplaySettings> _displaySettings
-
-bool* _abortRenderingPtr
+bool* _abortRenderingPtr
-
-bool _reportGLErrors
+bool _reportGLErrors
-
-ModeMap _modeMap
+ModeMap _modeMap
-
-AttributeMap _attributeMap
+AttributeMap _attributeMap
-
-TextureModeMapList _textureModeMapList
+TextureModeMapList _textureModeMapList
-
-TextureAttributeMapList _textureAttributeMapList
+TextureAttributeMapList _textureAttributeMapList
-
-StateSetStack _drawStateStack
+StateSetStack _drawStateStack
-
-EnabledArrayPair _vertexArray
+EnabledArrayPair _vertexArray
-
-EnabledArrayPair _normalArray
+EnabledArrayPair _normalArray
-
-EnabledArrayPair _colorArray
+EnabledArrayPair _colorArray
-
-EnabledArrayPair _secondaryColorArray
+EnabledArrayPair _secondaryColorArray
-
-EnabledArrayPair _indexArray
+EnabledArrayPair _indexArray
-
-EnabledArrayPair _fogArray
+EnabledArrayPair _fogArray
-
-EnabledTexCoordArrayList _texCoordArrayList
+EnabledTexCoordArrayList _texCoordArrayList
-
-EnabledVertexAttribArrayList _vertexAttribArrayList
+EnabledVertexAttribArrayList _vertexAttribArrayList
-
-unsigned int _currentActiveTextureUnit
+unsigned int _currentActiveTextureUnit
-
-unsigned int _currentClientActiveTextureUnit
+unsigned int _currentClientActiveTextureUnit
-
-mutable bool _isSecondaryColorSupportResolved
+mutable bool _isSecondaryColorSupportResolved
-
-mutable bool _isSecondaryColorSupported
+mutable bool _isSecondaryColorSupported
-
-mutable bool _isFogCoordSupportResolved
+mutable bool _isFogCoordSupportResolved
-
-mutable bool _isFogCoordSupported
+mutable bool _isFogCoordSupported
-
-mutable bool _isVertexBufferObjectSupportResolved
+mutable bool _isVertexBufferObjectSupportResolved
-
-mutable bool _isVertexBufferObjectSupported
+mutable bool _isVertexBufferObjectSupported
Protected Methods
-
-virtual ~State()
+virtual ~State()
-
-inline bool applyMode(StateAttribute::GLMode mode, bool enabled, ModeStack& ms)
+inline bool applyMode(StateAttribute::GLMode mode, bool enabled, ModeStack& ms)
- apply an OpenGL mode if required, passing in mode, enable flag and appropriate mode stack
-
-inline bool applyAttribute(const StateAttribute* attribute, AttributeStack& as)
+inline bool applyAttribute(const StateAttribute* attribute, AttributeStack& as)
- apply an attribute if required, passing in attribute and appropriate attribute stack
-
-inline bool applyGlobalDefaultAttribute(AttributeStack& as)
+inline bool applyGlobalDefaultAttribute(AttributeStack& as)
-
-inline ModeMap& getOrCreateTextureModeMap(unsigned int unit)
+inline ModeMap& getOrCreateTextureModeMap(unsigned int unit)
-
-inline AttributeMap& getOrCreateTextureAttributeMap(unsigned int unit)
+inline AttributeMap& getOrCreateTextureAttributeMap(unsigned int unit)
-
-void haveAppliedMode(ModeMap& modeMap, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
+void haveAppliedMode(ModeMap& modeMap, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
-
-void haveAppliedMode(ModeMap& modeMap, StateAttribute::GLMode mode)
+void haveAppliedMode(ModeMap& modeMap, StateAttribute::GLMode mode)
-
-void haveAppliedAttribute(AttributeMap& attributeMap, const StateAttribute* attribute)
+void haveAppliedAttribute(AttributeMap& attributeMap, const StateAttribute* attribute)
-
-void haveAppliedAttribute(AttributeMap& attributeMap, StateAttribute::Type type)
+void haveAppliedAttribute(AttributeMap& attributeMap, StateAttribute::Type type)
-
-bool getLastAppliedMode(const ModeMap& modeMap, StateAttribute::GLMode mode) const
+bool getLastAppliedMode(const ModeMap& modeMap, StateAttribute::GLMode mode) const
-
-const StateAttribute* getLastAppliedAttribute(const AttributeMap& attributeMap, StateAttribute::Type type) const
+const StateAttribute* getLastAppliedAttribute(const AttributeMap& attributeMap, StateAttribute::Type type) const
-
-bool computeSecondaryColorSupported() const
+bool computeSecondaryColorSupported() const
-
-bool computeFogCoordSupported() const
+bool computeFogCoordSupported() const
-
-bool computeVertexBufferObjectSupported() const
+bool computeVertexBufferObjectSupported() const
Protected
-
-typedef std::map<StateAttribute::GLMode,ModeStack> ModeMap
+typedef std::map<StateAttribute::GLMode,ModeStack> ModeMap
-
-typedef std::vector<ModeMap> TextureModeMapList
+typedef std::vector<ModeMap> TextureModeMapList
-
-typedef std::map<StateAttribute::Type,AttributeStack> AttributeMap
+typedef std::map<StateAttribute::Type,AttributeStack> AttributeMap
-
-typedef std::vector<AttributeMap> TextureAttributeMapList
+typedef std::vector<AttributeMap> TextureAttributeMapList
-
-typedef std::vector<const StateSet*> StateSetStack
+typedef std::vector<const StateSet*> StateSetStack
-
-typedef std::vector<ref_ptr<const Matrix> > MatrixStack
+typedef std::vector<ref_ptr<const Matrix> > MatrixStack
-
-typedef std::vector<EnabledArrayPair> EnabledTexCoordArrayList
+typedef std::vector<EnabledArrayPair> EnabledTexCoordArrayList
-
-typedef std::vector<EnabledArrayPair> EnabledVertexAttribArrayList
+typedef std::vector<EnabledArrayPair> EnabledVertexAttribArrayList
@@ -507,42 +523,74 @@ note, to return OpenGL to default state, one should do any state.popAllStatSets(
void apply()
Apply the state
-
+
+
inline void setGlobalDefaultModeValue(StateAttribute::GLMode mode, bool enabled)
+
+
+
+
inline bool getGlobalDefaultModeValue(StateAttribute::GLMode mode)
+
+
+
inline bool applyMode(StateAttribute::GLMode mode, bool enabled)
Apply an OpenGL mode if required.
+
+
+
inline void setGlobalDefaultTextureModeValue(unsigned int unit, StateAttribute::GLMode mode, bool enabled)
+
+
+
+
inline bool getGlobalDefaultTextureModeValue(unsigned int unit, StateAttribute::GLMode mode)
+
-
+
inline bool applyTextureMode(unsigned int unit, StateAttribute::GLMode mode, bool enabled)
+
+
+
inline void setGlobalDefaultAttribute(const StateAttribute* attribute)
+
+
+
+
inline const StateAttribute* getGlobalDefaultAttribute(StateAttribute::Type type)
+
-
+
inline bool applyAttribute(const StateAttribute* attribute)
Apply an attribute if required.
+
+
+
inline void setGlobalDefaultTextureAttribute(unsigned int unit, const StateAttribute* attribute)
+
+
+
+
inline const StateAttribute* getGlobalDefaultTextureAttribute(unsigned int unit, StateAttribute::Type type)
+
-
+
inline bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute)
-
+
void haveAppliedMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
Mode has been set externally, update state to reflect this setting
-
+
void haveAppliedMode(StateAttribute::GLMode mode)
Mode has been set externally, therefore dirty the associated mode in osg::State
so it is applied on next call to osg::State::apply()
-
+
void haveAppliedAttribute(const StateAttribute* attribute)
Attribute has been applied externally, update state to reflect this setting
-
+
void haveAppliedAttribute(StateAttribute::Type type)
Attribute has been applied externally,
and therefore this attribute type has been dirtied
@@ -553,33 +601,33 @@ track the current state more accuratly and enable lazy state updating such
that only changed state will be applied.
-
+
bool getLastAppliedMode(StateAttribute::GLMode mode) const
Get whether the current specified mode is enabled (true) or disabled (false)
-
+
const StateAttribute* getLastAppliedAttribute(StateAttribute::Type type) const
Get the current specified attribute, return NULL is one has not yet been applied
-
+
void haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
texture Mode has been set externally, update state to reflect this setting
-
+
void haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode)
texture Mode has been set externally, therefore dirty the associated mode in osg::State
so it is applied on next call to osg::State::apply()
-
+
void haveAppliedTextureAttribute(unsigned int unit, const StateAttribute* attribute)
texture Attribute has been applied externally, update state to reflect this setting
-
+
void haveAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type)
texture Attribute has been applied externally,
and therefore this attribute type has been dirtied
@@ -590,208 +638,208 @@ track the current state more accuratly and enable lazy state updating such
that only changed state will be applied.
-
+
bool getLastAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode) const
Get whether the current specified texture mode is enabled (true) or disabled (false)
-
+
const StateAttribute* getLastAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type) const
Get the current specified texture attribute, return NULL is one has not yet been applied
-
+
void dirtyAllModes()
Dirty the modes previously applied in osg::State
-
+
void dirtyAllAttributes()
Dirty the modes attributes previously applied in osg::State
-
+
void disableAllVertexArrays()
disable the vertex, normal, color, tex coords, secenday color, fog coord and index arrays
-
+
void dirtyAllVertexArrays()
dirty the vertex, normal, color, tex coords, secenday color, fog coord and index arrays
-
+
void setInterleavedArrays( GLenum format, GLsizei stride, const GLvoid* pointer)
Wrapper around glInterleavedArrays().
also resets the internal array points and modes within osg::State to keep the other
vertex array operations consistent.
-
+
inline void setVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_VERTEX_ARRAY);glVertexPointer();
note, only updates values that change
-
+
inline void disableVertexPointer()
wrapper glDisableClientState(GL_VERTEX_ARRAY).
note, only updates values that change.
-
+
inline void dirtyVertexPointer()
-
+
inline void setNormalPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_NORMAL_ARRAY);glNormalPointer();
note, only updates values that change
-
+
inline void disableNormalPointer()
wrapper around glDisableClientState(GL_NORMAL_ARRAY);
note, only updates values that change
-
+
inline void dirtyNormalPointer()
-
+
inline void setColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_COLOR_ARRAY);glColorPointer();
note, only updates values that change
-
+
inline void disableColorPointer()
wrapper around glDisableClientState(GL_COLOR_ARRAY);
note, only updates values that change
-
+
inline void dirtyColorPointer()
-
+
inline bool isSecondaryColorSupported() const
-
+
void setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_SECONDARY_COLOR_ARRAY);glSecondayColorPointer();
note, only updates values that change
-
+
inline void disableSecondaryColorPointer()
wrapper around glDisableClientState(GL_SECONDARY_COLOR_ARRAY);
note, only updates values that change
-
+
inline void dirtySecondaryColorPointer()
-
+
inline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_INDEX_ARRAY);glIndexPointer();
note, only updates values that change
-
+
inline void disableIndexPointer()
wrapper around glDisableClientState(GL_INDEX_ARRAY);
note, only updates values that change
-
+
inline void dirtyIndexPointer()
-
+
inline bool isFogCoordSupported() const
-
+
void setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_FOG_COORDINATE_ARRAY);glFogCoordPointer();
note, only updates values that change
-
+
inline void disableFogCoordPointer()
wrapper around glDisableClientState(GL_FOG_COORDINATE_ARRAY);
note, only updates values that change
-
+
inline void dirtyFogCoordPointer()
-
+
inline void setTexCoordPointer( unsigned int unit, GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableClientState(GL_TEXTURE_COORD_ARRAY);glTexCoordPointer();
note, only updates values that change
-
+
inline void disableTexCoordPointer( unsigned int unit )
wrapper around glDisableClientState(GL_TEXTURE_COORD_ARRAY);
note, only updates values that change
-
+
inline void dirtyTexCoordPointer( unsigned int unit )
-
+
inline void disableTexCoordPointersAboveAndIncluding( unsigned int unit )
-
+
inline void dirtyTexCoordPointersAboveAndIncluding( unsigned int unit )
-
+
bool setClientActiveTextureUnit( unsigned int unit )
set the current tex coord array texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
note, only updates values that change.
-
+
bool setActiveTextureUnit( unsigned int unit )
set the current texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
note, only updates values that change.
-
+
void setVertexAttribPointer( unsigned int index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr )
wrapper around glEnableVertexAttribArrayARB(index);glVertexAttribPointerARB();
note, only updates values that change
-
+
void disableVertexAttribPointer( unsigned int index )
wrapper around DisableVertexAttribArrayARB(index);
note, only updates values that change
-
+
void disableVertexAttribPointersAboveAndIncluding( unsigned int index )
-
+
inline void dirtyVertexAttribPointersAboveAndIncluding( unsigned int index )
-
+
bool isVertexBufferObjectSupported() const
-
+
inline void setContextID(unsigned int contextID)
Set the current OpenGL context uniqueID.
Note, it is the application developers responsibility to
@@ -805,411 +853,411 @@ number of graphics contexts you have setup.
By default contextID is 0.
-
+
inline unsigned int getContextID() const
Get the current OpenGL context unique ID
-
+
inline void setFrameStamp(FrameStamp* fs)
Set the frame stamp for the current frame
-
+
inline const FrameStamp* getFrameStamp() const
Set the frame stamp for the current frame
-
+
inline void setDisplaySettings(DisplaySettings* vs)
Set the DisplaySettings. Note, nothing is applied, the visual settings are just used
used in the State object to pass the current visual settings to Drawables
during rendering.
-
+
inline const DisplaySettings* getDisplaySettings() const
Get the DisplaySettings
-
+
typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair
-
-
typedef std::vector<AttributePair> AttributeVec
+
+typedef std::vector<AttributePair> AttributeVec
-
+
typedef std::vector<StateAttribute::GLModeValue> ValueVec
-
+
void setAbortRenderingPtr(bool* abortPtr)
Set flag for early termination of the draw traversal
-
+
bool getAbortRendering() const
Get flag for early termination of the draw traversal,
if true steps should be taken to complete rendering early
-
+
void setReportGLErrors(bool flag)
-
+
bool getReportGLErrors() const
-
+
bool checkGLErrors(const char* str) const
-
+
bool checkGLErrors(StateAttribute::GLMode mode) const
-
+
bool checkGLErrors(const StateAttribute* attribute) const
-
+
virtual ~State()
-
+
unsigned int _contextID
-
+
ref_ptr<FrameStamp> _frameStamp
-
+
ref_ptr<const RefMatrix> _identity
-
+
ref_ptr<const RefMatrix> _initialViewMatrix
-
+
ref_ptr<const RefMatrix> _projection
-
+
ref_ptr<const RefMatrix> _modelView
-
+
Matrix _initialInverseViewMatrix
-
+
ref_ptr<DisplaySettings> _displaySettings
-
+
bool* _abortRenderingPtr
-
+
bool _reportGLErrors
-
+
struct ModeStack
-
+
- ModeStack()
-
+
- bool changed
-
+
- bool last_applied_value
-
+
- bool global_default_value
-
-
- ValueVec valueVec
+
+
- ValueVec valueVec
-
+
struct AttributeStack
-
+
- AttributeStack()
-
+
- bool changed
- apply an attribute if required, passing in attribute and appropriate attribute stack
-
+
- const StateAttribute* last_applied_attribute
-
-
- ref_ptr<StateAttribute> global_default_attribute
+
+
- ref_ptr<const StateAttribute> global_default_attribute
-
-
- AttributeVec attributeVec
+
+
- AttributeVec attributeVec
-
-inline bool applyMode(StateAttribute::GLMode mode, bool enabled, ModeStack& ms)
+
+inline bool applyMode(StateAttribute::GLMode mode, bool enabled, ModeStack& ms)
apply an OpenGL mode if required, passing in mode, enable flag and appropriate mode stack
-
-
inline bool applyAttribute(const StateAttribute* attribute, AttributeStack& as)
+
+inline bool applyAttribute(const StateAttribute* attribute, AttributeStack& as)
apply an attribute if required, passing in attribute and appropriate attribute stack
-
-
inline bool applyGlobalDefaultAttribute(AttributeStack& as)
+
+inline bool applyGlobalDefaultAttribute(AttributeStack& as)
-
-
typedef std::map<StateAttribute::GLMode,ModeStack> ModeMap
+
+typedef std::map<StateAttribute::GLMode,ModeStack> ModeMap
-
-
typedef std::vector<ModeMap> TextureModeMapList
+
+typedef std::vector<ModeMap> TextureModeMapList
-
-
typedef std::map<StateAttribute::Type,AttributeStack> AttributeMap
+
+typedef std::map<StateAttribute::Type,AttributeStack> AttributeMap
-
-
typedef std::vector<AttributeMap> TextureAttributeMapList
+
+typedef std::vector<AttributeMap> TextureAttributeMapList
-
+
typedef std::vector<const StateSet*> StateSetStack
-
+
typedef std::vector<ref_ptr<const Matrix> > MatrixStack
-
-
ModeMap _modeMap
+
+ModeMap _modeMap
-
-
AttributeMap _attributeMap
+
+AttributeMap _attributeMap
-
-
TextureModeMapList _textureModeMapList
+
+TextureModeMapList _textureModeMapList
-
-
TextureAttributeMapList _textureAttributeMapList
+
+TextureAttributeMapList _textureAttributeMapList
-
-
StateSetStack _drawStateStack
+
+StateSetStack _drawStateStack
-
+
struct EnabledArrayPair
-
+
- EnabledArrayPair()
-
-
- EnabledArrayPair(const EnabledArrayPair& eap)
+
+
- EnabledArrayPair(const EnabledArrayPair& eap)
-
-
- EnabledArrayPair& operator = (const EnabledArrayPair& eap)
+
+
- EnabledArrayPair& operator = (const EnabledArrayPair& eap)
-
+
- bool _dirty
-
+
- bool _enabled
-
+
- GLboolean _normalized
-
+
- const GLvoid* _pointer
-
-typedef std::vector<EnabledArrayPair> EnabledTexCoordArrayList
+
+typedef std::vector<EnabledArrayPair> EnabledTexCoordArrayList
-
-
typedef std::vector<EnabledArrayPair> EnabledVertexAttribArrayList
+
+typedef std::vector<EnabledArrayPair> EnabledVertexAttribArrayList
-
-
EnabledArrayPair _vertexArray
+
+EnabledArrayPair _vertexArray
-
-
EnabledArrayPair _normalArray
+
+EnabledArrayPair _normalArray
-
-
EnabledArrayPair _colorArray
+
+EnabledArrayPair _colorArray
-
-
EnabledArrayPair _secondaryColorArray
+
+EnabledArrayPair _secondaryColorArray
-
-
EnabledArrayPair _indexArray
+
+EnabledArrayPair _indexArray
-
-
EnabledArrayPair _fogArray
+
+EnabledArrayPair _fogArray
-
-
EnabledTexCoordArrayList _texCoordArrayList
+
+EnabledTexCoordArrayList _texCoordArrayList
-
-
EnabledVertexAttribArrayList _vertexAttribArrayList
+
+EnabledVertexAttribArrayList _vertexAttribArrayList
-
+
unsigned int _currentActiveTextureUnit
-
+
unsigned int _currentClientActiveTextureUnit
-
-
inline ModeMap& getOrCreateTextureModeMap(unsigned int unit)
+
+inline ModeMap& getOrCreateTextureModeMap(unsigned int unit)
-
-
inline AttributeMap& getOrCreateTextureAttributeMap(unsigned int unit)
+
+inline AttributeMap& getOrCreateTextureAttributeMap(unsigned int unit)
-
-
void haveAppliedMode(ModeMap& modeMap, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
+
+void haveAppliedMode(ModeMap& modeMap, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
-
-
void haveAppliedMode(ModeMap& modeMap, StateAttribute::GLMode mode)
+
+void haveAppliedMode(ModeMap& modeMap, StateAttribute::GLMode mode)
-
-
void haveAppliedAttribute(AttributeMap& attributeMap, const StateAttribute* attribute)
+
+void haveAppliedAttribute(AttributeMap& attributeMap, const StateAttribute* attribute)
-
-
void haveAppliedAttribute(AttributeMap& attributeMap, StateAttribute::Type type)
+
+void haveAppliedAttribute(AttributeMap& attributeMap, StateAttribute::Type type)
-
-
bool getLastAppliedMode(const ModeMap& modeMap, StateAttribute::GLMode mode) const
+
+bool getLastAppliedMode(const ModeMap& modeMap, StateAttribute::GLMode mode) const
-
-
const StateAttribute* getLastAppliedAttribute(const AttributeMap& attributeMap, StateAttribute::Type type) const
+
+const StateAttribute* getLastAppliedAttribute(const AttributeMap& attributeMap, StateAttribute::Type type) const
-
+
mutable bool _isSecondaryColorSupportResolved
-
+
mutable bool _isSecondaryColorSupported
-
+
bool computeSecondaryColorSupported() const
-
+
mutable bool _isFogCoordSupportResolved
-
+
mutable bool _isFogCoordSupported
-
+
bool computeFogCoordSupported() const
-
+
mutable bool _isVertexBufferObjectSupportResolved
-
+
mutable bool _isVertexBufferObjectSupported
-
+
bool computeVertexBufferObjectSupported() const
-
-
inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
+inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
+inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
+inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
+inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
+inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
+inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void applyModeMap(ModeMap& modeMap)
+
+inline void applyModeMap(ModeMap& modeMap)
-
-
inline void applyAttributeMap(AttributeMap& attributeMap)
+
+inline void applyAttributeMap(AttributeMap& attributeMap)
- This class has no child classes.
diff --git a/doc/doc++/osgDB/Registry.html b/doc/doc++/osgDB/Registry.html
index 488eab65b..08912ba12 100644
--- a/doc/doc++/osgDB/Registry.html
+++ b/doc/doc++/osgDB/Registry.html
@@ -24,6 +24,7 @@
Public Classes
-
enum CacheHintOptions
+
- bit mask for setting up which object types get cached by readObject/Image/HeightField/Node(filename) calls
-
class ReadFileCallback: public osg::Referenced
-
@@ -326,31 +327,38 @@ register at runtime a reader/writer with the Registry.
- enum CacheHintOptions
+
- bit mask for setting up which object types get cached by readObject/Image/HeightField/Node(filename) calls
- CACHE_NONE
+
- do not cache objects of any type
- CACHE_NODES
+
- cache nodes loaded via readNode(filename)
- CACHE_IMAGES
+
- cache images loaded via readImage(filename)
- CACHE_HEIGHTFIELDS
+
- cache heightfield loaded via readHeightField(filename)
- CACHE_OBJECTS
+
- cache objects loaded via readObject(filename)
- CACHE_ALL
+
- cache on all read*(filename) calls
diff --git a/doc/doc++/osgFX/HIERjava.html b/doc/doc++/osgFX/HIERjava.html
index d8b78762d..2ccae089f 100644
--- a/doc/doc++/osgFX/HIERjava.html
+++ b/doc/doc++/osgFX/HIERjava.html
@@ -15,11 +15,11 @@
-