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.
This commit is contained in:
@@ -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
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user