This is a legacy Trac instance left read-only for reference purposes. More info. dev main | home

Changeset 193

Show
Ignore:
Timestamp:
03/02/2010 04:33:49 PM (2 years ago)
Author:
mceier
Message:

Remove old simulation code

Signed-off-by: Mariusz Ceier <mceier@gmail.com>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/include/waterworld/config.h.in

    r188 r193  
    33 
    44#cmakedefine WATERWORLD_WIN32 
    5 #cmakedefine USE_SIM2 
    65 
    76#endif/*CONFIG_INCLUDED*/ 

  • trunk/include/waterworld/sim2/CollisionSensor.h

    r186 r193  
    2626                 * Handle collision between animat1 and animat2 at contactPoint 
    2727                 * \param animat1 Colliding animat 
    28                  * \param animat2 Another colliding animat 
    2928                 * \param contactPoint Contact point 
    3029                 * \param world World 

  • trunk/include/waterworld/sim2/EventsThread.h

    r175 r193  
    66        /** 
    77         * \class EventsThread 
     8         * \brief Thread for processing events 
    89         */ 
    910        class EventsThread; 
    …… 
    1819namespace waterworld 
    1920{ 
    20         /// @TODO 
    2121        class EventsThread : public EventHandler 
    2222        { 
    …… 
    2525                typedef queue_t::value_type event_t; 
    2626                typedef queue_t::value_type value_type; 
     27                /** 
     28                 * \param queue Events queue 
     29                 * \param registry Handlers registry 
     30                 */ 
    2731                EventsThread(queue_t &queue, HandlersRegistry &registry); 
    2832                EventsThread(EventsThread const &evThread); 
    2933                EventsThread &operator=(EventsThread const &evThread); 
     34                /** 
     35                 * Waits for event 
     36                 * \return Event 
     37                 */ 
    3038                virtual event_t getEvent(); 
     39                /** 
     40                 * Handles event 
     41                 * \param event Event to handle 
     42                 */ 
    3143                virtual bool handle(Event *event); 
     44                /** 
     45                 * Thread main-loop 
     46                 */ 
    3247                void operator()(); 
    3348                virtual ~EventsThread(); 

  • trunk/include/waterworld/waterworld.h

    r110 r193  
    33 
    44/** 
    5  * \file waterworld.h 
    6  * \brief waterworld include-all header 
    7  * 
    8  * This file includes every other header in project,  
    9  * it allows easier 'refactoring' ( e.g. renaming headers in project,  
    10  * moving classes between headers, etc. ) 
    11  */ 
    12  
    13 /** 
    14  * \namespace waterworld 
    15  * \brief WaterWorld namespace 
     5 * Namespace for waterworld classes 
    166 */ 
    177namespace waterworld {} 
    188 
    19 #include "waterworld/config.h" 
    20 #include "waterworld/common.h" 
    21 #include "waterworld/simulation.h" 
    22 #include "waterworld/network.h" 
     9// include all headers 
    2310 
    24 //#include "waterworld/simpleanimatcontroller.h" 
    25 //#include "waterworld/simpleworld.h" 
     11#include <waterworld/config.h> 
     12#include "sim2.h" 
    2613 
    2714#endif/*WATERWORLD_INCLUDED*/ 
    28  

  • trunk/src/CMakeLists.txt

    r188 r193  
    1313ADD_SUBDIRECTORY(waterworld) 
    1414 
    15 IF(USE_SIM2) 
    16         ADD_EXECUTABLE(WaterWorld3 
    17                 waterworld3.cpp  
    18                 SerializeEventHandler.cpp 
    19                 QuitEventHandler.cpp) 
    20         TARGET_LINK_LIBRARIES(WaterWorld3 ${WATERWORLD_LIBRARY} ${WATERWORLD_LIBRARIES}) 
    21         ADD_EXECUTABLE(WaterWorld5 
    22                 waterworld5.cpp  
    23                 SerializeEventHandler.cpp 
    24                 QuitEventHandler.cpp) 
    25         TARGET_LINK_LIBRARIES(WaterWorld5 ${WATERWORLD_LIBRARY} ${WATERWORLD_LIBRARIES}) 
    26 ELSE(USE_SIM2) 
    27         ADD_EXECUTABLE(WaterWorld2 waterworld2.cpp) 
    28         TARGET_LINK_LIBRARIES(WaterWorld2 ${WATERWORLD_LIBRARY} ${WATERWORLD_LIBRARIES}) 
    29 ENDIF(USE_SIM2) 
     15ADD_EXECUTABLE(WaterWorld3 
     16        waterworld3.cpp  
     17        SerializeEventHandler.cpp 
     18        QuitEventHandler.cpp) 
     19TARGET_LINK_LIBRARIES(WaterWorld3 ${WATERWORLD_LIBRARY} ${WATERWORLD_LIBRARIES}) 
     20ADD_EXECUTABLE(WaterWorld5 
     21        waterworld5.cpp  
     22        SerializeEventHandler.cpp 
     23        QuitEventHandler.cpp) 
     24TARGET_LINK_LIBRARIES(WaterWorld5 ${WATERWORLD_LIBRARY} ${WATERWORLD_LIBRARIES}) 
    3025 
    3126IF(ENABLE_GUI) 
    …… 
    3328SET(WATERWORLD_GUI_LIBRARIES ${OPENGL_LIBRARIES} ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${CEGUI_LIBRARIES}) 
    3429 
    35 IF(USE_SIM2) 
    36         SET(WATERWORLD_GUI_SOURCES  
    37                 waterworld4.cpp  
    38                 SerializeEventHandler.cpp 
    39                 QuitEventHandler.cpp 
    40                 init_sdl.cpp 
    41                 gui2/Application.cpp 
    42                 gui2/Renderer.cpp) 
     30SET(WATERWORLD_GUI_SOURCES  
     31        waterworld4.cpp  
     32        SerializeEventHandler.cpp 
     33        QuitEventHandler.cpp 
     34        init_sdl.cpp 
     35        gui2/Application.cpp 
     36        gui2/Renderer.cpp) 
    4337 
    44         ADD_EXECUTABLE(WaterWorldGUI WIN32 ${WATERWORLD_GUI_SOURCES}) 
    45         TARGET_LINK_LIBRARIES(WaterWorldGUI ${WATERWORLD_LIBRARY} ${WATERWORLD_LIBRARIES} ${WATERWORLD_GUI_LIBRARIES}) 
    46 ELSE(USE_SIM2) 
    47  
    48         SET(WATERWORLD_GUI_SOURCES  
    49                 waterworld.cpp init_sdl.cpp 
    50                 gui/iapplication.cpp 
    51                 gui/application.cpp 
    52                 gui/renderer.cpp) 
    53  
    54         ADD_EXECUTABLE(WaterWorldGUI WIN32 ${WATERWORLD_GUI_SOURCES}) 
    55         TARGET_LINK_LIBRARIES(WaterWorldGUI ${WATERWORLD_LIBRARY} ${WATERWORLD_LIBRARIES} ${WATERWORLD_GUI_LIBRARIES}) 
    56 ENDIF(USE_SIM2) 
     38ADD_EXECUTABLE(WaterWorldGUI WIN32 ${WATERWORLD_GUI_SOURCES}) 
     39TARGET_LINK_LIBRARIES(WaterWorldGUI ${WATERWORLD_LIBRARY} ${WATERWORLD_LIBRARIES} ${WATERWORLD_GUI_LIBRARIES}) 
    5740 
    5841ADD_EXECUTABLE(TestGUI WIN32 TestGUI.cpp) 

  • trunk/src/tests/CMakeLists.txt

    r191 r193  
    1010ENDIF(Boost_TEST_EXEC_MONITOR_LIBRARY) 
    1111 
    12 IF(USE_SIM2) 
     12SET(TEST_BUILD_SOURCES test_sim2_build.cpp) 
     13ADD_EXECUTABLE(TestBuild ${TEST_BUILD_SOURCES}) 
     14TARGET_LINK_LIBRARIES(TestBuild ${TESTS_LIBRARIES}) 
    1315 
    14         SET(TEST_BUILD_SOURCES test_sim2_build.cpp) 
    15         ADD_EXECUTABLE(TestBuild ${TEST_BUILD_SOURCES}) 
    16         TARGET_LINK_LIBRARIES(TestBuild ${TESTS_LIBRARIES}) 
     16ADD_TEST(Build TestBuild) 
    1717 
    18         ADD_TEST(Build TestBuild) 
     18SET(TEST_EVENTS_SOURCES test_sim2_events.cpp) 
     19ADD_EXECUTABLE(TestEvents ${TEST_EVENTS_SOURCES}) 
     20TARGET_LINK_LIBRARIES(TestEvents ${TESTS_LIBRARIES}) 
    1921 
    20         SET(TEST_EVENTS_SOURCES test_sim2_events.cpp) 
    21         ADD_EXECUTABLE(TestEvents ${TEST_EVENTS_SOURCES}) 
    22         TARGET_LINK_LIBRARIES(TestEvents ${TESTS_LIBRARIES}) 
     22ADD_TEST(Events TestEvents) 
    2323 
    24         ADD_TEST(Events TestEvents) 
     24SET(TEST_WORLD_SOURCES test_sim2_world.cpp) 
     25ADD_EXECUTABLE(TestWorld ${TEST_WORLD_SOURCES}) 
     26TARGET_LINK_LIBRARIES(TestWorld ${TESTS_LIBRARIES}) 
    2527 
    26         SET(TEST_WORLD_SOURCES test_sim2_world.cpp) 
    27         ADD_EXECUTABLE(TestWorld ${TEST_WORLD_SOURCES}) 
    28         TARGET_LINK_LIBRARIES(TestWorld ${TESTS_LIBRARIES}) 
     28ADD_TEST(World TestWorld) 
    2929 
    30         ADD_TEST(World TestWorld) 
     30SET(TEST_SENSOR_SOURCES test_sim2_sensor.cpp) 
     31ADD_EXECUTABLE(TestSensor ${TEST_SENSOR_SOURCES}) 
     32TARGET_LINK_LIBRARIES(TestSensor ${TESTS_LIBRARIES}) 
    3133 
    32         SET(TEST_SENSOR_SOURCES test_sim2_sensor.cpp) 
    33         ADD_EXECUTABLE(TestSensor ${TEST_SENSOR_SOURCES}) 
    34         TARGET_LINK_LIBRARIES(TestSensor ${TESTS_LIBRARIES}) 
     34ADD_TEST(Sensor TestSensor) 
    3535 
    36         ADD_TEST(Sensor TestSensor) 
     36SET(TEST_COLLISION_SENSOR_SOURCES test_sim2_collision_sensor.cpp) 
     37ADD_EXECUTABLE(TestCollisionSensor ${TEST_COLLISION_SENSOR_SOURCES}) 
     38TARGET_LINK_LIBRARIES(TestCollisionSensor ${TESTS_LIBRARIES}) 
    3739 
    38         SET(TEST_COLLISION_SENSOR_SOURCES test_sim2_collision_sensor.cpp) 
    39         ADD_EXECUTABLE(TestCollisionSensor ${TEST_COLLISION_SENSOR_SOURCES}) 
    40         TARGET_LINK_LIBRARIES(TestCollisionSensor ${TESTS_LIBRARIES}) 
     40ADD_TEST(CollisionSensor TestCollisionSensor) 
    4141 
    42         ADD_TEST(CollisionSensor TestCollisionSensor) 
    43  
    44 ELSE(USE_SIM2) 
    45  
    46         SET(TEST_BUILD_SOURCES test_build.cpp) 
    47         ADD_EXECUTABLE(TestBuild ${TEST_BUILD_SOURCES}) 
    48         TARGET_LINK_LIBRARIES(TestBuild ${TESTS_LIBRARIES}) 
    49  
    50         SET(TEST_ICHEMICAL_SIGNAL_SOURCES test_ichemical_signal.cpp) 
    51         ADD_EXECUTABLE(TestIChemicalSignal ${TEST_ICHEMICAL_SIGNAL_SOURCES}) 
    52         TARGET_LINK_LIBRARIES(TestIChemicalSignal ${TESTS_LIBRARIES}) 
    53  
    54         SET(TEST_ISENSOR_SOURCES test_isensor.cpp) 
    55         ADD_EXECUTABLE(TestISensor ${TEST_ISENSOR_SOURCES}) 
    56         TARGET_LINK_LIBRARIES(TestISensor ${TESTS_LIBRARIES}) 
    57  
    58         SET(TEST_ACTUATOR_SOURCES test_actuator.cpp) 
    59         ADD_EXECUTABLE(TestActuator ${TEST_ACTUATOR_SOURCES}) 
    60         TARGET_LINK_LIBRARIES(TestActuator ${TESTS_LIBRARIES}) 
    61  
    62         SET(TEST_IANIMAT_SOURCES test_ianimat.cpp) 
    63         ADD_EXECUTABLE(TestIAnimat ${TEST_IANIMAT_SOURCES}) 
    64         TARGET_LINK_LIBRARIES(TestIAnimat ${TESTS_LIBRARIES}) 
    65  
    66         SET(TEST_IWORLD_SOURCES test_iworld.cpp) 
    67         ADD_EXECUTABLE(TestIWorld ${TEST_IWORLD_SOURCES}) 
    68         TARGET_LINK_LIBRARIES(TestIWorld ${TESTS_LIBRARIES}) 
    69  
    70         SET(TEST_SENSOR_SOURCES test_sensor.cpp) 
    71         ADD_EXECUTABLE(TestSensor ${TEST_SENSOR_SOURCES}) 
    72         TARGET_LINK_LIBRARIES(TestSensor ${TESTS_LIBRARIES}) 
    73  
    74         SET(TEST_EVENTS_SOURCES test_events.cpp) 
    75         ADD_EXECUTABLE(TestEvents ${TEST_EVENTS_SOURCES}) 
    76         TARGET_LINK_LIBRARIES(TestEvents ${TESTS_LIBRARIES}) 
    77  
    78         SET(TEST_CHEMICAL_SIGNAL_SOURCES test_chemical_signal.cpp) 
    79         ADD_EXECUTABLE(TestChemicalSignal ${TEST_CHEMICAL_SIGNAL_SOURCES}) 
    80         TARGET_LINK_LIBRARIES(TestChemicalSignal ${TESTS_LIBRARIES}) 
    81  
    82         ADD_TEST(Build TestBuild) 
    83         ADD_TEST(IChemicalSignal TestIChemicalSignal) 
    84         ADD_TEST(ISensor TestISensor) 
    85         ADD_TEST(Actuator TestActuator) 
    86         ADD_TEST(IAnimat TestIAnimat) 
    87         ADD_TEST(IWorld TestIWorld) 
    88         ADD_TEST(Sensor TestSensor) 
    89         ADD_TEST(Events TestEvents) 
    90         ADD_TEST(ChemicalSignal TestChemicalSignal) 
    91  
    92 ENDIF(USE_SIM2) 
    93  

  • trunk/src/tests/test_sim2_build.cpp

    r175 r193  
    44#include <boost/thread.hpp> 
    55 
    6 #include <waterworld/sim2/World.h> 
     6#include <waterworld/waterworld.h> 
    77 
    88static bool g_run = false; 

  • trunk/src/waterworld/CMakeLists.txt

    r175 r193  
    55ENDMACRO(INCLUDE_WATERWORLD_DIR) 
    66 
    7 IF(USE_SIM2) 
    87INCLUDE_WATERWORLD_DIR(sim2) 
    9 ELSE() 
    10 INCLUDE_WATERWORLD_DIR(simulation) 
    11 ENDIF() 
    128 
    139ADD_LIBRARY(${WATERWORLD_LIBRARY} ${WATERWORLD_SOURCES})