Changeset 10621 for OpenSceneGraph/trunk/include/osg/State

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/include/osg/State (modified) (3 diffs)

OpenSceneGraph/trunk/include/osg/State

@@ -167 +167 @@
             if (_projection!=matrix)
             {
+                if (matrix)
+                {
+                    _projection=matrix;
+                }
+                else
+                {
+                    _projection=_identity;
+                }
+
+                if (_projectionMatrixUniform.valid()) _projectionMatrixUniform->set(*_projection);
+                if (_modelViewProjectionMatrixUniform.valid()) _modelViewProjectionMatrixUniform->set((*_modelView) * (*_projection));
+
                 glMatrixMode( GL_PROJECTION );
+                    glLoadMatrix(_projection->ptr());
+                glMatrixMode( GL_MODELVIEW );
+            }
+        }
+
+        inline const osg::Matrix& getProjectionMatrix() const
+        {
+            return *_projection;
+        }
+
+        inline void applyModelViewMatrix(const osg::RefMatrix* matrix)
+        {
+            if (_modelView!=matrix)
+            {
                 if (matrix)
                 {
-                    _projection=matrix;
-                    glLoadMatrix(matrix->ptr());
+                    _modelView=matrix;
                 }
                 else
                 {
-                    _projection=_identity;
-                    glLoadIdentity();
-                }
-                glMatrixMode( GL_MODELVIEW );
-            }
-        }
-
-        inline const osg::Matrix& getProjectionMatrix() const
-        {
-            return *_projection;
-        }
-
-        inline void applyModelViewMatrix(const osg::RefMatrix* matrix)
-        {
-            if (_modelView!=matrix)
-            {
-                if (matrix)
-                {
-                    _modelView=matrix;
-                    glLoadMatrix(matrix->ptr());
-                }
-                else
-                {
                     _modelView=_identity;
-                    glLoadIdentity();
-                }
+                }
+
+                if (_modelViewMatrixUniform.valid()) _modelViewMatrixUniform->set(*_modelView);
+                if (_modelViewProjectionMatrixUniform.valid()) _modelViewProjectionMatrixUniform->set((*_modelView) * (*_projection));
+
+                glLoadMatrix(_modelView->ptr());
             }
         }
@@ -208 +214 @@
             return *_modelView;
         }
+
+        void applyModelViewAndProjectionUniformsIfRequired();
+
+        osg::Uniform* getModelViewMatrixUniform() { return _modelViewMatrixUniform.get(); }
+        osg::Uniform* getProjectionMatrixUniform() { return _projectionMatrixUniform.get(); }
+        osg::Uniform* getModelViewProjectionMatrixUniform() { return _modelViewProjectionMatrixUniform.get(); }
 
 
@@ -1088 +1100 @@
         ref_ptr<const RefMatrix>    _projection;
         ref_ptr<const RefMatrix>    _modelView;
+
+        ref_ptr<Uniform>            _modelViewMatrixUniform;
+        ref_ptr<Uniform>            _projectionMatrixUniform;
+        ref_ptr<Uniform>            _modelViewProjectionMatrixUniform;
 
         Matrix                      _initialInverseViewMatrix;