Changeset 3252

Timestamp:

08/07/04 11:42:19 (9 years ago)

Author:

robert

Message:

Added the ability to set the global stateset, as use this RenderStageLighting?

Location:

OpenSceneGraph/trunk

Files:

• include/osg/State (modified) (5 diffs)
• src/osgUtil/RenderStageLighting.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osg/State

@@ -154 +154 @@
 
 
+        inline void setGlobalDefaultModeValue(StateAttribute::GLMode mode,bool enabled)
+        {
+            ModeStack& ms = _modeMap[mode];
+            ms.global_default_value = enabled;
+        }
+
+        inline bool getGlobalDefaultModeValue(StateAttribute::GLMode mode)
+        {
+            return _modeMap[mode].global_default_value;
+        }
+
+
         /** Apply an OpenGL mode if required. */
         inline bool applyMode(StateAttribute::GLMode mode,bool enabled)
@@ -160 +172 @@
             ms.changed = true;    
             return applyMode(mode,enabled,ms);
+        }
+
+        inline void setGlobalDefaultTextureModeValue(unsigned int unit, StateAttribute::GLMode mode,bool enabled)
+        {
+            ModeMap& modeMap = getOrCreateTextureModeMap(unit);
+            ModeStack& ms = modeMap[mode];
+            ms.global_default_value = enabled;
+        }
+
+        inline bool getGlobalDefaultTextureModeValue(unsigned int unit, StateAttribute::GLMode mode)
+        {
+            ModeMap& modeMap = getOrCreateTextureModeMap(unit);
+            ModeStack& ms = modeMap[mode];
+            return ms.global_default_value;
         }
 
@@ -175 +201 @@
         }
 
+        inline void setGlobalDefaultAttribute(const StateAttribute* attribute)
+        {
+            AttributeStack& as = _attributeMap[attribute->getType()];
+            as.global_default_attribute = attribute;
+        }
+
+        inline const StateAttribute* getGlobalDefaultAttribute(StateAttribute::Type type)
+        {
+            AttributeStack& as = _attributeMap[type];
+            return as.global_default_attribute.get();
+        }
+
         /** Apply an attribute if required. */
         inline bool applyAttribute(const StateAttribute* attribute)
@@ -182 +220 @@
             return applyAttribute(attribute,as);
         }
+
+        inline void setGlobalDefaultTextureAttribute(unsigned int unit, const StateAttribute* attribute)
+        {
+            AttributeMap& attributeMap = getOrCreateTextureAttributeMap(unit);
+            AttributeStack& as = attributeMap[attribute->getType()];
+            as.global_default_attribute = attribute;
+        }
+
+        inline const StateAttribute* getGlobalDefaultTextureAttribute(unsigned int unit, StateAttribute::Type type)
+        {
+            AttributeMap& attributeMap = getOrCreateTextureAttributeMap(unit);
+            AttributeStack& as = attributeMap[type];
+            return as.global_default_attribute.get();
+        }
+
 
         inline bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute)
@@ -677 +730 @@
             bool                    changed;
             const StateAttribute*   last_applied_attribute;
-            ref_ptr<StateAttribute> global_default_attribute;
+            ref_ptr<const StateAttribute> global_default_attribute;
             AttributeVec            attributeVec;
         };

OpenSceneGraph/trunk/src/osgUtil/RenderStageLighting.cpp

@@ -54 +54 @@
         // tell state about.
         state.haveAppliedAttribute(litr->first.get());
-            
+        
+        // set this state as a global default
+        state.setGlobalDefaultAttribute(litr->first.get());
     }
 
@@ -77 +79 @@
             state.haveAppliedTextureAttribute(titr->first, litr->first.get());
 
+            // set this state as a global default
+            state.setGlobalDefaultTextureAttribute(titr->first, litr->first.get());
         }