From 285418d6f80f4254cda78c6f41911f13cffe5146 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 25 Oct 2005 09:23:21 +0000 Subject: [PATCH] From Brede Johansen, changed osg_InverseViewMatrix to osg_ViewMatrixInverse to bring into line with OpenGL shader languague conventions. From Robert Osfield, changed the SceneView::ActiveUnforms enum to from INVERSE_VIEW_MATRIX_UNIFORM VIEW_MATRIX_INVERSE_UNIFORM to be convistent with the above change. --- include/osgUtil/SceneView | 4 ++-- src/osgUtil/SceneView.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osgUtil/SceneView b/include/osgUtil/SceneView index 0e5e5fdfb..88c3777d3 100644 --- a/include/osgUtil/SceneView +++ b/include/osgUtil/SceneView @@ -129,12 +129,12 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced, public osg::CullSetting FRAME_TIME_UNIFORM = 0x2, DELTA_FRAME_TIME_UNIFORM = 0x4, VIEW_MATRIX_UNIFORM = 0x8, - INVERSE_VIEW_MATRIX_UNIFORM = 0x10, + VIEW_MATRIX_INVERSE_UNIFORM = 0x10, DEFAULT_UNIFORMS = FRAME_NUMBER_UNIFORM | FRAME_TIME_UNIFORM | DELTA_FRAME_TIME_UNIFORM | VIEW_MATRIX_UNIFORM | - INVERSE_VIEW_MATRIX_UNIFORM, + VIEW_MATRIX_INVERSE_UNIFORM, ALL_UNIFORMS = 0xFFFFFFFF }; diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp index 3536fbcc3..380a4ce4d 100644 --- a/src/osgUtil/SceneView.cpp +++ b/src/osgUtil/SceneView.cpp @@ -226,9 +226,9 @@ void SceneView::updateUniforms() uniform->set(_viewMatrix); } - if (_activeUniforms & INVERSE_VIEW_MATRIX_UNIFORM) + if (_activeUniforms & VIEW_MATRIX_INVERSE_UNIFORM) { - osg::Uniform* uniform = _localStateSet->getOrCreateUniform("osg_InverseViewMatrix",osg::Uniform::FLOAT_MAT4); + osg::Uniform* uniform = _localStateSet->getOrCreateUniform("osg_ViewMatrixInverse",osg::Uniform::FLOAT_MAT4); uniform->set(osg::Matrix::inverse(_viewMatrix)); }