Changeset 58 for osgVisual


Ignore:
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:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • osgVisual/CMakeLists.txt

    r52 r58  
    4343
    4444SET(OpenSceneGraph_MARK_AS_ADVANCED ON)
    45 FIND_PACKAGE(OpenSceneGraph 2.9.7 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
     45FIND_PACKAGE(OpenSceneGraph 2.9.8 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
    4646FIND_PACKAGE(OpenGL REQUIRED)
    4747
     
    155155# Module cluster
    156156SET(USE_CLUSTER_UDP ON CACHE BOOL "Enable to use the UDP Implementation for the cluster interface")
    157 IF( USE_CLUSTER_UDP )
     157SET(USE_CLUSTER_ASIO_TCP_IOSTREAM ON CACHE BOOL "Enable to use the Boost ASIO TCP iostream Implementation for the cluster interface")
     158IF( USE_CLUSTER_UDP   )
    158159                SET(SOURCES
    159160                        ${SOURCES}
     
    165166                )
    166167                ADD_DEFINITIONS( "-DUSE_CLUSTER_UDP" )
    167 ELSE(USE_CLUSTER_UDP)
     168ENDIF()
     169
     170IF( USE_CLUSTER_ASIO_TCP_IOSTREAM )
     171                SET(SOURCES
     172                        ${SOURCES}
     173                        include/cluster/dataIO_cluster.h
     174                        include/cluster/dataIO_clusterAsioTcpIostream.h
     175                        src/cluster/dataIO_clusterAsioTcpIostream.cpp
     176                )
     177                ADD_DEFINITIONS( "-DUSE_CLUSTER_ASIO_TCP_IOSTREAM" )
     178                #SET(BOOST_ASIO_LIBRARY_RELEASE ../3rdParty_x86_x64/include/bo.lib CACHE FILEPATH "Select the release library of Boost ASIO to link against." )
     179                #SET(BOOST_ASIO_LIBRARY_DEBUG ../3rdParty_x86_x64/lib\x86/adsda.lib CACHE FILEPATH "Select the debug library of Boost ASIO to link against." )
     180                SET(BOOST_INCLUDE_DIR "../../3rdParty_x86_x64/include/boost-1.43.0/" CACHE PATH "Enter the path to the the include directory of Boost" )
     181ELSE()
     182                #UNSET(BOOST_ASIO_LIBRARY_RELEASE CACHE)
     183                #UNSET(BOOST_ASIO_LIBRARY_DEBUG CACHE)
     184                UNSET(BOOST_ASIO_INCLUDE_DIR CACHE)     
     185ENDIF()
     186
     187IF(NOT USE_CLUSTER_UDP AND NOT USE_CLUSTER_ASIO_TCP_IOSTREAM)
    168188                SET(SOURCES
    169189                        ${SOURCES}
     
    173193                )
    174194                ADD_DEFINITIONS( "-DUSE_CLUSTER_DUMMY" )
    175 ENDIF(USE_CLUSTER_UDP)
     195ENDIF()
    176196
    177197
  • osgVisual/include/dataIO/visual_dataIO.h

    r32 r58  
    2323
    2424// Cluster einbinden
     25#ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM
     26        #include <dataIO_clusterAsioTcpIostream.h>
     27#endif
    2528#ifdef USE_CLUSTER_DUMMY
    2629        #include <dataIO_clusterDummy.h>
     
    2932        #include <dataIO_clusterUDP.h>
    3033#endif
     34
     35
    3136
    3237//ExtLink einbinden
  • osgVisual/src/core/visual_core.cpp

    r57 r58  
    172172        else
    173173        {
    174         OSG_NOTIFY( osg::FATAL ) << arguments_.getApplicationName() <<"Load terrain: No data loaded" << std::endl;
     174        OSG_NOTIFY( osg::FATAL ) << "Load terrain: No data loaded" << std::endl;
    175175        return false;
    176176    }   
  • osgVisual/src/dataIO/visual_dataIO.cpp

    r31 r58  
    7171                cluster = new dataIO_clusterDummy();
    7272        #endif
     73        #ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM
     74                cluster = new dataIO_clusterAsioTcpIostream();
     75        #endif
    7376        #ifdef USE_CLUSTER_UDP
    7477                cluster = new dataIO_clusterUDP();
  • osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

    r57 r58  
    316316        //addCloudLayer( 0, 5000000, 5000000, 600.0, 7351.0, 0.2, CIRRUS_FIBRATUS );
    317317        //addCloudLayer( 0, 50000, 50000, 600.0, 7351.0, 0.2, CIRROCUMULUS );
    318         //addCloudLayer( 1, 8000, 10000, 3000, 2000.0, 0.01, CUMULONIMBUS_CAPPILATUS );
    319         addCloudLayer( 1, 200000, 200000, 3000, 2000.0, 0.05, CUMULUS_CONGESTUS );
     318        addCloudLayer( 1, 8000, 10000, 3000, 2000.0, 0.01, CUMULONIMBUS_CAPPILATUS );
     319        //addCloudLayer( 1, 200000, 200000, 3000, 2000.0, 0.05, CUMULUS_CONGESTUS );
    320320        //addCloudLayer( 1, 500000, 500000, 15000, 2000.0, 0.6, STRATUS );
    321321        //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::RAIN, 15.0 );
Note: See TracChangeset for help on using the changeset viewer.