Changeset 58

Timestamp:

May 30, 2010, 3:17:44 PM (14 years ago)

Author:

Torben Dannhauer

Message:

added support cluster implementation via Boost ASIO TCP iostreams.

Status: Skeleton, ready to implement.

Minor: changed Silverlining default clouds.

Location:

osgVisual

Files:

• CMakeLists.txt (modified) (4 diffs)
• include/cluster/dataIO_clusterAsioTcpIostream.h (added)
• include/dataIO/visual_dataIO.h (modified) (2 diffs)
• src/cluster/dataIO_clusterAsioTcpIostream.cpp (added)
• src/core/visual_core.cpp (modified) (1 diff)
• src/dataIO/visual_dataIO.cpp (modified) (1 diff)
• src/sky_Silverlining/visual_skySilverLining.cpp (modified) (1 diff)

osgVisual/CMakeLists.txt

@@ -43 +43 @@
 
 SET(OpenSceneGraph_MARK_AS_ADVANCED ON)
-FIND_PACKAGE(OpenSceneGraph 2.9.7 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
+FIND_PACKAGE(OpenSceneGraph 2.9.8 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
 FIND_PACKAGE(OpenGL REQUIRED)
 
@@ -155 +155 @@
 # Module cluster
 SET(USE_CLUSTER_UDP ON CACHE BOOL "Enable to use the UDP Implementation for the cluster interface")
-IF( USE_CLUSTER_UDP )
+SET(USE_CLUSTER_ASIO_TCP_IOSTREAM ON CACHE BOOL "Enable to use the Boost ASIO TCP iostream Implementation for the cluster interface")
+IF( USE_CLUSTER_UDP   )
                 SET(SOURCES
                         ${SOURCES}
@@ -165 +166 @@
                 )
                 ADD_DEFINITIONS( "-DUSE_CLUSTER_UDP" )
-ELSE(USE_CLUSTER_UDP)
+ENDIF()
+
+IF( USE_CLUSTER_ASIO_TCP_IOSTREAM )
+                SET(SOURCES
+                        ${SOURCES}
+                        include/cluster/dataIO_cluster.h
+                        include/cluster/dataIO_clusterAsioTcpIostream.h
+                        src/cluster/dataIO_clusterAsioTcpIostream.cpp
+                )
+                ADD_DEFINITIONS( "-DUSE_CLUSTER_ASIO_TCP_IOSTREAM" )
+                #SET(BOOST_ASIO_LIBRARY_RELEASE ../3rdParty_x86_x64/include/bo.lib CACHE FILEPATH "Select the release library of Boost ASIO to link against." )
+                #SET(BOOST_ASIO_LIBRARY_DEBUG ../3rdParty_x86_x64/lib\x86/adsda.lib CACHE FILEPATH "Select the debug library of Boost ASIO to link against." )
+                SET(BOOST_INCLUDE_DIR "../../3rdParty_x86_x64/include/boost-1.43.0/" CACHE PATH "Enter the path to the the include directory of Boost" )
+ELSE()
+                #UNSET(BOOST_ASIO_LIBRARY_RELEASE CACHE)
+                #UNSET(BOOST_ASIO_LIBRARY_DEBUG CACHE)
+                UNSET(BOOST_ASIO_INCLUDE_DIR CACHE)     
+ENDIF()
+
+IF(NOT USE_CLUSTER_UDP AND NOT USE_CLUSTER_ASIO_TCP_IOSTREAM)
                 SET(SOURCES
                         ${SOURCES}
@@ -173 +193 @@
                 )
                 ADD_DEFINITIONS( "-DUSE_CLUSTER_DUMMY" )
-ENDIF(USE_CLUSTER_UDP)
+ENDIF()
 
 

osgVisual/include/dataIO/visual_dataIO.h

@@ -23 +23 @@
 
 // Cluster einbinden
+#ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM
+        #include <dataIO_clusterAsioTcpIostream.h>
+#endif
 #ifdef USE_CLUSTER_DUMMY
         #include <dataIO_clusterDummy.h>
@@ -29 +32 @@
         #include <dataIO_clusterUDP.h>
 #endif
+
+
 
 //ExtLink einbinden

osgVisual/src/core/visual_core.cpp

@@ -172 +172 @@
         else
         {
-        OSG_NOTIFY( osg::FATAL ) << arguments_.getApplicationName() <<"Load terrain: No data loaded" << std::endl;
+        OSG_NOTIFY( osg::FATAL ) << "Load terrain: No data loaded" << std::endl;
         return false;
     }    

osgVisual/src/dataIO/visual_dataIO.cpp

@@ -71 +71 @@
                 cluster = new dataIO_clusterDummy();
         #endif
+        #ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM
+                cluster = new dataIO_clusterAsioTcpIostream();
+        #endif 
         #ifdef USE_CLUSTER_UDP
                 cluster = new dataIO_clusterUDP();

osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

@@ -316 +316 @@
         //addCloudLayer( 0, 5000000, 5000000, 600.0, 7351.0, 0.2, CIRRUS_FIBRATUS );
         //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, 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 );