From 336c47e5fed94f780cd654c62395c76db1aecfaa Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 24 Jun 2002 21:44:27 +0000 Subject: [PATCH] Fixed osgText::Text::DrawModeType::ALIGNEMENT spelling mistake, now is ALIGNMENT. --- include/osgText/Text | 6 +++--- src/Demos/osghud/osghud.cpp | 10 +++++----- src/Demos/osgtext/main.cpp | 22 +++++++++++----------- src/osgText/Text.cpp | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/osgText/Text b/include/osgText/Text index 345da1407..ebb11ed2b 100644 --- a/include/osgText/Text +++ b/include/osgText/Text @@ -59,9 +59,9 @@ class OSGTEXT_EXPORT Text : public osg::Drawable enum DrawModeType { // from left to right, top to bottom TEXT = 1<<0, - BOUNDINGBOX = 1<<1, - ALIGNEMENT = 1<<2, - DEFAULT = TEXT, + BOUNDINGBOX = 1<<1, + ALIGNMENT = 1<<2, + DEFAULT = TEXT, }; Text(); diff --git a/src/Demos/osghud/osghud.cpp b/src/Demos/osghud/osghud.cpp index df079c322..1848e8a2f 100644 --- a/src/Demos/osghud/osghud.cpp +++ b/src/Demos/osghud/osghud.cpp @@ -98,7 +98,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("BitmapFont"); @@ -126,7 +126,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("PixmapFont"); @@ -166,7 +166,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("TextureFont"); @@ -203,7 +203,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("PolygonFont"); @@ -233,7 +233,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("OutlineFont"); diff --git a/src/Demos/osgtext/main.cpp b/src/Demos/osgtext/main.cpp index b843f8ad5..a8e9981b3 100644 --- a/src/Demos/osgtext/main.cpp +++ b/src/Demos/osgtext/main.cpp @@ -76,7 +76,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("BitmapFont"); @@ -104,7 +104,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("PixmapFont"); @@ -144,7 +144,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("TextureFont"); @@ -181,7 +181,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("PolygonFont"); @@ -211,7 +211,7 @@ void set2dScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("OutlineFont"); @@ -259,7 +259,7 @@ void setScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("BitmapFont"); @@ -286,7 +286,7 @@ void setScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("PixmapFont"); @@ -320,7 +320,7 @@ void setScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("TextureFont"); @@ -357,7 +357,7 @@ void setScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("PolygonFont"); @@ -386,7 +386,7 @@ void setScene(osg::Group* rootNode) text->setPosition(osg::Vec3(xOffset,yOffset,0)); text->setDrawMode( osgText::Text::TEXT | osgText::Text::BOUNDINGBOX | - osgText::Text::ALIGNEMENT ); + osgText::Text::ALIGNMENT ); text->setAlignment(gAlignment); geode = osgNew osg::Geode(); geode->setName("OutlineFont"); @@ -511,7 +511,7 @@ protected: { // change DrawMode std::vector >::iterator itr=gTextList.begin(); for(;itr!=gTextList.end();itr++) - (*itr)->setDrawMode(osgText::Text::ALIGNEMENT ^ (*itr)->getDrawMode()); + (*itr)->setDrawMode(osgText::Text::ALIGNMENT ^ (*itr)->getDrawMode()); } return; /////////////////////////////////////////////////////////////////// diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp index 314cbb576..0764f7637 100644 --- a/src/osgText/Text.cpp +++ b/src/osgText/Text.cpp @@ -187,7 +187,7 @@ void Text::drawImmediateMode(State& state) if(_drawMode & BOUNDINGBOX) drawBoundingBox(); // draw alignment - if(_drawMode & ALIGNEMENT) + if(_drawMode & ALIGNMENT) drawAlignment(); // draw boundingBox