Changeset 189

Timestamp:

Jan 9, 2011, 9:50:33 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• src/core/visual_core.cpp (modified) (2 diffs)

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -50 +50 @@
       </model>
     </models>
-    <datetime day="01" month="02" year="2010" hour="23" minute="45"></datetime>
+    <datetime day="0" month="0" year="0" hour="15" minute="30"></datetime>
     <visibility range="50000" turbidity="2.2" ></visibility>
     <cloudlayer slot="1" type="cumulusCongestus" enabled="true" fadetime="15">

osgVisual/trunk/src/core/visual_core.cpp

@@ -91 +91 @@
         addManipulators();
 
-        loadTerrain(arguments);
-
         // create the windows and run the threads.
         viewer->realize();
 
+        loadTerrain(arguments);
+
         // parse Configuration file
         xmlDoc* tmpDoc;
-        xmlNode* sceneryNode = util::getSceneryXMLConfig( "osgVisualConfig.xml", tmpDoc);
+        xmlNode* sceneryNode = util::getSceneryXMLConfig(configFilename, tmpDoc);
         parseScenery(sceneryNode);
         if(sceneryNode)
@@ -311 +311 @@
                 if(cur_node->type == XML_ELEMENT_NODE && node_name == "datetime")
                 {
-                        //<datetime day="01" month="02" year="2010" hour="23" minute="45"></datetime>
+                        int hour, minute;
+                        int day=0,month=0,year=0;
+
+                        xmlAttr  *attr = cur_node->properties;
+                        while ( attr ) 
+                        { 
+                                std::string attr_name=reinterpret_cast<const char*>(attr->name);
+                                std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
+                                if( attr_name == "day" )
+                                {
+                                        std::stringstream sstr(attr_value);
+                                        sstr >> day;
+                                }
+                                if( attr_name == "month" )
+                                {
+                                        std::stringstream sstr(attr_value);
+                                        sstr >> month;
+                                }
+                                if( attr_name == "year" )
+                                {
+                                        std::stringstream sstr(attr_value);
+                                        sstr >> year;
+                                }
+                                if( attr_name == "hour" )
+                                {
+                                        std::stringstream sstr(attr_value);
+                                        sstr >> hour;
+                                }
+                                if( attr_name == "minute" )
+                                {
+                                        std::stringstream sstr(attr_value);
+                                        sstr >> minute;
+                                }
+                                attr = attr->next; 
+                        }
+                        if(sky.valid())
+                        {
+                                if(day!=0 && month!=0 && year!=0)
+                                        sky->setDate(year, month, day);
+                                sky->setTime(hour,minute,00);
+                        }
+
                 }