Changeset 7741 for OpenSceneGraph/trunk/examples/osgtext/osgtext.cpp

Timestamp:

12/23/07 14:18:40 (5 years ago)

Author:

robert

Message:

Renamed osgText::Font::SizePair? to osgText::FontSizePair? in prep for use this more
widely within osgText/freetype plugin.

Added support for inserting loading models into --mt multithreaded implementation.

Files:

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

OpenSceneGraph/trunk/examples/osgtext/osgtext.cpp

@@ -482 +482 @@
 public:
 
-    UpdateTextOperation(osg::Group* group):        
+    UpdateTextOperation(const osg::Vec3& center, float diameter, osg::Group* group):        
         Operation("UpdateTextOperation", true),
+        _center(center),
+        _diameter(diameter),
         _maxNumChildren(200),
         _maxNumTextPerGeode(10),
@@ -545 +547 @@
         for(unsigned int i=0; i<_maxNumTextPerGeode; ++i)
         {
-            osg::Vec3 position(float(rand()) / float(RAND_MAX), float(rand()) / float(RAND_MAX), float(i)/float(_maxNumTextPerGeode));
+            osg::Vec3 position(float(rand()) / float(RAND_MAX) - 0.5f, float(rand()) / float(RAND_MAX) - 0.5f, float(i)/float(_maxNumTextPerGeode) - 0.5f);
 
             std::string str;
@@ -556 +558 @@
             osgText::Text* text = new osgText::Text;
             text->setDataVariance(osg::Object::DYNAMIC);
-            text->setPosition(position);
+            text->setPosition(_center + position * _diameter);
             text->setFont("times.ttf");
             text->setText(str);
-            text->setCharacterSize(0.025f);
+            text->setCharacterSize(0.025f * _diameter);
             text->setAxisAlignment(osgText::Text::SCREEN);
             
@@ -584 +586 @@
     typedef std::list< osg::ref_ptr<osg::Geode> > AvailableList;
 
+    osg::Vec3                   _center;
+    float                       _diameter;
     unsigned int                _maxNumChildren;
     unsigned int                _maxNumTextPerGeode;
@@ -619 +623 @@
         osg::Group* mainGroup = new osg::Group;
         
+        osg::Vec3 center(0.5f,0.5f,0.5f);
+        float diameter = 1.0f;
+        
+        osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+        if (loadedModel.valid())
+        {
+            mainGroup->addChild(loadedModel.get());
+            
+            center = loadedModel->getBound().center();
+            diameter = loadedModel->getBound().radius() * 2.0f;
+        }
+        
         for(unsigned int i=0; i<numThreads; ++i)
         {
@@ -631 +647 @@
             // create the operation that will run in the background and
             // sync once per frame with the main viewer loop.
-            updateOperation = new UpdateTextOperation(textGroup);
+            updateOperation = new UpdateTextOperation(center, diameter, textGroup);
 
             // add the operation to the operation thread and start it.
@@ -644 +660 @@
             osg::Geode* geode = new osg::Geode;
             geode->getOrCreateStateSet()->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK,osg::PolygonMode::LINE));
-            geode->addDrawable(new osg::ShapeDrawable(new osg::Box(osg::Vec3(0.5f,0.5f,0.5f),1.0)));
+            geode->addDrawable(new osg::ShapeDrawable(new osg::Box(center,diameter)));
 
             mainGroup->addChild(geode);