Changeset 60

Timestamp:

Jun 1, 2010, 4:00:07 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• CMakeLists.txt (modified) (2 diffs)
• include/sky_Silverlining/visual_skySilverLining.h (modified) (1 diff)
• src/sky_Silverlining/visual_skySilverLining.cpp (modified) (1 diff)

osgVisual/CMakeLists.txt

@@ -176 +176 @@
                 )
                 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." )
+                ADD_DEFINITIONS( "-D_WIN32_WINNT=0x0501" )
+                SET(BOOST_LIBRARY_PATH "../../3rdParty_x86_x64/lib/${DESTINATION_ARCH}/" CACHE PATH "Select the library folder of Boost libraries 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" )
+                INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
+                LINK_DIRECTORIES(${BOOST_LIBRARY_PATH})
 ELSE()
-                #UNSET(BOOST_ASIO_LIBRARY_RELEASE CACHE)
-                #UNSET(BOOST_ASIO_LIBRARY_DEBUG CACHE)
+                UNSET(BOOST_LIBRARY_PATH CACHE)
                 UNSET(BOOST_ASIO_INCLUDE_DIR CACHE)     
 ENDIF()
@@ -277 +278 @@
 )
 
-INCLUDE_DIRECTORIES(include/core include/util include/draw2D include/draw3D include/object include/manip_ObjectMounted include/manip_Spacemouse)
+INCLUDE_DIRECTORIES(include/core include/util include/draw2D include/draw3D include/object include/manip_ObjectMounted)
 INCLUDE_DIRECTORIES(include/dataIO include/cluster include/extLink ${OPENSCENEGRAPH_INCLUDE_DIRS} .)
 

osgVisual/include/sky_Silverlining/visual_skySilverLining.h

@@ -609 +609 @@
 using namespace SilverLining;
 
-class MyMillisecondTimer : public SilverLining::MillisecondTimer
-{
-public:
-        virtual unsigned long GetMilliseconds() const
-        {
-                        return timeGetTime() * 50;
-        }
-};
+//class MyMillisecondTimer : public SilverLining::MillisecondTimer
+//{
+//public:
+//      virtual unsigned long GetMilliseconds() const
+//        {
+//                      return timeGetTime() * 50;
+//        }
+//};
 
 

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, 18000, 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 );
+        //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::SLEET, 25.0 );
 
 }