From b0c36076fbc24297858e2c6b9acb1e3e83a34875 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 18 Mar 2005 09:48:09 +0000 Subject: [PATCH] From Marco Jez, added OSGNVEXT_ prefex to StateAttribute enums. --- include/osg/StateAttribute | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute index 301c2ee37..3cd652a60 100644 --- a/include/osg/StateAttribute +++ b/include/osg/StateAttribute @@ -141,8 +141,8 @@ class SG_EXPORT StateAttribute : public Object TEXMAT, LIGHTMODEL, BLENDFUNC, - BLENDEQUATION, - LOGICOP, + BLENDEQUATION, + LOGICOP, STENCIL, COLORMASK, DEPTH, @@ -169,13 +169,21 @@ class SG_EXPORT StateAttribute : public Object VIEWMATRIXEXTRACTOR, // osgNV namespace - PARAMETER_BLOCK, + OSGNV_PARAMETER_BLOCK, + // osgNVExt namespace - TEXTURE_SHADER, - VERTEX_PROGRAM, - REGISTER_COMBINERS, + OSGNVEXT_TEXTURE_SHADER, + OSGNVEXT_VERTEX_PROGRAM, + OSGNVEXT_REGISTER_COMBINERS, + + // osgNVCg namespace + OSGNVCG_PROGRAM, + + // osgNVSlang namespace + OSGNVSLANG_PROGRAM, + // osgNVParse - PROGRAM_PARSER, + OSGNVPARSE_PROGRAM_PARSER, }; /** Simple pairing between an attribute type and the member within that attribute type group.*/