Index: /OpenSceneGraph/trunk/examples/osgfont/osgfont.cpp =================================================================== --- /OpenSceneGraph/trunk/examples/osgfont/osgfont.cpp (revision 9705) +++ /OpenSceneGraph/trunk/examples/osgfont/osgfont.cpp (revision 11250) @@ -6,84 +6,85 @@ #include #include +#include void textInfo(osgText::Text* text) { - const osgText::Text::TextureGlyphQuadMap& tgqm = text->getTextureGlyphQuadMap(); + const osgText::Text::TextureGlyphQuadMap& tgqm = text->getTextureGlyphQuadMap(); - const osgText::Text::TextureGlyphQuadMap::const_iterator tgqmi = tgqm.begin(); + const osgText::Text::TextureGlyphQuadMap::const_iterator tgqmi = tgqm.begin(); - const osgText::Text::GlyphQuads& gq = tgqmi->second; + const osgText::Text::GlyphQuads& gq = tgqmi->second; - osgText::String& s = text->getText(); + osgText::String& s = text->getText(); - for(unsigned int i = 0; i < s.size(); i++) - { - osg::Vec2 ul = gq.getCoords()[0 + (i * 4)]; // upperLeft - osg::Vec2 ll = gq.getCoords()[1 + (i * 4)]; // lowerLeft - osg::Vec2 lr = gq.getCoords()[2 + (i * 4)]; // lowerRight - osg::Vec2 ur = gq.getCoords()[3 + (i * 4)]; // upperRight + for(unsigned int i = 0; i < s.size(); i++) + { + osg::Vec2 ul = gq.getCoords()[0 + (i * 4)]; // upperLeft + osg::Vec2 ll = gq.getCoords()[1 + (i * 4)]; // lowerLeft + osg::Vec2 lr = gq.getCoords()[2 + (i * 4)]; // lowerRight + osg::Vec2 ur = gq.getCoords()[3 + (i * 4)]; // upperRight - /* - osg::Vec3 ul = gq.getTransformedCoords(0)[0 + (i * 4)]; - osg::Vec3 ll = gq.getTransformedCoords(0)[1 + (i * 4)]; - osg::Vec3 lr = gq.getTransformedCoords(0)[2 + (i * 4)]; - osg::Vec3 ur = gq.getTransformedCoords(0)[3 + (i * 4)]; - */ + /* + osg::Vec3 ul = gq.getTransformedCoords(0)[0 + (i * 4)]; + osg::Vec3 ll = gq.getTransformedCoords(0)[1 + (i * 4)]; + osg::Vec3 lr = gq.getTransformedCoords(0)[2 + (i * 4)]; + osg::Vec3 ur = gq.getTransformedCoords(0)[3 + (i * 4)]; + */ - osg::notify(osg::NOTICE) - << "'" << static_cast(s[i]) << "':" - << " width(" << lr.x() - ll.x() << ")" - << " height(" << ul.y() - ll.y() << ")" << std::endl << "\t" - << "ul(" << ul << "), " - << "ll(" << ll << "), " - << "lr(" << lr << "), " - << "ur(" << ur << ")" - << std::endl - ; - } + osg::notify(osg::NOTICE) + << "'" << static_cast(s[i]) << "':" + << " width(" << lr.x() - ll.x() << ")" + << " height(" << ul.y() - ll.y() << ")" << std::endl << "\t" + << "ul(" << ul << "), " + << "ll(" << ll << "), " + << "lr(" << lr << "), " + << "ur(" << ur << ")" + << std::endl + ; + } } osg::Camera* createOrthoCamera(double width, double height) { - osg::Camera* camera = new osg::Camera(); + osg::Camera* camera = new osg::Camera(); - camera->getOrCreateStateSet()->setMode( - GL_LIGHTING, - osg::StateAttribute::PROTECTED | osg::StateAttribute::OFF - ); + camera->getOrCreateStateSet()->setMode( + GL_LIGHTING, + osg::StateAttribute::PROTECTED | osg::StateAttribute::OFF + ); - osg::Matrix m = osg::Matrix::ortho2D(0.0f, width, 0.0f, height); + osg::Matrix m = osg::Matrix::ortho2D(0.0f, width, 0.0f, height); - camera->setProjectionMatrix(m); - camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF); - camera->setViewMatrix(osg::Matrix::identity()); - camera->setClearMask(GL_DEPTH_BUFFER_BIT); - camera->setRenderOrder(osg::Camera::POST_RENDER); + camera->setProjectionMatrix(m); + camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF); + camera->setViewMatrix(osg::Matrix::identity()); + camera->setClearMask(GL_DEPTH_BUFFER_BIT); + camera->setRenderOrder(osg::Camera::POST_RENDER); - return camera; + return camera; } osgText::Text* createLabel(const std::string& l, const char* f, unsigned int size) { - static osg::Vec3 pos(10.0f, 10.0f, 0.0f); + static osg::Vec3 pos(10.0f, 10.0f, 0.0f); - osgText::Text* label = new osgText::Text(); - osgText::Font* font = osgText::readFontFile(f); + osgText::Text* label = new osgText::Text(); + osgText::Font* font = osgText::readFontFile(f); - label->setFont(font); - label->setCharacterSize(size); - label->setFontResolution(size, size); - label->setColor(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f)); - label->setPosition(pos); - label->setAlignment(osgText::Text::LEFT_BOTTOM); + label->setFont(font); + label->setCharacterSize(size); + label->setFontResolution(size, size); + label->setColor(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f)); + label->setPosition(pos); + label->setAlignment(osgText::Text::LEFT_BOTTOM); - // It seems to be important we do this last to get best results? - label->setText(l); + // It seems to be important we do this last to get best results? + label->setText(l); - textInfo(label); + textInfo(label); - pos.y() += size + 10.0f; + pos.y() += size + 10.0f; - return label; + return label; } @@ -92,50 +93,52 @@ int main(int argc, char** argv) { - osgViewer::Viewer viewer; - osg::ArgumentParser args(&argc, argv); + osgViewer::Viewer viewer; + osg::ArgumentParser args(&argc, argv); - // Make sure we have the minimum args... - if(argc <= 2) - { - osg::notify(osg::FATAL) << "usage: " << args[0] << " fontfile size1 [size2 ...]" << std::endl; + // Make sure we have the minimum args... + if(argc <= 2) + { + osg::notify(osg::FATAL) << "usage: " << args[0] << " fontfile size1 [size2 ...]" << std::endl; - return 1; - } + return 1; + } - viewer.addEventHandler(new osgViewer::StatsHandler()); - viewer.addEventHandler(new osgViewer::WindowSizeHandler()); - osg::Group* group = new osg::Group(); - osg::Camera* camera = createOrthoCamera(1280.0f, 1024.0f); + viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) ); + viewer.addEventHandler(new osgViewer::StatsHandler()); + viewer.addEventHandler(new osgViewer::WindowSizeHandler()); - // Create the list of desired sizes. - Sizes sizes; + osg::Group* group = new osg::Group(); + osg::Camera* camera = createOrthoCamera(1280.0f, 1024.0f); - for(int i = 2; i < argc; i++) - { - if(!args.isNumber(i)) continue; + // Create the list of desired sizes. + Sizes sizes; - sizes.push_back(std::atoi(args[i])); - } + for(int i = 2; i < argc; i++) + { + if(!args.isNumber(i)) continue; - osg::Geode* geode = new osg::Geode(); + sizes.push_back(std::atoi(args[i])); + } - // Add all of our osgText drawables. - for(Sizes::const_iterator i = sizes.begin(); i != sizes.end(); i++) - { - std::stringstream ss; + osg::Geode* geode = new osg::Geode(); - ss << *i << " 1234567890 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + // Add all of our osgText drawables. + for(Sizes::const_iterator i = sizes.begin(); i != sizes.end(); i++) + { + std::stringstream ss; - geode->addDrawable(createLabel(ss.str(), args[1], *i)); - } + ss << *i << " 1234567890 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - camera->addChild(geode); + geode->addDrawable(createLabel(ss.str(), args[1], *i)); + } - group->addChild(camera); + camera->addChild(geode); - viewer.setSceneData(group); + group->addChild(camera); - return viewer.run(); + viewer.setSceneData(group); + + return viewer.run(); } Index: /OpenSceneGraph/trunk/examples/osgtext/osgtext.cpp =================================================================== --- /OpenSceneGraph/trunk/examples/osgtext/osgtext.cpp (revision 7875) +++ /OpenSceneGraph/trunk/examples/osgtext/osgtext.cpp (revision 11250) @@ -23,4 +23,5 @@ #include +#include #include #include @@ -702,4 +703,5 @@ #endif + viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) ); viewer.addEventHandler(new osgViewer::StatsHandler());