- Timestamp:
- May 30, 2010, 3:17:44 PM (14 years ago)
- Location:
- osgVisual
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
osgVisual/CMakeLists.txt
r52 r58 43 43 44 44 SET(OpenSceneGraph_MARK_AS_ADVANCED ON) 45 FIND_PACKAGE(OpenSceneGraph 2.9. 7REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)45 FIND_PACKAGE(OpenSceneGraph 2.9.8 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil) 46 46 FIND_PACKAGE(OpenGL REQUIRED) 47 47 … … 155 155 # Module cluster 156 156 SET(USE_CLUSTER_UDP ON CACHE BOOL "Enable to use the UDP Implementation for the cluster interface") 157 IF( USE_CLUSTER_UDP ) 157 SET(USE_CLUSTER_ASIO_TCP_IOSTREAM ON CACHE BOOL "Enable to use the Boost ASIO TCP iostream Implementation for the cluster interface") 158 IF( USE_CLUSTER_UDP ) 158 159 SET(SOURCES 159 160 ${SOURCES} … … 165 166 ) 166 167 ADD_DEFINITIONS( "-DUSE_CLUSTER_UDP" ) 167 ELSE(USE_CLUSTER_UDP) 168 ENDIF() 169 170 IF( 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" ) 181 ELSE() 182 #UNSET(BOOST_ASIO_LIBRARY_RELEASE CACHE) 183 #UNSET(BOOST_ASIO_LIBRARY_DEBUG CACHE) 184 UNSET(BOOST_ASIO_INCLUDE_DIR CACHE) 185 ENDIF() 186 187 IF(NOT USE_CLUSTER_UDP AND NOT USE_CLUSTER_ASIO_TCP_IOSTREAM) 168 188 SET(SOURCES 169 189 ${SOURCES} … … 173 193 ) 174 194 ADD_DEFINITIONS( "-DUSE_CLUSTER_DUMMY" ) 175 ENDIF( USE_CLUSTER_UDP)195 ENDIF() 176 196 177 197 -
osgVisual/include/dataIO/visual_dataIO.h
r32 r58 23 23 24 24 // Cluster einbinden 25 #ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM 26 #include <dataIO_clusterAsioTcpIostream.h> 27 #endif 25 28 #ifdef USE_CLUSTER_DUMMY 26 29 #include <dataIO_clusterDummy.h> … … 29 32 #include <dataIO_clusterUDP.h> 30 33 #endif 34 35 31 36 32 37 //ExtLink einbinden -
osgVisual/src/core/visual_core.cpp
r57 r58 172 172 else 173 173 { 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; 175 175 return false; 176 176 } -
osgVisual/src/dataIO/visual_dataIO.cpp
r31 r58 71 71 cluster = new dataIO_clusterDummy(); 72 72 #endif 73 #ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM 74 cluster = new dataIO_clusterAsioTcpIostream(); 75 #endif 73 76 #ifdef USE_CLUSTER_UDP 74 77 cluster = new dataIO_clusterUDP(); -
osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp
r57 r58 316 316 //addCloudLayer( 0, 5000000, 5000000, 600.0, 7351.0, 0.2, CIRRUS_FIBRATUS ); 317 317 //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 ); 320 320 //addCloudLayer( 1, 500000, 500000, 15000, 2000.0, 0.6, STRATUS ); 321 321 //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::RAIN, 15.0 );
Note: See TracChangeset
for help on using the changeset viewer.