Changeset 155 for osgVisual/include

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

File:

• osgVisual/include/vista2D/visual_vista2D.h (modified) (4 diffs)

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;
 };