Changeset 12289

Timestamp:

04/19/11 11:53:34 (2 years ago)

Author:

robert

Message:

Cleaned up example

Files:

• OpenSceneGraph/trunk/examples/osgtext/osgtext.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/examples/osgtext/osgtext.cpp

@@ -387 +387 @@
     osg::Geode* geode  = new osg::Geode;
 
+    
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 //    
@@ -393 +394 @@
 
     float characterSize=radius*0.2f;
-    
+
+
     osg::Vec3 pos(center.x()-radius*.5f,center.y()-radius*.5f,center.z()-radius*.5f);
 
@@ -420 +422 @@
     geode->addDrawable(text3);
 
+    osg::Vec4 characterSizeModeColor(1.0f,0.0f,0.5f,1.0f);
 
     osgText::Text* text4 = new osgText::Text;
@@ -427 +430 @@
     text4->setAxisAlignment(osgText::Text::SCREEN);
 
-    osg::Vec4 characterSizeModeColor(1.0f,0.0f,0.5f,1.0f);
+    // reproduce outline bounding box compute problem with backdrop on.
+    text4->setBackdropType(osgText::Text::OUTLINE);
+    text4->setDrawMode(osgText::Text::TEXT | osgText::Text::BOUNDINGBOX);
+
+    text4->setText("SCREEN");
+    geode->addDrawable(text4);
 
     osgText::Text* text5 = new osgText::Text;
@@ -437 +445 @@
     text5->setAxisAlignment(osgText::Text::SCREEN);
     text5->setCharacterSizeMode(osgText::Text::SCREEN_COORDS);
+    text5->setDrawMode(osgText::Text::TEXT | osgText::Text::BOUNDINGBOX);
     text5->setText("CharacterSizeMode SCREEN_COORDS(size 32.0)");
     geode->addDrawable(text5);
@@ -460 +469 @@
     geode->addDrawable(text7);
 
-#if 1
-    // reproduce outline bounding box compute problem with backdrop on.
-    text4->setBackdropType(osgText::Text::OUTLINE);
-    text4->setDrawMode(osgText::Text::TEXT | osgText::Text::BOUNDINGBOX);
-#endif
-
-    text4->setText("SCREEN");
-    geode->addDrawable(text4);
+
 
     osg::ShapeDrawable* shape = new osg::ShapeDrawable(new osg::Sphere(center,characterSize*0.2f));
@@ -679 +681 @@
         // make sure the root node is group so we can add extra nodes to it.
         osg::Group* group = new osg::Group;
-        
+
+        if (true)
         {
             // create the hud.
@@ -693 +696 @@
         }
 
-        group->addChild(create3DText(center,radius));
+        if (true)
+        {
+            group->addChild(create3DText(center,radius));
+        }
 
         // set the scene to render