Changeset 156 for osgVisual/src

Timestamp:

Nov 12, 2010, 9:13:14 AM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/src

Files:

• core/visual_core.cpp (modified) (1 diff)
• vista2D/visual_vista2D.cpp (modified) (6 diffs)

osgVisual/src/core/visual_core.cpp

@@ -513 +513 @@
         visual_dataIO::getInstance()->setSlotData("TestSlot1", osgVisual::dataIO_slot::TO_OBJ, 0.12345);
 
-
-        // Vista2D Test: 
-        visual_vista2D::init(rootNode, configFilename );
-}
+}

osgVisual/src/vista2D/visual_vista2D.cpp

@@ -26 +26 @@
    // Create a Vista2D View
    view = new Vista2D::VistaView();
+
+        vistaProjectfile = "";
+        paintBackground = false;
+        playanimation = false;
+        position_x = 0;
+        position_y = 0;
+        zoom = 1;
 }
 
 visual_vista2D::~visual_vista2D(void)
 {
-}
-
-void visual_vista2D::startVista2D(std::string vistaProjectfile, bool paintBackground, int posX, int posY, float zoom)
+        view->stopView();
+}
+
+void visual_vista2D::startVista2D()
 {
     /***************
@@ -39 +47 @@
         view->load( vistaProjectfile );
     view->setBackgroundMode(paintBackground);   // don't paint background
-        view->setPosition( posX, posY);
+        view->setPosition( position_x, position_y);
         view->setZoom( zoom );
 
@@ -46 +54 @@
     self running datasource
     ***************/
-    view->startView (true);
-
-}
-
-bool visual_vista2D::processXMLConfiguration(std::string& configFileName, std::string& vistaProjectfile, bool& paintBackground, int& position_x, int& position_y, float& zoom)
+    view->startView (playanimation);
+}
+
+bool visual_vista2D::processXMLConfiguration()
 {
         // Init XML
@@ -109 +116 @@
                                                 std::stringstream sstr(attr_value);
                                                 sstr >> zoom;
+                                        }
+
+                                        if( attr_name == "playanimation" )
+                                        {
+                                                playanimation = (attr_value == "yes") ? true : false;
                                         }
 
@@ -133 +145 @@
         OSG_NOTIFY (osg::ALWAYS ) << "visual_vista2D initialize..";  // The sentence is finished by the init result...
 
-        std::string vistaProjectfile = "";
-        bool paintBackground = false;
-        int position_x = 0;
-        int position_y = 0;
-        float zoom = 1;
+        this->configFileName = configFileName;
 
         // Process XML configuration
-        if(!processXMLConfiguration(configFileName, vistaProjectfile, paintBackground, position_x, position_y, zoom))
+        if(!processXMLConfiguration())
                 return false;   // Abort vista2D initialization.
 
@@ -184 +192 @@
 
         // Add Payload: Vista2D                 
-        osg::ref_ptr<visual_vista2D> vista2D = new visual_vista2D();
-        vista2D->startVista2D(vistaProjectfile, paintBackground, position_x, position_y, zoom);
-
-        vista2D.get()->setUseDisplayList( false );
-        vista2Dgeode->addDrawable( vista2D.get() );
+        startVista2D();
+
+        // Add this class to the scene Graph
+        this->setUseDisplayList( false );
+        vista2Dgeode->addDrawable( this );
 
         sceneGraphRoot_->addChild( vista2DProjectionMatrix );