Changeset 60


Ignore:
Timestamp:
Jun 1, 2010, 4:00:07 PM (14 years ago)
Author:
Torben Dannhauer
Message:
 
Location:
osgVisual
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • osgVisual/CMakeLists.txt

    r58 r60  
    176176                )
    177177                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." )
     178                ADD_DEFINITIONS( "-D_WIN32_WINNT=0x0501" )
     179                SET(BOOST_LIBRARY_PATH "../../3rdParty_x86_x64/lib/${DESTINATION_ARCH}/" CACHE PATH "Select the library folder of Boost libraries to link against." )
    180180                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                INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
     182                LINK_DIRECTORIES(${BOOST_LIBRARY_PATH})
    181183ELSE()
    182                 #UNSET(BOOST_ASIO_LIBRARY_RELEASE CACHE)
    183                 #UNSET(BOOST_ASIO_LIBRARY_DEBUG CACHE)
     184                UNSET(BOOST_LIBRARY_PATH CACHE)
    184185                UNSET(BOOST_ASIO_INCLUDE_DIR CACHE)     
    185186ENDIF()
     
    277278)
    278279
    279 INCLUDE_DIRECTORIES(include/core include/util include/draw2D include/draw3D include/object include/manip_ObjectMounted include/manip_Spacemouse)
     280INCLUDE_DIRECTORIES(include/core include/util include/draw2D include/draw3D include/object include/manip_ObjectMounted)
    280281INCLUDE_DIRECTORIES(include/dataIO include/cluster include/extLink ${OPENSCENEGRAPH_INCLUDE_DIRS} .)
    281282
  • osgVisual/include/sky_Silverlining/visual_skySilverLining.h

    r32 r60  
    609609using namespace SilverLining;
    610610
    611 class MyMillisecondTimer : public SilverLining::MillisecondTimer
    612 {
    613 public:
    614         virtual unsigned long GetMilliseconds() const
    615         {
    616                         return timeGetTime() * 50;
    617         }
    618 };
     611//class MyMillisecondTimer : public SilverLining::MillisecondTimer
     612//{
     613//public:
     614//      virtual unsigned long GetMilliseconds() const
     615//        {
     616//                      return timeGetTime() * 50;
     617//        }
     618//};
    619619
    620620
  • osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

    r58 r60  
    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 );
     318        addCloudLayer( 1, 18000, 10000, 3000, 2000.0, 0.01, CUMULONIMBUS_CAPPILATUS );
    319319        //addCloudLayer( 1, 200000, 200000, 3000, 2000.0, 0.05, CUMULUS_CONGESTUS );
    320320        //addCloudLayer( 1, 500000, 500000, 15000, 2000.0, 0.6, STRATUS );
    321         //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::RAIN, 15.0 );
     321        //cloudLayerSlots[1].cloudLayerPointer->SetPrecipitation(SilverLining::CloudLayer::SLEET, 25.0 );
    322322
    323323}
Note: See TracChangeset for help on using the changeset viewer.