From 7c29110e40971750652d408597bdd37f4fe77645 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 16 Jan 2002 21:22:06 +0000 Subject: [PATCH] Changed the enum Types { ... } so that in no longer explicitly sets the values, leaving C++ to ensire that values are unque and insequence. --- include/osg/StateAttribute | 78 +++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute index 88af486dc..c4a6bf800 100644 --- a/include/osg/StateAttribute +++ b/include/osg/StateAttribute @@ -97,53 +97,53 @@ class SG_EXPORT StateAttribute : public Object * that types value. */ enum Types { - TEXTURE =0, + TEXTURE, TEXTURE_0 =TEXTURE, - TEXTURE_1 =TEXTURE_0+1, - TEXTURE_2 =TEXTURE_1+2, - TEXTURE_3 =TEXTURE_2+3, + TEXTURE_1, + TEXTURE_2, + TEXTURE_3, - MATERIAL =TEXTURE_3+1, - ALPHAFUNC =MATERIAL+1, - ANTIALIAS =ALPHAFUNC+1, - COLORTABLE =ANTIALIAS+1, - CULLFACE =COLORTABLE+1, - FOG =CULLFACE+1, - FRONTFACE =FOG+1, + MATERIAL, + ALPHAFUNC, + ANTIALIAS, + COLORTABLE, + CULLFACE, + FOG, + FRONTFACE, - LIGHT =FRONTFACE+1, + LIGHT, LIGHT_0 =LIGHT, - LIGHT_1 =LIGHT+1, - LIGHT_2 =LIGHT+1, - LIGHT_3 =LIGHT+1, - LIGHT_4 =LIGHT+1, - LIGHT_5 =LIGHT+1, - LIGHT_6 =LIGHT+1, - LIGHT_7 =LIGHT+1, + LIGHT_1, + LIGHT_2, + LIGHT_3, + LIGHT_4, + LIGHT_5, + LIGHT_6, + LIGHT_7, - POINT =LIGHT_7+1, - LINEWIDTH =POINT+1, - SHADEMODEL =LINEWIDTH+1, - POLYGONMODE =SHADEMODEL+1, - POLYGONOFFSET =POLYGONMODE+1, - TEXENV =POLYGONOFFSET+1, - TEXGEN =TEXENV+1, - TEXMAT =TEXGEN+1, - TRANSPARENCY =TEXMAT+1, - STENCIL =TRANSPARENCY+1, - COLORMASK =STENCIL+1, - DEPTH =COLORMASK+1, - VIEWPORT =DEPTH+1, + POINT, + LINEWIDTH, + SHADEMODEL, + POLYGONMODE, + POLYGONOFFSET, + TEXENV, + TEXGEN, + TEXMAT, + TRANSPARENCY, + STENCIL, + COLORMASK, + DEPTH, + VIEWPORT, - CLIPPLANE =VIEWPORT+1, + CLIPPLANE, CLIPPLANE_0 =CLIPPLANE, - CLIPPLANE_1 =CLIPPLANE_0+1, - CLIPPLANE_2 =CLIPPLANE_1+1, - CLIPPLANE_3 =CLIPPLANE_2+1, - CLIPPLANE_4 =CLIPPLANE_3+1, - CLIPPLANE_5 =CLIPPLANE_4+1, + CLIPPLANE_1, + CLIPPLANE_2, + CLIPPLANE_3, + CLIPPLANE_4, + CLIPPLANE_5, - COLORMATRIX =CLIPPLANE_5+1 + COLORMATRIX }; StateAttribute() {}