From 594b3064c09f34baa71d0d3c620c89e3b4b4fcd5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 23 Feb 2015 11:43:21 +0000 Subject: [PATCH] =?UTF-8?q?From=20Miha=20Rav=C5=A1elj=20and=20Robert=20Osf?= =?UTF-8?q?ield,=20fix=20for=20serializer=20bug=20in=20osgText::TextBase?= =?UTF-8?q?=20and=20osg::Camera?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14711 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgWrappers/serializers/osg/Camera.cpp | 8 ++++---- src/osgWrappers/serializers/osgText/TextBase.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/osgWrappers/serializers/osg/Camera.cpp b/src/osgWrappers/serializers/osg/Camera.cpp index a008de085..2a57b8209 100644 --- a/src/osgWrappers/serializers/osg/Camera.cpp +++ b/src/osgWrappers/serializers/osg/Camera.cpp @@ -143,10 +143,10 @@ static bool writeClearMask( osgDB::OutputStream& os, const osg::Camera& node ) else { std::string maskString; - if ( mask==GL_COLOR_BUFFER_BIT ) maskString += std::string("COLOR|"); - if ( mask==GL_DEPTH_BUFFER_BIT ) maskString += std::string("DEPTH|"); - if ( mask==GL_ACCUM_BUFFER_BIT ) maskString += std::string("ACCUM|"); - if ( mask==GL_STENCIL_BUFFER_BIT ) maskString += std::string("STENCIL|"); + if ( (mask & GL_COLOR_BUFFER_BIT)!=0 ) maskString += std::string("COLOR|"); + if ( (mask & GL_DEPTH_BUFFER_BIT)!=0 ) maskString += std::string("DEPTH|"); + if ( (mask & GL_ACCUM_BUFFER_BIT)!=0 ) maskString += std::string("ACCUM|"); + if ( (mask & GL_STENCIL_BUFFER_BIT)!=0 ) maskString += std::string("STENCIL|"); if ( !maskString.size() ) maskString = std::string("NONE|"); os << maskString.substr(0, maskString.size()-1) << std::endl; } diff --git a/src/osgWrappers/serializers/osgText/TextBase.cpp b/src/osgWrappers/serializers/osgText/TextBase.cpp index a57ef259b..3aa026977 100644 --- a/src/osgWrappers/serializers/osgText/TextBase.cpp +++ b/src/osgWrappers/serializers/osgText/TextBase.cpp @@ -159,10 +159,10 @@ static bool writeDrawMode( osgDB::OutputStream& os, const osgText::TextBase& tex else { std::string maskString; - if ( mask==osgText::TextBase::TEXT ) maskString += std::string("TEXT|"); - if ( mask==osgText::TextBase::BOUNDINGBOX ) maskString += std::string("BOUND|"); - if ( mask==osgText::TextBase::FILLEDBOUNDINGBOX ) maskString += std::string("FILLED|"); - if ( mask==osgText::TextBase::ALIGNMENT ) maskString += std::string("ALIGNMENT|"); + if ( (mask&osgText::TextBase::TEXT)!=0 ) maskString += std::string("TEXT|"); + if ( (mask&osgText::TextBase::BOUNDINGBOX)!=0 ) maskString += std::string("BOUND|"); + if ( (mask&osgText::TextBase::FILLEDBOUNDINGBOX)!=0 ) maskString += std::string("FILLED|"); + if ( (mask&osgText::TextBase::ALIGNMENT)!=0 ) maskString += std::string("ALIGNMENT|"); if ( !maskString.size() ) maskString = std::string("NONE|"); os << maskString.substr(0, maskString.size()-1) << std::endl; }