Changeset 129

Timestamp:

Sep 11, 2010, 10:21:58 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• bin/osgVisualConfig.xml (modified) (2 diffs)
• include/core/visual_core.h (modified) (3 diffs)
• src/core/visual_core.cpp (modified) (2 diffs)

osgVisual/bin/osgVisualConfig.xml

@@ -2 +2 @@
 <osgvisualconfiguration>
   <module name="distortion" enabled="yes">
-    <distortion active="yes" channelname="center"></distortion>
+    <distortion channelname="center"></distortion>
   </module>
-  
-  <module name="sky_silverlining" enabled="yes">
-    <datetime day="01" month="02" year="2010" hour="23" minute="45"></datetime>
-    <cloudlayer slot="1" type="cumulusCongestus" enabled="true" fadetime="15">
-      <geometry baselength="50000" basewidth="50000" thickness="500" baseHeight="1700" density="0.3"></geometry>
-      <precipitation rate_mmPerHour_rain="5.0" rate_mmPerHour_drySnow="7.0" rate_mmPerHour_wetSnow="10.0" rate_mmPerHour_sleet="0.0"></precipitation>
-    </cloudlayer>
-    <windlayer bottom="500.0" top="700." speed="25.0" direction="90.0"></windlayer>
-    <visibility range="50000" turbidity="2.2" ></visibility>
-  </module>
+  <module name="sky_silverlining" enabled="yes"></module>
   
   <scenery>
@@ -28 +19 @@
       </model>
     </models>
+    <datetime day="01" month="02" year="2010" hour="23" minute="45"></datetime>
+    <visibility range="50000" turbidity="2.2" ></visibility>
+    <cloudlayer slot="1" type="cumulusCongestus" enabled="true" fadetime="15">
+      <geometry baselength="50000" basewidth="50000" thickness="500" baseHeight="1700" density="0.3"></geometry>
+      <precipitation rate_mmPerHour_rain="5.0" rate_mmPerHour_drySnow="7.0" rate_mmPerHour_wetSnow="10.0" rate_mmPerHour_sleet="0.0"></precipitation>
+    </cloudlayer>
+    <windlayer bottom="500.0" top="700." speed="25.0" direction="90.0"></windlayer>
   </scenery>
 </osgvisualconfiguration>

osgVisual/include/core/visual_core.h

@@ -110 +110 @@
         void parseModule(xmlNode * a_node);
         void parseScenery(xmlNode * a_node);
+        void config(xmlNode * a_node);
         bool loadTerrain(osg::ArgumentParser& arguments_);
         bool checkCommandlineArgumentsForFinalErrors();
@@ -165 +166 @@
          */ 
         osg::ref_ptr<visual_skySilverLining> sky;
+
+        xmlNode* skySilverliningConfig;
 #endif
 
@@ -172 +175 @@
          */ 
         osg::ref_ptr<visual_distortion> distortion;
+
+        xmlNode* distortionConfig;
 #endif
 

osgVisual/src/core/visual_core.cpp

@@ -350 +350 @@
                         enabled = false;
 
-
-                std::cout << "Attribute name: " << attr->name << " value: " << attr_value << std::endl;
+                OSG_ALWAYS << "Module '" << name << "' found. Enabled = " << enabled << std::endl;
+
                 attr = attr->next; 
         } 
 
+        // Pass the nodes to the corresponding modules...
+        if(name == "core") this->config(a_node);
 
 }
@@ -361 +363 @@
 {
         OSG_ALWAYS << "parseScenery()" << std::endl;
+}
+
+void visual_core::config(xmlNode * a_node)
+{
+        // Currently no configuration options fpr the core module are available.
 }