Changeset 10621 for OpenSceneGraph/trunk/src/osg/State.cpp

Timestamp:

10/09/09 15:39:11 (4 years ago)

Author:

robert

Message:

Introduced new uniforms for tracking the modelview and project matrices in shaders using non built-ins.

Files:

• OpenSceneGraph/trunk/src/osg/State.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/src/osg/State.cpp

@@ -45 +45 @@
     _modelView = _identity;
 
+    _modelViewMatrixUniform = new Uniform(Uniform::FLOAT_MAT4,"osg_ModelViewMatrix");
+    _projectionMatrixUniform = new Uniform(Uniform::FLOAT_MAT4,"osg_ProjectionMatrix");
+    _modelViewProjectionMatrixUniform = new Uniform(Uniform::FLOAT_MAT4,"osg_ModelViewProjectionMatrix");
+
     _abortRenderingPtr = false;    
 
@@ -91 +95 @@
     _maxTexturePoolSize = 0;
     _maxBufferObjectPoolSize = 0;
+
+
 }
 
@@ -421 +427 @@
     //popStateSet();
     //return;
-    
+
     if (dstate)
     {
@@ -441 +447 @@
                 if (unit<ds_textureModeList.size()) applyModeList(getOrCreateTextureModeMap(unit),ds_textureModeList[unit]);
                 else if (unit<_textureModeMapList.size()) applyModeMap(_textureModeMapList[unit]);
-                
+
                 if (unit<ds_textureAttributeList.size()) applyAttributeList(getOrCreateTextureAttributeMap(unit),ds_textureAttributeList[unit]);
                 else if (unit<_textureAttributeMapList.size()) applyAttributeMap(_textureAttributeMapList[unit]);
             }
         }
-        
-#if 1        
+
         applyUniformList(_uniformMap,dstate->getUniformList());
-#else                
-        if (_lastAppliedProgramObject)
-        {
-            for(StateSetStack::iterator sitr=_stateStateStack.begin();
-                sitr!=_stateStateStack.end();
-                ++sitr)
-            {
-                const StateSet* stateset = *sitr;
-                const StateSet::UniformList& uniformList = stateset->getUniformList();
-                for(StateSet::UniformList::const_iterator itr=uniformList.begin();
-                    itr!=uniformList.end();
-                    ++itr)
-                {
-                    _lastAppliedProgramObject->apply(*(itr->second.first));
-                }
-            }
-
-            const StateSet::UniformList& uniformList = dstate->getUniformList();
-            for(StateSet::UniformList::const_iterator itr=uniformList.begin();
-                itr!=uniformList.end();
-                ++itr)
-            {
-                _lastAppliedProgramObject->apply(*(itr->second.first));
-            }
-        }
-#endif
-
     }
     else
@@ -509 +487 @@
     }
 
-#if 1        
     applyUniformMap(_uniformMap);
-#else        
-    if (_lastAppliedProgramObject && !_stateStateStack.empty())
-    {
-        for(StateSetStack::iterator sitr=_stateStateStack.begin();
-            sitr!=_stateStateStack.end();
-            ++sitr)
-        {
-            const StateSet* stateset = *sitr;
-            const StateSet::UniformList& uniformList = stateset->getUniformList();
-            for(StateSet::UniformList::const_iterator itr=uniformList.begin();
-                itr!=uniformList.end();
-                ++itr)
-            {
-                _lastAppliedProgramObject->apply(*(itr->second.first));
-            }
-        }
-    }
-#endif
-
 
     if (_checkGLErrors==ONCE_PER_ATTRIBUTE) checkGLErrors("end of State::apply()");
@@ -1034 +992 @@
 
 
+void State::applyModelViewAndProjectionUniformsIfRequired()
+{
+    if (!_lastAppliedProgramObject) return;
+
+    if (_modelViewMatrixUniform.valid()) _lastAppliedProgramObject->apply(*_modelViewMatrixUniform);
+    if (_projectionMatrixUniform) _lastAppliedProgramObject->apply(*_projectionMatrixUniform);
+    if (_modelViewProjectionMatrixUniform) _lastAppliedProgramObject->apply(*_modelViewProjectionMatrixUniform);
+}