Changeset 155

Timestamp:

Nov 12, 2010, 8:51:06 AM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• include/vista2D/visual_vista2D.h (modified) (4 diffs)
• src/core/visual_core.cpp (modified) (1 diff)
• src/vista2D/visual_vista2D.cpp (modified) (6 diffs)

osgVisual/bin/osgVisualConfig.xml

@@ -18 +18 @@
   <module name="sky_silverlining" enabled="yes"></module>
   <module name="vista2d" enabled="yes">
-    <vista2d filename="hud.view" paintBackground="no" position_x="800" position_y="450" zoom="0.5"></vista2d>
+    <vista2d filename="D:\osgVisual\osgVisual\bin\hud.v" paintBackground="no" position_x="800" position_y="450" zoom="0.5"></vista2d>
   </module>
   <module name="dataio" enabled="yes">

osgVisual/include/vista2D/visual_vista2D.h

@@ -16 +16 @@
 */
 
+// Vista 2D
 #include "VistaView.h"
 
+// C++ libraries
 #include <string>
 
+// XML Parser
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+// OSG Includes
 #include <osg/Drawable>
 #include <osg/Geode>
@@ -28 +36 @@
 #include <osgDB/FileUtils>
 
+// osgVisual Includes
+#include <visual_util.h>
 
 namespace osgVisual
@@ -91 +101 @@
 private:
 
-        bool processXMLConfiguration();
+        static bool processXMLConfiguration(std::string& configFileName, std::string& vistaProjectfile, bool& paintBackground, int& position_x, int& position_y, float& zoom);
 
         /**
          * \brief This function initialized the visual_vista2D object after instantiation by createVistaOverlay()
          */ 
-        void startVista2D();
+        void startVista2D(std::string vistaProjectfile, bool paintBackground, int posX, int posY, float zoom);
 
         /**
@@ -113 +123 @@
         Vista2D::VistaView* view;
 
-        /**
-         * XML config filename
-         */ 
-        std::string configFileName;
+        ///**
+        // * XML config filename
+        // */ 
+        //std::string configFileName;
 
-        /**
-         * Filename of the Vista2D project file.
-         */
-        std::string filename;
+        ///**
+        // * Filename of the Vista2D project file.
+        // */
+        //std::string filename;
 
-        /**
-         * Should the background of the Vista2D project be painted?
-         */
-        bool paintBackground;
+        ///**
+        // * Should the background of the Vista2D project be painted?
+        // */
+        //bool paintBackground;
 
-        /**
-         * X-Position to draw.
-         */
-        int position_x;
+        ///**
+        // * X-Position to draw.
+        // */
+        //int position_x;
 
-        /**
-         * Y-Position to draw.
-         */
-        int position_y;
+        ///**
+        // * Y-Position to draw.
+        // */
+        //int position_y;
 
-        /**
-         * Zoom factor to draw the project.
-         */
-        double zoom;
+        ///**
+        // * Zoom factor to draw the project.
+        // */
+        //double zoom;
 }; 
 

osgVisual/src/core/visual_core.cpp

@@ -512 +512 @@
 
         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

@@ -22 +22 @@
 visual_vista2D::visual_vista2D(void)
 {
+        OSG_NOTIFY (osg::ALWAYS ) << "visual_vista2D instantiated." << std::endl;
+
    // Create a Vista2D View
    view = new Vista2D::VistaView();
-
-        filename = "";
-        paintBackground = false;;
-        position_x = 600;
-        position_y = 400;
-        zoom = 0.5;
 }
 
@@ -36 +32 @@
 }
 
-void visual_vista2D::startVista2D(std::string vista2DFilename_)
+void visual_vista2D::startVista2D(std::string vistaProjectfile, bool paintBackground, int posX, int posY, float zoom)
 {
     /***************
     load view
     ***************/
-        view->load( filename );
+        view->load( vistaProjectfile );
     view->setBackgroundMode(paintBackground);   // don't paint background
-        view->setPosition( position_x,position_y);
+        view->setPosition( posX, posY);
         view->setZoom( zoom );
 
@@ -54 +50 @@
 }
 
-bool visual_vista2D::processXMLConfiguration()
+bool visual_vista2D::processXMLConfiguration(std::string& configFileName, std::string& vistaProjectfile, bool& paintBackground, int& position_x, int& position_y, float& zoom)
 {
         // Init XML
         xmlDoc* tmpDoc;
         bool disabled;
-        xmlNode* config = util::getModuleXMLConfig( configFileName, "vista2D", tmpDoc, disabled );
+        xmlNode* config = util::getModuleXMLConfig( configFileName, "vista2d", tmpDoc, disabled );
 
         if( disabled)
@@ -89 +85 @@
                                         if( attr_name == "filename" )
                                         {
-                                                filename=attr_value
+                                                vistaProjectfile=attr_value;
                                         }
 
@@ -137 +133 @@
         OSG_NOTIFY (osg::ALWAYS ) << "visual_vista2D initialize..";  // The sentence is finished by the init result...
 
-        this->configFileName = configFileName;
-
-        // Analyse XML configuration file
-                // Process XML configuration
-        if(!processXMLConfiguration())
+        std::string vistaProjectfile = "";
+        bool paintBackground = false;
+        int position_x = 0;
+        int position_y = 0;
+        float zoom = 1;
+
+        // Process XML configuration
+        if(!processXMLConfiguration(configFileName, vistaProjectfile, paintBackground, position_x, position_y, zoom))
                 return false;   // Abort vista2D initialization.
 
-        // Check if Vista2D file exist
-        if (! osgDB::fileExists( filename ) )
-        {
-                osg::notify( osg::WARN ) << "WARNING: visual_vista2D::createVistaOverlay - Could not find specified Vista2D projectfile. Skip adding Vista2D project." << std::endl;
+        // Check if Vista2D project file exists
+        if ( !osgDB::fileExists(vistaProjectfile) )
+        {
+                OSG_ALWAYS << "WARNING: visual_vista2D::init() - Specified vista2D projectfile '"<< vistaProjectfile <<"' does not exist! Skip using Vista2D!" << std::endl;
                 return false;
         }
@@ -186 +185 @@
         // Add Payload: Vista2D                 
         osg::ref_ptr<visual_vista2D> vista2D = new visual_vista2D();
-        vista2D->startVista2D( vista2DFilename_ );
+        vista2D->startVista2D(vistaProjectfile, paintBackground, position_x, position_y, zoom);
 
         vista2D.get()->setUseDisplayList( false );