From 3ecaf3cd6c9c6aec2325b6d0f650790aef2b16ae Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Sun, 14 Oct 2001 06:01:31 +0000 Subject: [PATCH] Fixed a small boo-boo in definition of bit masks in include/osg/Drawable Fixed incorrect normal conversions for osgconv. --- include/osg/Drawable | 8 ++++++++ src/Demos/osgconv/orientationconverter.cpp | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/osg/Drawable b/include/osg/Drawable index ce4180e76..1173267f1 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -136,9 +136,17 @@ class SG_EXPORT Drawable : public Object COLORS = 0x4, TEXTURE_COORDS = 0x8, TEXTURE_COORDS_0 = TEXTURE_COORDS, + /* + * Robert, + * These would have kept you up late if you were + * trying to use these as bitmasks TEXTURE_COORDS_1 = 0x16, TEXTURE_COORDS_2 = 0x32, TEXTURE_COORDS_3 = 0x64 + */ + TEXTURE_COORDS_1 = 0x10, + TEXTURE_COORDS_2 = 0x20, + TEXTURE_COORDS_3 = 0x40 }; class AttributeFunctor diff --git a/src/Demos/osgconv/orientationconverter.cpp b/src/Demos/osgconv/orientationconverter.cpp index 52bcee740..fcbb9e824 100644 --- a/src/Demos/osgconv/orientationconverter.cpp +++ b/src/Demos/osgconv/orientationconverter.cpp @@ -6,7 +6,6 @@ using namespace osg; class TransformFunctor : public osg::Drawable::AttributeFunctor { - public: osg::Matrix _m;