Changeset 57

Timestamp:

May 30, 2010, 1:05:25 PM (14 years ago)

Author:

Torben Dannhauer

Message:

corrected cluster/dataIO_clusterUDP.h and extLink/dataIO_extLinkDummy.h and extLink/dataIO_extLinkVCL.h to be able to use it in any combination.h

Location:

osgVisual

Files:

• include/cluster/dataIO_clusterUDP.h (modified) (1 diff)
• include/core/visual_core.h (modified) (1 diff)
• include/extLink/dataIO_extLinkDummy.h (modified) (2 diffs)
• src/core/visual_core.cpp (modified) (1 diff)
• src/extLink/dataIO_extLinkDummy.cpp (modified) (1 diff)
• src/extLink/dataIO_extLinkVCL.cpp (modified) (1 diff)
• src/sky_Silverlining/visual_skySilverLining.cpp (modified) (2 diffs)

osgVisual/include/cluster/dataIO_clusterUDP.h

@@ -23 +23 @@
 #include <osgDB/ReaderWriter>
 #include <iostream>
+#include <winsock2.h>
+#pragma comment ( lib, "WSock32.lib" )
 
 #include "dataIO_clusterUDP_Transmission.h"

osgVisual/include/core/visual_core.h

@@ -86 +86 @@
 
 
+
 namespace osgVisual
 {

osgVisual/include/extLink/dataIO_extLinkDummy.h

@@ -18 +18 @@
 #include <dataIO_extLink.h>
 #include <osg/Notify>
+#include <vector>
 
 namespace osgVisual
@@ -33 +34 @@
 {
 public:
-        dataIO_extLinkDummy(std::vector<dataIOSlot>& dataSlots_);
+        dataIO_extLinkDummy(std::vector<dataIO_slot>& dataSlots_);
         virtual ~dataIO_extLinkDummy(void);
 

osgVisual/src/core/visual_core.cpp

@@ -422 +422 @@
 
         // Size ermitteln.
-        stringbuf *pbuf;
+        std::stringbuf *pbuf;
         pbuf = myOstream.rdbuf();
         OSG_NOTIFY( osg::WARN ) << "PBUF Bytes available: " << pbuf->in_avail() << std::endl;

osgVisual/src/extLink/dataIO_extLinkDummy.cpp

@@ -15 +15 @@
 */
 
-#include "dataIO_extLinkDummy.h"
+#include <dataIO_extLinkDummy.h>
 
-dataIO_extLinkDummy::dataIO_extLinkDummy(std::vector<dataIOSlot>& dataSlots_) : dataIO_extLink(dataSlots_)
+#include <visual_dataIO.h>      // include in.cpp to avoid circular inclusion (visual_dataIO <-> extLinkDummy)
+
+
+using namespace osgVisual;
+
+dataIO_extLinkDummy::dataIO_extLinkDummy(std::vector<dataIO_slot>& dataSlots_) : dataIO_extLink(dataSlots_)
 {
         OSG_NOTIFY( osg::ALWAYS ) << "extLinkDummy constructed" << std::endl;

osgVisual/src/extLink/dataIO_extLinkVCL.cpp

@@ -17 +17 @@
 #include <dataIO_extLinkVCL.h>
 
-#include <visual_dataIO.h>
+#include <visual_dataIO.h>      // include in.cpp to avoid circular inclusion (visual_dataIO <-> extLinkVCL)
 
 using namespace osgVisual;

osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

@@ -300 +300 @@
         updateCallback->operator ()(this, NULL);
 
-        setTime(16,00,23);
+        setTime(12,00,23);
         setVisibility(50000);
         //atmosphere->GetConditions()->SetFog( 0.8, 1, 1, 1);   // use this for simulation real fog.
@@ -315 +315 @@
         //addCloudLayer( 0, 300000, 300000, 600.0, 2351.0, 0.5, NIMBOSTRATUS );
         //addCloudLayer( 0, 5000000, 5000000, 600.0, 7351.0, 0.2, CIRRUS_FIBRATUS );
-        addCloudLayer( 1, 8000, 10000, 3000, 2000.0, 0.01, CUMULONIMBUS_CAPPILATUS );
-        //addCloudLayer( 1, 25000, 25000, 3000, 2000.0, 0.05, CUMULUS_CONGESTUS );
+        //addCloudLayer( 0, 50000, 50000, 600.0, 7351.0, 0.2, CIRROCUMULUS );
+        //addCloudLayer( 1, 8000, 10000, 3000, 2000.0, 0.01, CUMULONIMBUS_CAPPILATUS );
+        addCloudLayer( 1, 200000, 200000, 3000, 2000.0, 0.05, CUMULUS_CONGESTUS );
         //addCloudLayer( 1, 500000, 500000, 15000, 2000.0, 0.6, STRATUS );
         //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::RAIN, 15.0 );