[Orxonox-commit 406] r2990 - in branches/netp3: . bin cmake src/core src/cpptcl src/network src/network/packet src/network/synchronisable src/orxonox src/orxonox/objects src/orxonox/objects/collisionshapes src/orxonox/objects/controllers src/orxonox/objects/gametypes src/orxonox/objects/pickup src/orxonox/objects/quest src/orxonox/objects/weaponSystem src/orxonox/objects/worldentities src/orxonox/objects/worldentities/pawns src/orxonox/objects/worldentities/triggers src/tolua src/util
scheusso at orxonox.net
scheusso at orxonox.net
Tue May 19 21:35:11 CEST 2009
Author: scheusso
Date: 2009-05-19 21:35:10 +0200 (Tue, 19 May 2009)
New Revision: 2990
Added:
branches/netp3/src/network/FunctionCallManager.cc
branches/netp3/src/network/FunctionCallManager.h
branches/netp3/src/network/NetworkFunction.cc
branches/netp3/src/network/NetworkFunction.h
branches/netp3/src/network/packet/FunctionCalls.cc
branches/netp3/src/network/packet/FunctionCalls.h
branches/netp3/src/network/packet/FunctionIDs.cc
branches/netp3/src/network/packet/FunctionIDs.h
branches/netp3/src/network/synchronisable/SynchronisableVariable.cc
branches/netp3/src/util/Serialise.h
Removed:
branches/netp3/src/network/synchronisable/SynchronisableVariable.cc
Modified:
branches/netp3/
branches/netp3/bin/client1.bat.in
branches/netp3/bin/client2.bat.in
branches/netp3/bin/dedicated.bat.in
branches/netp3/bin/run.bat.in
branches/netp3/bin/server.bat.in
branches/netp3/bin/standalone.bat.in
branches/netp3/cmake/FindDirectX.cmake
branches/netp3/cmake/LibraryConfigTardis.cmake
branches/netp3/src/core/LuaBind.cc
branches/netp3/src/core/LuaBind.h
branches/netp3/src/core/Template.cc
branches/netp3/src/core/Template.h
branches/netp3/src/core/XMLFile.h
branches/netp3/src/core/XMLIncludes.h
branches/netp3/src/cpptcl/cpptcl.cc
branches/netp3/src/cpptcl/cpptcl.h
branches/netp3/src/network/CMakeLists.txt
branches/netp3/src/network/Client.cc
branches/netp3/src/network/Client.h
branches/netp3/src/network/ClientConnection.cc
branches/netp3/src/network/ClientConnection.h
branches/netp3/src/network/ConnectionManager.cc
branches/netp3/src/network/ConnectionManager.h
branches/netp3/src/network/Host.h
branches/netp3/src/network/NetworkPrereqs.h
branches/netp3/src/network/Server.cc
branches/netp3/src/network/Server.h
branches/netp3/src/network/TrafficControl.cc
branches/netp3/src/network/packet/CMakeLists.txt
branches/netp3/src/network/packet/ClassID.cc
branches/netp3/src/network/packet/Gamestate.cc
branches/netp3/src/network/packet/Packet.cc
branches/netp3/src/network/packet/Packet.h
branches/netp3/src/network/synchronisable/NetworkCallback.h
branches/netp3/src/network/synchronisable/NetworkCallbackManager.cc
branches/netp3/src/network/synchronisable/Synchronisable.cc
branches/netp3/src/network/synchronisable/Synchronisable.h
branches/netp3/src/network/synchronisable/SynchronisableSpecialisations.cc
branches/netp3/src/network/synchronisable/SynchronisableVariable.h
branches/netp3/src/orxonox/CameraManager.cc
branches/netp3/src/orxonox/CameraManager.h
branches/netp3/src/orxonox/OrxonoxPrereqs.h
branches/netp3/src/orxonox/objects/Level.cc
branches/netp3/src/orxonox/objects/Level.h
branches/netp3/src/orxonox/objects/Test.cc
branches/netp3/src/orxonox/objects/Test.h
branches/netp3/src/orxonox/objects/collisionshapes/
branches/netp3/src/orxonox/objects/controllers/AIController.cc
branches/netp3/src/orxonox/objects/gametypes/TeamDeathmatch.cc
branches/netp3/src/orxonox/objects/gametypes/TeamDeathmatch.h
branches/netp3/src/orxonox/objects/pickup/Usable.h
branches/netp3/src/orxonox/objects/quest/AddQuest.cc
branches/netp3/src/orxonox/objects/quest/AddQuest.h
branches/netp3/src/orxonox/objects/quest/AddQuestHint.cc
branches/netp3/src/orxonox/objects/quest/AddQuestHint.h
branches/netp3/src/orxonox/objects/quest/AddReward.cc
branches/netp3/src/orxonox/objects/quest/AddReward.h
branches/netp3/src/orxonox/objects/quest/ChangeQuestStatus.cc
branches/netp3/src/orxonox/objects/quest/ChangeQuestStatus.h
branches/netp3/src/orxonox/objects/quest/CompleteQuest.cc
branches/netp3/src/orxonox/objects/quest/CompleteQuest.h
branches/netp3/src/orxonox/objects/quest/FailQuest.cc
branches/netp3/src/orxonox/objects/quest/FailQuest.h
branches/netp3/src/orxonox/objects/quest/GlobalQuest.cc
branches/netp3/src/orxonox/objects/quest/GlobalQuest.h
branches/netp3/src/orxonox/objects/quest/LocalQuest.cc
branches/netp3/src/orxonox/objects/quest/LocalQuest.h
branches/netp3/src/orxonox/objects/quest/Quest.cc
branches/netp3/src/orxonox/objects/quest/Quest.h
branches/netp3/src/orxonox/objects/quest/QuestDescription.cc
branches/netp3/src/orxonox/objects/quest/QuestDescription.h
branches/netp3/src/orxonox/objects/quest/QuestEffect.cc
branches/netp3/src/orxonox/objects/quest/QuestEffect.h
branches/netp3/src/orxonox/objects/quest/QuestHint.cc
branches/netp3/src/orxonox/objects/quest/QuestHint.h
branches/netp3/src/orxonox/objects/quest/QuestItem.cc
branches/netp3/src/orxonox/objects/quest/QuestItem.h
branches/netp3/src/orxonox/objects/quest/QuestManager.cc
branches/netp3/src/orxonox/objects/quest/QuestManager.h
branches/netp3/src/orxonox/objects/quest/Rewardable.cc
branches/netp3/src/orxonox/objects/quest/Rewardable.h
branches/netp3/src/orxonox/objects/weaponSystem/WeaponSystem.cc
branches/netp3/src/orxonox/objects/weaponSystem/WeaponSystem.h
branches/netp3/src/orxonox/objects/worldentities/Backlight.cc
branches/netp3/src/orxonox/objects/worldentities/Backlight.h
branches/netp3/src/orxonox/objects/worldentities/Camera.cc
branches/netp3/src/orxonox/objects/worldentities/Camera.h
branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.cc
branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h
branches/netp3/src/orxonox/objects/worldentities/MobileEntity.cc
branches/netp3/src/orxonox/objects/worldentities/MobileEntity.h
branches/netp3/src/orxonox/objects/worldentities/ParticleSpawner.cc
branches/netp3/src/orxonox/objects/worldentities/ParticleSpawner.h
branches/netp3/src/orxonox/objects/worldentities/StaticEntity.cc
branches/netp3/src/orxonox/objects/worldentities/StaticEntity.h
branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc
branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.h
branches/netp3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
branches/netp3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
branches/netp3/src/orxonox/objects/worldentities/triggers/Trigger.cc
branches/netp3/src/orxonox/objects/worldentities/triggers/Trigger.h
branches/netp3/src/tolua/all-5.0.lua
branches/netp3/src/tolua/all-5.1.lua
branches/netp3/src/util/
branches/netp3/src/util/Exception.cc
branches/netp3/src/util/Exception.h
branches/netp3/src/util/MultiType.h
branches/netp3/src/util/MultiTypeValue.h
branches/netp3/src/util/SignalHandler.cc
branches/netp3/src/util/SignalHandler.h
Log:
merged netp2 -> netp3
Property changes on: branches/netp3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem:1875-2277,2279-2401
/branches/buildsystem2:2507-2659
/branches/buildsystem3:2663-2709
/branches/ceguilua:1803-1809
/branches/core3:1573-1740
/branches/gcc43:1581
/branches/gui:1636-1724,2796-2895
/branches/input:1630-1637
/branches/lodfinal:2373-2412
/branches/miniprojects:2755-2825
/branches/network:2357
/branches/network64:2211-2356
/branches/objecthierarchy:1912-2086,2101,2111-2170
/branches/objecthierarchy2:2172-2480
/branches/overlay:2118-2386
/branches/physics:1913-2056,2108-2440
/branches/physics_merge:2437-2458
/branches/pickups:1927-2087,2128
/branches/pickups2:2108-2498
/branches/presentation:2370-2653,2655-2661
/branches/questsystem:1895-2089
/branches/questsystem2:2108-2260
/branches/questsystem5:2777-2906
/branches/script_trigger:1296-1954,1956
/branches/weapon:1926-2095
/branches/weapon2:2108-2489
/branches/weaponsystem:2743-2891
+ /branches/buildsystem:1875-2277,2279-2401
/branches/buildsystem2:2507-2659
/branches/buildsystem3:2663-2709
/branches/ceguilua:1803-1809
/branches/core3:1573-1740
/branches/gcc43:1581
/branches/gui:1636-1724,2796-2895
/branches/input:1630-1637
/branches/lodfinal:2373-2412
/branches/miniprojects:2755-2825
/branches/netp2:2836-2989
/branches/network:2357
/branches/network64:2211-2356
/branches/objecthierarchy:1912-2086,2101,2111-2170
/branches/objecthierarchy2:2172-2480
/branches/overlay:2118-2386
/branches/physics:1913-2056,2108-2440
/branches/physics_merge:2437-2458
/branches/pickups:1927-2087,2128
/branches/pickups2:2108-2498
/branches/presentation:2370-2653,2655-2661
/branches/questsystem:1895-2089
/branches/questsystem2:2108-2260
/branches/questsystem5:2777-2906
/branches/script_trigger:1296-1954,1956
/branches/weapon:1926-2095
/branches/weapon2:2108-2489
/branches/weaponsystem:2743-2891
Property changes on: branches/netp3/bin/client1.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/client1.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client1.bat.in:2755-2825
/branches/questsystem5/bin/client1.bat.in:2777-2906
/branches/weaponsystem/bin/client1.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/client1.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client1.bat.in:2755-2825
/branches/netp2/bin/client1.bat.in:2836-2989
/branches/questsystem5/bin/client1.bat.in:2777-2906
/branches/weaponsystem/bin/client1.bat.in:2743-2891
Property changes on: branches/netp3/bin/client2.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/client2.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client2.bat.in:2755-2825
/branches/questsystem5/bin/client2.bat.in:2777-2906
/branches/weaponsystem/bin/client2.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/client2.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client2.bat.in:2755-2825
/branches/netp2/bin/client2.bat.in:2836-2989
/branches/questsystem5/bin/client2.bat.in:2777-2906
/branches/weaponsystem/bin/client2.bat.in:2743-2891
Property changes on: branches/netp3/bin/dedicated.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/dedicated.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/dedicated.bat.in:2755-2825
/branches/questsystem5/bin/dedicated.bat.in:2777-2906
/branches/weaponsystem/bin/dedicated.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/dedicated.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/dedicated.bat.in:2755-2825
/branches/netp2/bin/dedicated.bat.in:2836-2989
/branches/questsystem5/bin/dedicated.bat.in:2777-2906
/branches/weaponsystem/bin/dedicated.bat.in:2743-2891
Property changes on: branches/netp3/bin/run.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/run.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/run.bat.in:2755-2825
/branches/questsystem5/bin/run.bat.in:2777-2906
/branches/weaponsystem/bin/run.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/run.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/run.bat.in:2755-2825
/branches/netp2/bin/run.bat.in:2836-2989
/branches/questsystem5/bin/run.bat.in:2777-2906
/branches/weaponsystem/bin/run.bat.in:2743-2891
Property changes on: branches/netp3/bin/server.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/server.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/server.bat.in:2755-2825
/branches/questsystem5/bin/server.bat.in:2777-2906
/branches/weaponsystem/bin/server.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/server.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/server.bat.in:2755-2825
/branches/netp2/bin/server.bat.in:2836-2989
/branches/questsystem5/bin/server.bat.in:2777-2906
/branches/weaponsystem/bin/server.bat.in:2743-2891
Property changes on: branches/netp3/bin/standalone.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/standalone.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/questsystem5/bin/standalone.bat.in:2777-2906
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/standalone.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/netp2/bin/standalone.bat.in:2836-2989
/branches/questsystem5/bin/standalone.bat.in:2777-2906
Property changes on: branches/netp3/cmake/FindDirectX.cmake
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/cmake/FindDirectX.cmake:1875-2401
/branches/buildsystem2/cmake/FindDirectX.cmake:2507-2659
/branches/buildsystem3/cmake/FindDirectX.cmake:2663-2709
/branches/ceguilua/cmake/FindDirectX.cmake:1803-1809
/branches/core3/cmake/FindDirectX.cmake:1573-1740
/branches/gcc43/cmake/FindDirectX.cmake:1581
/branches/gui/cmake/FindDirectX.cmake:1636-1724,2796-2895
/branches/input/cmake/FindDirectX.cmake:1630-1637
/branches/lodfinal/cmake/FindDirectX.cmake:2373-2412
/branches/miniprojects/cmake/FindDirectX.cmake:2755-2825
/branches/network/cmake/FindDirectX.cmake:2357
/branches/network64/cmake/FindDirectX.cmake:2211-2356
/branches/objecthierarchy/cmake/FindDirectX.cmake:1912-2086,2101,2111-2170
/branches/objecthierarchy2/cmake/FindDirectX.cmake:2172-2480
/branches/overlay/cmake/FindDirectX.cmake:2118-2386
/branches/physics/cmake/FindDirectX.cmake:1913-2056,2108-2440
/branches/physics_merge/cmake/FindDirectX.cmake:2437-2458
/branches/pickups/cmake/FindDirectX.cmake:1927-2087,2128
/branches/pickups2/cmake/FindDirectX.cmake:2108-2498
/branches/presentation/cmake/FindDirectX.cmake:2370-2653,2655-2661
/branches/questsystem/cmake/FindDirectX.cmake:1895-2089
/branches/questsystem2/cmake/FindDirectX.cmake:2108-2260
/branches/questsystem5/cmake/FindDirectX.cmake:2777-2906
/branches/script_trigger/cmake/FindDirectX.cmake:1296-1954,1956
/branches/weapon/cmake/FindDirectX.cmake:1926-2095
/branches/weapon2/cmake/FindDirectX.cmake:2108-2489
/branches/weaponsystem/cmake/FindDirectX.cmake:2743-2891
+ /branches/buildsystem/cmake/FindDirectX.cmake:1875-2401
/branches/buildsystem2/cmake/FindDirectX.cmake:2507-2659
/branches/buildsystem3/cmake/FindDirectX.cmake:2663-2709
/branches/ceguilua/cmake/FindDirectX.cmake:1803-1809
/branches/core3/cmake/FindDirectX.cmake:1573-1740
/branches/gcc43/cmake/FindDirectX.cmake:1581
/branches/gui/cmake/FindDirectX.cmake:1636-1724,2796-2895
/branches/input/cmake/FindDirectX.cmake:1630-1637
/branches/lodfinal/cmake/FindDirectX.cmake:2373-2412
/branches/miniprojects/cmake/FindDirectX.cmake:2755-2825
/branches/netp2/cmake/FindDirectX.cmake:2836-2989
/branches/network/cmake/FindDirectX.cmake:2357
/branches/network64/cmake/FindDirectX.cmake:2211-2356
/branches/objecthierarchy/cmake/FindDirectX.cmake:1912-2086,2101,2111-2170
/branches/objecthierarchy2/cmake/FindDirectX.cmake:2172-2480
/branches/overlay/cmake/FindDirectX.cmake:2118-2386
/branches/physics/cmake/FindDirectX.cmake:1913-2056,2108-2440
/branches/physics_merge/cmake/FindDirectX.cmake:2437-2458
/branches/pickups/cmake/FindDirectX.cmake:1927-2087,2128
/branches/pickups2/cmake/FindDirectX.cmake:2108-2498
/branches/presentation/cmake/FindDirectX.cmake:2370-2653,2655-2661
/branches/questsystem/cmake/FindDirectX.cmake:1895-2089
/branches/questsystem2/cmake/FindDirectX.cmake:2108-2260
/branches/questsystem5/cmake/FindDirectX.cmake:2777-2906
/branches/script_trigger/cmake/FindDirectX.cmake:1296-1954,1956
/branches/weapon/cmake/FindDirectX.cmake:1926-2095
/branches/weapon2/cmake/FindDirectX.cmake:2108-2489
/branches/weaponsystem/cmake/FindDirectX.cmake:2743-2891
Property changes on: branches/netp3/cmake/LibraryConfigTardis.cmake
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/cmake/CheckTardis.cmake:1875-2277,2279-2401
/branches/ceguilua/cmake/CheckTardis.cmake:1803-1809
/branches/core3/cmake/CheckTardis.cmake:1573-1740
/branches/gcc43/cmake/CheckTardis.cmake:1581
/branches/gui/cmake/CheckTardis.cmake:1636-1724
/branches/gui/cmake/LibraryConfigTardis.cmake:2796-2895
/branches/input/cmake/CheckTardis.cmake:1630-1637
/branches/miniprojects/cmake/LibraryConfigTardis.cmake:2755-2825
/branches/objecthierarchy/cmake/CheckTardis.cmake:1912-2086,2101,2111-2170
/branches/pickups/cmake/CheckTardis.cmake:1927-2087
/branches/questsystem/cmake/CheckTardis.cmake:1895-2089
/branches/questsystem2/cmake/CheckTardis.cmake:2108-2260
/branches/questsystem5/cmake/LibraryConfigTardis.cmake:2777-2906
/branches/script_trigger/cmake/CheckTardis.cmake:1296-1954,1956
/branches/weapon/cmake/CheckTardis.cmake:1926-2095
/branches/weaponsystem/cmake/LibraryConfigTardis.cmake:2743-2891
+ /branches/buildsystem/cmake/CheckTardis.cmake:1875-2277,2279-2401
/branches/ceguilua/cmake/CheckTardis.cmake:1803-1809
/branches/core3/cmake/CheckTardis.cmake:1573-1740
/branches/gcc43/cmake/CheckTardis.cmake:1581
/branches/gui/cmake/CheckTardis.cmake:1636-1724
/branches/gui/cmake/LibraryConfigTardis.cmake:2796-2895
/branches/input/cmake/CheckTardis.cmake:1630-1637
/branches/miniprojects/cmake/LibraryConfigTardis.cmake:2755-2825
/branches/netp2/cmake/LibraryConfigTardis.cmake:2836-2989
/branches/objecthierarchy/cmake/CheckTardis.cmake:1912-2086,2101,2111-2170
/branches/pickups/cmake/CheckTardis.cmake:1927-2087
/branches/questsystem/cmake/CheckTardis.cmake:1895-2089
/branches/questsystem2/cmake/CheckTardis.cmake:2108-2260
/branches/questsystem5/cmake/LibraryConfigTardis.cmake:2777-2906
/branches/script_trigger/cmake/CheckTardis.cmake:1296-1954,1956
/branches/weapon/cmake/CheckTardis.cmake:1926-2095
/branches/weaponsystem/cmake/LibraryConfigTardis.cmake:2743-2891
Property changes on: branches/netp3/src/core/LuaBind.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/core/LuaBind.cc:1875-2277,2279-2401
/branches/buildsystem/src/core/Script.cc:1875-2239
/branches/buildsystem2/src/core/LuaBind.cc:2507-2659
/branches/buildsystem3/src/core/LuaBind.cc:2663-2709
/branches/ceguilua/src/core/LuaBind.cc:1803-1809
/branches/core3/src/core/LuaBind.cc:1573-1740
/branches/gcc43/src/core/LuaBind.cc:1581
/branches/gui/src/core/LuaBind.cc:1636-1724,2796-2895
/branches/input/src/core/LuaBind.cc:1630-1637
/branches/lodfinal/src/core/LuaBind.cc:2373-2412
/branches/miniprojects/src/core/LuaBind.cc:2755-2825
/branches/network/src/core/LuaBind.cc:2357
/branches/network64/src/core/LuaBind.cc:2211-2356
/branches/objecthierarchy/src/core/LuaBind.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/LuaBind.cc:2172-2480
/branches/overlay/src/core/LuaBind.cc:2118-2386
/branches/physics/src/core/LuaBind.cc:1913-2056,2108-2440
/branches/physics_merge/src/core/LuaBind.cc:2437-2458
/branches/pickups/src/core/LuaBind.cc:1927-2087,2128
/branches/pickups2/src/core/LuaBind.cc:2108-2498
/branches/presentation/src/core/LuaBind.cc:2370-2653,2655-2661
/branches/questsystem/src/core/LuaBind.cc:1895-2089
/branches/questsystem2/src/core/LuaBind.cc:2108-2260
/branches/questsystem5/src/core/LuaBind.cc:2777-2906
/branches/script_trigger/src/core/LuaBind.cc:1296-1954,1956
/branches/weapon/src/core/LuaBind.cc:1926-2095
/branches/weapon2/src/core/LuaBind.cc:2108-2489
/branches/weaponsystem/src/core/LuaBind.cc:2743-2891
+ /branches/buildsystem/src/core/LuaBind.cc:1875-2277,2279-2401
/branches/buildsystem/src/core/Script.cc:1875-2239
/branches/buildsystem2/src/core/LuaBind.cc:2507-2659
/branches/buildsystem3/src/core/LuaBind.cc:2663-2709
/branches/ceguilua/src/core/LuaBind.cc:1803-1809
/branches/core3/src/core/LuaBind.cc:1573-1740
/branches/gcc43/src/core/LuaBind.cc:1581
/branches/gui/src/core/LuaBind.cc:1636-1724,2796-2895
/branches/input/src/core/LuaBind.cc:1630-1637
/branches/lodfinal/src/core/LuaBind.cc:2373-2412
/branches/miniprojects/src/core/LuaBind.cc:2755-2825
/branches/netp2/src/core/LuaBind.cc:2836-2989
/branches/network/src/core/LuaBind.cc:2357
/branches/network64/src/core/LuaBind.cc:2211-2356
/branches/objecthierarchy/src/core/LuaBind.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/LuaBind.cc:2172-2480
/branches/overlay/src/core/LuaBind.cc:2118-2386
/branches/physics/src/core/LuaBind.cc:1913-2056,2108-2440
/branches/physics_merge/src/core/LuaBind.cc:2437-2458
/branches/pickups/src/core/LuaBind.cc:1927-2087,2128
/branches/pickups2/src/core/LuaBind.cc:2108-2498
/branches/presentation/src/core/LuaBind.cc:2370-2653,2655-2661
/branches/questsystem/src/core/LuaBind.cc:1895-2089
/branches/questsystem2/src/core/LuaBind.cc:2108-2260
/branches/questsystem5/src/core/LuaBind.cc:2777-2906
/branches/script_trigger/src/core/LuaBind.cc:1296-1954,1956
/branches/weapon/src/core/LuaBind.cc:1926-2095
/branches/weapon2/src/core/LuaBind.cc:2108-2489
/branches/weaponsystem/src/core/LuaBind.cc:2743-2891
Property changes on: branches/netp3/src/core/LuaBind.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/core/LuaBind.h:1875-2277,2279-2401
/branches/buildsystem/src/core/Script.h:1875-2234
/branches/buildsystem2/src/core/LuaBind.h:2507-2659
/branches/buildsystem3/src/core/LuaBind.h:2663-2709
/branches/ceguilua/src/core/LuaBind.h:1803-1809
/branches/core3/src/core/LuaBind.h:1573-1740
/branches/gcc43/src/core/LuaBind.h:1581
/branches/gui/src/core/LuaBind.h:1636-1724,2796-2895
/branches/input/src/core/LuaBind.h:1630-1637
/branches/lodfinal/src/core/LuaBind.h:2373-2412
/branches/miniprojects/src/core/LuaBind.h:2755-2825
/branches/network/src/core/LuaBind.h:2357
/branches/network64/src/core/LuaBind.h:2211-2356
/branches/objecthierarchy/src/core/LuaBind.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/LuaBind.h:2172-2480
/branches/overlay/src/core/LuaBind.h:2118-2386
/branches/physics/src/core/LuaBind.h:1913-2056,2108-2440
/branches/physics_merge/src/core/LuaBind.h:2437-2458
/branches/pickups/src/core/LuaBind.h:1927-2087,2128
/branches/pickups2/src/core/LuaBind.h:2108-2498
/branches/presentation/src/core/LuaBind.h:2370-2653,2655-2661
/branches/questsystem/src/core/LuaBind.h:1895-2089
/branches/questsystem2/src/core/LuaBind.h:2108-2260
/branches/questsystem5/src/core/LuaBind.h:2777-2906
/branches/script_trigger/src/core/LuaBind.h:1296-1954,1956
/branches/weapon/src/core/LuaBind.h:1926-2095
/branches/weapon2/src/core/LuaBind.h:2108-2489
/branches/weaponsystem/src/core/LuaBind.h:2743-2891
+ /branches/buildsystem/src/core/LuaBind.h:1875-2277,2279-2401
/branches/buildsystem/src/core/Script.h:1875-2234
/branches/buildsystem2/src/core/LuaBind.h:2507-2659
/branches/buildsystem3/src/core/LuaBind.h:2663-2709
/branches/ceguilua/src/core/LuaBind.h:1803-1809
/branches/core3/src/core/LuaBind.h:1573-1740
/branches/gcc43/src/core/LuaBind.h:1581
/branches/gui/src/core/LuaBind.h:1636-1724,2796-2895
/branches/input/src/core/LuaBind.h:1630-1637
/branches/lodfinal/src/core/LuaBind.h:2373-2412
/branches/miniprojects/src/core/LuaBind.h:2755-2825
/branches/netp2/src/core/LuaBind.h:2836-2989
/branches/network/src/core/LuaBind.h:2357
/branches/network64/src/core/LuaBind.h:2211-2356
/branches/objecthierarchy/src/core/LuaBind.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/LuaBind.h:2172-2480
/branches/overlay/src/core/LuaBind.h:2118-2386
/branches/physics/src/core/LuaBind.h:1913-2056,2108-2440
/branches/physics_merge/src/core/LuaBind.h:2437-2458
/branches/pickups/src/core/LuaBind.h:1927-2087,2128
/branches/pickups2/src/core/LuaBind.h:2108-2498
/branches/presentation/src/core/LuaBind.h:2370-2653,2655-2661
/branches/questsystem/src/core/LuaBind.h:1895-2089
/branches/questsystem2/src/core/LuaBind.h:2108-2260
/branches/questsystem5/src/core/LuaBind.h:2777-2906
/branches/script_trigger/src/core/LuaBind.h:1296-1954,1956
/branches/weapon/src/core/LuaBind.h:1926-2095
/branches/weapon2/src/core/LuaBind.h:2108-2489
/branches/weaponsystem/src/core/LuaBind.h:2743-2891
Property changes on: branches/netp3/src/core/Template.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/core/Template.cc:2507-2659
/branches/buildsystem3/src/core/Template.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Template.cc:1803-1809
/branches/core3/src/orxonox/objects/Template.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Template.cc:1581
/branches/gui/src/core/Template.cc:2796-2895
/branches/gui/src/orxonox/objects/Template.cc:1636-1724
/branches/input/src/orxonox/objects/Template.cc:1630-1637
/branches/lodfinal/src/core/Template.cc:2373-2412
/branches/miniprojects/src/core/Template.cc:2755-2825
/branches/network/src/core/Template.cc:2357
/branches/network64/src/core/Template.cc:2211-2356
/branches/objecthierarchy/src/core/Template.cc:2101,2111-2170
/branches/objecthierarchy2/src/core/Template.cc:2172-2480
/branches/overlay/src/core/Template.cc:2118-2386
/branches/physics/src/core/Template.cc:2108-2440
/branches/physics_merge/src/core/Template.cc:2437-2458
/branches/pickups2/src/core/Template.cc:2108-2498
/branches/presentation/src/core/Template.cc:2370-2653,2655-2661
/branches/questsystem2/src/core/Template.cc:2108-2260
/branches/questsystem5/src/core/Template.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Template.cc:1296-1954,1956
/branches/weapon2/src/core/Template.cc:2108-2489
/branches/weaponsystem/src/core/Template.cc:2743-2891
+ /branches/buildsystem2/src/core/Template.cc:2507-2659
/branches/buildsystem3/src/core/Template.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Template.cc:1803-1809
/branches/core3/src/orxonox/objects/Template.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Template.cc:1581
/branches/gui/src/core/Template.cc:2796-2895
/branches/gui/src/orxonox/objects/Template.cc:1636-1724
/branches/input/src/orxonox/objects/Template.cc:1630-1637
/branches/lodfinal/src/core/Template.cc:2373-2412
/branches/miniprojects/src/core/Template.cc:2755-2825
/branches/netp2/src/core/Template.cc:2836-2989
/branches/network/src/core/Template.cc:2357
/branches/network64/src/core/Template.cc:2211-2356
/branches/objecthierarchy/src/core/Template.cc:2101,2111-2170
/branches/objecthierarchy2/src/core/Template.cc:2172-2480
/branches/overlay/src/core/Template.cc:2118-2386
/branches/physics/src/core/Template.cc:2108-2440
/branches/physics_merge/src/core/Template.cc:2437-2458
/branches/pickups2/src/core/Template.cc:2108-2498
/branches/presentation/src/core/Template.cc:2370-2653,2655-2661
/branches/questsystem2/src/core/Template.cc:2108-2260
/branches/questsystem5/src/core/Template.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Template.cc:1296-1954,1956
/branches/weapon2/src/core/Template.cc:2108-2489
/branches/weaponsystem/src/core/Template.cc:2743-2891
Property changes on: branches/netp3/src/core/Template.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/core/Template.h:2507-2659
/branches/buildsystem3/src/core/Template.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Template.h:1803-1809
/branches/core3/src/orxonox/objects/Template.h:1573-1740
/branches/gcc43/src/orxonox/objects/Template.h:1581
/branches/gui/src/core/Template.h:2796-2895
/branches/gui/src/orxonox/objects/Template.h:1636-1724
/branches/input/src/orxonox/objects/Template.h:1630-1637
/branches/lodfinal/src/core/Template.h:2373-2412
/branches/miniprojects/src/core/Template.h:2755-2825
/branches/network/src/core/Template.h:2357
/branches/network64/src/core/Template.h:2211-2356
/branches/objecthierarchy/src/core/Template.h:2101,2111-2170
/branches/objecthierarchy2/src/core/Template.h:2172-2480
/branches/overlay/src/core/Template.h:2118-2386
/branches/physics/src/core/Template.h:2108-2440
/branches/physics_merge/src/core/Template.h:2437-2458
/branches/pickups2/src/core/Template.h:2108-2498
/branches/presentation/src/core/Template.h:2370-2653,2655-2661
/branches/questsystem2/src/core/Template.h:2108-2260
/branches/questsystem5/src/core/Template.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Template.h:1296-1954,1956
/branches/weapon2/src/core/Template.h:2108-2489
/branches/weaponsystem/src/core/Template.h:2743-2891
+ /branches/buildsystem2/src/core/Template.h:2507-2659
/branches/buildsystem3/src/core/Template.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Template.h:1803-1809
/branches/core3/src/orxonox/objects/Template.h:1573-1740
/branches/gcc43/src/orxonox/objects/Template.h:1581
/branches/gui/src/core/Template.h:2796-2895
/branches/gui/src/orxonox/objects/Template.h:1636-1724
/branches/input/src/orxonox/objects/Template.h:1630-1637
/branches/lodfinal/src/core/Template.h:2373-2412
/branches/miniprojects/src/core/Template.h:2755-2825
/branches/netp2/src/core/Template.h:2836-2989
/branches/network/src/core/Template.h:2357
/branches/network64/src/core/Template.h:2211-2356
/branches/objecthierarchy/src/core/Template.h:2101,2111-2170
/branches/objecthierarchy2/src/core/Template.h:2172-2480
/branches/overlay/src/core/Template.h:2118-2386
/branches/physics/src/core/Template.h:2108-2440
/branches/physics_merge/src/core/Template.h:2437-2458
/branches/pickups2/src/core/Template.h:2108-2498
/branches/presentation/src/core/Template.h:2370-2653,2655-2661
/branches/questsystem2/src/core/Template.h:2108-2260
/branches/questsystem5/src/core/Template.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Template.h:1296-1954,1956
/branches/weapon2/src/core/Template.h:2108-2489
/branches/weaponsystem/src/core/Template.h:2743-2891
Property changes on: branches/netp3/src/core/XMLFile.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/core/XMLFile.h:2507-2659
/branches/buildsystem3/src/core/XMLFile.h:2663-2709
/branches/ceguilua/src/core/Level.h:1803-1809
/branches/core3/src/core/Level.h:1573-1740
/branches/gcc43/src/core/Level.h:1581
/branches/gui/src/core/Level.h:1636-1724
/branches/gui/src/core/XMLFile.h:2796-2895
/branches/input/src/core/Level.h:1630-1637
/branches/lodfinal/src/core/XMLFile.h:2373-2412
/branches/miniprojects/src/core/XMLFile.h:2755-2825
/branches/network/src/core/XMLFile.h:2357
/branches/network64/src/core/XMLFile.h:2211-2356
/branches/objecthierarchy/src/core/XMLFile.h:2101,2111-2170
/branches/objecthierarchy2/src/core/XMLFile.h:2172-2480
/branches/overlay/src/core/XMLFile.h:2118-2386
/branches/physics/src/core/XMLFile.h:2108-2440
/branches/physics_merge/src/core/XMLFile.h:2437-2458
/branches/pickups2/src/core/XMLFile.h:2108-2498
/branches/presentation/src/core/XMLFile.h:2370-2653,2655-2661
/branches/questsystem2/src/core/XMLFile.h:2108-2260
/branches/questsystem5/src/core/XMLFile.h:2777-2906
/branches/script_trigger/src/core/Level.h:1296-1954,1956
/branches/weapon2/src/core/XMLFile.h:2108-2489
/branches/weaponsystem/src/core/XMLFile.h:2743-2891
/trunk/src/core/XMLFile.h:2-2086
+ /branches/buildsystem2/src/core/XMLFile.h:2507-2659
/branches/buildsystem3/src/core/XMLFile.h:2663-2709
/branches/ceguilua/src/core/Level.h:1803-1809
/branches/core3/src/core/Level.h:1573-1740
/branches/gcc43/src/core/Level.h:1581
/branches/gui/src/core/Level.h:1636-1724
/branches/gui/src/core/XMLFile.h:2796-2895
/branches/input/src/core/Level.h:1630-1637
/branches/lodfinal/src/core/XMLFile.h:2373-2412
/branches/miniprojects/src/core/XMLFile.h:2755-2825
/branches/netp2/src/core/XMLFile.h:2836-2989
/branches/network/src/core/XMLFile.h:2357
/branches/network64/src/core/XMLFile.h:2211-2356
/branches/objecthierarchy/src/core/XMLFile.h:2101,2111-2170
/branches/objecthierarchy2/src/core/XMLFile.h:2172-2480
/branches/overlay/src/core/XMLFile.h:2118-2386
/branches/physics/src/core/XMLFile.h:2108-2440
/branches/physics_merge/src/core/XMLFile.h:2437-2458
/branches/pickups2/src/core/XMLFile.h:2108-2498
/branches/presentation/src/core/XMLFile.h:2370-2653,2655-2661
/branches/questsystem2/src/core/XMLFile.h:2108-2260
/branches/questsystem5/src/core/XMLFile.h:2777-2906
/branches/script_trigger/src/core/Level.h:1296-1954,1956
/branches/weapon2/src/core/XMLFile.h:2108-2489
/branches/weaponsystem/src/core/XMLFile.h:2743-2891
/trunk/src/core/XMLFile.h:2-2086
Property changes on: branches/netp3/src/core/XMLIncludes.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/core/XMLIncludes.h:1875-2277,2279-2401
/branches/buildsystem2/src/core/XMLIncludes.h:2507-2659
/branches/buildsystem3/src/core/XMLIncludes.h:2663-2709
/branches/ceguilua/src/util/XMLIncludes.h:1803-1809
/branches/core3/src/util/XMLIncludes.h:1573-1740
/branches/gcc43/src/util/XMLIncludes.h:1581
/branches/gui/src/core/XMLIncludes.h:2796-2895
/branches/gui/src/util/XMLIncludes.h:1636-1724
/branches/input/src/util/XMLIncludes.h:1630-1637
/branches/lodfinal/src/core/XMLIncludes.h:2373-2412
/branches/miniprojects/src/core/XMLIncludes.h:2755-2825
/branches/network/src/core/XMLIncludes.h:2357
/branches/network64/src/core/XMLIncludes.h:2211-2356
/branches/objecthierarchy/src/core/XMLIncludes.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/XMLIncludes.h:2172-2480
/branches/overlay/src/core/XMLIncludes.h:2118-2386
/branches/physics/src/core/XMLIncludes.h:1913-2056,2108-2440
/branches/physics_merge/src/core/XMLIncludes.h:2437-2458
/branches/pickups/src/core/XMLIncludes.h:1927-2087,2128
/branches/pickups2/src/core/XMLIncludes.h:2108-2498
/branches/presentation/src/core/XMLIncludes.h:2370-2653,2655-2661
/branches/questsystem/src/core/XMLIncludes.h:1895-2089
/branches/questsystem2/src/core/XMLIncludes.h:2108-2260
/branches/questsystem5/src/core/XMLIncludes.h:2777-2906
/branches/weapon/src/core/XMLIncludes.h:1926-2095
/branches/weapon2/src/core/XMLIncludes.h:2108-2489
/branches/weaponsystem/src/core/XMLIncludes.h:2743-2891
+ /branches/buildsystem/src/core/XMLIncludes.h:1875-2277,2279-2401
/branches/buildsystem2/src/core/XMLIncludes.h:2507-2659
/branches/buildsystem3/src/core/XMLIncludes.h:2663-2709
/branches/ceguilua/src/util/XMLIncludes.h:1803-1809
/branches/core3/src/util/XMLIncludes.h:1573-1740
/branches/gcc43/src/util/XMLIncludes.h:1581
/branches/gui/src/core/XMLIncludes.h:2796-2895
/branches/gui/src/util/XMLIncludes.h:1636-1724
/branches/input/src/util/XMLIncludes.h:1630-1637
/branches/lodfinal/src/core/XMLIncludes.h:2373-2412
/branches/miniprojects/src/core/XMLIncludes.h:2755-2825
/branches/netp2/src/core/XMLIncludes.h:2836-2989
/branches/network/src/core/XMLIncludes.h:2357
/branches/network64/src/core/XMLIncludes.h:2211-2356
/branches/objecthierarchy/src/core/XMLIncludes.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/XMLIncludes.h:2172-2480
/branches/overlay/src/core/XMLIncludes.h:2118-2386
/branches/physics/src/core/XMLIncludes.h:1913-2056,2108-2440
/branches/physics_merge/src/core/XMLIncludes.h:2437-2458
/branches/pickups/src/core/XMLIncludes.h:1927-2087,2128
/branches/pickups2/src/core/XMLIncludes.h:2108-2498
/branches/presentation/src/core/XMLIncludes.h:2370-2653,2655-2661
/branches/questsystem/src/core/XMLIncludes.h:1895-2089
/branches/questsystem2/src/core/XMLIncludes.h:2108-2260
/branches/questsystem5/src/core/XMLIncludes.h:2777-2906
/branches/weapon/src/core/XMLIncludes.h:1926-2095
/branches/weapon2/src/core/XMLIncludes.h:2108-2489
/branches/weaponsystem/src/core/XMLIncludes.h:2743-2891
Property changes on: branches/netp3/src/cpptcl/cpptcl.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/cpptcl/CppTcl.cc:1875-2277,2279-2401
/branches/ceguilua/src/cpptcl/CppTcl.cc:1803-1809
/branches/core3/src/cpptcl/CppTcl.cc:1573-1740
/branches/gcc43/src/cpptcl/CppTcl.cc:1581
/branches/gui/src/cpptcl/CppTcl.cc:1636-1724
/branches/gui/src/cpptcl/cpptcl.cc:2796-2895
/branches/input/src/cpptcl/CppTcl.cc:1630-1637
/branches/miniprojects/src/cpptcl/cpptcl.cc:2755-2825
/branches/objecthierarchy/src/cpptcl/CppTcl.cc:1912-2086,2101,2111-2170
/branches/pickups/src/cpptcl/CppTcl.cc:1927-2087
/branches/questsystem/src/cpptcl/CppTcl.cc:1895-2089
/branches/questsystem2/src/cpptcl/CppTcl.cc:2108-2260
/branches/questsystem5/src/cpptcl/cpptcl.cc:2777-2906
/branches/script_trigger/src/cpptcl/CppTcl.cc:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.cc:1926-2095
/branches/weaponsystem/src/cpptcl/cpptcl.cc:2743-2891
+ /branches/buildsystem/src/cpptcl/CppTcl.cc:1875-2277,2279-2401
/branches/ceguilua/src/cpptcl/CppTcl.cc:1803-1809
/branches/core3/src/cpptcl/CppTcl.cc:1573-1740
/branches/gcc43/src/cpptcl/CppTcl.cc:1581
/branches/gui/src/cpptcl/CppTcl.cc:1636-1724
/branches/gui/src/cpptcl/cpptcl.cc:2796-2895
/branches/input/src/cpptcl/CppTcl.cc:1630-1637
/branches/miniprojects/src/cpptcl/cpptcl.cc:2755-2825
/branches/netp2/src/cpptcl/cpptcl.cc:2836-2989
/branches/objecthierarchy/src/cpptcl/CppTcl.cc:1912-2086,2101,2111-2170
/branches/pickups/src/cpptcl/CppTcl.cc:1927-2087
/branches/questsystem/src/cpptcl/CppTcl.cc:1895-2089
/branches/questsystem2/src/cpptcl/CppTcl.cc:2108-2260
/branches/questsystem5/src/cpptcl/cpptcl.cc:2777-2906
/branches/script_trigger/src/cpptcl/CppTcl.cc:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.cc:1926-2095
/branches/weaponsystem/src/cpptcl/cpptcl.cc:2743-2891
Property changes on: branches/netp3/src/cpptcl/cpptcl.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/cpptcl/CppTcl.h:1875-2277,2279-2401
/branches/ceguilua/src/cpptcl/CppTcl.h:1803-1809
/branches/core3/src/cpptcl/CppTcl.h:1573-1740
/branches/gcc43/src/cpptcl/CppTcl.h:1581
/branches/gui/src/cpptcl/CppTcl.h:1636-1724
/branches/gui/src/cpptcl/cpptcl.h:2796-2895
/branches/input/src/cpptcl/CppTcl.h:1630-1637
/branches/miniprojects/src/cpptcl/cpptcl.h:2755-2825
/branches/objecthierarchy/src/cpptcl/CppTcl.h:1912-2086,2101,2111-2170
/branches/pickups/src/cpptcl/CppTcl.h:1927-2087
/branches/questsystem/src/cpptcl/CppTcl.h:1895-2089
/branches/questsystem2/src/cpptcl/CppTcl.h:2108-2260
/branches/questsystem5/src/cpptcl/cpptcl.h:2777-2906
/branches/script_trigger/src/cpptcl/CppTcl.h:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.h:1926-2095
/branches/weaponsystem/src/cpptcl/cpptcl.h:2743-2891
+ /branches/buildsystem/src/cpptcl/CppTcl.h:1875-2277,2279-2401
/branches/ceguilua/src/cpptcl/CppTcl.h:1803-1809
/branches/core3/src/cpptcl/CppTcl.h:1573-1740
/branches/gcc43/src/cpptcl/CppTcl.h:1581
/branches/gui/src/cpptcl/CppTcl.h:1636-1724
/branches/gui/src/cpptcl/cpptcl.h:2796-2895
/branches/input/src/cpptcl/CppTcl.h:1630-1637
/branches/miniprojects/src/cpptcl/cpptcl.h:2755-2825
/branches/netp2/src/cpptcl/cpptcl.h:2836-2989
/branches/objecthierarchy/src/cpptcl/CppTcl.h:1912-2086,2101,2111-2170
/branches/pickups/src/cpptcl/CppTcl.h:1927-2087
/branches/questsystem/src/cpptcl/CppTcl.h:1895-2089
/branches/questsystem2/src/cpptcl/CppTcl.h:2108-2260
/branches/questsystem5/src/cpptcl/cpptcl.h:2777-2906
/branches/script_trigger/src/cpptcl/CppTcl.h:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.h:1926-2095
/branches/weaponsystem/src/cpptcl/cpptcl.h:2743-2891
Modified: branches/netp3/src/network/CMakeLists.txt
===================================================================
--- branches/netp3/src/network/CMakeLists.txt 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/CMakeLists.txt 2009-05-19 19:35:10 UTC (rev 2990)
@@ -24,13 +24,15 @@
ClientInformation.cc
ClientConnectionListener.cc
ConnectionManager.cc
+ FunctionCallManager.cc
GamestateManager.cc
GamestateClient.cc
GamestateHandler.cc
+ NetworkFunction.cc
+ Host.cc
PacketBuffer.cc
Server.cc
TrafficControl.cc
- Host.cc
)
ADD_SUBDIRECTORY(packet)
ADD_SUBDIRECTORY(synchronisable)
Modified: branches/netp3/src/network/Client.cc
===================================================================
--- branches/netp3/src/network/Client.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/Client.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -47,6 +47,7 @@
#include "core/Clock.h"
#include "core/CoreIncludes.h"
#include "packet/Packet.h"
+#include "FunctionCallManager.h"
// #include "packet/Acknowledgement.h"
@@ -139,33 +140,40 @@
* @param time
*/
void Client::update(const Clock& time){
-// COUT(3) << ".";
- if(client_connection.isConnected() && isSynched_){
- COUT(4) << "popping partial gamestate: " << std::endl;
- packet::Gamestate *gs = gamestate.getGamestate();
- if(gs){
- COUT(4) << "client tick: sending gs " << gs << std::endl;
- if( !gs->send() )
- COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
+ //this steers our network frequency
+ timeSinceLastUpdate_+=time;
+ if(timeSinceLastUpdate_>=NETWORK_PERIOD){
+ timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
+ // COUT(3) << ".";
+ if(client_connection.isConnected() && isSynched_){
+ COUT(4) << "popping partial gamestate: " << std::endl;
+ packet::Gamestate *gs = gamestate.getGamestate();
+ if(gs){
+ COUT(4) << "client tick: sending gs " << gs << std::endl;
+ if( !gs->send() )
+ COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
// gs gets automatically deleted by enet callback
+ }
+ FunctionCallManager::sendCalls();
}
- }
- ENetEvent *event;
+ ENetEvent *event;
// stop if the packet queue is empty
- while(!(client_connection.queueEmpty())){
- event = client_connection.getEvent();
- COUT(5) << "tick packet size " << event->packet->dataLength << std::endl;
- packet::Packet *packet = packet::Packet::createPacket(event->packet, event->peer);
+ while(!(client_connection.queueEmpty())){
+ event = client_connection.getEvent();
+ COUT(5) << "tick packet size " << event->packet->dataLength << std::endl;
+ packet::Packet *packet = packet::Packet::createPacket(event->packet, event->peer);
// note: packet commits suicide here except for the GameState. That is then deleted by a GamestateHandler
- bool b = packet->process();
- assert(b);
+ bool b = packet->process();
+ assert(b);
+ }
+ if(gamestate.processGamestates())
+ {
+ if(!isSynched_)
+ isSynched_=true;
+ }
+ gamestate.cleanup();
}
- if(gamestate.processGamestates())
- {
- if(!isSynched_)
- isSynched_=true;
- }
- gamestate.cleanup();
+
return;
}
Modified: branches/netp3/src/network/Client.h
===================================================================
--- branches/netp3/src/network/Client.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/Client.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -87,6 +87,7 @@
bool isSynched_;
bool gameStateFailure_;
+ float timeSinceLastUpdate_;
};
Modified: branches/netp3/src/network/ClientConnection.cc
===================================================================
--- branches/netp3/src/network/ClientConnection.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/ClientConnection.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -41,6 +41,7 @@
#include <enet/enet.h>
#include <iostream>
+#include <cassert>
// boost.thread library for multithreading support
#include <boost/thread/thread.hpp>
#include <boost/bind.hpp>
@@ -56,7 +57,7 @@
static boost::recursive_mutex enet_mutex_g;
ClientConnection::ClientConnection(int port, const std::string& address) {
- quit=false;
+ quit_=false;
server=NULL;
serverAddress = new ENetAddress();
enet_address_set_host(serverAddress, address.c_str());
@@ -65,7 +66,7 @@
}
ClientConnection::ClientConnection(int port, const char *address) {
- quit=false;
+ quit_=false;
server=NULL;
serverAddress = new ENetAddress();
enet_address_set_host(serverAddress, address);
@@ -105,7 +106,7 @@
}
bool ClientConnection::closeConnection() {
- quit=true;
+ quit_=true;
//network_threads.join_all();
receiverThread_->join();
established=false;
@@ -149,24 +150,26 @@
if(client==NULL) {
COUT(2) << "ClientConnection: could not create client host" << std::endl;
// add some error handling here ==========================
- quit=true;
+ quit_=true;
}
//connect to the server
if(!establishConnection()){
COUT(2) << "clientConn: receiver thread: could not establishConnection" << std::endl;
- quit=true;
+ quit_=true;
return;
}
event = new ENetEvent;
//main loop
- while(!quit){
+ while(!quit_){
//std::cout << "connection loop" << std::endl;
{
boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
if(enet_host_service(client, event, NETWORK_CLIENT_WAIT_TIME)<0){
// we should never reach this point
- quit=true;
- continue;
+// assert(0);
+ printf("ClientConnection: ENet returned with an error!\n");
+ quit_=true;
+ break;
// add some error handling here ========================
}
lock.unlock();
@@ -182,7 +185,8 @@
event = new ENetEvent;
break;
case ENET_EVENT_TYPE_DISCONNECT:
- quit=true;
+ quit_=true;
+ printf("Received disconnect Packet from Server!\n");
// server closed the connection
return;
break;
@@ -205,7 +209,7 @@
ENetEvent event;
boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
enet_peer_disconnect(server, 0);
- while(enet_host_service(client, &event, NETWORK_CLIENT_WAIT_TIME) > 0){
+ while(enet_host_service(client, &event, NETWORK_CLIENT_WAIT_TIME) >= 0){
switch (event.type)
{
case ENET_EVENT_TYPE_NONE:
@@ -232,7 +236,7 @@
return false;
}
// handshake
- while(enet_host_service(client, &event, NETWORK_CLIENT_WAIT_TIME)>=0 && !quit){
+ while(enet_host_service(client, &event, NETWORK_CLIENT_WAIT_TIME)>=0 && !quit_){
if( event.type == ENET_EVENT_TYPE_CONNECT ){
established=true;
return true;
Modified: branches/netp3/src/network/ClientConnection.h
===================================================================
--- branches/netp3/src/network/ClientConnection.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/ClientConnection.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -52,7 +52,7 @@
const int NETWORK_PORT = 55556;
const int NETWORK_CLIENT_MAX_CONNECTIONS = 5;
- const int NETWORK_CLIENT_WAIT_TIME = 1;
+ const int NETWORK_CLIENT_WAIT_TIME = 10;
const int NETWORK_CLIENT_CONNECT_TIMEOUT = 3000; // miliseconds
const int NETWORK_CLIENT_CHANNELS = 2;
@@ -75,7 +75,8 @@
// send out all queued packets and save result in event
//bool sendPackets(ENetEvent *event);
bool waitEstablished(int milisec);
- bool isConnected(){return established;}
+ inline bool isConnected(){return established;}
+ inline bool checkConnection(){ return !quit_ && isConnected(); }
private:
ClientConnection(const ClientConnection& copy); // not used
bool processData(ENetEvent *event);
@@ -89,7 +90,7 @@
ENetHost *client;
ENetAddress *serverAddress;
// quit-variable (communication with threads)
- bool quit;
+ bool quit_;
bool established;
// clientlist
ENetPeer *server;
Modified: branches/netp3/src/network/ConnectionManager.cc
===================================================================
--- branches/netp3/src/network/ConnectionManager.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/ConnectionManager.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -57,10 +57,7 @@
namespace std
{
bool operator< (ENetAddress a, ENetAddress b) {
- if(a.host <= b.host)
- return true;
- else
- return false;
+ return a.host <= b.host;
}
}
@@ -74,7 +71,7 @@
ConnectionManager::ConnectionManager():receiverThread_(0){
assert(instance_==0);
instance_=this;
- quit=false;
+ quit_=false;
bindAddress = new ENetAddress();
bindAddress->host = ENET_HOST_ANY;
bindAddress->port = NETWORK_PORT;
@@ -83,7 +80,7 @@
ConnectionManager::ConnectionManager(int port){
assert(instance_==0);
instance_=this;
- quit=false;
+ quit_=false;
bindAddress = new ENetAddress();
bindAddress->host = ENET_HOST_ANY;
bindAddress->port = port;
@@ -92,7 +89,7 @@
ConnectionManager::ConnectionManager(int port, const std::string& address) :receiverThread_(0) {
assert(instance_==0);
instance_=this;
- quit=false;
+ quit_=false;
bindAddress = new ENetAddress();
enet_address_set_host (bindAddress, address.c_str());
bindAddress->port = NETWORK_PORT;
@@ -101,14 +98,14 @@
ConnectionManager::ConnectionManager(int port, const char *address) : receiverThread_(0) {
assert(instance_==0);
instance_=this;
- quit=false;
+ quit_=false;
bindAddress = new ENetAddress();
enet_address_set_host (bindAddress, address);
bindAddress->port = NETWORK_PORT;
}
ConnectionManager::~ConnectionManager(){
- if(!quit)
+ if(!quit_)
quitListener();
instance_=0;
delete bindAddress;
@@ -132,7 +129,7 @@
}
bool ConnectionManager::quitListener() {
- quit=true;
+ quit_=true;
receiverThread_->join();
return true;
}
@@ -188,18 +185,21 @@
}
if(server==NULL){
// add some error handling here ==========================
- quit=true;
+ quit_=true;
return;
}
event = new ENetEvent;
- while(!quit){
+ while(!quit_)
+ {
{ //mutex scope
boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
if(enet_host_service(server, event, NETWORK_WAIT_TIMEOUT)<0){
// we should never reach this point
- quit=true;
+ printf("ConnectionManager: ENet returned with an error\n");
+ quit_=true;
continue;
+ printf("waaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhhhhhhhhhhhhhhh");
// add some error handling here ========================
}
lock.unlock();
@@ -207,6 +207,7 @@
switch(event->type){
// log handling ================
case ENET_EVENT_TYPE_CONNECT:
+ printf("====================================================================");
case ENET_EVENT_TYPE_DISCONNECT:
case ENET_EVENT_TYPE_RECEIVE:
processData(event);
@@ -214,7 +215,7 @@
break;
case ENET_EVENT_TYPE_NONE:
//receiverThread_->yield();
- msleep(1);
+ msleep(10);
break;
}
// usleep(100);
@@ -266,14 +267,7 @@
return;
}
- bool ConnectionManager::processData(ENetEvent *event) {
- // just add packet to the buffer
- // this can be extended with some preprocessing
- return buffer.push(event);
- }
-
-
int ConnectionManager::getClientID(ENetPeer* peer) {
return getClientID(&(peer->address));
}
Modified: branches/netp3/src/network/ConnectionManager.h
===================================================================
--- branches/netp3/src/network/ConnectionManager.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/ConnectionManager.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -54,7 +54,7 @@
{
const int NETWORK_PORT = 55556;
const int NETWORK_MAX_CONNECTIONS = 50;
- const int NETWORK_WAIT_TIMEOUT = 1;
+ const int NETWORK_WAIT_TIMEOUT = 10;
const int NETWORK_DEFAULT_CHANNEL = 0;
struct _NetworkExport ClientList{
@@ -80,10 +80,11 @@
bool sendPackets();
void disconnectClient(ClientInformation *client);
void syncClassid(unsigned int clientID);
+ bool checkReceiverThread(){ return !quit_; }
private:
ConnectionManager(const ConnectionManager& copy); // not used
- bool processData(ENetEvent *event);
+ inline bool processData(ENetEvent *event){ return buffer.push(event); }
void receiverThread();
void disconnectClients();
int getClientID(ENetPeer* peer);
@@ -94,7 +95,7 @@
ENetHost *server;
ENetAddress *bindAddress;
- bool quit; // quit-variable (communication with threads)
+ bool quit_; // quit-variable (communication with threads)
boost::thread *receiverThread_;
static ConnectionManager *instance_;
Copied: branches/netp3/src/network/FunctionCallManager.cc (from rev 2989, branches/netp2/src/network/FunctionCallManager.cc)
===================================================================
--- branches/netp3/src/network/FunctionCallManager.cc (rev 0)
+++ branches/netp3/src/network/FunctionCallManager.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,165 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss <scheusso [at] ee.ethz.ch>, (C) 2008
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "FunctionCallManager.h"
+#include "packet/FunctionCalls.h"
+
+namespace orxonox {
+
+std::map<uint32_t, packet::FunctionCalls*> FunctionCallManager::clientMap_;
+
+// Static calls
+
+void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID);
+}
+void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1);
+}
+void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2);
+}
+void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3);
+}
+void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3, &mt4);
+}
+void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3, &mt4, &mt5);
+}
+
+
+// MemberCalls
+
+void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID);
+}
+void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1);
+}
+void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2);
+}
+void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3);
+}
+void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3, &mt4);
+}
+void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
+ {
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
+ FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3, &mt4, &mt5);
+}
+
+// Send calls
+
+void FunctionCallManager::sendCalls()
+{
+ std::map<uint32_t, packet::FunctionCalls*>::iterator it;
+ for (it = FunctionCallManager::clientMap_.begin(); it != FunctionCallManager::clientMap_.end(); it++ )
+ {
+ assert(!FunctionCallManager::clientMap_.empty());
+ it->second->send();
+ }
+ FunctionCallManager::clientMap_.clear();
+}
+
+
+} //namespace orxonox
Copied: branches/netp3/src/network/FunctionCallManager.h (from rev 2989, branches/netp2/src/network/FunctionCallManager.h)
===================================================================
--- branches/netp3/src/network/FunctionCallManager.h (rev 0)
+++ branches/netp3/src/network/FunctionCallManager.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,44 @@
+
+#ifndef NETWORKFUNCTIONCALLMANAGER_H
+#define NETWORKFUNCTIONCALLMANAGER_H
+
+#include "NetworkPrereqs.h"
+#include "packet/FunctionCalls.h"
+#include <map>
+
+
+namespace orxonox {
+/**
+ @author
+*/
+
+class MultiType;
+
+class _NetworkExport FunctionCallManager
+{
+public:
+ static void addCallStatic(uint32_t functionID, uint32_t clientID);
+ static void addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1);
+ static void addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2);
+ static void addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3);
+ static void addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4);
+ static void addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5);
+
+ static void addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID);
+ static void addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1);
+ static void addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2);
+ static void addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3);
+ static void addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4);
+ static void addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5);
+
+ static void sendCalls();
+
+ static std::map<uint32_t, packet::FunctionCalls*> clientMap_;
+protected:
+ FunctionCallManager();
+ ~FunctionCallManager();
+};
+
+} //namespace orxonox
+
+#endif
Modified: branches/netp3/src/network/Host.h
===================================================================
--- branches/netp3/src/network/Host.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/Host.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -35,6 +35,10 @@
namespace orxonox {
+ const int CLIENTID_SERVER = 0;
+ const unsigned int NETWORK_FREQUENCY = 25;
+ const float NETWORK_PERIOD = 1.0f/NETWORK_FREQUENCY;
+
/**
* @brief Base class of Server and Client
* This is the Base class of the Server and Client classes
Copied: branches/netp3/src/network/NetworkFunction.cc (from rev 2989, branches/netp2/src/network/NetworkFunction.cc)
===================================================================
--- branches/netp3/src/network/NetworkFunction.cc (rev 0)
+++ branches/netp3/src/network/NetworkFunction.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,91 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "NetworkFunction.h"
+#include <string>
+#include "synchronisable/Synchronisable.h"
+
+namespace orxonox
+{
+ std::map<std::string, NetworkFunctionBase*> NetworkFunctionBase::nameMap_;
+ std::map<uint32_t, bool> NetworkFunctionBase::isStaticMap_;
+
+ std::map<NetworkFunctionPointer, NetworkFunctionStatic*> NetworkFunctionStatic::functorMap_;
+ std::map<uint32_t, NetworkFunctionStatic*> NetworkFunctionStatic::idMap_;
+
+ std::map<NetworkFunctionPointer, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::functorMap_;
+ std::map<uint32_t, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::idMap_;
+
+ NetworkFunctionBase::NetworkFunctionBase(std::string name)
+ {
+ RegisterRootObject(NetworkFunctionBase);
+
+ static uint32_t networkID = 0;
+ this->networkID_ = networkID++;
+
+ this->name_ = name;
+ nameMap_[name] = this;
+ }
+ NetworkFunctionBase::~NetworkFunctionBase()
+ {
+ }
+
+
+
+ NetworkFunctionStatic::NetworkFunctionStatic(FunctorStatic* functor, std::string name, const NetworkFunctionPointer& p):
+ NetworkFunctionBase(name)
+ {
+ RegisterObject(NetworkFunctionStatic);
+
+ this->functor_ = functor;
+ functorMap_[p] = this;
+ idMap_[ this->getNetworkID() ] = this;
+ }
+
+ NetworkFunctionStatic::~NetworkFunctionStatic()
+ {
+ delete this->functor_;
+ }
+
+
+
+ NetworkMemberFunctionBase::NetworkMemberFunctionBase(std::string name, const NetworkFunctionPointer& p):
+ NetworkFunctionBase(name)
+ {
+ RegisterObject(NetworkMemberFunctionBase);
+
+ functorMap_[p] = this;
+ idMap_[ this->getNetworkID() ] = this;
+ }
+
+ NetworkMemberFunctionBase::~NetworkMemberFunctionBase()
+ {
+ }
+
+
+}
Copied: branches/netp3/src/network/NetworkFunction.h (from rev 2989, branches/netp2/src/network/NetworkFunction.h)
===================================================================
--- branches/netp3/src/network/NetworkFunction.h (rev 0)
+++ branches/netp3/src/network/NetworkFunction.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,237 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef NETWORKFUNCTION_H
+#define NETWORKFUNCTION_H
+
+#include "NetworkPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+#include <string>
+#include <map>
+#include <cassert>
+#include "util/MultiType.h"
+#include "synchronisable/Synchronisable.h"
+#include "OrxonoxConfig.h"
+#include "FunctionCallManager.h"
+
+
+namespace orxonox
+{
+
+#ifdef ORXONOX_COMPILER_GCC
+static const unsigned int MAX_FUNCTION_POINTER_SIZE = 8;
+#else //ORXONOX_COMPILER_GCC
+static const unsigned int MAX_FUNCTION_POINTER_SIZE = 16;
+#endif //ORXONOX_COMPILER_GCC
+static const unsigned int MAX_FUNCTION_POINTER_INTS = (MAX_FUNCTION_POINTER_SIZE-1)/4+1;
+
+struct _NetworkExport NetworkFunctionPointer {
+ uint32_t pointer[MAX_FUNCTION_POINTER_INTS];
+ bool operator<(const NetworkFunctionPointer& b) const
+ {
+#ifdef ORXONOX_COMPILER_GCC
+ return pointer[0]<b.pointer[0] ? true : pointer[1]<b.pointer[1];
+#else //ORXONOX_COMPILER_GCC
+ return pointer[0]<b.pointer[0] ? true : ( pointer[1]<b.pointer[1] ? true : ( pointer[2]<b.pointer[2] ? true : pointer[3]<b.pointer[3] ) );
+#endif //ORXONOX_COMPILER_GCC
+ }
+};
+
+
+
+
+
+class _NetworkExport NetworkFunctionBase: virtual public OrxonoxClass {
+ public:
+ NetworkFunctionBase(std::string name);
+ ~NetworkFunctionBase();
+
+ inline void setNetworkID(uint32_t id) { this->networkID_ = id; }
+ inline uint32_t getNetworkID() const { return this->networkID_; }
+ inline std::string getName() const { return name_; }
+ static inline bool isStatic( uint32_t networkID ) { return isStaticMap_[networkID]; }
+
+ static inline void setNetworkID(std::string name, uint32_t id){ assert( nameMap_.find(name)!=nameMap_.end() ); nameMap_[name]->setNetworkID(id); }
+
+ protected:
+ static std::map<uint32_t, bool> isStaticMap_;
+
+ private:
+ static std::map<std::string, NetworkFunctionBase*> nameMap_;
+ uint32_t networkID_;
+ std::string name_;
+
+};
+
+
+class _NetworkExport NetworkFunctionStatic: public NetworkFunctionBase {
+ public:
+ NetworkFunctionStatic(FunctorStatic* functor, std::string name, const NetworkFunctionPointer& p);
+ ~NetworkFunctionStatic();
+
+ inline void call(){ (*this->functor_)(); }
+ inline void call(const MultiType& mt1){ (*this->functor_)(mt1); }
+ inline void call(const MultiType& mt1, const MultiType& mt2){ (*this->functor_)(mt1, mt2); }
+ inline void call(const MultiType& mt1, const MultiType& mt2, const MultiType& mt3){ (*this->functor_)(mt1, mt2, mt3); }
+ inline void call(const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4){ (*this->functor_)(mt1, mt2, mt3, mt4); }
+ inline void call(const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5){ (*this->functor_)(mt1, mt2, mt3, mt4, mt5); }
+
+ static inline NetworkFunctionStatic* getNetworkFunction( uint32_t id){ assert( idMap_.find(id)!=idMap_.end() ); return idMap_[id]; }
+ static NetworkFunctionStatic* getFunction( uint32_t id ){ assert( idMap_.find(id) != idMap_.end() ); return idMap_[id]; }
+ static NetworkFunctionStatic* getFunction( const NetworkFunctionPointer& p ){ assert( functorMap_.find(p) != functorMap_.end() ); return functorMap_[p]; }
+
+ private:
+ static std::map<NetworkFunctionPointer, NetworkFunctionStatic*> functorMap_;
+ static std::map<uint32_t, NetworkFunctionStatic*> idMap_;
+
+ FunctorStatic* functor_;
+
+};
+
+
+class _NetworkExport NetworkMemberFunctionBase: public NetworkFunctionBase {
+ public:
+ NetworkMemberFunctionBase(std::string name, const NetworkFunctionPointer& p);
+ ~NetworkMemberFunctionBase();
+
+ static inline NetworkMemberFunctionBase* getNetworkFunction( uint32_t id){ assert( idMap_.find(id)!=idMap_.end() ); return idMap_[id]; }
+ static NetworkMemberFunctionBase* getFunction( uint32_t id ){ assert( idMap_.find(id) != idMap_.end() ); return idMap_[id]; }
+ static NetworkMemberFunctionBase* getFunction( const NetworkFunctionPointer& p ){ assert( functorMap_.find(p) != functorMap_.end() ); return functorMap_[p]; }
+
+ //
+ virtual void call(uint32_t objectID)=0;
+ virtual void call(uint32_t objectID, const MultiType& mt1)=0;
+ virtual void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)=0;
+ virtual void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)=0;
+ virtual void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)=0;
+ virtual void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)=0;
+
+ private:
+ static std::map<NetworkFunctionPointer, NetworkMemberFunctionBase*> functorMap_;
+ static std::map<uint32_t, NetworkMemberFunctionBase*> idMap_;
+};
+
+
+template <class T> class _NetworkExport NetworkMemberFunction: public NetworkMemberFunctionBase {
+ public:
+ NetworkMemberFunction(FunctorMember<T>* functor, std::string name, const NetworkFunctionPointer& p);
+ ~NetworkMemberFunction();
+
+ inline void call(uint32_t objectID)
+ {
+ if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)));
+ }
+ inline void call(uint32_t objectID, const MultiType& mt1)
+ {
+ if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1);
+ }
+ inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)
+ {
+ if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2);
+ }
+ inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
+ {
+ if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3);
+ }
+ inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
+ {
+ if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4);
+ }
+ inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
+ {
+ if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ (*this->functor_)(dynamic_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4, mt5);
+ }
+
+ private:
+ FunctorMember<T>* functor_;
+};
+
+template <class T> NetworkMemberFunction<T>::NetworkMemberFunction(FunctorMember<T>* functor, std::string name, const NetworkFunctionPointer& p):
+ NetworkMemberFunctionBase(name, p), functor_(functor)
+{
+}
+template <class T> NetworkMemberFunction<T>::~NetworkMemberFunction()
+{
+ delete this->functor_;
+}
+
+template<class T> inline void copyPtr( T ptr, NetworkFunctionPointer& destptr)
+{
+ memset((uint8_t*)&destptr + sizeof(T), 0, sizeof(NetworkFunctionPointer)-sizeof(T));
+ T p2 = ptr;
+ memcpy( &destptr, &p2, sizeof(T) );
+// for(unsigned int i=0; i<(sizeof(T)-1/4)+1; i++)
+// *((uint32_t*)destptr+i) = p2>>32*i;
+}
+
+template<class T> inline void* registerStaticNetworkFunctionFct( T ptr, std::string name )
+{
+ NetworkFunctionPointer destptr;
+ copyPtr( ptr, destptr );
+ new NetworkFunctionStatic( createFunctor(ptr), name, destptr );
+ return 0;
+}
+
+template<class T, class PT> inline void* registerMemberNetworkFunctionFct( PT ptr, std::string name )
+{
+ NetworkFunctionPointer destptr;
+ copyPtr( ptr, destptr );
+ new NetworkMemberFunction<T>( createFunctor(ptr), name, destptr );
+ return 0;
+}
+
+#define registerStaticNetworkFunction( functionPointer ) \
+ static void* MACRO_CONCATENATE( NETWORK_FUNCTION_, __LINE__ ) = registerStaticNetworkFunctionFct( functionPointer, #functionPointer );
+#define registerMemberNetworkFunction( class, function ) \
+ static void* MACRO_CONCATENATE( NETWORK_FUNCTION_##class, __LINE__ ) = registerMemberNetworkFunctionFct<class>( &class::function, #class "_" #function);
+ // call it with functionPointer, clientID, args
+#define callStaticNetworkFunction( functionPointer, ...) \
+ { \
+ NetworkFunctionPointer p1; \
+ copyPtr( functionPointer, p1 ); \
+ FunctionCallManager::addCallStatic(NetworkFunctionStatic::getFunction(p1)->getNetworkID(), __VA_ARGS__); \
+ }
+ // call it with class, function, objectID, clientID, args
+#define callMemberNetworkFunction( class, function, objectID, ...) \
+ { \
+ NetworkFunctionPointer p1; \
+ copyPtr( &class::function, p1 ); \
+ FunctionCallManager::addCallMember(NetworkMemberFunctionBase::getFunction(p1)->getNetworkID(), objectID, __VA_ARGS__); \
+ }
+
+
+}
+
+#endif
Modified: branches/netp3/src/network/NetworkPrereqs.h
===================================================================
--- branches/netp3/src/network/NetworkPrereqs.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/NetworkPrereqs.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -89,12 +89,18 @@
class ClientFrameListener;
class ClientInformation;
class ConnectionManager;
+ class FunctionCallManager;
class GamestateClient;
class GamestateManager;
class GamestateHandler;
class NetworkCallbackBase;
template <class T> class NetworkCallback;
class NetworkCallbackManager;
+ class NetworkFunctionBase;
+ class NetworkFunctionStatic;
+ class NetworkMemberFunctionBase;
+ template <class T> class NetworkMemeberFunction;
+ struct NetworkFunctionPointer;
class PacketBuffer;
class Server;
class ServerFrameListener;
@@ -111,12 +117,15 @@
namespace packet
{
+ class Acknowledgement;
+ class Chat;
+ class ClassID;
+ class FunctionCalls;
+ class FunctionIDs;
class Gamestate;
+ class NetworkIDs;
class Packet;
- class Acknowledgement;
- class ClassID;
class Welcome;
- class Chat;
}
}
Modified: branches/netp3/src/network/Server.cc
===================================================================
--- branches/netp3/src/network/Server.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/Server.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -60,7 +60,10 @@
#include "packet/DeleteObjects.h"
#include "util/Convert.h"
#include "ChatListener.h"
+#include "FunctionCallManager.h"
+#include "packet/FunctionIDs.h"
+
namespace orxonox
{
const unsigned int MAX_FAILURES = 20;
@@ -157,6 +160,7 @@
timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
gamestates_->processGamestates();
updateGamestate();
+ FunctionCallManager::sendCalls();
}
}
@@ -340,13 +344,22 @@
COUT(2) << "Conn.Man. could not create client with id: " << clientID << std::endl;
return false;
}
- COUT(4) << "Con.Man: creating client id: " << temp->getID() << std::endl;
+ COUT(5) << "Con.Man: creating client id: " << temp->getID() << std::endl;
+
+ // synchronise class ids
connection->syncClassid(temp->getID());
+
+ // now synchronise functionIDs
+ packet::FunctionIDs *fIDs = new packet::FunctionIDs();
+ fIDs->setClientID(clientID);
+ bool b = fIDs->send();
+ assert(b);
+
temp->setSynched(true);
- COUT(3) << "sending welcome" << std::endl;
+ COUT(4) << "sending welcome" << std::endl;
packet::Welcome *w = new packet::Welcome(temp->getID(), temp->getShipID());
w->setClientID(temp->getID());
- bool b = w->send();
+ b = w->send();
assert(b);
packet::Gamestate *g = new packet::Gamestate();
g->setClientID(temp->getID());
Modified: branches/netp3/src/network/Server.h
===================================================================
--- branches/netp3/src/network/Server.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/Server.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -50,9 +50,6 @@
namespace orxonox
{
- const int CLIENTID_SERVER = 0;
- const unsigned int NETWORK_FREQUENCY = 25;
- const float NETWORK_PERIOD = 1.f/NETWORK_FREQUENCY;
/**
* This class is the root class of the network module for a server.
Modified: branches/netp3/src/network/TrafficControl.cc
===================================================================
--- branches/netp3/src/network/TrafficControl.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/TrafficControl.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -90,8 +90,8 @@
void TrafficControl::setConfigValues()
{
- SetConfigValue ( bActive_, true );
- SetConfigValue ( targetSize, 5000 );
+ SetConfigValue ( bActive_, false );
+ SetConfigValue ( targetSize, 10000 );
}
/**
Modified: branches/netp3/src/network/packet/CMakeLists.txt
===================================================================
--- branches/netp3/src/network/packet/CMakeLists.txt 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/packet/CMakeLists.txt 2009-05-19 19:35:10 UTC (rev 2990)
@@ -1,9 +1,11 @@
ADD_SOURCE_FILES(NETWORK_SRC_FILES
Packet.cc
+ Acknowledgement.cc
Chat.cc
ClassID.cc
- Acknowledgement.cc
+ DeleteObjects.cc
+ FunctionIDs.cc
+ FunctionCalls.cc
Gamestate.cc
Welcome.cc
- DeleteObjects.cc
)
Modified: branches/netp3/src/network/packet/ClassID.cc
===================================================================
--- branches/netp3/src/network/packet/ClassID.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/packet/ClassID.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -92,7 +92,7 @@
temp+=2*sizeof(uint32_t)+tempPair.second.size()+1;
}
- COUT(0) << "classid packetSize is " << packetSize << endl;
+ COUT(5) << "classid packetSize is " << packetSize << endl;
}
Copied: branches/netp3/src/network/packet/FunctionCalls.cc (from rev 2989, branches/netp2/src/network/packet/FunctionCalls.cc)
===================================================================
--- branches/netp3/src/network/packet/FunctionCalls.cc (rev 0)
+++ branches/netp3/src/network/packet/FunctionCalls.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,323 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss <scheusso [at] ee.ethz.ch>, (C) 2008
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "FunctionCalls.h"
+
+#include <enet/enet.h>
+#include <cassert>
+#include <cstring>
+#include "network/Host.h"
+#include "network/NetworkFunction.h"
+#include "util/MultiType.h"
+
+namespace orxonox {
+namespace packet {
+
+#define PACKET_FLAGS_FUNCTIONCALLS ENET_PACKET_FLAG_RELIABLE
+#define _PACKETID 0
+const unsigned int FUNCTIONCALLS_MEM_ALLOCATION = 1000;
+
+FunctionCalls::FunctionCalls()
+ : Packet()
+{
+ flags_ = flags_ | PACKET_FLAGS_FUNCTIONCALLS;
+ currentSize_ = 2*sizeof(uint32_t); // for packetid and nrOfCalls
+ nrOfCalls_ = 0;
+ currentMemBlocks_ = 1;
+ data_=new uint8_t[ FUNCTIONCALLS_MEM_ALLOCATION ];
+ *(ENUM::Type *)(data_ + _PACKETID ) = ENUM::FunctionCalls;
+ *(uint32_t*)(data_+sizeof(uint32_t)) = 0; // set nrOfCalls to 0
+}
+
+FunctionCalls::FunctionCalls( uint8_t* data, unsigned int clientID )
+ : Packet(data, clientID)
+{
+}
+
+FunctionCalls::~FunctionCalls()
+{
+}
+
+
+bool FunctionCalls::process(){
+ assert(isDataENetAllocated());
+ uint8_t* temp = data_+sizeof(uint32_t); //skip packetid
+ this->nrOfCalls_ = *(uint32_t*)temp;
+ temp += sizeof(uint32_t);
+ for( unsigned int i = 0; i<this->nrOfCalls_; i++ )
+ {
+ uint32_t functionID = *(uint32_t*)temp;
+ bool isStatic = *(uint8_t*)(temp+sizeof(uint32_t));
+ if( isStatic )
+ {
+ MultiType mt1, mt2, mt3, mt4, mt5;
+ NetworkFunctionStatic *fct = NetworkFunctionStatic::getFunction( functionID );
+ uint32_t nrOfArguments = *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t));
+ temp+=2*sizeof(uint32_t)+sizeof(uint8_t);
+ switch(nrOfArguments)
+ {
+ case 0:
+ fct->call();
+ break;
+ case 1:
+ mt1.importData(temp);
+ fct->call(mt1);
+ break;
+ case 2:
+ mt1.importData(temp);
+ mt2.importData(temp);
+ fct->call(mt1, mt2);
+ break;
+ case 3:
+ mt1.importData(temp);
+ mt2.importData(temp);
+ mt3.importData(temp);
+ fct->call(mt1, mt2, mt3);
+ break;
+ case 4:
+ mt1.importData(temp);
+ mt2.importData(temp);
+ mt3.importData(temp);
+ mt4.importData(temp);
+ fct->call(mt1, mt2, mt3, mt4);
+ break;
+ case 5:
+ mt1.importData(temp);
+ mt2.importData(temp);
+ mt3.importData(temp);
+ mt4.importData(temp);
+ mt5.importData(temp);
+ fct->call(mt1, mt2, mt3, mt4, mt5);
+ break;
+ default:
+ assert(0);
+ }
+ }
+ else // not a static function, so also handle the objectID
+ {
+ MultiType mt1, mt2, mt3, mt4, mt5;
+ NetworkMemberFunctionBase *fct = NetworkMemberFunctionBase::getFunction( functionID );
+ uint32_t nrOfArguments = *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t));
+ uint32_t objectID = *(uint32_t*)(temp+2*sizeof(uint32_t)+sizeof(uint8_t));
+ temp+=3*sizeof(uint32_t)+sizeof(uint8_t);
+ switch(nrOfArguments)
+ {
+ case 0:
+ fct->call(objectID);
+ break;
+ case 1:
+ mt1.importData(temp);
+ fct->call(objectID, mt1);
+ break;
+ case 2:
+ mt1.importData(temp);
+ mt2.importData(temp);
+ fct->call(objectID, mt1, mt2);
+ break;
+ case 3:
+ mt1.importData(temp);
+ mt2.importData(temp);
+ mt3.importData(temp);
+ fct->call(objectID, mt1, mt2, mt3);
+ break;
+ case 4:
+ mt1.importData(temp);
+ mt2.importData(temp);
+ mt3.importData(temp);
+ mt4.importData(temp);
+ fct->call(objectID, mt1, mt2, mt3, mt4);
+ break;
+ case 5:
+ mt1.importData(temp);
+ mt2.importData(temp);
+ mt3.importData(temp);
+ mt4.importData(temp);
+ mt5.importData(temp);
+ fct->call(objectID, mt1, mt2, mt3, mt4, mt5);
+ break;
+ default:
+ assert(0);
+ break;
+ }
+ }
+ }
+ delete this;
+ return true;
+}
+
+void FunctionCalls::addCallStatic( uint32_t networkID, const MultiType* mt1, const MultiType* mt2, const MultiType* mt3, const MultiType* mt4, const MultiType* mt5){
+ assert(!isDataENetAllocated());
+
+ // first determine the size that has to be reserved for this call
+ uint32_t callsize = 2*sizeof(uint32_t)+sizeof(uint8_t); //size for network-function-id and nrOfArguments and for bool isStatic
+ uint32_t nrOfArguments = 0;
+ if(mt1)
+ {
+ nrOfArguments++;
+ callsize += mt1->getNetworkSize();
+ if(mt2)
+ {
+ nrOfArguments++;
+ callsize += mt2->getNetworkSize();
+ if(mt3)
+ {
+ nrOfArguments++;
+ callsize += mt3->getNetworkSize();
+ if(mt4)
+ {
+ nrOfArguments++;
+ callsize += mt4->getNetworkSize();
+ if(mt5)
+ {
+ nrOfArguments++;
+ callsize += mt5->getNetworkSize();
+ }
+ }
+ }
+ }
+ }
+
+ // now allocated mem if neccessary
+ if( currentSize_ + callsize > currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION )
+ {
+ currentMemBlocks_ = (currentSize_ + callsize)%FUNCTIONCALLS_MEM_ALLOCATION+1;
+ uint8_t *temp = new uint8_t[currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION];
+ memcpy( temp, data_, currentSize_ );
+ delete[] data_;
+ data_ = temp;
+ }
+
+ // now serialise the mt values and copy the function id and isStatic
+ uint8_t* temp = data_+currentSize_;
+ *(uint32_t*)(data_+sizeof(uint32_t)) = *(uint32_t*)(data_+sizeof(uint32_t))+1; // increase number of calls
+ *(uint32_t*)temp = networkID;
+ *(uint8_t*)(temp+sizeof(uint32_t)) = true;
+ *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t)) = nrOfArguments;
+ temp += 2*sizeof(uint32_t)+sizeof(uint8_t);
+ if(mt1)
+ {
+ mt1->exportData( temp ); //temp gets automatically increased
+ if(mt2)
+ {
+ mt2->exportData( temp ); //temp gets automatically increased
+ if(mt3)
+ {
+ mt3->exportData( temp ); //temp gets automatically increased
+ if(mt4)
+ {
+ mt4->exportData( temp ); //temp gets automatically increased
+ if(mt5)
+ {
+ mt5->exportData( temp ); //temp gets automatically increased
+ }
+ }
+ }
+ }
+ }
+ //currentSize_ += callsize;
+ currentSize_ = temp-data_;
+
+}
+
+void FunctionCalls::addCallMember( uint32_t networkID, uint32_t objectID, const MultiType* mt1, const MultiType* mt2, const MultiType* mt3, const MultiType* mt4, const MultiType* mt5){
+ assert(!isDataENetAllocated());
+
+ // first determine the size that has to be reserved for this call
+ uint32_t callsize = 3*sizeof(uint32_t)+sizeof(uint8_t); //size for network-function-id and nrOfArguments and the objectID
+ uint32_t nrOfArguments = 0;
+ if(mt1)
+ {
+ nrOfArguments++;
+ callsize += mt1->getNetworkSize();
+ if(mt2)
+ {
+ nrOfArguments++;
+ callsize += mt2->getNetworkSize();
+ if(mt3)
+ {
+ nrOfArguments++;
+ callsize += mt3->getNetworkSize();
+ if(mt4)
+ {
+ nrOfArguments++;
+ callsize += mt4->getNetworkSize();
+ if(mt5)
+ {
+ nrOfArguments++;
+ callsize += mt5->getNetworkSize();
+ }
+ }
+ }
+ }
+ }
+
+ // now allocated mem if neccessary
+ if( currentSize_ + callsize > currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION )
+ {
+ currentMemBlocks_ = (currentSize_ + callsize)%FUNCTIONCALLS_MEM_ALLOCATION+1;
+ uint8_t *temp = new uint8_t[currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION];
+ memcpy( temp, data_, currentSize_ );
+ delete[] data_;
+ data_ = temp;
+ }
+
+ // now serialise the mt values and copy the function id
+ uint8_t* temp = data_+currentSize_;
+ *(uint32_t*)(data_+sizeof(uint32_t)) = *(uint32_t*)(data_+sizeof(uint32_t))+1; // increase number of calls
+ *(uint32_t*)temp = networkID;
+ *(uint8_t*)(temp+sizeof(uint32_t)) = false;
+ *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t)) = nrOfArguments;
+ *(uint32_t*)(temp+2*sizeof(uint32_t)+sizeof(uint8_t)) = objectID;
+ temp += 3*sizeof(uint32_t)+sizeof(uint8_t);
+ if(mt1)
+ {
+ mt1->exportData( temp ); //temp gets automatically increased
+ if(mt2)
+ {
+ mt2->exportData( temp ); //temp gets automatically increased
+ if(mt3)
+ {
+ mt3->exportData( temp ); //temp gets automatically increased
+ if(mt4)
+ {
+ mt4->exportData( temp ); //temp gets automatically increased
+ if(mt5)
+ {
+ mt5->exportData( temp ); //temp gets automatically increased
+ }
+ }
+ }
+ }
+ }
+ currentSize_ += callsize;
+
+}
+
+
+} //namespace packet
+} //namespace orxonox
Copied: branches/netp3/src/network/packet/FunctionCalls.h (from rev 2989, branches/netp2/src/network/packet/FunctionCalls.h)
===================================================================
--- branches/netp3/src/network/packet/FunctionCalls.h (rev 0)
+++ branches/netp3/src/network/packet/FunctionCalls.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,46 @@
+
+#ifndef NETWORKFUNCTIONCALLS_H
+#define NETWORKFUNCTIONCALLS_H
+
+#include "../NetworkPrereqs.h"
+
+#include <string>
+#include <cstring>
+
+#include "Packet.h"
+#include <cassert>
+
+namespace orxonox {
+
+class MultiType;
+
+namespace packet {
+/**
+ @author
+*/
+
+
+class _NetworkExport FunctionCalls : public Packet
+{
+public:
+ FunctionCalls();
+ FunctionCalls( uint8_t* data, unsigned int clientID );
+ ~FunctionCalls();
+
+ inline unsigned int getSize() const
+ { assert(!this->isDataENetAllocated()); return currentSize_; }
+ bool process();
+
+ void addCallStatic( uint32_t networkID, const MultiType* mt1=0, const MultiType* mt2=0, const MultiType* mt3=0, const MultiType* mt4=0, const MultiType* mt5=0);
+ void addCallMember( uint32_t networkID, uint32_t objectID, const MultiType* mt1=0, const MultiType* mt2=0, const MultiType* mt3=0, const MultiType* mt4=0, const MultiType* mt5=0);
+private:
+ uint32_t nrOfCalls_;
+ unsigned int clientID_;
+ uint32_t currentSize_;
+ uint32_t currentMemBlocks_; // this saves the number of memory blocks (of size FUNCTIONCALLS_MEM_ALLOCATION) allocated
+};
+
+} //namespace packet
+} //namespace orxonox
+
+#endif
Copied: branches/netp3/src/network/packet/FunctionIDs.cc (from rev 2989, branches/netp2/src/network/packet/FunctionIDs.cc)
===================================================================
--- branches/netp3/src/network/packet/FunctionIDs.cc (rev 0)
+++ branches/netp3/src/network/packet/FunctionIDs.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,143 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+
+
+#include "FunctionIDs.h"
+#include "network/NetworkFunction.h"
+#include <enet/enet.h>
+#include "core/CoreIncludes.h"
+#include <string>
+#include <cassert>
+#include <queue>
+
+namespace orxonox {
+namespace packet {
+
+
+#define PACKET_FLAGS_FUNCTIONIDS ENET_PACKET_FLAG_RELIABLE
+#define _PACKETID 0
+
+
+FunctionIDs::FunctionIDs( ) : Packet(){
+ std::string functionname;
+ unsigned int nrOfFunctions=0;
+ unsigned int packetSize=2*sizeof(uint32_t); //space for the packetID and for the nroffunctions
+ uint32_t networkID;
+ flags_ = flags_ | PACKET_FLAGS_FUNCTIONIDS;
+ std::queue<std::pair<uint32_t, std::string> > tempQueue;
+
+ //calculate total needed size (for all strings and integers)
+ ObjectList<NetworkFunctionBase>::iterator it;
+ for(it = ObjectList<NetworkFunctionBase>::begin(); it; ++it){
+ functionname = it->getName();
+ networkID = it->getNetworkID();
+ // now push the network id and the classname to the stack
+ tempQueue.push( std::pair<unsigned int, std::string>(networkID, functionname) );
+ ++nrOfFunctions;
+ packetSize += (functionname.size()+1)+sizeof(uint32_t)+sizeof(uint32_t); // reserver size for the functionname string, the functionname length and the networkID
+ }
+
+ this->data_=new uint8_t[ packetSize ];
+ //set the appropriate packet id
+ assert(this->data_);
+ *(ENUM::Type *)(this->data_ + _PACKETID ) = ENUM::FunctionIDs;
+
+ uint8_t *temp=data_+sizeof(uint32_t);
+ // save the number of all classes
+ *(uint32_t*)temp = nrOfFunctions;
+ temp += sizeof(uint32_t);
+
+ // now save all classids and classnames
+ std::pair<uint32_t, std::string> tempPair;
+ while( !tempQueue.empty() ){
+ tempPair = tempQueue.front();
+ tempQueue.pop();
+ *(uint32_t*)temp = tempPair.first;
+ *(uint32_t*)(temp+sizeof(uint32_t)) = tempPair.second.size()+1;
+ memcpy(temp+2*sizeof(uint32_t), tempPair.second.c_str(), tempPair.second.size()+1);
+ temp+=2*sizeof(uint32_t)+tempPair.second.size()+1;
+ }
+
+ COUT(5) << "FunctionIDs packetSize is " << packetSize << endl;
+
+}
+
+FunctionIDs::FunctionIDs( uint8_t* data, unsigned int clientID )
+ : Packet(data, clientID)
+{
+}
+
+FunctionIDs::~FunctionIDs()
+{
+}
+
+uint32_t FunctionIDs::getSize() const{
+ assert(this->data_);
+ uint8_t *temp = data_+sizeof(uint32_t); // packet identification
+ uint32_t totalsize = sizeof(uint32_t); // data size
+ uint32_t nrOfFunctions = *(uint32_t*)temp;
+ temp += sizeof(uint32_t);
+ totalsize += sizeof(uint32_t); // storage size for nr of all classes
+
+ for(unsigned int i=0; i<nrOfFunctions; i++){
+ totalsize += 2*sizeof(uint32_t) + *(uint32_t*)(temp + sizeof(uint32_t)); // for each network function add size for id, sizeof(string) and length of string itself to totalsize
+ temp += 2*sizeof(uint32_t) + *(uint32_t*)(temp + sizeof(uint32_t));
+ }
+ return totalsize;
+}
+
+
+bool FunctionIDs::process(){
+ int nrOfFunctions;
+ uint8_t *temp = data_+sizeof(uint32_t); //skip the packetid
+ uint32_t networkID;
+ uint32_t stringsize;
+ unsigned char *functionname;
+
+ COUT(4) << "=== processing functionids: " << endl;
+ std::pair<uint32_t, std::string> tempPair;
+ // read the total number of classes
+ nrOfFunctions = *(uint32_t*)temp;
+ temp += sizeof(uint32_t);
+
+ for( int i=0; i<nrOfFunctions; i++){
+ networkID = *(uint32_t*)temp;
+ stringsize = *(uint32_t*)(temp+sizeof(uint32_t));
+ functionname = temp+2*sizeof(uint32_t);
+ COUT(0) << "processing functionid: " << networkID << " name: " << functionname << std::endl;
+ NetworkFunctionBase::setNetworkID((const char*)functionname, networkID);
+ temp += 2*sizeof(uint32_t) + stringsize;
+ }
+ delete this;
+ return true;
+}
+
+
+} //namespace packet
+}//namespace orxonox
Copied: branches/netp3/src/network/packet/FunctionIDs.h (from rev 2989, branches/netp2/src/network/packet/FunctionIDs.h)
===================================================================
--- branches/netp3/src/network/packet/FunctionIDs.h (rev 0)
+++ branches/netp3/src/network/packet/FunctionIDs.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,60 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss <scheusso [at] ee.ethz.ch>
+ * Co-authors:
+ * ...
+ *
+ */
+#ifndef NETWORKFUNCTIONIDS_H
+#define NETWORKFUNCTIONIDS_H
+
+#include "../NetworkPrereqs.h"
+
+#include <string>
+
+#include "Packet.h"
+
+namespace orxonox {
+namespace packet {
+
+
+/**
+ @author
+*/
+class _NetworkExport FunctionIDs : public Packet
+{
+public:
+ FunctionIDs( );
+ FunctionIDs( uint8_t* data, unsigned int clientID );
+ ~FunctionIDs();
+
+ uint32_t getSize() const;
+ bool process();
+
+private:
+};
+
+} //namespace packet
+} //namespace orxonox
+
+#endif
Modified: branches/netp3/src/network/packet/Gamestate.cc
===================================================================
--- branches/netp3/src/network/packet/Gamestate.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/packet/Gamestate.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -106,7 +106,12 @@
ObjectList<Synchronisable>::iterator it;
for(it = ObjectList<Synchronisable>::begin(); it; ++it){
- tempsize=it->getSize(id, mode);
+// tempsize=it->getSize(id, mode);
+
+ tempsize = it->getData(mem, id, mode);
+ if ( it->doSync( id, mode ) )
+ dataMap_.push_back( obj(it->getObjectID(), it->getCreatorID(), tempsize, mem-data_) );
+
#ifndef NDEBUG
if(currentsize+tempsize > size){
assert(0); // if we don't use multithreading this part shouldn't be neccessary
@@ -122,11 +127,8 @@
size = currentsize+addsize;
}// stop allocate additional memory
#endif
-
- if ( it->doSync( id, mode ) )
- dataMap_.push_back( obj(it->getObjectID(), it->getCreatorID(), tempsize, mem-data_) );
- if(!it->getData(mem, id, mode))
- return false; // mem pointer gets automatically increased because of call by reference
+// if(!it->getData(mem, id, mode))
+// return false; // mem pointer gets automatically increased because of call by reference
// increase size counter by size of current synchronisable
currentsize+=tempsize;
}
Modified: branches/netp3/src/network/packet/Packet.cc
===================================================================
--- branches/netp3/src/network/packet/Packet.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/packet/Packet.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -38,11 +38,13 @@
#include "network/ClientInformation.h"
#include "Acknowledgement.h"
+#include "DeleteObjects.h"
#include "Chat.h"
#include "ClassID.h"
+#include "FunctionCalls.h"
+#include "FunctionIDs.h"
#include "Gamestate.h"
#include "Welcome.h"
-#include "DeleteObjects.h"
#include "network/Host.h"
#include "core/CoreIncludes.h"
@@ -152,6 +154,8 @@
case ENUM::Gamestate:
case ENUM::Welcome:
case ENUM::DeleteObjects:
+ case ENUM::FunctionIDs:
+ case ENUM::FunctionCalls:
break;
default:
assert(0); //there was some error, if this is the case
@@ -169,34 +173,42 @@
assert(ClientInformation::findClient(&peer->address)->getID() != (unsigned int)-2 || !Host::isServer());
unsigned int clientID = ClientInformation::findClient(&peer->address)->getID();
Packet *p = 0;
- COUT(5) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;
+ COUT(6) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;
switch( *(ENUM::Type *)(data + _PACKETID) )
{
case ENUM::Acknowledgement:
- COUT(4) << "ack" << std::endl;
+ COUT(5) << "ack" << std::endl;
p = new Acknowledgement( data, clientID );
break;
case ENUM::Chat:
- COUT(4) << "chat" << std::endl;
+ COUT(5) << "chat" << std::endl;
p = new Chat( data, clientID );
break;
case ENUM::ClassID:
- COUT(4) << "classid" << std::endl;
+ COUT(5) << "classid" << std::endl;
p = new ClassID( data, clientID );
break;
case ENUM::Gamestate:
- COUT(4) << "gamestate" << std::endl;
+ COUT(5) << "gamestate" << std::endl;
// TODO: remove brackets
p = new Gamestate( data, clientID );
break;
case ENUM::Welcome:
- COUT(4) << "welcome" << std::endl;
+ COUT(5) << "welcome" << std::endl;
p = new Welcome( data, clientID );
break;
case ENUM::DeleteObjects:
- COUT(4) << "deleteobjects" << std::endl;
+ COUT(5) << "deleteobjects" << std::endl;
p = new DeleteObjects( data, clientID );
break;
+ case ENUM::FunctionCalls:
+ COUT(5) << "functionCalls" << std::endl;
+ p = new FunctionCalls( data, clientID );
+ break;
+ case ENUM::FunctionIDs:
+ COUT(5) << "functionIDs" << std::endl;
+ p = new FunctionIDs( data, clientID );
+ break;
default:
assert(0); //TODO: repair this
break;
Modified: branches/netp3/src/network/packet/Packet.h
===================================================================
--- branches/netp3/src/network/packet/Packet.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/packet/Packet.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -44,11 +44,13 @@
};
enum Type{
Acknowledgement,
+ Chat,
+ ClassID,
+ DeleteObjects,
+ FunctionIDs,
+ FunctionCalls,
Gamestate,
- ClassID,
- Chat,
- Welcome,
- DeleteObjects
+ Welcome
};
}
@@ -65,11 +67,11 @@
virtual unsigned char *getData(){ return data_; };
virtual unsigned int getSize() const =0;
virtual bool process()=0;
- uint32_t getFlags()
+ inline uint32_t getFlags()
{ return flags_; }
- int getClientID()
+ inline int getClientID()
{ return clientID_; }
- void setClientID( int id )
+ inline void setClientID( int id )
{ clientID_ = id; }
bool send();
@@ -77,6 +79,9 @@
Packet();
Packet(uint8_t *data, unsigned int clientID);
// Packet(ENetPacket *packet, ENetPeer *peer);
+ inline bool isDataENetAllocated() const
+ { return bDataENetAllocated_; }
+
uint32_t flags_;
unsigned int clientID_;
ENUM::Direction packetDirection_;
Property changes on: branches/netp3/src/network/synchronisable/NetworkCallback.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/network/synchronisable/NetworkCallback.h:2663-2709
/branches/ceguilua/src/network/NetworkCallback.h:1803-1809
/branches/core3/src/network/NetworkCallback.h:1573-1740
/branches/gcc43/src/network/NetworkCallback.h:1581
/branches/gui/src/network/NetworkCallback.h:1636-1724
/branches/gui/src/network/synchronisable/NetworkCallback.h:2796-2895
/branches/input/src/network/NetworkCallback.h:1630-1637
/branches/miniprojects/src/network/synchronisable/NetworkCallback.h:2755-2825
/branches/network/src/network/synchronisable/NetworkCallback.h:2357
/branches/objecthierarchy/src/network/NetworkCallback.h:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/NetworkCallback.h:2437-2458
/branches/pickups/src/network/NetworkCallback.h:1927-2087
/branches/presentation/src/network/synchronisable/NetworkCallback.h:2655-2661
/branches/questsystem/src/network/NetworkCallback.h:1895-2089
/branches/questsystem5/src/network/synchronisable/NetworkCallback.h:2777-2906
/branches/script_trigger/src/network/NetworkCallback.h:1296-1954,1956
/branches/weapon/src/network/NetworkCallback.h:1926-2095
/branches/weaponsystem/src/network/synchronisable/NetworkCallback.h:2743-2891
+ /branches/buildsystem3/src/network/synchronisable/NetworkCallback.h:2663-2709
/branches/ceguilua/src/network/NetworkCallback.h:1803-1809
/branches/core3/src/network/NetworkCallback.h:1573-1740
/branches/gcc43/src/network/NetworkCallback.h:1581
/branches/gui/src/network/NetworkCallback.h:1636-1724
/branches/gui/src/network/synchronisable/NetworkCallback.h:2796-2895
/branches/input/src/network/NetworkCallback.h:1630-1637
/branches/miniprojects/src/network/synchronisable/NetworkCallback.h:2755-2825
/branches/netp2/src/network/synchronisable/NetworkCallback.h:2836-2989
/branches/network/src/network/synchronisable/NetworkCallback.h:2357
/branches/objecthierarchy/src/network/NetworkCallback.h:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/NetworkCallback.h:2437-2458
/branches/pickups/src/network/NetworkCallback.h:1927-2087
/branches/presentation/src/network/synchronisable/NetworkCallback.h:2655-2661
/branches/questsystem/src/network/NetworkCallback.h:1895-2089
/branches/questsystem5/src/network/synchronisable/NetworkCallback.h:2777-2906
/branches/script_trigger/src/network/NetworkCallback.h:1296-1954,1956
/branches/weapon/src/network/NetworkCallback.h:1926-2095
/branches/weaponsystem/src/network/synchronisable/NetworkCallback.h:2743-2891
Modified: branches/netp3/src/network/synchronisable/NetworkCallbackManager.cc
===================================================================
--- branches/netp3/src/network/synchronisable/NetworkCallbackManager.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/synchronisable/NetworkCallbackManager.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -31,7 +31,7 @@
#include "NetworkCallback.h"
namespace orxonox{
-
+
std::set<NetworkCallbackBase*> NetworkCallbackManager::callbackSet_;
std::queue<NetworkCallbackBase*> NetworkCallbackManager::triggeredCallbacks_;
@@ -59,7 +59,9 @@
{
while( triggeredCallbacks_.empty()==false )
{
- triggeredCallbacks_.front()->call();
+ //make sure callback hasn't been deleted before
+ if ( callbackSet_.find(triggeredCallbacks_.front()) != callbackSet_.end() )
+ triggeredCallbacks_.front()->call();
triggeredCallbacks_.pop();
}
}
Modified: branches/netp3/src/network/synchronisable/Synchronisable.cc
===================================================================
--- branches/netp3/src/network/synchronisable/Synchronisable.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/synchronisable/Synchronisable.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -65,7 +65,9 @@
else
objectID=OBJECTID_UNKNOWN;
classID = static_cast<uint32_t>(-1);
-
+
+ // set dataSize to 0
+ this->dataSize_ = 0;
// set standard priority
this->setPriority( priority::normal );
@@ -95,7 +97,7 @@
Synchronisable::~Synchronisable(){
// delete callback function objects
if(!Identifier::isCreatingHierarchy()){
- for(std::list<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)
+ for(std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)
delete (*it);
if (this->objectMode_ != 0x0 && (Host::running() && Host::isServer()))
deletedObjects_.push(objectID);
@@ -235,12 +237,12 @@
* 0x3: bidirectional
* @return true: if !doSync or if everything was successfully saved
*/
- bool Synchronisable::getData(uint8_t*& mem, int32_t id, uint8_t mode){
+ uint32_t Synchronisable::getData(uint8_t*& mem, int32_t id, uint8_t mode){
if(mode==0x0)
mode=state_;
//if this tick is we dont synchronise, then abort now
if(!doSync(id, mode))
- return true;
+ return 0;
uint32_t tempsize = 0;
if (this->classID==0)
COUT(3) << "classid 0 " << this->getIdentifier()->getName() << std::endl;
@@ -249,30 +251,34 @@
this->classID = this->getIdentifier()->getNetworkID();
assert(this->classID==this->getIdentifier()->getNetworkID());
- std::list<SynchronisableVariableBase*>::iterator i;
- uint32_t size;
- size=getSize(id, mode);
+ std::vector<SynchronisableVariableBase*>::iterator i;
// start copy header
SynchronisableHeader header(mem);
- header.setDataSize( size );
- header.setObjectID( this->objectID );
- header.setCreatorID( this->creatorID );
- header.setClassID( this->classID );
- header.setDataAvailable( true );
- tempsize += SynchronisableHeader::getSize();
mem += SynchronisableHeader::getSize();
// end copy header
- COUT(5) << "Synchronisable getting data from objectID: " << objectID << " classID: " << classID << " length: " << size << std::endl;
+ COUT(5) << "Synchronisable getting data from objectID: " << objectID << " classID: " << classID << std::endl;
// copy to location
for(i=syncList.begin(); i!=syncList.end(); ++i){
- (*i)->getData( mem, mode );
- tempsize += (*i)->getSize( mode );
+ tempsize += (*i)->getData( mem, mode );
+ //tempsize += (*i)->getSize( mode );
}
+
+ tempsize += SynchronisableHeader::getSize();
+ header.setObjectID( this->objectID );
+ header.setCreatorID( this->creatorID );
+ header.setClassID( this->classID );
+ header.setDataAvailable( true );
+ header.setDataSize( tempsize );
+
+#ifndef NDEBUG
+ uint32_t size;
+ size=getSize(id, mode);
assert(tempsize==size);
- return true;
+#endif
+ return tempsize;
}
@@ -285,7 +291,7 @@
bool Synchronisable::updateData(uint8_t*& mem, uint8_t mode, bool forceCallback){
if(mode==0x0)
mode=state_;
- std::list<SynchronisableVariableBase *>::iterator i;
+ std::vector<SynchronisableVariableBase *>::iterator i;
if(syncList.empty()){
assert(0);
COUT(4) << "Synchronisable::updateData syncList is empty" << std::endl;
@@ -324,12 +330,14 @@
*/
uint32_t Synchronisable::getSize(int32_t id, uint8_t mode){
int tsize=SynchronisableHeader::getSize();
- if(mode==0x0)
+ if (mode==0x0)
mode=state_;
- if(!doSync(id, mode))
+ if (!doSync(id, mode))
return 0;
- std::list<SynchronisableVariableBase*>::iterator i;
- for(i=syncList.begin(); i!=syncList.end(); i++){
+ assert( mode==state_ );
+ tsize += this->dataSize_;
+ std::vector<SynchronisableVariableBase*>::iterator i;
+ for(i=stringList.begin(); i!=stringList.end(); ++i){
tsize += (*i)->getSize( mode );
}
return tsize;
Property changes on: branches/netp3/src/network/synchronisable/Synchronisable.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/network/synchronisable/Synchronisable.cc:2663-2709
/branches/ceguilua/src/network/Synchronisable.cc:1803-1809
/branches/core3/src/network/Synchronisable.cc:1573-1740
/branches/gcc43/src/network/Synchronisable.cc:1581
/branches/gui/src/network/Synchronisable.cc:1636-1724
/branches/gui/src/network/synchronisable/Synchronisable.cc:2796-2895
/branches/input/src/network/Synchronisable.cc:1630-1637
/branches/miniprojects/src/network/synchronisable/Synchronisable.cc:2755-2825
/branches/network/src/network/synchronisable/Synchronisable.cc:2357
/branches/objecthierarchy/src/network/Synchronisable.cc:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/Synchronisable.cc:2437-2458
/branches/pickups/src/network/Synchronisable.cc:1927-2087
/branches/presentation/src/network/synchronisable/Synchronisable.cc:2655-2661
/branches/questsystem/src/network/Synchronisable.cc:1895-2089
/branches/questsystem5/src/network/synchronisable/Synchronisable.cc:2777-2906
/branches/script_trigger/src/network/Synchronisable.cc:1296-1954,1956
/branches/weapon/src/network/Synchronisable.cc:1926-2095
/branches/weaponsystem/src/network/synchronisable/Synchronisable.cc:2743-2891
+ /branches/buildsystem3/src/network/synchronisable/Synchronisable.cc:2663-2709
/branches/ceguilua/src/network/Synchronisable.cc:1803-1809
/branches/core3/src/network/Synchronisable.cc:1573-1740
/branches/gcc43/src/network/Synchronisable.cc:1581
/branches/gui/src/network/Synchronisable.cc:1636-1724
/branches/gui/src/network/synchronisable/Synchronisable.cc:2796-2895
/branches/input/src/network/Synchronisable.cc:1630-1637
/branches/miniprojects/src/network/synchronisable/Synchronisable.cc:2755-2825
/branches/netp2/src/network/synchronisable/Synchronisable.cc:2836-2989
/branches/network/src/network/synchronisable/Synchronisable.cc:2357
/branches/objecthierarchy/src/network/Synchronisable.cc:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/Synchronisable.cc:2437-2458
/branches/pickups/src/network/Synchronisable.cc:1927-2087
/branches/presentation/src/network/synchronisable/Synchronisable.cc:2655-2661
/branches/questsystem/src/network/Synchronisable.cc:1895-2089
/branches/questsystem5/src/network/synchronisable/Synchronisable.cc:2777-2906
/branches/script_trigger/src/network/Synchronisable.cc:1296-1954,1956
/branches/weapon/src/network/Synchronisable.cc:1926-2095
/branches/weaponsystem/src/network/synchronisable/Synchronisable.cc:2743-2891
Modified: branches/netp3/src/network/synchronisable/Synchronisable.h
===================================================================
--- branches/netp3/src/network/synchronisable/Synchronisable.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/synchronisable/Synchronisable.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -32,9 +32,11 @@
#include "network/NetworkPrereqs.h"
#include <list>
+#include <vector>
#include <map>
#include <queue>
#include <cassert>
+#include <string>
#include "util/Math.h"
#include "util/mbool.h"
#include "core/OrxonoxClass.h"
@@ -119,7 +121,6 @@
class _NetworkExport Synchronisable : virtual public OrxonoxClass{
public:
friend class packet::Gamestate;
-// friend class Server;
virtual ~Synchronisable();
static void setClient(bool b);
@@ -138,13 +139,13 @@
protected:
Synchronisable(BaseObject* creator);
template <class T> void registerVariable(T& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false);
- template <class T> void unregisterVariable(T& var);
+ //template <class T> void unregisterVariable(T& var);
void setObjectMode(uint8_t mode);
void setPriority(unsigned int freq){ objectFrequency_ = freq; }
private:
- bool getData(uint8_t*& men, int32_t id, uint8_t mode=0x0);
+ uint32_t getData(uint8_t*& men, int32_t id, uint8_t mode=0x0);
uint32_t getSize(int32_t id, uint8_t mode=0x0);
bool updateData(uint8_t*& mem, uint8_t mode=0x0, bool forceCallback=false);
bool isMyData(uint8_t* mem);
@@ -154,7 +155,9 @@
uint32_t creatorID;
uint32_t classID;
- std::list<SynchronisableVariableBase*> syncList;
+ std::vector<SynchronisableVariableBase*> syncList;
+ std::vector<SynchronisableVariableBase*> stringList;
+ uint32_t dataSize_; //size of all variables except strings
static uint8_t state_; // detemines wheter we are server (default) or client
bool backsync_; // if true the variables with mode > 1 will be synchronised to server (client -> server)
unsigned int objectFrequency_;
@@ -163,31 +166,10 @@
static std::queue<uint32_t> deletedObjects_;
};
- template <class T> void Synchronisable::registerVariable(T& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
- {
- if (bidirectional)
- syncList.push_back(new SynchronisableVariableBidirectional<const T>(variable, mode, cb));
- else
- syncList.push_back(new SynchronisableVariable<const T>(variable, mode, cb));
- }
-
- template <class T> void Synchronisable::unregisterVariable(T& var){
- std::list<SynchronisableVariableBase*>::iterator it = syncList.begin();
- while(it!=syncList.end()){
- if( ((*it)->getReference()) == &var ){
- delete (*it);
- syncList.erase(it);
- return;
- }
- else
- it++;
- }
- bool unregistered_nonexistent_variable = false;
- assert(unregistered_nonexistent_variable); //if we reach this point something went wrong:
- // the variable has not been registered before
- }
-
// ================= Specialisation declarations
+
+// template <> _NetworkExport void Synchronisable::registerVariable( const std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional);
+ template <> _NetworkExport void Synchronisable::registerVariable( std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional);
template <> _NetworkExport void Synchronisable::registerVariable( const ColourValue& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional);
template <> _NetworkExport void Synchronisable::registerVariable( ColourValue& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional);
template <> _NetworkExport void Synchronisable::registerVariable( const Vector2& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional);
@@ -199,6 +181,41 @@
template <> _NetworkExport void Synchronisable::registerVariable( mbool& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional);
template <> _NetworkExport void Synchronisable::registerVariable( const Quaternion& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional);
template <> _NetworkExport void Synchronisable::registerVariable( Quaternion& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional);
+
+ template <class T> void Synchronisable::registerVariable(T& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
+ {
+ if (bidirectional)
+ {
+ syncList.push_back(new SynchronisableVariableBidirectional<const T>(variable, mode, cb));
+ this->dataSize_ += syncList.back()->getSize(state_);
+ }
+ else
+ {
+ syncList.push_back(new SynchronisableVariable<const T>(variable, mode, cb));
+ if ( this->state_ == mode )
+ this->dataSize_ += syncList.back()->getSize(state_);
+ }
+ }
+
+
+
+// template <class T> void Synchronisable::unregisterVariable(T& var){
+// std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin();
+// while(it!=syncList.end()){
+// if( ((*it)->getReference()) == &var ){
+// delete (*it);
+// syncList.erase(it);
+// return;
+// }
+// else
+// it++;
+// }
+// bool unregistered_nonexistent_variable = false;
+// assert(unregistered_nonexistent_variable); //if we reach this point something went wrong:
+// // the variable has not been registered before
+// }
+
+
}
#endif /* _Synchronisable_H__ */
Property changes on: branches/netp3/src/network/synchronisable/Synchronisable.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/network/synchronisable/Synchronisable.h:2663-2709
/branches/ceguilua/src/network/Synchronisable.h:1803-1809
/branches/core3/src/network/Synchronisable.h:1573-1740
/branches/gcc43/src/network/Synchronisable.h:1581
/branches/gui/src/network/Synchronisable.h:1636-1724
/branches/gui/src/network/synchronisable/Synchronisable.h:2796-2895
/branches/input/src/network/Synchronisable.h:1630-1637
/branches/miniprojects/src/network/synchronisable/Synchronisable.h:2755-2825
/branches/network/src/network/synchronisable/Synchronisable.h:2357
/branches/objecthierarchy/src/network/Synchronisable.h:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/Synchronisable.h:2437-2458
/branches/pickups/src/network/Synchronisable.h:1927-2087
/branches/presentation/src/network/synchronisable/Synchronisable.h:2655-2661
/branches/questsystem/src/network/Synchronisable.h:1895-2089
/branches/questsystem5/src/network/synchronisable/Synchronisable.h:2777-2906
/branches/script_trigger/src/network/Synchronisable.h:1296-1954,1956
/branches/weapon/src/network/Synchronisable.h:1926-2095
/branches/weaponsystem/src/network/synchronisable/Synchronisable.h:2743-2891
+ /branches/buildsystem3/src/network/synchronisable/Synchronisable.h:2663-2709
/branches/ceguilua/src/network/Synchronisable.h:1803-1809
/branches/core3/src/network/Synchronisable.h:1573-1740
/branches/gcc43/src/network/Synchronisable.h:1581
/branches/gui/src/network/Synchronisable.h:1636-1724
/branches/gui/src/network/synchronisable/Synchronisable.h:2796-2895
/branches/input/src/network/Synchronisable.h:1630-1637
/branches/miniprojects/src/network/synchronisable/Synchronisable.h:2755-2825
/branches/netp2/src/network/synchronisable/Synchronisable.h:2836-2989
/branches/network/src/network/synchronisable/Synchronisable.h:2357
/branches/objecthierarchy/src/network/Synchronisable.h:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/Synchronisable.h:2437-2458
/branches/pickups/src/network/Synchronisable.h:1927-2087
/branches/presentation/src/network/synchronisable/Synchronisable.h:2655-2661
/branches/questsystem/src/network/Synchronisable.h:1895-2089
/branches/questsystem5/src/network/synchronisable/Synchronisable.h:2777-2906
/branches/script_trigger/src/network/Synchronisable.h:1296-1954,1956
/branches/weapon/src/network/Synchronisable.h:1926-2095
/branches/weaponsystem/src/network/synchronisable/Synchronisable.h:2743-2891
Modified: branches/netp3/src/network/synchronisable/SynchronisableSpecialisations.cc
===================================================================
--- branches/netp3/src/network/synchronisable/SynchronisableSpecialisations.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/synchronisable/SynchronisableSpecialisations.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -28,12 +28,31 @@
*/
#include "network/synchronisable/Synchronisable.h"
+#include <string>
// ================ template spezialisation
namespace orxonox{
+// template <> void Synchronisable::registerVariable( const std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
+// {
+// if (bidirectional)
+// syncList.push_back(new SynchronisableVariableBidirectional<const std::string>(variable, mode, cb));
+// else
+// syncList.push_back(new SynchronisableVariable<const std::string>(variable, mode, cb));
+// stringList.push_back(syncList.back());
+// }
+
+ template <> void Synchronisable::registerVariable( std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
+ {
+ if (bidirectional)
+ syncList.push_back(new SynchronisableVariableBidirectional<const std::string>(variable, mode, cb));
+ else
+ syncList.push_back(new SynchronisableVariable<const std::string>(variable, mode, cb));
+ stringList.push_back(syncList.back());
+ }
+
template <> void Synchronisable::registerVariable( const ColourValue& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional)
{
registerVariable(variable.r, mode, cb, bidirectional);
@@ -51,10 +70,10 @@
registerVariable(variable.x, mode, cb, bidirectional);
registerVariable(variable.y, mode, cb, bidirectional);
}
- template <> void Synchronisable::registerVariable( Vector2& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional)
- {
- registerVariable( (const ColourValue&)variable, mode, cb, bidirectional);
- }
+// template <> void Synchronisable::registerVariable( Vector2& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional)
+// {
+// registerVariable( (const ColourValue&)variable, mode, cb, bidirectional);
+// }
template <> void Synchronisable::registerVariable( const Vector3& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional)
{
Deleted: branches/netp3/src/network/synchronisable/SynchronisableVariable.cc
===================================================================
--- branches/netp3/src/network/synchronisable/SynchronisableVariable.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/synchronisable/SynchronisableVariable.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -1,441 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Oliver Scheuss, (C) 2008
- * Co-authors:
- * ...
- *
- */
-
-#include "SynchronisableVariable.h"
-#include <cstring>
-#include "util/Math.h"
-#include "core/GameMode.h"
-
-
-namespace orxonox{
-
-uint8_t SynchronisableVariableBase::state_ = 0;
-
-/*static*/ void SynchronisableVariableBase::setState()
-{
- if ( state_ == 0x0 )
- {
- state_ = GameMode::isMaster() ? 0x1 : 0x2; // set the appropriate mode here
- }
-}
-
-
-// =================== Template specialisation stuff =============
-
-// =========== bool
-
-template <> uint32_t SynchronisableVariable<const bool>::returnSize()
-{
- return sizeof(uint8_t);
-}
-
-template <> void SynchronisableVariable<const bool>::setAndIncrease( uint8_t*& mem )
-{
- *(uint8_t*)(&this->variable_) = *static_cast<uint8_t*>(mem);
- mem += SynchronisableVariable<const bool>::returnSize();
-}
-
-template <> void SynchronisableVariable<const bool>::getAndIncrease( uint8_t*& mem )
-{
- *static_cast<uint8_t*>(mem) = *(uint8_t*)(&this->variable_);
- mem += SynchronisableVariable<const bool>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const bool>::checkEquality( uint8_t* mem )
-{
- return *static_cast<uint8_t*>(mem) == *(uint8_t*)(&this->variable_);
-}
-
-// =========== char
-
-template <> uint32_t SynchronisableVariable<const char>::returnSize()
-{
- return sizeof(uint8_t);
-}
-
-template <> void SynchronisableVariable<const char>::setAndIncrease( uint8_t*& mem )
-{
- *(uint8_t*)(&this->variable_) = *static_cast<uint8_t*>(mem);
- mem += SynchronisableVariable<const char>::returnSize();
-}
-
-template <> void SynchronisableVariable<const char>::getAndIncrease( uint8_t*& mem )
-{
- *static_cast<uint8_t*>(mem) = *(uint8_t*)(&this->variable_);
- mem += SynchronisableVariable<const char>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const char>::checkEquality( uint8_t* mem )
-{
- return *static_cast<uint8_t*>(mem) == *(uint8_t*)(&this->variable_);
-}
-
-// =========== unsigned char
-
-template <> uint32_t SynchronisableVariable<const unsigned char>::returnSize()
-{
- return sizeof(uint8_t);
-}
-
-template <> void SynchronisableVariable<const unsigned char>::setAndIncrease( uint8_t*& mem )
-{
- *(uint8_t*)(&this->variable_) = *static_cast<uint8_t*>(mem);
- mem += SynchronisableVariable<const unsigned char>::returnSize();
-}
-
-template <> void SynchronisableVariable<const unsigned char>::getAndIncrease( uint8_t*& mem )
-{
- *static_cast<uint8_t*>(mem) = *(uint8_t*)(&this->variable_);
- mem += SynchronisableVariable<const unsigned char>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const unsigned char>::checkEquality( uint8_t* mem )
-{
- return *static_cast<uint8_t*>(mem) == *(uint8_t*)(&this->variable_);
-}
-
-// =========== short
-
-template <> uint32_t SynchronisableVariable<const short>::returnSize()
-{
- return sizeof(int16_t);
-}
-
-template <> void SynchronisableVariable<const short>::setAndIncrease( uint8_t*& mem )
-{
- *(short*)(&this->variable_) = *(int16_t*)(mem);
- mem += SynchronisableVariable<const short>::returnSize();
-}
-
-template <> void SynchronisableVariable<const short>::getAndIncrease( uint8_t*& mem )
-{
- *(int16_t*)(mem) = this->variable_;
- mem += SynchronisableVariable<const short>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const short>::checkEquality( uint8_t* mem )
-{
- return *(int16_t*)(mem) == static_cast<int16_t>(this->variable_);
-}
-
-// =========== unsigned short
-
-template <> uint32_t SynchronisableVariable<const unsigned short>::returnSize()
-{
- return sizeof(uint16_t);
-}
-
-template <> void SynchronisableVariable<const unsigned short>::setAndIncrease( uint8_t*& mem )
-{
- *(unsigned short*)(&this->variable_) = *(uint16_t*)(mem);
- mem += SynchronisableVariable<const unsigned short>::returnSize();
-}
-
-template <> void SynchronisableVariable<const unsigned short>::getAndIncrease( uint8_t*& mem )
-{
- *(uint16_t*)(mem) = this->variable_;
- mem += SynchronisableVariable<const unsigned short>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const unsigned short>::checkEquality( uint8_t* mem )
-{
- return *(uint16_t*)(mem) == this->variable_;
-}
-
-// =========== int
-
-template <> uint32_t SynchronisableVariable<const int>::returnSize()
-{
- return sizeof(int32_t);
-}
-
-template <> void SynchronisableVariable<const int>::setAndIncrease( uint8_t*& mem )
-{
- *(int *)(&this->variable_) = *(int32_t*)(mem);
- mem += SynchronisableVariable<const int>::returnSize();
-}
-
-template <> void SynchronisableVariable<const int>::getAndIncrease( uint8_t*& mem )
-{
- *(int32_t*)(mem) = this->variable_;
- mem += SynchronisableVariable<const int>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const int>::checkEquality( uint8_t* mem )
-{
- return *(int32_t*)(mem) == this->variable_;
-}
-
-// =========== unsigned int
-
-template <> uint32_t SynchronisableVariable<const unsigned int>::returnSize()
-{
- return sizeof(uint32_t);
-}
-
-template <> void SynchronisableVariable<const unsigned int>::setAndIncrease( uint8_t*& mem )
-{
- *(unsigned int*)(&this->variable_) = *(uint32_t*)(mem);
- mem += SynchronisableVariable<const unsigned int>::returnSize();
-}
-
-template <> void SynchronisableVariable<const unsigned int>::getAndIncrease( uint8_t*& mem )
-{
- *(uint32_t*)(mem) = this->variable_;
- mem += SynchronisableVariable<const unsigned int>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const unsigned int>::checkEquality( uint8_t* mem )
-{
- return *(uint32_t*)(mem) == this->variable_;
-}
-
-// =========== long
-
-template <> uint32_t SynchronisableVariable<const long>::returnSize()
-{
- return sizeof(int32_t);
-}
-
-template <> void SynchronisableVariable<const long>::setAndIncrease( uint8_t*& mem )
-{
- *(long*)(&this->variable_) = *(int32_t*)(mem);
- mem += SynchronisableVariable<const long>::returnSize();
-}
-
-template <> void SynchronisableVariable<const long>::getAndIncrease( uint8_t*& mem )
-{
- *(int32_t*)(mem) = this->variable_;
- mem += SynchronisableVariable<const long>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const long>::checkEquality( uint8_t* mem )
-{
- return *(int32_t*)(mem) == this->variable_;
-}
-
-// =========== unsigned long
-
-template <> uint32_t SynchronisableVariable<const unsigned long>::returnSize()
-{
- return sizeof(uint32_t);
-}
-
-template <> void SynchronisableVariable<const unsigned long>::setAndIncrease( uint8_t*& mem )
-{
- *(unsigned long*)(&this->variable_) = *(uint32_t*)(mem);
- mem += SynchronisableVariable<const unsigned long>::returnSize();
-}
-
-template <> void SynchronisableVariable<const unsigned long>::getAndIncrease( uint8_t*& mem )
-{
- *(uint32_t*)(mem) = this->variable_;
- mem += SynchronisableVariable<const unsigned long>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const unsigned long>::checkEquality( uint8_t* mem )
-{
- return *(uint32_t*)(mem) == this->variable_;
-}
-
-// =========== long long
-
-template <> uint32_t SynchronisableVariable<const long long>::returnSize()
-{
- return sizeof(int64_t);
-}
-
-template <> void SynchronisableVariable<const long long>::setAndIncrease( uint8_t*& mem )
-{
- *(long long*)(&this->variable_) = *(int64_t*)(mem);
- mem += SynchronisableVariable<const long long>::returnSize();
-}
-
-template <> void SynchronisableVariable<const long long>::getAndIncrease( uint8_t*& mem )
-{
- *(int64_t*)(mem) = this->variable_;
- mem += SynchronisableVariable<const long long>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const long long>::checkEquality( uint8_t* mem )
-{
- return *(int64_t*)(mem) == this->variable_;
-}
-
-// =========== unsigned long long
-
-template <> uint32_t SynchronisableVariable<const unsigned long long>::returnSize()
-{
- return sizeof(uint64_t);
-}
-
-template <> void SynchronisableVariable<const unsigned long long>::setAndIncrease( uint8_t*& mem )
-{
- *(unsigned long long*)(&this->variable_) = *(uint64_t*)(mem);
- mem += SynchronisableVariable<const unsigned long long>::returnSize();
-}
-
-template <> void SynchronisableVariable<const unsigned long long>::getAndIncrease( uint8_t*& mem )
-{
- *(uint64_t*)(mem) = this->variable_;
- mem += SynchronisableVariable<const unsigned long long>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const unsigned long long>::checkEquality( uint8_t* mem )
-{
- return *(uint64_t*)(mem) == this->variable_;
-}
-
-// =========== float
-
-template <> uint32_t SynchronisableVariable<const float>::returnSize()
-{
- return sizeof(uint32_t);
-}
-
-template <> void SynchronisableVariable<const float>::setAndIncrease( uint8_t*& mem )
-{
- *(uint32_t*)(&this->variable_) = *(uint32_t*)(mem);
- mem += SynchronisableVariable<const float>::returnSize();
-}
-
-template <> void SynchronisableVariable<const float>::getAndIncrease( uint8_t*& mem )
-{
- *(uint32_t*)(mem) = *(uint32_t*)(&this->variable_);
- mem += SynchronisableVariable<const float>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const float>::checkEquality( uint8_t* mem )
-{
- return *(uint32_t*)(mem) == *(uint32_t*)(&this->variable_);
-}
-
-// =========== double
-
-template <> uint32_t SynchronisableVariable<const double>::returnSize()
-{
- return sizeof(uint64_t);
-}
-
-template <> void SynchronisableVariable<const double>::setAndIncrease( uint8_t*& mem )
-{
- *(uint64_t*)(&this->variable_) = *(uint64_t*)(mem);
- mem += SynchronisableVariable<const double>::returnSize();
-}
-
-template <> void SynchronisableVariable<const double>::getAndIncrease( uint8_t*& mem )
-{
- *(uint64_t*)(mem) = *(uint64_t*)(&this->variable_);
- mem += SynchronisableVariable<const double>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const double>::checkEquality( uint8_t* mem )
-{
- return *(uint64_t*)(mem) == *(uint64_t*)(&this->variable_);
-}
-
-// =========== long double
-
-template <> uint32_t SynchronisableVariable<const long double>::returnSize()
-{
- return sizeof(uint64_t);
-}
-
-template <> void SynchronisableVariable<const long double>::setAndIncrease( uint8_t*& mem )
-{
- double temp;
- memcpy(&temp, mem, sizeof(uint64_t));
- *(long double*)(&this->variable_) = static_cast<const long double>(temp);
- mem += SynchronisableVariable<const long double>::returnSize();
-}
-
-template <> void SynchronisableVariable<const long double>::getAndIncrease( uint8_t*& mem )
-{
- double temp = static_cast<double>(this->variable_);
- memcpy(mem, &temp, sizeof(uint64_t));
- mem += SynchronisableVariable<const long double>::returnSize();
-}
-
-template <> bool SynchronisableVariable<const long double>::checkEquality( uint8_t* mem )
-{
- double temp = static_cast<double>(this->variable_);
- return memcmp(&temp, mem, sizeof(uint64_t))==0;
-}
-
-// =========== string
-
-template <> uint32_t SynchronisableVariable<const std::string>::returnSize()
-{
- return variable_.length()+1;
-}
-
-template <> void SynchronisableVariable<const std::string>::getAndIncrease( uint8_t*& mem )
-{
- memcpy(mem, this->variable_.c_str(), this->variable_.length()+1);
- mem += this->variable_.length()+1;
-}
-
-template <> void SynchronisableVariable<const std::string>::setAndIncrease( uint8_t*& mem )
-{
- *(std::string*)(&this->variable_) = std::string((const char *)mem);
- mem += this->variable_.length()+1;
-}
-
-template <> bool SynchronisableVariable<const std::string>::checkEquality( uint8_t* mem )
-{
- return std::string((const char*)mem)==this->variable_;
-}
-
-// =========== Degree
-
-template <> uint32_t SynchronisableVariable<const Degree>::returnSize()
-{
- return sizeof(Ogre::Real);
-}
-
-template <> void SynchronisableVariable<const Degree>::getAndIncrease( uint8_t*& mem )
-{
- Ogre::Real r = this->variable_.valueDegrees();
- memcpy(mem, &r, returnSize());
- mem += returnSize();
-}
-
-template <> void SynchronisableVariable<const Degree>::setAndIncrease( uint8_t*& mem )
-{
- Ogre::Real* r = (Ogre::Real*)mem;
- (Degree&)this->variable_ = *r;
- mem += returnSize();
-}
-
-template <> bool SynchronisableVariable<const Degree>::checkEquality( uint8_t* mem )
-{
- Ogre::Real* r = (Ogre::Real*)mem;
- return this->variable_==Degree(*r);
-}
-
-}
Copied: branches/netp3/src/network/synchronisable/SynchronisableVariable.cc (from rev 2989, branches/netp2/src/network/synchronisable/SynchronisableVariable.cc)
===================================================================
--- branches/netp3/src/network/synchronisable/SynchronisableVariable.cc (rev 0)
+++ branches/netp3/src/network/synchronisable/SynchronisableVariable.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,36 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss, (C) 2008
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "SynchronisableVariable.h"
+
+
+namespace orxonox{
+
+uint8_t SynchronisableVariableBase::state_ = 0;
+
+} //namespace
Modified: branches/netp3/src/network/synchronisable/SynchronisableVariable.h
===================================================================
--- branches/netp3/src/network/synchronisable/SynchronisableVariable.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/network/synchronisable/SynchronisableVariable.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2008
+ * Oliver Scheuss
* Co-authors:
* ...
*
@@ -34,7 +34,9 @@
#include <string>
#include <cassert>
-#include "util/Math.h"
+#include "util/Serialise.h"
+#include "core/Core.h"
+#include "core/CoreIncludes.h"
#include "network/synchronisable/NetworkCallback.h"
#include "network/synchronisable/NetworkCallbackManager.h"
@@ -54,7 +56,7 @@
class _NetworkExport SynchronisableVariableBase
{
public:
- virtual void getData(uint8_t*& mem, uint8_t mode)=0;
+ virtual uint32_t getData(uint8_t*& mem, uint8_t mode)=0;
virtual void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false)=0;
virtual uint32_t getSize(uint8_t mode)=0;
virtual void* getReference()=0;
@@ -73,15 +75,15 @@
virtual ~SynchronisableVariable();
virtual inline uint8_t getMode(){ return mode_; }
- virtual inline void getData(uint8_t*& mem, uint8_t mode);
+ virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode);
virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false);
virtual inline uint32_t getSize(uint8_t mode);
virtual inline void* getReference(){ return (void *)&this->variable_; }
protected:
- bool checkEquality(uint8_t* mem);
- void setAndIncrease(uint8_t*& mem);
- void getAndIncrease(uint8_t*& mem);
- uint32_t returnSize();
+// inline bool checkEquality(uint8_t* mem);
+// inline void loadAndIncrease(uint8_t*& mem);
+// inline void saveAndIncrease(uint8_t*& mem);
+// inline uint32_t returnSize();
T& variable_;
uint8_t mode_;
@@ -96,9 +98,9 @@
virtual ~SynchronisableVariableBidirectional();
virtual inline uint8_t getMode(){ return 0x3; } //this basically is a hack ^^
- virtual void getData(uint8_t*& mem, uint8_t mode);
+ virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode);
virtual void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false);
- virtual uint32_t getSize(uint8_t mode);
+ virtual inline uint32_t getSize(uint8_t mode);
private:
T varBuffer_;
uint8_t varReference_;
@@ -118,10 +120,15 @@
NetworkCallbackManager::deleteCallback(this->callback_); //safe call for deletion
}
- template <class T> void SynchronisableVariable<T>::getData(uint8_t*& mem, uint8_t mode)
+ template <class T> inline uint32_t SynchronisableVariable<T>::getData(uint8_t*& mem, uint8_t mode)
{
if ( state_ == this->mode_ )
- getAndIncrease( mem );
+ {
+ saveAndIncrease( this->variable_, mem );
+ return returnSize( this->variable_ );
+ }
+ else
+ return 0;
// mem += SynchronisableVariable<T>::getSize();
}
@@ -134,86 +141,84 @@
// check whether we need to consider a callback
if ( this->callback_ != 0 )
{
- if( forceCallback || !checkEquality( mem ) )
+ if( forceCallback || !checkEquality( this->variable_, mem ) )
callback = true;
}
// write the data
- setAndIncrease( mem );
-// mem += SynchronisableVariable<T>::getSize();
+ loadAndIncrease( this->variable_, mem );
// now do a callback if neccessary
if ( callback )
NetworkCallbackManager::triggerCallback( this->callback_ );
- //this->callback_->call();
}
- template <class T> uint32_t SynchronisableVariable<T>::getSize(uint8_t mode)
+ template <class T> inline uint32_t SynchronisableVariable<T>::getSize(uint8_t mode)
{
if ( mode == this->mode_ )
- return returnSize();
+ return returnSize( this->variable_ );
else
return 0;
}
- template <> _NetworkExport uint32_t SynchronisableVariable<const bool>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const bool>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const bool>::getAndIncrease(uint8_t*& mem);
+ /*template <> _NetworkExport uint32_t SynchronisableVariable<const bool>::returnSize();
+ template <> _NetworkExport void SynchronisableVariable<const bool>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const bool>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const bool>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned char>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned char>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned char>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned char>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned char>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const unsigned char>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const short>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const short>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const short>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const short>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const short>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const short>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned short>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned short>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned short>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned short>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned short>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const unsigned short>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const int>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const int>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const int>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const int>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const int>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const int>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned int>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned int>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned int>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned int>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned int>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const unsigned int>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const long>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const long>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const long>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const long>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const long>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const long>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned long>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned long>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned long>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned long>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned long>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const unsigned long>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const long long>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const long long>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const long long>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const long long>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const long long>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const long long>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned long long>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned long long>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned long long>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned long long>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const unsigned long long>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const unsigned long long>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const float>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const float>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const float>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const float>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const float>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const float>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const double>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const double>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const double>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const double>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const double>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const double>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const long double>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const long double>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const long double>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const long double>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const long double>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const long double>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const std::string>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const std::string>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const std::string>::getAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const std::string>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const std::string>::saveAndIncrease(uint8_t*& mem);
template <> _NetworkExport bool SynchronisableVariable<const std::string>::checkEquality(uint8_t* mem);
template <> _NetworkExport uint32_t SynchronisableVariable<const Degree>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const Degree>::setAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const Degree>::getAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const Degree>::checkEquality(uint8_t* mem);
+ template <> _NetworkExport void SynchronisableVariable<const Degree>::loadAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport void SynchronisableVariable<const Degree>::saveAndIncrease(uint8_t*& mem);
+ template <> _NetworkExport bool SynchronisableVariable<const Degree>::checkEquality(uint8_t* mem);*/
@@ -228,7 +233,7 @@
{
}
- template <class T> void SynchronisableVariableBidirectional<T>::getData(uint8_t*& mem, uint8_t mode)
+ template <class T> uint32_t SynchronisableVariableBidirectional<T>::getData(uint8_t*& mem, uint8_t mode)
{
if ( this->mode_ == mode )
{ // we are master for this variable and have to check whether to change the varReference
@@ -242,8 +247,9 @@
*static_cast<uint8_t*>(mem) = varReference_;
mem += sizeof(this->varReference_);
// now write the content
- SynchronisableVariable<T>::getAndIncrease( mem );
+ saveAndIncrease( this->variable_, mem );
// mem += SynchronisableVariable<T>::getSize();
+ return SynchronisableVariableBidirectional::getSize(mode);
}
template <class T> void SynchronisableVariableBidirectional<T>::putData(uint8_t*& mem, uint8_t mode, bool forceCallback)
@@ -259,14 +265,14 @@
}
else{
// apply data
- mem += sizeof(varReference_);
- if ( SynchronisableVariableBidirectional<T>::checkEquality( mem )==true )
+ if ( checkEquality( this->variable_, mem+sizeof(varReference_) )==true )
{
- mem += SynchronisableVariable<T>::getSize( mode );
+ mem += getSize( mode );
return;
}
else
{
+ mem += sizeof(varReference_);
memcpy((void*)&this->varBuffer_, &this->variable_, sizeof(T));
if ( this->callback_ != 0 )
callback = true;
@@ -284,7 +290,7 @@
{
this->varReference_ = *static_cast<uint8_t*>(mem);
mem += sizeof(varReference_);
- if ( SynchronisableVariable<T>::checkEquality( mem ) == false )
+ if ( checkEquality( this->variable_, mem ) == false )
{
// value changed so remark for callback
if ( this->callback_ != 0 )
@@ -293,20 +299,21 @@
}
}
// now write the data
- SynchronisableVariable<T>::setAndIncrease(mem);
+ loadAndIncrease(this->variable_, mem);
// now do a callback if neccessary
if ( callback )
NetworkCallbackManager::triggerCallback( this->callback_ );
//this->callback_->call();
}
- template <class T> uint32_t SynchronisableVariableBidirectional<T>::getSize(uint8_t mode)
+ template <class T> inline uint32_t SynchronisableVariableBidirectional<T>::getSize(uint8_t mode)
{
- return SynchronisableVariable<T>::returnSize() + sizeof(varReference_);
+ return returnSize( this->variable_ ) + sizeof(varReference_);
}
}
+//#include "network/synchronisable/SynchronisableVariableSpecialisations.h"
#endif
Property changes on: branches/netp3/src/orxonox/CameraManager.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/CameraManager.cc:2507-2659
/branches/buildsystem3/src/orxonox/CameraManager.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/CameraHandler.cc:1803-1809
/branches/core3/src/orxonox/objects/CameraHandler.cc:1573-1740
/branches/gcc43/src/orxonox/objects/CameraHandler.cc:1581
/branches/gui/src/orxonox/CameraManager.cc:2796-2895
/branches/gui/src/orxonox/objects/CameraHandler.cc:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.cc:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.cc:2373-2412
/branches/miniprojects/src/orxonox/CameraManager.cc:2755-2825
/branches/network/src/orxonox/CameraManager.cc:2357
/branches/network64/src/orxonox/CameraManager.cc:2211-2356
/branches/objecthierarchy/src/orxonox/CameraManager.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/CameraManager.cc:2172-2480
/branches/overlay/src/orxonox/CameraManager.cc:2118-2386
/branches/physics/src/orxonox/CameraManager.cc:2108-2440
/branches/physics_merge/src/orxonox/CameraManager.cc:2437-2458
/branches/pickups2/src/orxonox/CameraManager.cc:2108-2498
/branches/presentation/src/orxonox/CameraManager.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/CameraManager.cc:2108-2260
/branches/questsystem5/src/orxonox/CameraManager.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/CameraHandler.cc:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.cc:2108-2489
/branches/weaponsystem/src/orxonox/CameraManager.cc:2743-2891
/trunk/src/orxonox/CameraManager.cc:2-2086
+ /branches/buildsystem2/src/orxonox/CameraManager.cc:2507-2659
/branches/buildsystem3/src/orxonox/CameraManager.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/CameraHandler.cc:1803-1809
/branches/core3/src/orxonox/objects/CameraHandler.cc:1573-1740
/branches/gcc43/src/orxonox/objects/CameraHandler.cc:1581
/branches/gui/src/orxonox/CameraManager.cc:2796-2895
/branches/gui/src/orxonox/objects/CameraHandler.cc:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.cc:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.cc:2373-2412
/branches/miniprojects/src/orxonox/CameraManager.cc:2755-2825
/branches/netp2/src/orxonox/CameraManager.cc:2836-2989
/branches/network/src/orxonox/CameraManager.cc:2357
/branches/network64/src/orxonox/CameraManager.cc:2211-2356
/branches/objecthierarchy/src/orxonox/CameraManager.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/CameraManager.cc:2172-2480
/branches/overlay/src/orxonox/CameraManager.cc:2118-2386
/branches/physics/src/orxonox/CameraManager.cc:2108-2440
/branches/physics_merge/src/orxonox/CameraManager.cc:2437-2458
/branches/pickups2/src/orxonox/CameraManager.cc:2108-2498
/branches/presentation/src/orxonox/CameraManager.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/CameraManager.cc:2108-2260
/branches/questsystem5/src/orxonox/CameraManager.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/CameraHandler.cc:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.cc:2108-2489
/branches/weaponsystem/src/orxonox/CameraManager.cc:2743-2891
/trunk/src/orxonox/CameraManager.cc:2-2086
Property changes on: branches/netp3/src/orxonox/CameraManager.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/CameraManager.h:2507-2659
/branches/buildsystem3/src/orxonox/CameraManager.h:2663-2709
/branches/ceguilua/src/orxonox/objects/CameraHandler.h:1803-1809
/branches/core3/src/orxonox/objects/CameraHandler.h:1573-1740
/branches/gcc43/src/orxonox/objects/CameraHandler.h:1581
/branches/gui/src/orxonox/CameraManager.h:2796-2895
/branches/gui/src/orxonox/objects/CameraHandler.h:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.h:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.h:2373-2412
/branches/miniprojects/src/orxonox/CameraManager.h:2755-2825
/branches/network/src/orxonox/CameraManager.h:2357
/branches/network64/src/orxonox/CameraManager.h:2211-2356
/branches/objecthierarchy/src/orxonox/CameraManager.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/CameraManager.h:2172-2480
/branches/overlay/src/orxonox/CameraManager.h:2118-2386
/branches/physics/src/orxonox/CameraManager.h:2108-2440
/branches/physics_merge/src/orxonox/CameraManager.h:2437-2458
/branches/pickups2/src/orxonox/CameraManager.h:2108-2498
/branches/presentation/src/orxonox/CameraManager.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/CameraManager.h:2108-2260
/branches/questsystem5/src/orxonox/CameraManager.h:2777-2906
/branches/script_trigger/src/orxonox/objects/CameraHandler.h:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.h:2108-2489
/branches/weaponsystem/src/orxonox/CameraManager.h:2743-2891
/trunk/src/orxonox/CameraManager.h:2-2086
+ /branches/buildsystem2/src/orxonox/CameraManager.h:2507-2659
/branches/buildsystem3/src/orxonox/CameraManager.h:2663-2709
/branches/ceguilua/src/orxonox/objects/CameraHandler.h:1803-1809
/branches/core3/src/orxonox/objects/CameraHandler.h:1573-1740
/branches/gcc43/src/orxonox/objects/CameraHandler.h:1581
/branches/gui/src/orxonox/CameraManager.h:2796-2895
/branches/gui/src/orxonox/objects/CameraHandler.h:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.h:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.h:2373-2412
/branches/miniprojects/src/orxonox/CameraManager.h:2755-2825
/branches/netp2/src/orxonox/CameraManager.h:2836-2989
/branches/network/src/orxonox/CameraManager.h:2357
/branches/network64/src/orxonox/CameraManager.h:2211-2356
/branches/objecthierarchy/src/orxonox/CameraManager.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/CameraManager.h:2172-2480
/branches/overlay/src/orxonox/CameraManager.h:2118-2386
/branches/physics/src/orxonox/CameraManager.h:2108-2440
/branches/physics_merge/src/orxonox/CameraManager.h:2437-2458
/branches/pickups2/src/orxonox/CameraManager.h:2108-2498
/branches/presentation/src/orxonox/CameraManager.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/CameraManager.h:2108-2260
/branches/questsystem5/src/orxonox/CameraManager.h:2777-2906
/branches/script_trigger/src/orxonox/objects/CameraHandler.h:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.h:2108-2489
/branches/weaponsystem/src/orxonox/CameraManager.h:2743-2891
/trunk/src/orxonox/CameraManager.h:2-2086
Modified: branches/netp3/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- branches/netp3/src/orxonox/OrxonoxPrereqs.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/OrxonoxPrereqs.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -157,6 +157,7 @@
class CameraPosition;
class SpawnPoint;
class TeamSpawnPoint;
+ class Test;
class Spectator;
class Pawn;
Property changes on: branches/netp3/src/orxonox/objects/Level.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/Level.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/Level.cc:2663-2709
/branches/gui/src/orxonox/objects/Level.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/Level.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/Level.cc:2755-2825
/branches/network/src/orxonox/objects/Level.cc:2357
/branches/network64/src/orxonox/objects/Level.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/Level.cc:2172-2480
/branches/physics_merge/src/orxonox/objects/Level.cc:2437-2458
/branches/presentation/src/orxonox/objects/Level.cc:2370-2653,2655-2661
/branches/questsystem5/src/orxonox/objects/Level.cc:2777-2906
/branches/weaponsystem/src/orxonox/objects/Level.cc:2743-2891
/trunk/src/orxonox/objects/Level.cc:2-2170
+ /branches/buildsystem2/src/orxonox/objects/Level.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/Level.cc:2663-2709
/branches/gui/src/orxonox/objects/Level.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/Level.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/Level.cc:2755-2825
/branches/netp2/src/orxonox/objects/Level.cc:2836-2989
/branches/network/src/orxonox/objects/Level.cc:2357
/branches/network64/src/orxonox/objects/Level.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/Level.cc:2172-2480
/branches/physics_merge/src/orxonox/objects/Level.cc:2437-2458
/branches/presentation/src/orxonox/objects/Level.cc:2370-2653,2655-2661
/branches/questsystem5/src/orxonox/objects/Level.cc:2777-2906
/branches/weaponsystem/src/orxonox/objects/Level.cc:2743-2891
/trunk/src/orxonox/objects/Level.cc:2-2170
Property changes on: branches/netp3/src/orxonox/objects/Level.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/Level.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/Level.h:2663-2709
/branches/gui/src/orxonox/objects/Level.h:2796-2895
/branches/lodfinal/src/orxonox/objects/Level.h:2373-2412
/branches/miniprojects/src/orxonox/objects/Level.h:2755-2825
/branches/network/src/orxonox/objects/Level.h:2357
/branches/network64/src/orxonox/objects/Level.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/Level.h:2172-2480
/branches/physics_merge/src/orxonox/objects/Level.h:2437-2458
/branches/presentation/src/orxonox/objects/Level.h:2370-2653,2655-2661
/branches/questsystem5/src/orxonox/objects/Level.h:2777-2906
/branches/weaponsystem/src/orxonox/objects/Level.h:2743-2891
/trunk/src/orxonox/objects/Level.h:2-2170
+ /branches/buildsystem2/src/orxonox/objects/Level.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/Level.h:2663-2709
/branches/gui/src/orxonox/objects/Level.h:2796-2895
/branches/lodfinal/src/orxonox/objects/Level.h:2373-2412
/branches/miniprojects/src/orxonox/objects/Level.h:2755-2825
/branches/netp2/src/orxonox/objects/Level.h:2836-2989
/branches/network/src/orxonox/objects/Level.h:2357
/branches/network64/src/orxonox/objects/Level.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/Level.h:2172-2480
/branches/physics_merge/src/orxonox/objects/Level.h:2437-2458
/branches/presentation/src/orxonox/objects/Level.h:2370-2653,2655-2661
/branches/questsystem5/src/orxonox/objects/Level.h:2777-2906
/branches/weaponsystem/src/orxonox/objects/Level.h:2743-2891
/trunk/src/orxonox/objects/Level.h:2-2170
Modified: branches/netp3/src/orxonox/objects/Test.cc
===================================================================
--- branches/netp3/src/orxonox/objects/Test.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/objects/Test.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -30,7 +30,9 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/ConsoleCommand.h"
+#include "network/NetworkFunction.h"
#include "Test.h"
+#include "util/MultiType.h"
namespace orxonox
{
@@ -40,7 +42,18 @@
SetConsoleCommand(Test, printV2, true).accessLevel(AccessLevel::User);
SetConsoleCommand(Test, printV3, true).accessLevel(AccessLevel::User);
SetConsoleCommand(Test, printV4, true).accessLevel(AccessLevel::User);
+ SetConsoleCommand(Test, call, true).accessLevel(AccessLevel::User);
+ SetConsoleCommand(Test, call2, true).accessLevel(AccessLevel::User);
+
+ //void=* aaaaa = copyPtr<sizeof(&Test::printV1)>( &NETWORK_FUNCTION_POINTER, &Test::printV1 );
+ //void* NETWORK_FUNCTION_TEST_B = memcpy(&NETWORK_FUNCTION_POINTER, &a, sizeof(a));
+// NetworkFunctionBase* NETWORK_FUNCTION_TEST_C = new NetworkFunctionStatic( createFunctor(&Test::printV1), "bla", NETWORK_FUNCTION_POINTER );
+
+ registerStaticNetworkFunction( &Test::printV1 );
+ registerMemberNetworkFunction( Test, checkU1 );
+ registerMemberNetworkFunction( Test, printBlaBla );
+
Test* Test::instance_ = 0;
Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
@@ -72,19 +85,54 @@
}
- void Test::registerVariables()
- {
- registerVariable ( u1, variableDirection::toclient, new NetworkCallback<Test> ( this, &Test::checkU1 ));
+ void Test::registerVariables()
+ {
+ registerVariable ( u1, variableDirection::toclient, new NetworkCallback<Test> ( this, &Test::checkU1 ));
registerVariable ( u2, variableDirection::toserver, new NetworkCallback<Test> ( this, &Test::checkU2 ));
- registerVariable ( u3, variableDirection::serverMaster, new NetworkCallback<Test> ( this, &Test::checkU3 ), true );
+ registerVariable ( u3, variableDirection::serverMaster, new NetworkCallback<Test> ( this, &Test::checkU3 ), true );
registerVariable ( u4, variableDirection::clientMaster, new NetworkCallback<Test> ( this, &Test::checkU4 ), true );
registerVariable ( s1, variableDirection::toclient, new NetworkCallback<Test> ( this, &Test::checkS1 ));
registerVariable ( s2, variableDirection::toserver, new NetworkCallback<Test> ( this, &Test::checkS2 ));
registerVariable ( s3, variableDirection::serverMaster, new NetworkCallback<Test> ( this, &Test::checkS3 ), true );
registerVariable ( s4, variableDirection::clientMaster, new NetworkCallback<Test> ( this, &Test::checkS4 ), true );
- }
-
+ }
+
+ void Test::call(unsigned int clientID)
+ {
+ callStaticNetworkFunction( &Test::printV1, clientID );
+ callStaticNetworkFunction( &Test::printV1, clientID );
+ }
+
+ void Test::call2(unsigned int clientID, std::string s1, std::string s2, std::string s3, std::string s4)
+ {
+ callMemberNetworkFunction( Test, printBlaBla, this->getObjectID(), clientID, s1, s2, s3, s4, s4 );
+ }
+
+ void Test::tick(float dt)
+ {
+// std::string str1 = "blub";
+// //MultiType mt1(std::string("blub"));
+// MultiType mt1(str1);
+// uint8_t* mem = new uint8_t[mt1.getNetworkSize()];
+// uint8_t* temp = mem;
+// mt1.exportData( temp );
+// assert( temp-mem == mt1.getNetworkSize() );
+// MultiType mt2;
+// temp = mem;
+// mt2.importData( temp );
+// assert( temp-mem == mt1.getNetworkSize() );
+// COUT(0) << mt2 << endl;
+ if(!Core::isMaster())
+ call2(0, "bal", "a", "n", "ce");
+// callMemberNetworkFunction( Test, checkU1, this->getObjectID(), 0 );
+ }
+
+ void Test::printBlaBla(std::string s1, std::string s2, std::string s3, std::string s4, std::string s5)
+ {
+ COUT(0) << s1 << s2 << s3 << s4 << s5 << endl;
+ }
+
void Test::checkU1(){ COUT(1) << "U1 changed: " << u1 << std::endl; }
void Test::checkU2(){ COUT(1) << "U2 changed: " << u2 << std::endl; }
void Test::checkU3(){ COUT(1) << "U3 changed: " << u3 << std::endl; }
Modified: branches/netp3/src/orxonox/objects/Test.h
===================================================================
--- branches/netp3/src/orxonox/objects/Test.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/objects/Test.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -32,6 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
+#include "Tickable.h"
typedef int TYPE;
@@ -40,7 +41,7 @@
namespace orxonox
{
- class _OrxonoxExport Test: public BaseObject, public Synchronisable
+ class _OrxonoxExport Test: public BaseObject, public Synchronisable, public Tickable
{
public:
Test(BaseObject* creator);
@@ -48,6 +49,10 @@
void setConfigValues();
void registerVariables();
+
+ static void call(unsigned int clientID);
+ void call2(unsigned int clientID, std::string s1, std::string s2, std::string s3, std::string s4);
+ virtual void tick(float dt);
//unsigned functions
@@ -74,6 +79,8 @@
static void printV2(){ instance_->checkU2(); }
static void printV3(){ instance_->checkU3(); }
static void printV4(){ instance_->checkU4(); }
+
+ void printBlaBla(std::string s1, std::string s2, std::string s3, std::string s4, std::string s5);
private:
UTYPE u1;
Property changes on: branches/netp3/src/orxonox/objects/collisionshapes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/collisionshapes:2663-2709
/branches/ceguilua/src/orxonox/objects/collisionshapes:1803-1809
/branches/ceguilua/src/orxonox/objects/worldentities/collisionshapes:1803-1809
/branches/core3/src/orxonox/objects/collisionshapes:1573-1740
/branches/core3/src/orxonox/objects/worldentities/collisionshapes:1573-1740
/branches/gcc43/src/orxonox/objects/collisionshapes:1581
/branches/gcc43/src/orxonox/objects/worldentities/collisionshapes:1581
/branches/gui/src/orxonox/objects/collisionshapes:1636-1724,2796-2895
/branches/gui/src/orxonox/objects/worldentities/collisionshapes:1636-1724
/branches/input/src/orxonox/objects/collisionshapes:1630-1637
/branches/input/src/orxonox/objects/worldentities/collisionshapes:1630-1637
/branches/lodfinal/src/orxonox/objects/collisionshapes:2373-2412
/branches/miniprojects/src/orxonox/objects/collisionshapes:2755-2825
/branches/network/src/orxonox/objects/collisionshapes:2357
/branches/network64/src/orxonox/objects/collisionshapes:2211-2356
/branches/objecthierarchy/src/orxonox/objects/collisionshapes:1912-2086,2101,2111-2170
/branches/objecthierarchy/src/orxonox/objects/worldentities/collisionshapes:1912-2086,2101
/branches/objecthierarchy2/src/orxonox/objects/collisionshapes:2172-2480
/branches/overlay/src/orxonox/objects/collisionshapes:2118-2386
/branches/physics/src/orxonox/objects/collisionshapes:1913-2056,2108-2440
/branches/physics/src/orxonox/objects/worldentities/collisionshapes:1913-2056
/branches/physics_merge/src/orxonox/objects/collisionshapes:2437-2458
/branches/pickups/src/orxonox/objects/collisionshapes:1927-2087,2128
/branches/pickups/src/orxonox/objects/worldentities/collisionshapes:1927-2087
/branches/pickups2/src/orxonox/objects/collisionshapes:2108-2498
/branches/presentation/src/orxonox/objects/collisionshapes:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/collisionshapes:1895-2089
/branches/questsystem/src/orxonox/objects/worldentities/collisionshapes:1895-2089
/branches/questsystem2/src/orxonox/objects/collisionshapes:2108-2260
/branches/questsystem5/src/orxonox/objects/collisionshapes:2777-2906
/branches/script_trigger/src/orxonox/objects/collisionshapes:1296-1954,1956
/branches/script_trigger/src/orxonox/objects/worldentities/collisionshapes:1296-1954,1956
/branches/weapon/src/orxonox/objects/collisionshapes:1926-2095
/branches/weapon/src/orxonox/objects/worldentities/collisionshapes:1926-2095
/branches/weapon2/src/orxonox/objects/collisionshapes:2108-2489
/branches/weaponsystem/src/orxonox/objects/collisionshapes:2743-2891
+ /branches/buildsystem3/src/orxonox/objects/collisionshapes:2663-2709
/branches/ceguilua/src/orxonox/objects/collisionshapes:1803-1809
/branches/ceguilua/src/orxonox/objects/worldentities/collisionshapes:1803-1809
/branches/core3/src/orxonox/objects/collisionshapes:1573-1740
/branches/core3/src/orxonox/objects/worldentities/collisionshapes:1573-1740
/branches/gcc43/src/orxonox/objects/collisionshapes:1581
/branches/gcc43/src/orxonox/objects/worldentities/collisionshapes:1581
/branches/gui/src/orxonox/objects/collisionshapes:1636-1724,2796-2895
/branches/gui/src/orxonox/objects/worldentities/collisionshapes:1636-1724
/branches/input/src/orxonox/objects/collisionshapes:1630-1637
/branches/input/src/orxonox/objects/worldentities/collisionshapes:1630-1637
/branches/lodfinal/src/orxonox/objects/collisionshapes:2373-2412
/branches/miniprojects/src/orxonox/objects/collisionshapes:2755-2825
/branches/netp2/src/orxonox/objects/collisionshapes:2836-2989
/branches/network/src/orxonox/objects/collisionshapes:2357
/branches/network64/src/orxonox/objects/collisionshapes:2211-2356
/branches/objecthierarchy/src/orxonox/objects/collisionshapes:1912-2086,2101,2111-2170
/branches/objecthierarchy/src/orxonox/objects/worldentities/collisionshapes:1912-2086,2101
/branches/objecthierarchy2/src/orxonox/objects/collisionshapes:2172-2480
/branches/overlay/src/orxonox/objects/collisionshapes:2118-2386
/branches/physics/src/orxonox/objects/collisionshapes:1913-2056,2108-2440
/branches/physics/src/orxonox/objects/worldentities/collisionshapes:1913-2056
/branches/physics_merge/src/orxonox/objects/collisionshapes:2437-2458
/branches/pickups/src/orxonox/objects/collisionshapes:1927-2087,2128
/branches/pickups/src/orxonox/objects/worldentities/collisionshapes:1927-2087
/branches/pickups2/src/orxonox/objects/collisionshapes:2108-2498
/branches/presentation/src/orxonox/objects/collisionshapes:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/collisionshapes:1895-2089
/branches/questsystem/src/orxonox/objects/worldentities/collisionshapes:1895-2089
/branches/questsystem2/src/orxonox/objects/collisionshapes:2108-2260
/branches/questsystem5/src/orxonox/objects/collisionshapes:2777-2906
/branches/script_trigger/src/orxonox/objects/collisionshapes:1296-1954,1956
/branches/script_trigger/src/orxonox/objects/worldentities/collisionshapes:1296-1954,1956
/branches/weapon/src/orxonox/objects/collisionshapes:1926-2095
/branches/weapon/src/orxonox/objects/worldentities/collisionshapes:1926-2095
/branches/weapon2/src/orxonox/objects/collisionshapes:2108-2489
/branches/weaponsystem/src/orxonox/objects/collisionshapes:2743-2891
Modified: branches/netp3/src/orxonox/objects/controllers/AIController.cc
===================================================================
--- branches/netp3/src/orxonox/objects/controllers/AIController.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/objects/controllers/AIController.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -100,18 +100,21 @@
void AIController::tick(float dt)
{
- if (!this->isActive())
- return;
+ if(Core::isMaster())
+ {
+ if (!this->isActive())
+ return;
+
+ if (this->target_)
+ this->aimAtTarget();
+
+ if (this->bHasTargetPosition_)
+ this->moveToTargetPosition(dt);
+
+ if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(500) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
+ this->getControllableEntity()->fire(WeaponMode::fire);
+ }
- if (this->target_)
- this->aimAtTarget();
-
- if (this->bHasTargetPosition_)
- this->moveToTargetPosition(dt);
-
- if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(500) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
- this->getControllableEntity()->fire(WeaponMode::fire);
-
SUPER(AIController, tick, dt);
}
Property changes on: branches/netp3/src/orxonox/objects/gametypes/TeamDeathmatch.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.cc:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.cc:1803-1809
/branches/core3/src/orxonox/objects/gametypes/TeamGametype.cc:1573-1740
/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.cc:1581
/branches/gui/src/orxonox/objects/gametypes/TeamGametype.cc:1636-1724
/branches/input/src/orxonox/objects/gametypes/TeamGametype.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.cc:2373-2412
/branches/network/src/orxonox/objects/gametypes/TeamGametype.cc:2357
/branches/network64/src/orxonox/objects/gametypes/TeamGametype.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.cc:2172-2480
/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.cc:2118-2386
/branches/physics/src/orxonox/objects/gametypes/TeamGametype.cc:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.cc:2437-2458
/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.cc:1927-2087,2128
/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2498
/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.cc:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.cc:1895-2089
/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2260
/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.cc:1926-2095
/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2489
+ /branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.cc:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.cc:1803-1809
/branches/core3/src/orxonox/objects/gametypes/TeamGametype.cc:1573-1740
/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.cc:1581
/branches/gui/src/orxonox/objects/gametypes/TeamGametype.cc:1636-1724
/branches/input/src/orxonox/objects/gametypes/TeamGametype.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.cc:2373-2412
/branches/netp2/src/orxonox/objects/gametypes/TeamDeathmatch.cc:2836-2989
/branches/network/src/orxonox/objects/gametypes/TeamGametype.cc:2357
/branches/network64/src/orxonox/objects/gametypes/TeamGametype.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.cc:2172-2480
/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.cc:2118-2386
/branches/physics/src/orxonox/objects/gametypes/TeamGametype.cc:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.cc:2437-2458
/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.cc:1927-2087,2128
/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2498
/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.cc:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.cc:1895-2089
/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2260
/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.cc:1926-2095
/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2489
Property changes on: branches/netp3/src/orxonox/objects/gametypes/TeamDeathmatch.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.h:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.h:2663-2709
/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.h:1803-1809
/branches/core3/src/orxonox/objects/gametypes/TeamGametype.h:1573-1740
/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.h:1581
/branches/gui/src/orxonox/objects/gametypes/TeamGametype.h:1636-1724
/branches/input/src/orxonox/objects/gametypes/TeamGametype.h:1630-1637
/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.h:2373-2412
/branches/network/src/orxonox/objects/gametypes/TeamGametype.h:2357
/branches/network64/src/orxonox/objects/gametypes/TeamGametype.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.h:2172-2480
/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.h:2118-2386
/branches/physics/src/orxonox/objects/gametypes/TeamGametype.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.h:2437-2458
/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.h:1927-2087,2128
/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2498
/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.h:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.h:1895-2089
/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2260
/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.h:1926-2095
/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2489
+ /branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.h:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.h:2663-2709
/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.h:1803-1809
/branches/core3/src/orxonox/objects/gametypes/TeamGametype.h:1573-1740
/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.h:1581
/branches/gui/src/orxonox/objects/gametypes/TeamGametype.h:1636-1724
/branches/input/src/orxonox/objects/gametypes/TeamGametype.h:1630-1637
/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.h:2373-2412
/branches/netp2/src/orxonox/objects/gametypes/TeamDeathmatch.h:2836-2989
/branches/network/src/orxonox/objects/gametypes/TeamGametype.h:2357
/branches/network64/src/orxonox/objects/gametypes/TeamGametype.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.h:2172-2480
/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.h:2118-2386
/branches/physics/src/orxonox/objects/gametypes/TeamGametype.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.h:2437-2458
/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.h:1927-2087,2128
/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2498
/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.h:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.h:1895-2089
/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2260
/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.h:1926-2095
/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2489
Property changes on: branches/netp3/src/orxonox/objects/pickup/Usable.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/pickup/Usable.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/pickup/Usable.h:2663-2709
/branches/ceguilua/src/orxonox/objects/pickup/Usable:1803-1809
/branches/core3/src/orxonox/objects/pickup/Usable:1573-1740
/branches/gcc43/src/orxonox/objects/pickup/Usable:1581
/branches/gui/src/orxonox/objects/pickup/Usable:1636-1724
/branches/gui/src/orxonox/objects/pickup/Usable.h:2796-2895
/branches/input/src/orxonox/objects/pickup/Usable:1630-1637
/branches/lodfinal/src/orxonox/objects/pickup/Usable.h:2373-2412
/branches/miniprojects/src/orxonox/objects/pickup/Usable.h:2755-2825
/branches/network/src/orxonox/objects/pickup/Usable.h:2357
/branches/network64/src/orxonox/objects/pickup/Usable.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/pickup/Usable.h:2172-2480
/branches/overlay/src/orxonox/objects/pickup/Usable.h:2118-2386
/branches/physics/src/orxonox/objects/pickup/Usable.h:2108-2440
/branches/physics_merge/src/orxonox/objects/pickup/Usable.h:2437-2458
/branches/pickups/src/orxonox/objects/pickup/Usable.h:2128
/branches/pickups2/src/orxonox/objects/pickup/Usable.h:2108-2498
/branches/presentation/src/orxonox/objects/pickup/Usable.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/pickup/Usable.h:2108-2260
/branches/questsystem5/src/orxonox/objects/pickup/Usable.h:2777-2906
/branches/weapon2/src/orxonox/objects/pickup/Usable.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/pickup/Usable.h:2743-2891
+ /branches/buildsystem2/src/orxonox/objects/pickup/Usable.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/pickup/Usable.h:2663-2709
/branches/ceguilua/src/orxonox/objects/pickup/Usable:1803-1809
/branches/core3/src/orxonox/objects/pickup/Usable:1573-1740
/branches/gcc43/src/orxonox/objects/pickup/Usable:1581
/branches/gui/src/orxonox/objects/pickup/Usable:1636-1724
/branches/gui/src/orxonox/objects/pickup/Usable.h:2796-2895
/branches/input/src/orxonox/objects/pickup/Usable:1630-1637
/branches/lodfinal/src/orxonox/objects/pickup/Usable.h:2373-2412
/branches/miniprojects/src/orxonox/objects/pickup/Usable.h:2755-2825
/branches/netp2/src/orxonox/objects/pickup/Usable.h:2836-2989
/branches/network/src/orxonox/objects/pickup/Usable.h:2357
/branches/network64/src/orxonox/objects/pickup/Usable.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/pickup/Usable.h:2172-2480
/branches/overlay/src/orxonox/objects/pickup/Usable.h:2118-2386
/branches/physics/src/orxonox/objects/pickup/Usable.h:2108-2440
/branches/physics_merge/src/orxonox/objects/pickup/Usable.h:2437-2458
/branches/pickups/src/orxonox/objects/pickup/Usable.h:2128
/branches/pickups2/src/orxonox/objects/pickup/Usable.h:2108-2498
/branches/presentation/src/orxonox/objects/pickup/Usable.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/pickup/Usable.h:2108-2260
/branches/questsystem5/src/orxonox/objects/pickup/Usable.h:2777-2906
/branches/weapon2/src/orxonox/objects/pickup/Usable.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/pickup/Usable.h:2743-2891
Property changes on: branches/netp3/src/orxonox/objects/quest/AddQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/AddQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuest.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/AddQuest.cc:2836-2989
/branches/network/src/orxonox/objects/quest/AddQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/AddQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddQuest.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/AddQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuest.h:2357
/branches/network64/src/orxonox/objects/quest/AddQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/AddQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuest.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/AddQuest.h:2836-2989
/branches/network/src/orxonox/objects/quest/AddQuest.h:2357
/branches/network64/src/orxonox/objects/quest/AddQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/AddQuest.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/AddQuestHint.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddQuestHint.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuestHint.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuestHint.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuestHint.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuestHint.cc:2357
/branches/network64/src/orxonox/objects/quest/AddQuestHint.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuestHint.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuestHint.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuestHint.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuestHint.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddQuestHint.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddQuestHint.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuestHint.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuestHint.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuestHint.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/AddQuestHint.cc:2836-2989
/branches/network/src/orxonox/objects/quest/AddQuestHint.cc:2357
/branches/network64/src/orxonox/objects/quest/AddQuestHint.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuestHint.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuestHint.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuestHint.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuestHint.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddQuestHint.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/AddQuestHint.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddQuestHint.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuestHint.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuestHint.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuestHint.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuestHint.h:2357
/branches/network64/src/orxonox/objects/quest/AddQuestHint.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuestHint.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuestHint.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuestHint.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuestHint.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuestHint.h:2743-2891
/trunk/src/orxonox/objects/quest/AddQuestHint.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddQuestHint.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuestHint.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuestHint.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuestHint.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/AddQuestHint.h:2836-2989
/branches/network/src/orxonox/objects/quest/AddQuestHint.h:2357
/branches/network64/src/orxonox/objects/quest/AddQuestHint.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuestHint.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuestHint.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuestHint.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuestHint.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuestHint.h:2743-2891
/trunk/src/orxonox/objects/quest/AddQuestHint.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/AddReward.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddReward.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddReward.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddReward.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddReward.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddReward.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddReward.cc:2357
/branches/network64/src/orxonox/objects/quest/AddReward.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddReward.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddReward.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddReward.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddReward.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddReward.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddReward.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddReward.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddReward.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddReward.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddReward.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddReward.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddReward.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddReward.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddReward.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddReward.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/AddReward.cc:2836-2989
/branches/network/src/orxonox/objects/quest/AddReward.cc:2357
/branches/network64/src/orxonox/objects/quest/AddReward.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddReward.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddReward.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddReward.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddReward.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddReward.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddReward.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddReward.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddReward.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddReward.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddReward.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/AddReward.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddReward.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddReward.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddReward.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddReward.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddReward.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddReward.h:2357
/branches/network64/src/orxonox/objects/quest/AddReward.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddReward.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddReward.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddReward.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddReward.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddReward.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddReward.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddReward.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddReward.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddReward.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddReward.h:2743-2891
/trunk/src/orxonox/objects/quest/AddReward.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddReward.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddReward.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddReward.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddReward.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddReward.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/AddReward.h:2836-2989
/branches/network/src/orxonox/objects/quest/AddReward.h:2357
/branches/network64/src/orxonox/objects/quest/AddReward.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddReward.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddReward.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddReward.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddReward.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddReward.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddReward.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddReward.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddReward.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddReward.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddReward.h:2743-2891
/trunk/src/orxonox/objects/quest/AddReward.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/ChangeQuestStatus.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/ChangeQuestStatus.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/ChangeQuestStatus.cc:2755-2825
/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.cc:2357
/branches/network64/src/orxonox/objects/quest/ChangeQuestStatus.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/ChangeQuestStatus.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/ChangeQuestStatus.cc:2743-2891
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/ChangeQuestStatus.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/ChangeQuestStatus.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2836-2989
/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.cc:2357
/branches/network64/src/orxonox/objects/quest/ChangeQuestStatus.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/ChangeQuestStatus.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/ChangeQuestStatus.cc:2743-2891
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/ChangeQuestStatus.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/ChangeQuestStatus.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.h:2663-2709
/branches/gui/src/orxonox/objects/quest/ChangeQuestStatus.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/ChangeQuestStatus.h:2755-2825
/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.h:2357
/branches/network64/src/orxonox/objects/quest/ChangeQuestStatus.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/ChangeQuestStatus.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/ChangeQuestStatus.h:2118-2386
/branches/physics/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/ChangeQuestStatus.h:2743-2891
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/ChangeQuestStatus.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.h:2663-2709
/branches/gui/src/orxonox/objects/quest/ChangeQuestStatus.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/ChangeQuestStatus.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/ChangeQuestStatus.h:2836-2989
/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.h:2357
/branches/network64/src/orxonox/objects/quest/ChangeQuestStatus.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/ChangeQuestStatus.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/ChangeQuestStatus.h:2118-2386
/branches/physics/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/ChangeQuestStatus.h:2743-2891
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/CompleteQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/CompleteQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/CompleteQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/CompleteQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/CompleteQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/CompleteQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/CompleteQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/CompleteQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/CompleteQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/CompleteQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/CompleteQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/CompleteQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/CompleteQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/CompleteQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/CompleteQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/CompleteQuest.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/CompleteQuest.cc:2836-2989
/branches/network/src/orxonox/objects/quest/CompleteQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/CompleteQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/CompleteQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/CompleteQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/CompleteQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/CompleteQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/CompleteQuest.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/CompleteQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/CompleteQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/CompleteQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/CompleteQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/CompleteQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/CompleteQuest.h:2357
/branches/network64/src/orxonox/objects/quest/CompleteQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/CompleteQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/CompleteQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/CompleteQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/CompleteQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/CompleteQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/CompleteQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/CompleteQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/CompleteQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/CompleteQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/CompleteQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/CompleteQuest.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/CompleteQuest.h:2836-2989
/branches/network/src/orxonox/objects/quest/CompleteQuest.h:2357
/branches/network64/src/orxonox/objects/quest/CompleteQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/CompleteQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/CompleteQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/CompleteQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/CompleteQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/CompleteQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/CompleteQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/CompleteQuest.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/FailQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/FailQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/FailQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/FailQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/FailQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/FailQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/FailQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/FailQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/FailQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/FailQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/FailQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/FailQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/FailQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/FailQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/FailQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/FailQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/FailQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/FailQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/FailQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/FailQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/FailQuest.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/FailQuest.cc:2836-2989
/branches/network/src/orxonox/objects/quest/FailQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/FailQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/FailQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/FailQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/FailQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/FailQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/FailQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/FailQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/FailQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/FailQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/FailQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/FailQuest.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/FailQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/FailQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/FailQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/FailQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/FailQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/FailQuest.h:2357
/branches/network64/src/orxonox/objects/quest/FailQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/FailQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/FailQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/FailQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/FailQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/FailQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/FailQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/FailQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/FailQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/FailQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/FailQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/FailQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/FailQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/FailQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/FailQuest.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/FailQuest.h:2836-2989
/branches/network/src/orxonox/objects/quest/FailQuest.h:2357
/branches/network64/src/orxonox/objects/quest/FailQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/FailQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/FailQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/FailQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/FailQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/FailQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/FailQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/FailQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/FailQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/FailQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/FailQuest.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/GlobalQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/GlobalQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/GlobalQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/GlobalQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/GlobalQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/GlobalQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/GlobalQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/GlobalQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/GlobalQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/GlobalQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/GlobalQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/GlobalQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/GlobalQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/GlobalQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/GlobalQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/GlobalQuest.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/GlobalQuest.cc:2836-2989
/branches/network/src/orxonox/objects/quest/GlobalQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/GlobalQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/GlobalQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/GlobalQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/GlobalQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/GlobalQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/GlobalQuest.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/GlobalQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/GlobalQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/GlobalQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/GlobalQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/GlobalQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/GlobalQuest.h:2357
/branches/network64/src/orxonox/objects/quest/GlobalQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/GlobalQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/GlobalQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/GlobalQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/GlobalQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/GlobalQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/GlobalQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/GlobalQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/GlobalQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/GlobalQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/GlobalQuest.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/GlobalQuest.h:2836-2989
/branches/network/src/orxonox/objects/quest/GlobalQuest.h:2357
/branches/network64/src/orxonox/objects/quest/GlobalQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/GlobalQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/GlobalQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/GlobalQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/GlobalQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/GlobalQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/GlobalQuest.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/LocalQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/LocalQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/LocalQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/LocalQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/LocalQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/LocalQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/LocalQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/LocalQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/LocalQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/LocalQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/LocalQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/LocalQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/LocalQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/LocalQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/LocalQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/LocalQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/LocalQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/LocalQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/LocalQuest.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/LocalQuest.cc:2836-2989
/branches/network/src/orxonox/objects/quest/LocalQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/LocalQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/LocalQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/LocalQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/LocalQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/LocalQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/LocalQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/LocalQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/LocalQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/LocalQuest.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/LocalQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/LocalQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/LocalQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/LocalQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/LocalQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/LocalQuest.h:2357
/branches/network64/src/orxonox/objects/quest/LocalQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/LocalQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/LocalQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/LocalQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/LocalQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/LocalQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/LocalQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/LocalQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/LocalQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/LocalQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/LocalQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/LocalQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/LocalQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/LocalQuest.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/LocalQuest.h:2836-2989
/branches/network/src/orxonox/objects/quest/LocalQuest.h:2357
/branches/network64/src/orxonox/objects/quest/LocalQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/LocalQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/LocalQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/LocalQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/LocalQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/LocalQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/LocalQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/LocalQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/LocalQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/LocalQuest.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/Quest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/Quest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Quest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/Quest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Quest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Quest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/Quest.cc:2357
/branches/network64/src/orxonox/objects/quest/Quest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Quest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/Quest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/Quest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Quest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Quest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/Quest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Quest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Quest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Quest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Quest.cc:2743-2891
/trunk/src/orxonox/objects/quest/Quest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/Quest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Quest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/Quest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Quest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Quest.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/Quest.cc:2836-2989
/branches/network/src/orxonox/objects/quest/Quest.cc:2357
/branches/network64/src/orxonox/objects/quest/Quest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Quest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/Quest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/Quest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Quest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Quest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/Quest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Quest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Quest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Quest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Quest.cc:2743-2891
/trunk/src/orxonox/objects/quest/Quest.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/Quest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/Quest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Quest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/Quest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Quest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Quest.h:2755-2825
/branches/network/src/orxonox/objects/quest/Quest.h:2357
/branches/network64/src/orxonox/objects/quest/Quest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Quest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/Quest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/Quest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Quest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Quest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/Quest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Quest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Quest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Quest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Quest.h:2743-2891
/trunk/src/orxonox/objects/quest/Quest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/Quest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Quest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/Quest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Quest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Quest.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/Quest.h:2836-2989
/branches/network/src/orxonox/objects/quest/Quest.h:2357
/branches/network64/src/orxonox/objects/quest/Quest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Quest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/Quest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/Quest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Quest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Quest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/Quest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Quest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Quest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Quest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Quest.h:2743-2891
/trunk/src/orxonox/objects/quest/Quest.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestDescription.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestDescription.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestDescription.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestDescription.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestDescription.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestDescription.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestDescription.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestDescription.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestDescription.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestDescription.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestDescription.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestDescription.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestDescription.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestDescription.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestDescription.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestDescription.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestDescription.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestDescription.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestDescription.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestDescription.cc:2836-2989
/branches/network/src/orxonox/objects/quest/QuestDescription.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestDescription.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestDescription.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestDescription.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestDescription.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestDescription.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestDescription.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestDescription.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestDescription.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestDescription.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestDescription.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestDescription.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestDescription.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestDescription.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestDescription.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestDescription.h:2357
/branches/network64/src/orxonox/objects/quest/QuestDescription.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestDescription.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestDescription.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestDescription.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestDescription.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestDescription.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestDescription.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestDescription.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestDescription.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestDescription.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestDescription.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestDescription.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestDescription.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestDescription.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestDescription.h:2836-2989
/branches/network/src/orxonox/objects/quest/QuestDescription.h:2357
/branches/network64/src/orxonox/objects/quest/QuestDescription.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestDescription.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestDescription.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestDescription.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestDescription.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestDescription.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestDescription.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestDescription.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestDescription.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestDescription.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestEffect.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestEffect.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestEffect.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestEffect.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestEffect.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestEffect.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestEffect.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestEffect.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestEffect.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestEffect.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestEffect.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestEffect.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestEffect.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestEffect.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestEffect.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestEffect.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestEffect.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestEffect.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestEffect.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestEffect.cc:2836-2989
/branches/network/src/orxonox/objects/quest/QuestEffect.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestEffect.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestEffect.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestEffect.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestEffect.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestEffect.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestEffect.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestEffect.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestEffect.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestEffect.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestEffect.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestEffect.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestEffect.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestEffect.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestEffect.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestEffect.h:2357
/branches/network64/src/orxonox/objects/quest/QuestEffect.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestEffect.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestEffect.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestEffect.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestEffect.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestEffect.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestEffect.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestEffect.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestEffect.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestEffect.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestEffect.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestEffect.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestEffect.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestEffect.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestEffect.h:2836-2989
/branches/network/src/orxonox/objects/quest/QuestEffect.h:2357
/branches/network64/src/orxonox/objects/quest/QuestEffect.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestEffect.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestEffect.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestEffect.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestEffect.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestEffect.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestEffect.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestEffect.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestEffect.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestEffect.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestHint.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestHint.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestHint.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestHint.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestHint.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestHint.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestHint.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestHint.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestHint.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestHint.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestHint.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestHint.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestHint.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestHint.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestHint.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestHint.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestHint.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestHint.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestHint.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestHint.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestHint.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestHint.cc:2836-2989
/branches/network/src/orxonox/objects/quest/QuestHint.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestHint.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestHint.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestHint.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestHint.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestHint.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestHint.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestHint.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestHint.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestHint.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestHint.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestHint.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestHint.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestHint.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestHint.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestHint.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestHint.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestHint.h:2357
/branches/network64/src/orxonox/objects/quest/QuestHint.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestHint.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestHint.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestHint.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestHint.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestHint.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestHint.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestHint.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestHint.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestHint.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestHint.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestHint.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestHint.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestHint.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestHint.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestHint.h:2836-2989
/branches/network/src/orxonox/objects/quest/QuestHint.h:2357
/branches/network64/src/orxonox/objects/quest/QuestHint.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestHint.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestHint.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestHint.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestHint.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestHint.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestHint.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestHint.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestHint.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestHint.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestHint.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestItem.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestItem.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestItem.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestItem.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestItem.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestItem.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestItem.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestItem.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestItem.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestItem.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestItem.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestItem.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestItem.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestItem.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestItem.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestItem.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestItem.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestItem.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestItem.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestItem.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestItem.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestItem.cc:2836-2989
/branches/network/src/orxonox/objects/quest/QuestItem.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestItem.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestItem.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestItem.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestItem.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestItem.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestItem.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestItem.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestItem.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestItem.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestItem.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestItem.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestItem.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestItem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestItem.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestItem.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestItem.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestItem.h:2357
/branches/network64/src/orxonox/objects/quest/QuestItem.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestItem.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestItem.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestItem.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestItem.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestItem.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestItem.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestItem.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestItem.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestItem.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestItem.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestItem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestItem.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestItem.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestItem.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestItem.h:2836-2989
/branches/network/src/orxonox/objects/quest/QuestItem.h:2357
/branches/network64/src/orxonox/objects/quest/QuestItem.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestItem.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestItem.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestItem.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestItem.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestItem.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestItem.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestItem.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestItem.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestItem.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestItem.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestManager.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestManager.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestManager.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestManager.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestManager.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestManager.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestManager.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestManager.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestManager.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestManager.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestManager.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestManager.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestManager.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestManager.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestManager.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestManager.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestManager.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestManager.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestManager.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestManager.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestManager.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestManager.cc:2836-2989
/branches/network/src/orxonox/objects/quest/QuestManager.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestManager.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestManager.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestManager.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestManager.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestManager.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestManager.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestManager.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestManager.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestManager.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestManager.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestManager.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/QuestManager.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestManager.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestManager.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestManager.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestManager.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestManager.h:2357
/branches/network64/src/orxonox/objects/quest/QuestManager.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestManager.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestManager.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestManager.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestManager.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestManager.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestManager.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestManager.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestManager.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestManager.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestManager.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestManager.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestManager.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestManager.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestManager.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/QuestManager.h:2836-2989
/branches/network/src/orxonox/objects/quest/QuestManager.h:2357
/branches/network64/src/orxonox/objects/quest/QuestManager.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestManager.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestManager.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestManager.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestManager.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestManager.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestManager.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestManager.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestManager.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestManager.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestManager.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/Rewardable.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/Rewardable.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/Rewardable.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Rewardable.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Rewardable.cc:2755-2825
/branches/network/src/orxonox/objects/quest/Rewardable.cc:2357
/branches/network64/src/orxonox/objects/quest/Rewardable.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/Rewardable.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/Rewardable.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Rewardable.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Rewardable.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/Rewardable.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Rewardable.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Rewardable.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.cc:2743-2891
/trunk/src/orxonox/objects/quest/Rewardable.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/Rewardable.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/Rewardable.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Rewardable.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Rewardable.cc:2755-2825
/branches/netp2/src/orxonox/objects/quest/Rewardable.cc:2836-2989
/branches/network/src/orxonox/objects/quest/Rewardable.cc:2357
/branches/network64/src/orxonox/objects/quest/Rewardable.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/Rewardable.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/Rewardable.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Rewardable.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Rewardable.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/Rewardable.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Rewardable.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Rewardable.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.cc:2743-2891
/trunk/src/orxonox/objects/quest/Rewardable.cc:2-2090
Property changes on: branches/netp3/src/orxonox/objects/quest/Rewardable.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/Rewardable.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.h:2663-2709
/branches/gui/src/orxonox/objects/quest/Rewardable.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Rewardable.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Rewardable.h:2755-2825
/branches/network/src/orxonox/objects/quest/Rewardable.h:2357
/branches/network64/src/orxonox/objects/quest/Rewardable.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/Rewardable.h:2118-2386
/branches/physics/src/orxonox/objects/quest/Rewardable.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Rewardable.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Rewardable.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/Rewardable.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Rewardable.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Rewardable.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.h:2743-2891
/trunk/src/orxonox/objects/quest/Rewardable.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/Rewardable.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.h:2663-2709
/branches/gui/src/orxonox/objects/quest/Rewardable.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Rewardable.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Rewardable.h:2755-2825
/branches/netp2/src/orxonox/objects/quest/Rewardable.h:2836-2989
/branches/network/src/orxonox/objects/quest/Rewardable.h:2357
/branches/network64/src/orxonox/objects/quest/Rewardable.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/Rewardable.h:2118-2386
/branches/physics/src/orxonox/objects/quest/Rewardable.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Rewardable.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Rewardable.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/Rewardable.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Rewardable.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Rewardable.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.h:2743-2891
/trunk/src/orxonox/objects/quest/Rewardable.h:2-2090
Property changes on: branches/netp3/src/orxonox/objects/weaponSystem/WeaponSystem.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/WeaponSystem.cc:1803-1809
/branches/core3/src/orxonox/objects/WeaponSystem.cc:1573-1740
/branches/gcc43/src/orxonox/objects/WeaponSystem.cc:1581
/branches/gui/src/orxonox/objects/WeaponSystem.cc:1636-1724
/branches/gui/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2796-2895
/branches/input/src/orxonox/objects/WeaponSystem.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2755-2825
/branches/network/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2357
/branches/network64/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/WeaponSystem.cc:1912-2086,2101
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2437-2458
/branches/pickups/src/orxonox/objects/WeaponSystem.cc:1927-2087
/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/WeaponSystem.cc:1895-2089
/branches/questsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/WeaponSystem.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/WeaponSystem.cc:1926-2048
/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2743-2891
+ /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/WeaponSystem.cc:1803-1809
/branches/core3/src/orxonox/objects/WeaponSystem.cc:1573-1740
/branches/gcc43/src/orxonox/objects/WeaponSystem.cc:1581
/branches/gui/src/orxonox/objects/WeaponSystem.cc:1636-1724
/branches/gui/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2796-2895
/branches/input/src/orxonox/objects/WeaponSystem.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2755-2825
/branches/netp2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2836-2989
/branches/network/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2357
/branches/network64/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/WeaponSystem.cc:1912-2086,2101
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2437-2458
/branches/pickups/src/orxonox/objects/WeaponSystem.cc:1927-2087
/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/WeaponSystem.cc:1895-2089
/branches/questsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/WeaponSystem.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/WeaponSystem.cc:1926-2048
/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2743-2891
Property changes on: branches/netp3/src/orxonox/objects/weaponSystem/WeaponSystem.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.h:2663-2709
/branches/gui/src/orxonox/objects/weaponSystem/WeaponSystem.h:2796-2895
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.h:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/WeaponSystem.h:2755-2825
/branches/network/src/orxonox/objects/weaponSystem/WeaponSystem.h:2357
/branches/network64/src/orxonox/objects/weaponSystem/WeaponSystem.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/weaponSystem/WeaponSystem.h:2111-2170
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/WeaponSystem.h:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.h:2437-2458
/branches/pickups/src/orxonox/objects/weaponSystem/WeaponSystem.h:2128
/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2260
/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h:2777-2906
/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.h:2743-2891
+ /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.h:2663-2709
/branches/gui/src/orxonox/objects/weaponSystem/WeaponSystem.h:2796-2895
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.h:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/WeaponSystem.h:2755-2825
/branches/netp2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2836-2989
/branches/network/src/orxonox/objects/weaponSystem/WeaponSystem.h:2357
/branches/network64/src/orxonox/objects/weaponSystem/WeaponSystem.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/weaponSystem/WeaponSystem.h:2111-2170
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/WeaponSystem.h:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.h:2437-2458
/branches/pickups/src/orxonox/objects/weaponSystem/WeaponSystem.h:2128
/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2260
/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h:2777-2906
/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.h:2743-2891
Property changes on: branches/netp3/src/orxonox/objects/worldentities/Backlight.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/Backlight.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Backlight.cc:1803-1809
/branches/core3/src/orxonox/objects/Backlight.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Backlight.cc:1581
/branches/gui/src/orxonox/objects/Backlight.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Backlight.cc:2796-2895
/branches/input/src/orxonox/objects/Backlight.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Backlight.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/Backlight.cc:2357
/branches/network64/src/orxonox/objects/worldentities/Backlight.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Backlight.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Backlight.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Backlight.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Backlight.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Backlight.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Backlight.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/Backlight.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/Backlight.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Backlight.cc:1803-1809
/branches/core3/src/orxonox/objects/Backlight.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Backlight.cc:1581
/branches/gui/src/orxonox/objects/Backlight.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Backlight.cc:2796-2895
/branches/input/src/orxonox/objects/Backlight.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Backlight.cc:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/Backlight.cc:2836-2989
/branches/network/src/orxonox/objects/worldentities/Backlight.cc:2357
/branches/network64/src/orxonox/objects/worldentities/Backlight.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Backlight.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Backlight.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Backlight.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Backlight.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Backlight.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Backlight.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/Backlight.cc:2-2086
Property changes on: branches/netp3/src/orxonox/objects/worldentities/Backlight.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/Backlight.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Backlight.h:1803-1809
/branches/core3/src/orxonox/objects/Backlight.h:1573-1740
/branches/gcc43/src/orxonox/objects/Backlight.h:1581
/branches/gui/src/orxonox/objects/Backlight.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Backlight.h:2796-2895
/branches/input/src/orxonox/objects/Backlight.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Backlight.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/Backlight.h:2357
/branches/network64/src/orxonox/objects/worldentities/Backlight.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Backlight.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Backlight.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Backlight.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Backlight.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Backlight.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Backlight.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Backlight.h:2743-2891
/trunk/src/orxonox/objects/worldentities/Backlight.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/Backlight.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Backlight.h:1803-1809
/branches/core3/src/orxonox/objects/Backlight.h:1573-1740
/branches/gcc43/src/orxonox/objects/Backlight.h:1581
/branches/gui/src/orxonox/objects/Backlight.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Backlight.h:2796-2895
/branches/input/src/orxonox/objects/Backlight.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Backlight.h:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/Backlight.h:2836-2989
/branches/network/src/orxonox/objects/worldentities/Backlight.h:2357
/branches/network64/src/orxonox/objects/worldentities/Backlight.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Backlight.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Backlight.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Backlight.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Backlight.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Backlight.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Backlight.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Backlight.h:2743-2891
/trunk/src/orxonox/objects/worldentities/Backlight.h:2-2086
Property changes on: branches/netp3/src/orxonox/objects/worldentities/Camera.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/Camera.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Camera.cc:1803-1809
/branches/core3/src/orxonox/objects/Camera.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Camera.cc:1581
/branches/gui/src/orxonox/objects/Camera.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Camera.cc:2796-2895
/branches/input/src/orxonox/objects/Camera.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Camera.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/Camera.cc:2357
/branches/network64/src/orxonox/objects/worldentities/Camera.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Camera.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Camera.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Camera.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Camera.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Camera.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Camera.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Camera.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Camera.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Camera.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/Camera.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/Camera.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Camera.cc:1803-1809
/branches/core3/src/orxonox/objects/Camera.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Camera.cc:1581
/branches/gui/src/orxonox/objects/Camera.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Camera.cc:2796-2895
/branches/input/src/orxonox/objects/Camera.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Camera.cc:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/Camera.cc:2836-2989
/branches/network/src/orxonox/objects/worldentities/Camera.cc:2357
/branches/network64/src/orxonox/objects/worldentities/Camera.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Camera.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Camera.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Camera.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Camera.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Camera.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Camera.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Camera.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Camera.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Camera.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/Camera.cc:2-2086
Property changes on: branches/netp3/src/orxonox/objects/worldentities/Camera.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/Camera.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Camera.h:1803-1809
/branches/core3/src/orxonox/objects/Camera.h:1573-1740
/branches/gcc43/src/orxonox/objects/Camera.h:1581
/branches/gui/src/orxonox/objects/Camera.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Camera.h:2796-2895
/branches/input/src/orxonox/objects/Camera.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Camera.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/Camera.h:2357
/branches/network64/src/orxonox/objects/worldentities/Camera.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Camera.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Camera.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Camera.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Camera.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Camera.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Camera.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Camera.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Camera.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Camera.h:2743-2891
/trunk/src/orxonox/objects/worldentities/Camera.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/Camera.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Camera.h:1803-1809
/branches/core3/src/orxonox/objects/Camera.h:1573-1740
/branches/gcc43/src/orxonox/objects/Camera.h:1581
/branches/gui/src/orxonox/objects/Camera.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Camera.h:2796-2895
/branches/input/src/orxonox/objects/Camera.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Camera.h:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/Camera.h:2836-2989
/branches/network/src/orxonox/objects/worldentities/Camera.h:2357
/branches/network64/src/orxonox/objects/worldentities/Camera.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Camera.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Camera.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Camera.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Camera.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Camera.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Camera.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Camera.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Camera.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Camera.h:2743-2891
/trunk/src/orxonox/objects/worldentities/Camera.h:2-2086
Modified: branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.cc
===================================================================
--- branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -65,14 +65,14 @@
this->bMouseLook_ = false;
this->mouseLookSpeed_ = 200;
- this->server_position_ = Vector3::ZERO;
- this->client_position_ = Vector3::ZERO;
- this->server_linear_velocity_ = Vector3::ZERO;
- this->client_linear_velocity_ = Vector3::ZERO;
- this->server_orientation_ = Quaternion::IDENTITY;
- this->client_orientation_ = Quaternion::IDENTITY;
- this->server_angular_velocity_ = Vector3::ZERO;
- this->client_angular_velocity_ = Vector3::ZERO;
+ this->common_position_ = Vector3::ZERO;
+// this->client_position_ = Vector3::ZERO;
+ this->common_linear_velocity_ = Vector3::ZERO;
+// this->client_linear_velocity_ = Vector3::ZERO;
+ this->common_orientation_ = Quaternion::IDENTITY;
+// this->client_orientation_ = Quaternion::IDENTITY;
+ this->common_angular_velocity_ = Vector3::ZERO;
+// this->client_angular_velocity_ = Vector3::ZERO;
this->setConfigValues();
@@ -325,20 +325,20 @@
// Check whether Bullet doesn't do the physics for us
if (!this->isDynamic())
{
- if (GameMode::isMaster())
- {
- this->server_position_ = this->getPosition();
- this->server_orientation_ = this->getOrientation();
- this->server_linear_velocity_ = this->getVelocity();
- this->server_angular_velocity_ = this->getAngularVelocity();
- }
- else if (this->bHasLocalController_)
- {
- this->client_position_ = this->getPosition();
- this->client_orientation_ = this->getOrientation();
- this->client_linear_velocity_ = this->getVelocity();
- this->client_angular_velocity_ = this->getAngularVelocity();
- }
+// if (GameMode::isMaster())
+// {
+ this->common_position_ = this->getPosition();
+ this->common_orientation_ = this->getOrientation();
+ this->common_linear_velocity_ = this->getVelocity();
+ this->common_angular_velocity_ = this->getAngularVelocity();
+// }
+// else if (this->bHasLocalController_)
+// {
+// this->client_position_ = this->getPosition();
+// this->client_orientation_ = this->getOrientation();
+// this->client_linear_velocity_ = this->getVelocity();
+// this->client_angular_velocity_ = this->getAngularVelocity();
+// }
}
}
}
@@ -348,56 +348,61 @@
registerVariable(this->cameraPositionTemplate_, variableDirection::toclient);
registerVariable(this->hudtemplate_, variableDirection::toclient);
- registerVariable(this->server_position_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerPosition));
- registerVariable(this->server_linear_velocity_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerLinearVelocity));
- registerVariable(this->server_orientation_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerOrientation));
- registerVariable(this->server_angular_velocity_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerAngularVelocity));
+// registerVariable(this->server_position_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerPosition));
+// registerVariable(this->server_linear_velocity_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerLinearVelocity));
+// registerVariable(this->server_orientation_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerOrientation));
+// registerVariable(this->server_angular_velocity_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerAngularVelocity));
+//
+// registerVariable(this->server_overwrite_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processOverwrite));
+// registerVariable(this->client_overwrite_, variableDirection::toserver);
+//
+// registerVariable(this->client_position_, variableDirection::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientPosition));
+// registerVariable(this->client_linear_velocity_, variableDirection::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientLinearVelocity));
+// registerVariable(this->client_orientation_, variableDirection::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientOrientation));
+// registerVariable(this->client_angular_velocity_, variableDirection::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientAngularVelocity));
+
+ registerVariable(this->common_position_, variableDirection::serverMaster, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerPosition), true);
+ registerVariable(this->common_linear_velocity_, variableDirection::serverMaster, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerLinearVelocity), true);
+ registerVariable(this->common_orientation_, variableDirection::serverMaster, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerOrientation), true);
+ registerVariable(this->common_angular_velocity_, variableDirection::serverMaster, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerAngularVelocity), true);
- registerVariable(this->server_overwrite_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processOverwrite));
- registerVariable(this->client_overwrite_, variableDirection::toserver);
-
- registerVariable(this->client_position_, variableDirection::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientPosition));
- registerVariable(this->client_linear_velocity_, variableDirection::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientLinearVelocity));
- registerVariable(this->client_orientation_, variableDirection::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientOrientation));
- registerVariable(this->client_angular_velocity_, variableDirection::toserver, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientAngularVelocity));
-
registerVariable(this->playerID_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedplayerID));
}
void ControllableEntity::processServerPosition()
{
if (!this->bHasLocalController_)
- MobileEntity::setPosition(this->server_position_);
+ MobileEntity::setPosition(this->common_position_);
}
void ControllableEntity::processServerLinearVelocity()
{
if (!this->bHasLocalController_)
- MobileEntity::setVelocity(this->server_linear_velocity_);
+ MobileEntity::setVelocity(this->common_linear_velocity_);
}
void ControllableEntity::processServerOrientation()
{
if (!this->bHasLocalController_)
- MobileEntity::setOrientation(this->server_orientation_);
+ MobileEntity::setOrientation(this->common_orientation_);
}
void ControllableEntity::processServerAngularVelocity()
{
if (!this->bHasLocalController_)
- MobileEntity::setAngularVelocity(this->server_angular_velocity_);
+ MobileEntity::setAngularVelocity(this->common_angular_velocity_);
}
void ControllableEntity::processOverwrite()
{
if (this->bHasLocalController_)
{
- this->setPosition(this->server_position_);
- this->setOrientation(this->server_orientation_);
- this->setVelocity(this->server_linear_velocity_);
- this->setAngularVelocity(this->server_angular_velocity_);
+// this->setPosition(this->server_position_);
+// this->setOrientation(this->server_orientation_);
+// this->setVelocity(this->server_linear_velocity_);
+// this->setAngularVelocity(this->server_angular_velocity_);
- this->client_overwrite_ = this->server_overwrite_;
+// this->client_overwrite_ = this->server_overwrite_;
}
}
@@ -405,8 +410,8 @@
{
if (this->server_overwrite_ == this->client_overwrite_)
{
- MobileEntity::setPosition(this->client_position_);
- this->server_position_ = this->getPosition();
+// MobileEntity::setPosition(this->client_position_);
+// this->server_position_ = this->getPosition();
}
}
@@ -414,8 +419,8 @@
{
if (this->server_overwrite_ == this->client_overwrite_)
{
- MobileEntity::setVelocity(this->client_linear_velocity_);
- this->server_linear_velocity_ = this->getVelocity();
+// MobileEntity::setVelocity(this->client_linear_velocity_);
+// this->server_linear_velocity_ = this->getVelocity();
}
}
@@ -423,8 +428,8 @@
{
if (this->server_overwrite_ == this->client_overwrite_)
{
- MobileEntity::setOrientation(this->client_orientation_);
- this->server_orientation_ = this->getOrientation();
+// MobileEntity::setOrientation(this->client_orientation_);
+// this->server_orientation_ = this->getOrientation();
}
}
@@ -432,87 +437,87 @@
{
if (this->server_overwrite_ == this->client_overwrite_)
{
- MobileEntity::setAngularVelocity(this->client_angular_velocity_);
- this->server_angular_velocity_ = this->getAngularVelocity();
+// MobileEntity::setAngularVelocity(this->client_angular_velocity_);
+// this->server_angular_velocity_ = this->getAngularVelocity();
}
}
void ControllableEntity::setPosition(const Vector3& position)
{
- if (GameMode::isMaster())
- {
+// if (GameMode::isMaster())
+// {
MobileEntity::setPosition(position);
- this->server_position_ = this->getPosition();
- ++this->server_overwrite_;
- }
- else if (this->bHasLocalController_)
- {
- MobileEntity::setPosition(position);
- this->client_position_ = this->getPosition();
- }
+ this->common_position_ = this->getPosition();
+// ++this->server_overwrite_;
+// }
+// else if (this->bHasLocalController_)
+// {
+// MobileEntity::setPosition(position);
+// this->client_position_ = this->getPosition();
+// }
}
void ControllableEntity::setOrientation(const Quaternion& orientation)
{
- if (GameMode::isMaster())
- {
+// if (GameMode::isMaster())
+// {
MobileEntity::setOrientation(orientation);
- this->server_orientation_ = this->getOrientation();
- ++this->server_overwrite_;
- }
- else if (this->bHasLocalController_)
- {
- MobileEntity::setOrientation(orientation);
- this->client_orientation_ = this->getOrientation();
- }
+ this->common_orientation_ = this->getOrientation();
+// ++this->server_overwrite_;
+// }
+// else if (this->bHasLocalController_)
+// {
+// MobileEntity::setOrientation(orientation);
+// this->client_orientation_ = this->getOrientation();
+// }
}
void ControllableEntity::setVelocity(const Vector3& velocity)
{
- if (GameMode::isMaster())
- {
+// if (GameMode::isMaster())
+// {
MobileEntity::setVelocity(velocity);
- this->server_linear_velocity_ = this->getVelocity();
- ++this->server_overwrite_;
- }
- else if (this->bHasLocalController_)
- {
- MobileEntity::setVelocity(velocity);
- this->client_linear_velocity_ = this->getVelocity();
- }
+ this->common_linear_velocity_ = this->getVelocity();
+// ++this->server_overwrite_;
+// }
+// else if (this->bHasLocalController_)
+// {
+// MobileEntity::setVelocity(velocity);
+// this->client_linear_velocity_ = this->getVelocity();
+// }
}
void ControllableEntity::setAngularVelocity(const Vector3& velocity)
{
- if (GameMode::isMaster())
- {
+// if (GameMode::isMaster())
+// {
MobileEntity::setAngularVelocity(velocity);
- this->server_angular_velocity_ = this->getAngularVelocity();
- ++this->server_overwrite_;
- }
- else if (this->bHasLocalController_)
- {
- MobileEntity::setAngularVelocity(velocity);
- this->client_angular_velocity_ = this->getAngularVelocity();
- }
+ this->common_angular_velocity_ = this->getAngularVelocity();
+// ++this->server_overwrite_;
+// }
+// else if (this->bHasLocalController_)
+// {
+// MobileEntity::setAngularVelocity(velocity);
+// this->client_angular_velocity_ = this->getAngularVelocity();
+// }
}
void ControllableEntity::setWorldTransform(const btTransform& worldTrans)
{
MobileEntity::setWorldTransform(worldTrans);
- if (GameMode::isMaster())
- {
- this->server_position_ = this->getPosition();
- this->server_orientation_ = this->getOrientation();
- this->server_linear_velocity_ = this->getVelocity();
- this->server_angular_velocity_ = this->getAngularVelocity();
- }
- else if (this->bHasLocalController_)
- {
- this->client_position_ = this->getPosition();
- this->client_orientation_ = this->getOrientation();
- this->client_linear_velocity_ = this->getVelocity();
- this->client_angular_velocity_ = this->getAngularVelocity();
- }
+// if (GameMode::isMaster())
+// {
+ this->common_position_ = this->getPosition();
+ this->common_orientation_ = this->getOrientation();
+ this->common_linear_velocity_ = this->getVelocity();
+ this->common_angular_velocity_ = this->getAngularVelocity();
+// }
+// else if (this->bHasLocalController_)
+// {
+// this->client_position_ = this->getPosition();
+// this->client_orientation_ = this->getOrientation();
+// this->client_linear_velocity_ = this->getVelocity();
+// this->client_angular_velocity_ = this->getAngularVelocity();
+// }
}
}
Modified: branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h
===================================================================
--- branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -163,14 +163,18 @@
bool bHasHumanController_;
bool bDestroyWhenPlayerLeft_;
- Vector3 server_position_;
- Vector3 client_position_;
- Vector3 server_linear_velocity_;
- Vector3 client_linear_velocity_;
- Quaternion server_orientation_;
- Quaternion client_orientation_;
- Vector3 server_angular_velocity_;
- Vector3 client_angular_velocity_;
+// Vector3 server_position_;
+ Vector3 common_position_;
+// Vector3 client_position_;
+// Vector3 server_linear_velocity_;
+// Vector3 client_linear_velocity_;
+ Vector3 common_linear_velocity_;
+// Quaternion server_orientation_;
+// Quaternion client_orientation_;
+ Quaternion common_orientation_;
+// Vector3 server_angular_velocity_;
+// Vector3 client_angular_velocity_;
+ Vector3 common_angular_velocity_;
PlayerInfo* player_;
unsigned int playerID_;
Property changes on: branches/netp3/src/orxonox/objects/worldentities/MobileEntity.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.cc:2663-2709
/branches/gui/src/orxonox/objects/worldentities/MobileEntity.cc:2796-2895
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.cc:2755-2825
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc:2655-2661
/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc:2777-2906
/branches/weaponsystem/src/orxonox/objects/worldentities/MobileEntity.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/MobileEntity.cc:2-2661
+ /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.cc:2663-2709
/branches/gui/src/orxonox/objects/worldentities/MobileEntity.cc:2796-2895
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.cc:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/MobileEntity.cc:2836-2989
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc:2655-2661
/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc:2777-2906
/branches/weaponsystem/src/orxonox/objects/worldentities/MobileEntity.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/MobileEntity.cc:2-2661
Modified: branches/netp3/src/orxonox/objects/worldentities/MobileEntity.h
===================================================================
--- branches/netp3/src/orxonox/objects/worldentities/MobileEntity.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/objects/worldentities/MobileEntity.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -60,7 +60,7 @@
inline void setAngularVelocity(float x, float y, float z)
{ this->setAngularVelocity(Vector3(x, y, z)); }
inline const Vector3& getAngularVelocity() const
- { return this->linearAcceleration_; }
+ { return this->angularVelocity_; }
void setAcceleration(const Vector3& acceleration);
inline void setAcceleration(float x, float y, float z)
Property changes on: branches/netp3/src/orxonox/objects/worldentities/MobileEntity.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.h:2663-2709
/branches/gui/src/orxonox/objects/worldentities/MobileEntity.h:2796-2895
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.h:2755-2825
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h:2655-2661
/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.h:2777-2906
/branches/weaponsystem/src/orxonox/objects/worldentities/MobileEntity.h:2743-2891
/trunk/src/orxonox/objects/worldentities/MobileEntity.h:2-2661
+ /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.h:2663-2709
/branches/gui/src/orxonox/objects/worldentities/MobileEntity.h:2796-2895
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.h:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/MobileEntity.h:2836-2989
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h:2655-2661
/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.h:2777-2906
/branches/weaponsystem/src/orxonox/objects/worldentities/MobileEntity.h:2743-2891
/trunk/src/orxonox/objects/worldentities/MobileEntity.h:2-2661
Property changes on: branches/netp3/src/orxonox/objects/worldentities/ParticleSpawner.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/ParticleSpawner.cc:1803-1809
/branches/core3/src/orxonox/objects/ParticleSpawner.cc:1573-1740
/branches/gcc43/src/orxonox/objects/ParticleSpawner.cc:1581
/branches/gui/src/orxonox/objects/ParticleSpawner.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/ParticleSpawner.cc:2796-2895
/branches/input/src/orxonox/objects/ParticleSpawner.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/ParticleSpawner.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/ParticleSpawner.cc:2357
/branches/network64/src/orxonox/objects/worldentities/ParticleSpawner.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/ParticleSpawner.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/ParticleSpawner.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/ParticleSpawner.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/ParticleSpawner.cc:1803-1809
/branches/core3/src/orxonox/objects/ParticleSpawner.cc:1573-1740
/branches/gcc43/src/orxonox/objects/ParticleSpawner.cc:1581
/branches/gui/src/orxonox/objects/ParticleSpawner.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/ParticleSpawner.cc:2796-2895
/branches/input/src/orxonox/objects/ParticleSpawner.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/ParticleSpawner.cc:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2836-2989
/branches/network/src/orxonox/objects/worldentities/ParticleSpawner.cc:2357
/branches/network64/src/orxonox/objects/worldentities/ParticleSpawner.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/ParticleSpawner.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/ParticleSpawner.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/ParticleSpawner.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc:2-2086
Property changes on: branches/netp3/src/orxonox/objects/worldentities/ParticleSpawner.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/ParticleSpawner.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.h:2663-2709
/branches/ceguilua/src/orxonox/objects/ParticleSpawner.h:1803-1809
/branches/core3/src/orxonox/objects/ParticleSpawner.h:1573-1740
/branches/gcc43/src/orxonox/objects/ParticleSpawner.h:1581
/branches/gui/src/orxonox/objects/ParticleSpawner.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/ParticleSpawner.h:2796-2895
/branches/input/src/orxonox/objects/ParticleSpawner.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/ParticleSpawner.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/ParticleSpawner.h:2357
/branches/network64/src/orxonox/objects/worldentities/ParticleSpawner.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleSpawner.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/ParticleSpawner.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.h:2777-2906
/branches/script_trigger/src/orxonox/objects/ParticleSpawner.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/ParticleSpawner.h:2743-2891
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/ParticleSpawner.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.h:2663-2709
/branches/ceguilua/src/orxonox/objects/ParticleSpawner.h:1803-1809
/branches/core3/src/orxonox/objects/ParticleSpawner.h:1573-1740
/branches/gcc43/src/orxonox/objects/ParticleSpawner.h:1581
/branches/gui/src/orxonox/objects/ParticleSpawner.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/ParticleSpawner.h:2796-2895
/branches/input/src/orxonox/objects/ParticleSpawner.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/ParticleSpawner.h:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/ParticleSpawner.h:2836-2989
/branches/network/src/orxonox/objects/worldentities/ParticleSpawner.h:2357
/branches/network64/src/orxonox/objects/worldentities/ParticleSpawner.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleSpawner.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/ParticleSpawner.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.h:2777-2906
/branches/script_trigger/src/orxonox/objects/ParticleSpawner.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/ParticleSpawner.h:2743-2891
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h:2-2086
Property changes on: branches/netp3/src/orxonox/objects/worldentities/StaticEntity.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/StaticEntity.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.cc:1803-1809
/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.cc:1573-1740
/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.cc:1581
/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/StaticEntity.cc:2796-2895
/branches/input/src/orxonox/objects/worldentities/PositionableEntity.cc:1630-1637
/branches/miniprojects/src/orxonox/objects/worldentities/StaticEntity.cc:2755-2825
/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc:1912-2086,2101
/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.cc:1913-2056
/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.cc:1927-2087
/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.cc:2655-2661
/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.cc:1895-2089
/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.cc:1926-2095
/branches/weaponsystem/src/orxonox/objects/worldentities/StaticEntity.cc:2743-2891
+ /branches/buildsystem3/src/orxonox/objects/worldentities/StaticEntity.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.cc:1803-1809
/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.cc:1573-1740
/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.cc:1581
/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/StaticEntity.cc:2796-2895
/branches/input/src/orxonox/objects/worldentities/PositionableEntity.cc:1630-1637
/branches/miniprojects/src/orxonox/objects/worldentities/StaticEntity.cc:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/StaticEntity.cc:2836-2989
/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc:1912-2086,2101
/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.cc:1913-2056
/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.cc:1927-2087
/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.cc:2655-2661
/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.cc:1895-2089
/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.cc:1926-2095
/branches/weaponsystem/src/orxonox/objects/worldentities/StaticEntity.cc:2743-2891
Property changes on: branches/netp3/src/orxonox/objects/worldentities/StaticEntity.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/StaticEntity.h:2663-2709
/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.h:1803-1809
/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.h:1573-1740
/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.h:1581
/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/StaticEntity.h:2796-2895
/branches/input/src/orxonox/objects/worldentities/PositionableEntity.h:1630-1637
/branches/miniprojects/src/orxonox/objects/worldentities/StaticEntity.h:2755-2825
/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h:1912-2086,2101
/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.h:1913-2056
/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.h:1927-2087
/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.h:2655-2661
/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.h:1895-2089
/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.h:2777-2906
/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.h:1926-2095
/branches/weaponsystem/src/orxonox/objects/worldentities/StaticEntity.h:2743-2891
+ /branches/buildsystem3/src/orxonox/objects/worldentities/StaticEntity.h:2663-2709
/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.h:1803-1809
/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.h:1573-1740
/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.h:1581
/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/StaticEntity.h:2796-2895
/branches/input/src/orxonox/objects/worldentities/PositionableEntity.h:1630-1637
/branches/miniprojects/src/orxonox/objects/worldentities/StaticEntity.h:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/StaticEntity.h:2836-2989
/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h:1912-2086,2101
/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.h:1913-2056
/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.h:1927-2087
/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.h:2655-2661
/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.h:1895-2089
/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.h:2777-2906
/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.h:1926-2095
/branches/weaponsystem/src/orxonox/objects/worldentities/StaticEntity.h:2743-2891
Modified: branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-05-19 19:35:10 UTC (rev 2990)
@@ -38,10 +38,13 @@
#include "objects/gametypes/Gametype.h"
#include "objects/worldentities/ParticleSpawner.h"
#include "objects/worldentities/ExplosionChunk.h"
+#include "network/NetworkFunction.h"
namespace orxonox
{
CreateFactory(Pawn);
+
+ registerMemberNetworkFunction( Pawn, doFire );
Pawn::Pawn(BaseObject* creator) : ControllableEntity(creator)
{
@@ -116,19 +119,20 @@
{
SUPER(Pawn, tick, dt);
- if (this->weaponSystem_)
- {
- if (this->fire_ & WeaponMode::fire)
- this->weaponSystem_->fire(WeaponMode::fire);
- if (this->fire_ & WeaponMode::altFire)
- this->weaponSystem_->fire(WeaponMode::altFire);
- if (this->fire_ & WeaponMode::altFire2)
- this->weaponSystem_->fire(WeaponMode::altFire2);
- }
- this->fire_ = this->firehack_;
- this->firehack_ = 0x0;
+// if (this->weaponSystem_)
+// {
+// if (this->fire_ & WeaponMode::fire)
+// this->weaponSystem_->fire(WeaponMode::fire);
+// if (this->fire_ & WeaponMode::altFire)
+// this->weaponSystem_->fire(WeaponMode::altFire);
+// if (this->fire_ & WeaponMode::altFire2)
+// this->weaponSystem_->fire(WeaponMode::altFire2);
+// }
+// this->fire_ = this->firehack_;
+// this->firehack_ = 0x0;
- if (this->health_ <= 0)
+ if (Core::isMaster())
+ if (this->health_ <= 0)
this->death();
}
@@ -253,8 +257,23 @@
void Pawn::fire(WeaponMode::Enum fireMode)
{
- this->firehack_ |= fireMode;
+ doFire(fireMode);
}
+
+ void Pawn::doFire(uint8_t fireMode)
+ {
+ if(Core::isMaster())
+ {
+ if (this->weaponSystem_)
+ this->weaponSystem_->fire((WeaponMode::Enum)fireMode);
+ }
+ else
+ {
+ callMemberNetworkFunction( Pawn, doFire, this->getObjectID(), 0, ((uint8_t)fireMode));
+ if (this->weaponSystem_)
+ this->weaponSystem_->fire((WeaponMode::Enum)fireMode);
+ }
+ }
void Pawn::postSpawn()
{
Modified: branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.h
===================================================================
--- branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -79,6 +79,7 @@
virtual void kill();
virtual void fire(WeaponMode::Enum fireMode);
+ virtual void doFire(uint8_t fireMode);
virtual void postSpawn();
void setWeaponSlot(WeaponSlot * wSlot);
Property changes on: branches/netp3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/DistanceTrigger.cc:1803-1809
/branches/core3/src/orxonox/objects/DistanceTrigger.cc:1573-1740
/branches/gcc43/src/orxonox/objects/DistanceTrigger.cc:1581
/branches/gui/src/orxonox/objects/DistanceTrigger.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2796-2895
/branches/input/src/orxonox/objects/DistanceTrigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/DistanceTrigger.cc:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/DistanceTrigger.cc:1803-1809
/branches/core3/src/orxonox/objects/DistanceTrigger.cc:1573-1740
/branches/gcc43/src/orxonox/objects/DistanceTrigger.cc:1581
/branches/gui/src/orxonox/objects/DistanceTrigger.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2796-2895
/branches/input/src/orxonox/objects/DistanceTrigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2836-2989
/branches/network/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/DistanceTrigger.cc:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2-2086
Property changes on: branches/netp3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2663-2709
/branches/ceguilua/src/orxonox/objects/DistanceTrigger.h:1803-1809
/branches/core3/src/orxonox/objects/DistanceTrigger.h:1573-1740
/branches/gcc43/src/orxonox/objects/DistanceTrigger.h:1581
/branches/gui/src/orxonox/objects/DistanceTrigger.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2796-2895
/branches/input/src/orxonox/objects/DistanceTrigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2777-2906
/branches/script_trigger/src/orxonox/objects/DistanceTrigger.h:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2663-2709
/branches/ceguilua/src/orxonox/objects/DistanceTrigger.h:1803-1809
/branches/core3/src/orxonox/objects/DistanceTrigger.h:1573-1740
/branches/gcc43/src/orxonox/objects/DistanceTrigger.h:1581
/branches/gui/src/orxonox/objects/DistanceTrigger.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2796-2895
/branches/input/src/orxonox/objects/DistanceTrigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2836-2989
/branches/network/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2777-2906
/branches/script_trigger/src/orxonox/objects/DistanceTrigger.h:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2-2086
Property changes on: branches/netp3/src/orxonox/objects/worldentities/triggers/Trigger.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Trigger.cc:1803-1809
/branches/core3/src/orxonox/objects/Trigger.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Trigger.cc:1581
/branches/gui/src/orxonox/objects/Trigger.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.cc:2796-2895
/branches/input/src/orxonox/objects/Trigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/Trigger.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/Trigger.cc:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/Trigger.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/Trigger.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Trigger.cc:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/Trigger.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Trigger.cc:1803-1809
/branches/core3/src/orxonox/objects/Trigger.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Trigger.cc:1581
/branches/gui/src/orxonox/objects/Trigger.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.cc:2796-2895
/branches/input/src/orxonox/objects/Trigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/Trigger.cc:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2836-2989
/branches/network/src/orxonox/objects/worldentities/triggers/Trigger.cc:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/Trigger.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/Trigger.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Trigger.cc:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/Trigger.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc:2-2086
Property changes on: branches/netp3/src/orxonox/objects/worldentities/triggers/Trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/Trigger.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Trigger.h:1803-1809
/branches/core3/src/orxonox/objects/Trigger.h:1573-1740
/branches/gcc43/src/orxonox/objects/Trigger.h:1581
/branches/gui/src/orxonox/objects/Trigger.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.h:2796-2895
/branches/input/src/orxonox/objects/Trigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/Trigger.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/Trigger.h:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/Trigger.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/Trigger.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Trigger.h:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/Trigger.h:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/Trigger.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Trigger.h:1803-1809
/branches/core3/src/orxonox/objects/Trigger.h:1573-1740
/branches/gcc43/src/orxonox/objects/Trigger.h:1581
/branches/gui/src/orxonox/objects/Trigger.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.h:2796-2895
/branches/input/src/orxonox/objects/Trigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/Trigger.h:2755-2825
/branches/netp2/src/orxonox/objects/worldentities/triggers/Trigger.h:2836-2989
/branches/network/src/orxonox/objects/worldentities/triggers/Trigger.h:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/Trigger.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/Trigger.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Trigger.h:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/Trigger.h:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h:2-2086
Property changes on: branches/netp3/src/tolua/all-5.0.lua
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/tolua/all-5.0.lua:2279-2401
/branches/ceguilua/src/tolua/lua/all.lua:1803-1809
/branches/core3/src/tolua/lua/all.lua:1573-1740
/branches/gcc43/src/tolua/lua/all.lua:1581
/branches/gui/src/tolua/all-5.0.lua:2796-2895
/branches/gui/src/tolua/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.0.lua:2755-2825
/branches/questsystem5/src/tolua/all-5.0.lua:2777-2906
/branches/weaponsystem/src/tolua/all-5.0.lua:2743-2891
+ /branches/buildsystem/src/tolua/all-5.0.lua:2279-2401
/branches/ceguilua/src/tolua/lua/all.lua:1803-1809
/branches/core3/src/tolua/lua/all.lua:1573-1740
/branches/gcc43/src/tolua/lua/all.lua:1581
/branches/gui/src/tolua/all-5.0.lua:2796-2895
/branches/gui/src/tolua/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.0.lua:2755-2825
/branches/netp2/src/tolua/all-5.0.lua:2836-2989
/branches/questsystem5/src/tolua/all-5.0.lua:2777-2906
/branches/weaponsystem/src/tolua/all-5.0.lua:2743-2891
Property changes on: branches/netp3/src/tolua/all-5.1.lua
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/tolua/all-5.1.lua:2279-2401
/branches/ceguilua/src/tolua/lua/all.lua:1803-1809
/branches/core3/src/tolua/lua/all.lua:1573-1740
/branches/gcc43/src/tolua/lua/all.lua:1581
/branches/gui/src/tolua/all-5.1.lua:2796-2895
/branches/gui/src/tolua/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.1.lua:2755-2825
/branches/questsystem5/src/tolua/all-5.1.lua:2777-2906
/branches/weaponsystem/src/tolua/all-5.1.lua:2743-2891
+ /branches/buildsystem/src/tolua/all-5.1.lua:2279-2401
/branches/ceguilua/src/tolua/lua/all.lua:1803-1809
/branches/core3/src/tolua/lua/all.lua:1573-1740
/branches/gcc43/src/tolua/lua/all.lua:1581
/branches/gui/src/tolua/all-5.1.lua:2796-2895
/branches/gui/src/tolua/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.1.lua:2755-2825
/branches/netp2/src/tolua/all-5.1.lua:2836-2989
/branches/questsystem5/src/tolua/all-5.1.lua:2777-2906
/branches/weaponsystem/src/tolua/all-5.1.lua:2743-2891
Property changes on: branches/netp3/src/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/util:1875-2277,2279-2401
/branches/buildsystem2/src/util:2507-2659
/branches/buildsystem3/src/util:2663-2709
/branches/ceguilua/src/util:1803-1809
/branches/core3/src/util:1573-1740,1743-2015
/branches/gcc43/src/util:1581
/branches/gui/src/util:1636-1724,2796-2895
/branches/input/src/util:1630-1637
/branches/lodfinal/src/util:2373-2412
/branches/miniprojects/src/util:2755-2825
/branches/network/src/util:2357
/branches/network64/src/util:2211-2356
/branches/objecthierarchy/src/util:2101,2111-2170
/branches/objecthierarchy2/src/util:2172-2480
/branches/overlay/src/util:2118-2386
/branches/physics/src/util:1913-2056,2108-2440
/branches/physics_merge/src/util:2437-2458
/branches/pickups/src/util:1927-2087,2128
/branches/pickups2/src/util:2108-2498
/branches/presentation/src/util:2370-2653,2655-2661
/branches/questsystem/src/util:1895-2089
/branches/questsystem2/src/util:2108-2260
/branches/questsystem5/src/util:2777-2906
/branches/script_trigger/src/util:1296-1954,1956
/branches/weapon/src/util:1926-2095
/branches/weapon2/src/util:2108-2489
/branches/weaponsystem/src/util:2743-2891
+ /branches/buildsystem/src/util:1875-2277,2279-2401
/branches/buildsystem2/src/util:2507-2659
/branches/buildsystem3/src/util:2663-2709
/branches/ceguilua/src/util:1803-1809
/branches/core3/src/util:1573-1740,1743-2015
/branches/gcc43/src/util:1581
/branches/gui/src/util:1636-1724,2796-2895
/branches/input/src/util:1630-1637
/branches/lodfinal/src/util:2373-2412
/branches/miniprojects/src/util:2755-2825
/branches/netp2/src/util:2836-2989
/branches/network/src/util:2357
/branches/network64/src/util:2211-2356
/branches/objecthierarchy/src/util:2101,2111-2170
/branches/objecthierarchy2/src/util:2172-2480
/branches/overlay/src/util:2118-2386
/branches/physics/src/util:1913-2056,2108-2440
/branches/physics_merge/src/util:2437-2458
/branches/pickups/src/util:1927-2087,2128
/branches/pickups2/src/util:2108-2498
/branches/presentation/src/util:2370-2653,2655-2661
/branches/questsystem/src/util:1895-2089
/branches/questsystem2/src/util:2108-2260
/branches/questsystem5/src/util:2777-2906
/branches/script_trigger/src/util:1296-1954,1956
/branches/weapon/src/util:1926-2095
/branches/weapon2/src/util:2108-2489
/branches/weaponsystem/src/util:2743-2891
Property changes on: branches/netp3/src/util/Exception.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/util/Exception.cc:1875-2277,2279-2401
/branches/buildsystem2/src/util/Exception.cc:2507-2659
/branches/buildsystem3/src/util/Exception.cc:2663-2709
/branches/ceguilua/src/util/Exception.cc:1803-1809
/branches/core3/src/core/Exception.cc:1573-1740
/branches/gcc43/src/core/Exception.cc:1581
/branches/gui/src/core/Exception.cc:1636-1637
/branches/gui/src/util/Exception.cc:2796-2895
/branches/input/src/core/Exception.cc:1630-1637
/branches/lodfinal/src/util/Exception.cc:2373-2412
/branches/miniprojects/src/util/Exception.cc:2755-2825
/branches/network/src/util/Exception.cc:2357
/branches/network64/src/util/Exception.cc:2211-2356
/branches/objecthierarchy/src/util/Exception.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/util/Exception.cc:2172-2480
/branches/overlay/src/util/Exception.cc:2118-2386
/branches/physics/src/util/Exception.cc:1913-2056,2108-2440
/branches/physics_merge/src/util/Exception.cc:2437-2458
/branches/pickups/src/util/Exception.cc:1927-2087,2128
/branches/pickups2/src/util/Exception.cc:2108-2498
/branches/presentation/src/util/Exception.cc:2370-2653,2655-2661
/branches/questsystem/src/util/Exception.cc:1895-2089
/branches/questsystem2/src/util/Exception.cc:2108-2260
/branches/questsystem5/src/util/Exception.cc:2777-2906
/branches/weapon/src/util/Exception.cc:1926-2095
/branches/weapon2/src/util/Exception.cc:2108-2489
/branches/weaponsystem/src/util/Exception.cc:2743-2891
+ /branches/buildsystem/src/util/Exception.cc:1875-2277,2279-2401
/branches/buildsystem2/src/util/Exception.cc:2507-2659
/branches/buildsystem3/src/util/Exception.cc:2663-2709
/branches/ceguilua/src/util/Exception.cc:1803-1809
/branches/core3/src/core/Exception.cc:1573-1740
/branches/gcc43/src/core/Exception.cc:1581
/branches/gui/src/core/Exception.cc:1636-1637
/branches/gui/src/util/Exception.cc:2796-2895
/branches/input/src/core/Exception.cc:1630-1637
/branches/lodfinal/src/util/Exception.cc:2373-2412
/branches/miniprojects/src/util/Exception.cc:2755-2825
/branches/netp2/src/util/Exception.cc:2836-2989
/branches/network/src/util/Exception.cc:2357
/branches/network64/src/util/Exception.cc:2211-2356
/branches/objecthierarchy/src/util/Exception.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/util/Exception.cc:2172-2480
/branches/overlay/src/util/Exception.cc:2118-2386
/branches/physics/src/util/Exception.cc:1913-2056,2108-2440
/branches/physics_merge/src/util/Exception.cc:2437-2458
/branches/pickups/src/util/Exception.cc:1927-2087,2128
/branches/pickups2/src/util/Exception.cc:2108-2498
/branches/presentation/src/util/Exception.cc:2370-2653,2655-2661
/branches/questsystem/src/util/Exception.cc:1895-2089
/branches/questsystem2/src/util/Exception.cc:2108-2260
/branches/questsystem5/src/util/Exception.cc:2777-2906
/branches/weapon/src/util/Exception.cc:1926-2095
/branches/weapon2/src/util/Exception.cc:2108-2489
/branches/weaponsystem/src/util/Exception.cc:2743-2891
Property changes on: branches/netp3/src/util/Exception.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/util/Exception.h:1875-2277,2279-2401
/branches/buildsystem2/src/util/Exception.h:2507-2659
/branches/buildsystem3/src/util/Exception.h:2663-2709
/branches/ceguilua/src/util/Exception.h:1803-1809
/branches/core3/src/core/Exception.h:1573-1740
/branches/gcc43/src/core/Exception.h:1581
/branches/gui/src/core/Exception.h:1636-1637
/branches/gui/src/util/Exception.h:2796-2895
/branches/input/src/core/Exception.h:1630-1637
/branches/lodfinal/src/util/Exception.h:2373-2412
/branches/miniprojects/src/util/Exception.h:2755-2825
/branches/network/src/util/Exception.h:2357
/branches/network64/src/util/Exception.h:2211-2356
/branches/objecthierarchy/src/util/Exception.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/util/Exception.h:2172-2480
/branches/overlay/src/util/Exception.h:2118-2386
/branches/physics/src/util/Exception.h:1913-2056,2108-2440
/branches/physics_merge/src/util/Exception.h:2437-2458
/branches/pickups/src/util/Exception.h:1927-2087,2128
/branches/pickups2/src/util/Exception.h:2108-2498
/branches/presentation/src/util/Exception.h:2370-2653,2655-2661
/branches/questsystem/src/util/Exception.h:1895-2089
/branches/questsystem2/src/util/Exception.h:2108-2260
/branches/questsystem5/src/util/Exception.h:2777-2906
/branches/weapon/src/util/Exception.h:1926-2095
/branches/weapon2/src/util/Exception.h:2108-2489
/branches/weaponsystem/src/util/Exception.h:2743-2891
+ /branches/buildsystem/src/util/Exception.h:1875-2277,2279-2401
/branches/buildsystem2/src/util/Exception.h:2507-2659
/branches/buildsystem3/src/util/Exception.h:2663-2709
/branches/ceguilua/src/util/Exception.h:1803-1809
/branches/core3/src/core/Exception.h:1573-1740
/branches/gcc43/src/core/Exception.h:1581
/branches/gui/src/core/Exception.h:1636-1637
/branches/gui/src/util/Exception.h:2796-2895
/branches/input/src/core/Exception.h:1630-1637
/branches/lodfinal/src/util/Exception.h:2373-2412
/branches/miniprojects/src/util/Exception.h:2755-2825
/branches/netp2/src/util/Exception.h:2836-2989
/branches/network/src/util/Exception.h:2357
/branches/network64/src/util/Exception.h:2211-2356
/branches/objecthierarchy/src/util/Exception.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/util/Exception.h:2172-2480
/branches/overlay/src/util/Exception.h:2118-2386
/branches/physics/src/util/Exception.h:1913-2056,2108-2440
/branches/physics_merge/src/util/Exception.h:2437-2458
/branches/pickups/src/util/Exception.h:1927-2087,2128
/branches/pickups2/src/util/Exception.h:2108-2498
/branches/presentation/src/util/Exception.h:2370-2653,2655-2661
/branches/questsystem/src/util/Exception.h:1895-2089
/branches/questsystem2/src/util/Exception.h:2108-2260
/branches/questsystem5/src/util/Exception.h:2777-2906
/branches/weapon/src/util/Exception.h:1926-2095
/branches/weapon2/src/util/Exception.h:2108-2489
/branches/weaponsystem/src/util/Exception.h:2743-2891
Modified: branches/netp3/src/util/MultiType.h
===================================================================
--- branches/netp3/src/util/MultiType.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/util/MultiType.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -79,30 +79,30 @@
*/
enum MT_Type
{
- MT_null,
- MT_char,
- MT_uchar,
- MT_short,
- MT_ushort,
- MT_int,
- MT_uint,
- MT_long,
- MT_ulong,
- MT_longlong,
- MT_ulonglong,
- MT_float,
- MT_double,
- MT_longdouble,
- MT_bool,
- MT_void,
- MT_string,
- MT_vector2,
- MT_vector3,
- MT_vector4,
- MT_colourvalue,
- MT_quaternion,
- MT_radian,
- MT_degree
+ MT_null=0,
+ MT_char=1,
+ MT_uchar=2,
+ MT_short=3,
+ MT_ushort=4,
+ MT_int=5,
+ MT_uint=6,
+ MT_long=7,
+ MT_ulong=8,
+ MT_longlong=9,
+ MT_ulonglong=10,
+ MT_float=11,
+ MT_double=12,
+ MT_longdouble=13,
+ MT_bool=14,
+ MT_void=15,
+ MT_string=16,
+ MT_vector2=17,
+ MT_vector3=18,
+ MT_vector4=19,
+ MT_colourvalue=20,
+ MT_quaternion=21,
+ MT_radian=22,
+ MT_degree=23
};
/**
@@ -222,6 +222,10 @@
virtual operator orxonox::Degree() const = 0;
virtual void toString(std::ostream& outstream) const = 0;
+
+ virtual void importData( uint8_t*& mem )=0;
+ virtual void exportData( uint8_t*& mem ) const=0;
+ virtual uint8_t getSize() const=0;
MT_Type type_; //!< The type of the current value
bool bHasDefaultValue_; //!< True if the last conversion wasn't successful
@@ -319,6 +323,16 @@
/** @brief Returns true if the current type is T. */
template <typename T> inline bool isType() const { return false; } // Only works for specialized values - see below
std::string getTypename() const;
+
+ /** @brief Saves the value of the MT to a bytestream (pointed at by mem) and increases mem pointer by size of MT */
+ inline void exportData(uint8_t*& mem) const { assert(sizeof(MT_Type)<=8); *(uint8_t*)(mem) = this->getType(); mem+=sizeof(uint8_t); this->value_->exportData(mem); }
+ /** @brief Loads the value of the MT from a bytestream (pointed at by mem) and increases mem pointer by size of MT */
+ inline void importData(uint8_t*& mem) { assert(sizeof(MT_Type)<=8); this->setType(static_cast<MT_Type>(*(uint8_t*)mem)); mem+=sizeof(uint8_t); this->value_->importData(mem); }
+ /** @brief Saves the value of the MT to a bytestream and increases pointer to bytestream by size of MT */
+ inline uint8_t*& operator << (uint8_t*& mem) { importData(mem); return mem; }
+ /** @brief Loads the value of the MT to a bytestream and increases pointer to bytestream by size of MT */
+ inline void operator >> (uint8_t*& mem) const { exportData(mem); }
+ inline uint32_t getNetworkSize() const { assert(this->value_); return this->value_->getSize() + sizeof(uint8_t); }
/** @brief Checks whether the value is a default one. */
bool hasDefaultValue() const { return this->value_->hasDefaultValue(); }
Modified: branches/netp3/src/util/MultiTypeValue.h
===================================================================
--- branches/netp3/src/util/MultiTypeValue.h 2009-05-19 19:13:54 UTC (rev 2989)
+++ branches/netp3/src/util/MultiTypeValue.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -39,6 +39,8 @@
#include "UtilPrereqs.h"
#include "MathConvert.h"
#include "MultiType.h"
+#include "Serialise.h"
+#include <cassert>
namespace orxonox
{
@@ -146,9 +148,118 @@
/** @brief Puts the current value on the stream */
inline void toString(std::ostream& outstream) const { outstream << this->value_; }
+
+ /** @brief loads data from the bytestream (mem) into the MT and increases the bytestream pointer by the size of the data */
+ inline void importData( uint8_t*& mem ) { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
+ /** @brief saves data from the MT into the bytestream (mem) and increases the bytestream pointer by the size of the data */
+ inline void exportData( uint8_t*& mem ) const { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
+ /** @brief returns the size of the data that would be saved by exportData */
+ inline uint8_t getSize() const { return returnSize( this->value_ ); }
T value_; //!< The stored value
};
+
+ // Import / Export specialisation
+ // ColourValue
+ template <> inline void MT_Value<ColourValue>::importData( uint8_t*& mem )
+ {
+ loadAndIncrease( this->value_.r, mem );
+ loadAndIncrease( this->value_.g, mem );
+ loadAndIncrease( this->value_.b, mem );
+ loadAndIncrease( this->value_.a, mem );
+ }
+ template <> inline void MT_Value<ColourValue>::exportData( uint8_t*& mem ) const
+ {
+ saveAndIncrease( this->value_.r, mem );
+ saveAndIncrease( this->value_.g, mem );
+ saveAndIncrease( this->value_.b, mem );
+ saveAndIncrease( this->value_.a, mem );
+ }
+ template <> inline uint8_t MT_Value<ColourValue>::getSize() const
+ {
+ return 4*returnSize(this->value_.r);
+ }
+ // Ogre::Quaternion
+ template <> inline void MT_Value<Ogre::Quaternion>::importData( uint8_t*& mem )
+ {
+ loadAndIncrease( this->value_.x, mem );
+ loadAndIncrease( this->value_.y, mem );
+ loadAndIncrease( this->value_.z, mem );
+ loadAndIncrease( this->value_.w, mem );
+ }
+ template <> inline void MT_Value<Ogre::Quaternion>::exportData( uint8_t*& mem ) const
+ {
+ saveAndIncrease( this->value_.x, mem );
+ saveAndIncrease( this->value_.y, mem );
+ saveAndIncrease( this->value_.z, mem );
+ saveAndIncrease( this->value_.w, mem );
+ }template <> inline uint8_t MT_Value<Ogre::Quaternion>::getSize() const
+ {
+ return 4*returnSize(this->value_.x);
+ }
+ // Ogre::Vector2
+ template <> inline void MT_Value<Ogre::Vector2>::importData( uint8_t*& mem )
+ {
+ loadAndIncrease( this->value_.x, mem );
+ loadAndIncrease( this->value_.y, mem );
+ }
+ template <> inline void MT_Value<Ogre::Vector2>::exportData( uint8_t*& mem ) const
+ {
+ saveAndIncrease( this->value_.x, mem );
+ saveAndIncrease( this->value_.y, mem );
+ }
+ template <> inline uint8_t MT_Value<Ogre::Vector2>::getSize() const
+ {
+ return 2*returnSize(this->value_.x);
+ }
+ // Ogre::Vector3
+ template <> inline void MT_Value<Ogre::Vector3>::importData( uint8_t*& mem )
+ {
+ loadAndIncrease( this->value_.x, mem );
+ loadAndIncrease( this->value_.y, mem );
+ loadAndIncrease( this->value_.z, mem );
+ }
+ template <> inline void MT_Value<Ogre::Vector3>::exportData( uint8_t*& mem ) const
+ {
+ saveAndIncrease( this->value_.x, mem );
+ saveAndIncrease( this->value_.y, mem );
+ saveAndIncrease( this->value_.z, mem );
+ }
+ template <> inline uint8_t MT_Value<Ogre::Vector3>::getSize() const
+ {
+ return 3*returnSize(this->value_.x);
+ }
+ // Ogre::Vector4
+ template <> inline void MT_Value<Ogre::Vector4>::importData( uint8_t*& mem )
+ {
+ loadAndIncrease( this->value_.x, mem );
+ loadAndIncrease( this->value_.y, mem );
+ loadAndIncrease( this->value_.z, mem );
+ loadAndIncrease( this->value_.w, mem );
+ }
+ template <> inline void MT_Value<Ogre::Vector4>::exportData( uint8_t*& mem ) const
+ {
+ saveAndIncrease( this->value_.x, mem );
+ saveAndIncrease( this->value_.y, mem );
+ saveAndIncrease( this->value_.z, mem );
+ saveAndIncrease( this->value_.w, mem );
+ }
+ template <> inline uint8_t MT_Value<Ogre::Vector4>::getSize() const
+ {
+ return 4*returnSize(this->value_.x);
+ }
+ template <> inline void MT_Value<void*>::importData( uint8_t*& mem )
+ {
+ assert(0);
+ }
+ template <> inline void MT_Value<void*>::exportData( uint8_t*& mem ) const
+ {
+ assert(0);
+ }
+ template <> inline uint8_t MT_Value<void*>::getSize() const
+ {
+ assert(0); return 0;
+ }
}
#endif /* _MultiTypeValue_H__ */
Copied: branches/netp3/src/util/Serialise.h (from rev 2989, branches/netp2/src/util/Serialise.h)
===================================================================
--- branches/netp3/src/util/Serialise.h (rev 0)
+++ branches/netp3/src/util/Serialise.h 2009-05-19 19:35:10 UTC (rev 2990)
@@ -0,0 +1,477 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Functions to serialise most of the types/classed used in Orxonox
+*/
+
+#ifndef _Serialise_H__
+#define _Serialise_H__
+
+#include <cstring>
+#include "util/Math.h"
+
+namespace orxonox{
+
+// general template declaration
+
+ /** @brief returns the size of the variable in a datastream */
+ template <class T> inline uint32_t returnSize( const T& );
+ /** @brief loads the value of a variable out of the bytestream and increases the mem pointer */
+ template <class T> inline void loadAndIncrease( const T&, uint8_t*& );
+ /** @brief saves the value of a variable into the bytestream and increases the mem pointer */
+ template <class T> inline void saveAndIncrease( const T&, uint8_t*& );
+ /** @brief checks whether the variable of type T is the same as in the bytestream */
+ template <class T> inline bool checkEquality( const T&, uint8_t* );
+
+// =================== Template specialisation stuff =============
+
+// =========== bool
+
+ template <> inline uint32_t returnSize( const bool& variable )
+ {
+ return sizeof(uint8_t);
+ }
+
+ template <> inline void loadAndIncrease( const bool& variable, uint8_t*& mem )
+ {
+ *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const bool& variable, uint8_t*& mem )
+ {
+ *static_cast<uint8_t*>(mem) = *(uint8_t*)( &variable );
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const bool& variable, uint8_t* mem )
+ {
+ return *static_cast<uint8_t*>(mem) == *(uint8_t*)( &variable );
+ }
+
+// =========== char
+
+ template <> inline uint32_t returnSize( const char& variable )
+ {
+ return sizeof(uint8_t);
+ }
+
+ template <> inline void loadAndIncrease( const char& variable, uint8_t*& mem )
+ {
+ *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const char& variable, uint8_t*& mem )
+ {
+ *static_cast<uint8_t*>(mem) = *(uint8_t*)( &variable );
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const char& variable, uint8_t* mem )
+ {
+ return *static_cast<uint8_t*>(mem) == *(uint8_t*)( &variable );
+ }
+
+// =========== unsigned char
+
+ template <> inline uint32_t returnSize( const unsigned char& variable )
+ {
+ return sizeof(uint8_t);
+ }
+
+ template <> inline void loadAndIncrease( const unsigned char& variable, uint8_t*& mem )
+ {
+ *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const unsigned char& variable, uint8_t*& mem )
+ {
+ *static_cast<uint8_t*>(mem) = *(uint8_t*)( &variable );
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const unsigned char& variable, uint8_t* mem )
+ {
+ return *static_cast<uint8_t*>(mem) == *(uint8_t*)( &variable );
+ }
+
+// =========== short
+
+ template <> inline uint32_t returnSize( const short& variable )
+ {
+ return sizeof(int16_t);
+ }
+
+ template <> inline void loadAndIncrease( const short& variable, uint8_t*& mem )
+ {
+ *(short*)( &variable ) = *(int16_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const short& variable, uint8_t*& mem )
+ {
+ *(int16_t*)(mem) = variable;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const short& variable, uint8_t* mem )
+ {
+ return *(int16_t*)(mem) == static_cast<int16_t>(variable);
+ }
+
+// =========== unsigned short
+
+ template <> inline uint32_t returnSize( const unsigned short& variable )
+ {
+ return sizeof(uint16_t);
+ }
+
+ template <> inline void loadAndIncrease( const unsigned short& variable, uint8_t*& mem )
+ {
+ *(unsigned short*)( &variable ) = *(uint16_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const unsigned short& variable, uint8_t*& mem )
+ {
+ *(uint16_t*)(mem) = variable;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const unsigned short& variable, uint8_t* mem )
+ {
+ return *(uint16_t*)(mem) == variable;
+ }
+
+// =========== int
+
+ template <> inline uint32_t returnSize( const int& variable )
+ {
+ return sizeof(int32_t);
+ }
+
+ template <> inline void loadAndIncrease( const int& variable, uint8_t*& mem )
+ {
+ *(int *)( &variable ) = *(int32_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const int& variable, uint8_t*& mem )
+ {
+ *(int32_t*)(mem) = variable;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const int& variable, uint8_t* mem )
+ {
+ return *(int32_t*)(mem) == variable;
+ }
+
+// =========== unsigned int
+
+ template <> inline uint32_t returnSize( const unsigned int& variable )
+ {
+ return sizeof(uint32_t);
+ }
+
+ template <> inline void loadAndIncrease( const unsigned int& variable, uint8_t*& mem )
+ {
+ *(unsigned int*)( &variable ) = *(uint32_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const unsigned int& variable, uint8_t*& mem )
+ {
+ *(uint32_t*)(mem) = variable;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const unsigned int& variable, uint8_t* mem )
+ {
+ return *(uint32_t*)(mem) == variable;
+ }
+
+// =========== long
+
+ template <> inline uint32_t returnSize( const long& variable )
+ {
+ return sizeof(int32_t);
+ }
+
+ template <> inline void loadAndIncrease( const long& variable, uint8_t*& mem )
+ {
+ *(long*)( &variable ) = *(int32_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const long& variable, uint8_t*& mem )
+ {
+ *(int32_t*)(mem) = variable;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const long& variable, uint8_t* mem )
+ {
+ return *(int32_t*)(mem) == variable;
+ }
+
+// =========== unsigned long
+
+ template <> inline uint32_t returnSize( const unsigned long& variable )
+ {
+ return sizeof(uint32_t);
+ }
+
+ template <> inline void loadAndIncrease( const unsigned long& variable, uint8_t*& mem )
+ {
+ *(unsigned long*)( &variable ) = *(uint32_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const unsigned long& variable, uint8_t*& mem )
+ {
+ *(uint32_t*)(mem) = variable;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const unsigned long& variable, uint8_t* mem )
+ {
+ return *(uint32_t*)(mem) == variable;
+ }
+
+// =========== long long
+
+ template <> inline uint32_t returnSize( const long long& variable )
+ {
+ return sizeof(int64_t);
+ }
+
+ template <> inline void loadAndIncrease( const long long& variable, uint8_t*& mem )
+ {
+ *(long long*)( &variable ) = *(int64_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const long long& variable, uint8_t*& mem )
+ {
+ *(int64_t*)(mem) = variable;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const long long& variable, uint8_t* mem )
+ {
+ return *(int64_t*)(mem) == variable;
+ }
+
+// =========== unsigned long long
+
+ template <> inline uint32_t returnSize( const unsigned long long& variable )
+ {
+ return sizeof(uint64_t);
+ }
+
+ template <> inline void loadAndIncrease( const unsigned long long& variable, uint8_t*& mem )
+ {
+ *(unsigned long long*)( &variable ) = *(uint64_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const unsigned long long& variable, uint8_t*& mem )
+ {
+ *(uint64_t*)(mem) = variable;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const unsigned long long& variable, uint8_t* mem )
+ {
+ return *(uint64_t*)(mem) == variable;
+ }
+
+// =========== float
+
+ template <> inline uint32_t returnSize( const float& variable )
+ {
+ return sizeof(uint32_t);
+ }
+
+ template <> inline void loadAndIncrease( const float& variable, uint8_t*& mem )
+ {
+ *(uint32_t*)( &variable ) = *(uint32_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const float& variable, uint8_t*& mem )
+ {
+ *(uint32_t*)(mem) = *(uint32_t*)( &variable );
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const float& variable, uint8_t* mem )
+ {
+ return *(uint32_t*)(mem) == *(uint32_t*)( &variable );
+ }
+
+// =========== double
+
+ template <> inline uint32_t returnSize( const double& variable )
+ {
+ return sizeof(uint64_t);
+ }
+
+ template <> inline void loadAndIncrease( const double& variable, uint8_t*& mem )
+ {
+ *(uint64_t*)( &variable ) = *(uint64_t*)(mem);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const double& variable, uint8_t*& mem )
+ {
+ *(uint64_t*)(mem) = *(uint64_t*)( &variable );
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const double& variable, uint8_t* mem )
+ {
+ return *(uint64_t*)(mem) == *(uint64_t*)( &variable );
+ }
+
+// =========== long double
+
+ template <> inline uint32_t returnSize( const long double& variable )
+ {
+ return sizeof(uint64_t);
+ }
+
+ template <> inline void loadAndIncrease( const long double& variable, uint8_t*& mem )
+ {
+ double temp;
+ memcpy(&temp, mem, sizeof(uint64_t));
+ *(long double*)( &variable ) = static_cast<const long double>(temp);
+ mem += returnSize( variable );
+ }
+
+ template <> inline void saveAndIncrease( const long double& variable, uint8_t*& mem )
+ {
+ double temp = static_cast<double>(variable);
+ memcpy(mem, &temp, sizeof(uint64_t));
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const long double& variable, uint8_t* mem )
+ {
+ double temp = static_cast<double>(variable);
+ return memcmp(&temp, mem, sizeof(uint64_t))==0;
+ }
+
+// =========== string
+
+ template <> inline uint32_t returnSize( const std::string& variable )
+ {
+ return variable.length()+1;
+ }
+
+ template <> inline void saveAndIncrease( const std::string& variable, uint8_t*& mem )
+ {
+ memcpy(mem, variable.c_str(), variable.length()+1);
+ mem += variable.length()+1;
+ }
+
+ template <> inline void loadAndIncrease( const std::string& variable, uint8_t*& mem )
+ {
+ *(std::string*)( &variable ) = std::string((const char *)mem);
+ mem += variable.length()+1;
+ }
+
+ template <> inline bool checkEquality( const std::string& variable, uint8_t* mem )
+ {
+ return std::string((const char*)mem)==variable;
+ }
+
+// =========== Degree
+
+ template <> inline uint32_t returnSize( const Degree& variable )
+ {
+ return sizeof(Ogre::Real);
+ }
+
+ template <> inline void saveAndIncrease( const Degree& variable, uint8_t*& mem )
+ {
+ Ogre::Real r = variable.valueDegrees();
+ memcpy(mem, &r, returnSize( variable ));
+ mem += returnSize( variable );
+ }
+
+ template <> inline void loadAndIncrease( const Degree& variable, uint8_t*& mem )
+ {
+ Ogre::Real* r = (Ogre::Real*)mem;
+ (Degree&)variable = *r;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const Degree& variable, uint8_t* mem )
+ {
+ Ogre::Real* r = (Ogre::Real*)mem;
+ return variable==Degree(*r);
+ }
+
+// =========== Radian
+
+ template <> inline uint32_t returnSize( const Radian& variable )
+ {
+ return sizeof(Ogre::Real);
+ }
+
+ template <> inline void saveAndIncrease( const Radian& variable, uint8_t*& mem )
+ {
+ Ogre::Real r = variable.valueRadians();
+ memcpy(mem, &r, returnSize( variable ));
+ mem += returnSize( variable );
+ }
+
+ template <> inline void loadAndIncrease( const Radian& variable, uint8_t*& mem )
+ {
+ Ogre::Real* r = (Ogre::Real*)mem;
+ (Radian&)variable = *r;
+ mem += returnSize( variable );
+ }
+
+ template <> inline bool checkEquality( const Radian& variable, uint8_t* mem )
+ {
+ Ogre::Real* r = (Ogre::Real*)mem;
+ return variable==Degree(*r);
+ }
+
+
+}
+
+
+#endif
Property changes on: branches/netp3/src/util/SignalHandler.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/util/SignalHandler.cc:2507-2659
/branches/buildsystem3/src/util/SignalHandler.cc:2663-2709
/branches/ceguilua/src/orxonox/SignalHandler.cc:1803-1809
/branches/core3/src/orxonox/SignalHandler.cc:1573-1606
/branches/gcc43/src/orxonox/SignalHandler.cc:1581
/branches/gui/src/orxonox/SignalHandler.cc:1636-1724
/branches/gui/src/util/SignalHandler.cc:2796-2895
/branches/input/src/orxonox/SignalHandler.cc:1630-1637
/branches/lodfinal/src/util/SignalHandler.cc:2373-2412
/branches/miniprojects/src/util/SignalHandler.cc:2755-2825
/branches/network/src/util/SignalHandler.cc:2357
/branches/network64/src/util/SignalHandler.cc:2211-2356
/branches/objecthierarchy/src/util/SignalHandler.cc:2101,2111-2170
/branches/objecthierarchy2/src/util/SignalHandler.cc:2172-2480
/branches/overlay/src/util/SignalHandler.cc:2118-2386
/branches/physics/src/util/SignalHandler.cc:2108-2440
/branches/physics_merge/src/util/SignalHandler.cc:2437-2458
/branches/pickups2/src/util/SignalHandler.cc:2108-2498
/branches/presentation/src/util/SignalHandler.cc:2370-2653,2655-2661
/branches/questsystem2/src/util/SignalHandler.cc:2108-2260
/branches/questsystem5/src/util/SignalHandler.cc:2777-2906
/branches/script_trigger/src/orxonox/SignalHandler.cc:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.cc:2108-2489
/branches/weaponsystem/src/util/SignalHandler.cc:2743-2891
/trunk/src/util/SignalHandler.cc:2-2086
+ /branches/buildsystem2/src/util/SignalHandler.cc:2507-2659
/branches/buildsystem3/src/util/SignalHandler.cc:2663-2709
/branches/ceguilua/src/orxonox/SignalHandler.cc:1803-1809
/branches/core3/src/orxonox/SignalHandler.cc:1573-1606
/branches/gcc43/src/orxonox/SignalHandler.cc:1581
/branches/gui/src/orxonox/SignalHandler.cc:1636-1724
/branches/gui/src/util/SignalHandler.cc:2796-2895
/branches/input/src/orxonox/SignalHandler.cc:1630-1637
/branches/lodfinal/src/util/SignalHandler.cc:2373-2412
/branches/miniprojects/src/util/SignalHandler.cc:2755-2825
/branches/netp2/src/util/SignalHandler.cc:2836-2989
/branches/network/src/util/SignalHandler.cc:2357
/branches/network64/src/util/SignalHandler.cc:2211-2356
/branches/objecthierarchy/src/util/SignalHandler.cc:2101,2111-2170
/branches/objecthierarchy2/src/util/SignalHandler.cc:2172-2480
/branches/overlay/src/util/SignalHandler.cc:2118-2386
/branches/physics/src/util/SignalHandler.cc:2108-2440
/branches/physics_merge/src/util/SignalHandler.cc:2437-2458
/branches/pickups2/src/util/SignalHandler.cc:2108-2498
/branches/presentation/src/util/SignalHandler.cc:2370-2653,2655-2661
/branches/questsystem2/src/util/SignalHandler.cc:2108-2260
/branches/questsystem5/src/util/SignalHandler.cc:2777-2906
/branches/script_trigger/src/orxonox/SignalHandler.cc:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.cc:2108-2489
/branches/weaponsystem/src/util/SignalHandler.cc:2743-2891
/trunk/src/util/SignalHandler.cc:2-2086
Property changes on: branches/netp3/src/util/SignalHandler.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/util/SignalHandler.h:2507-2659
/branches/buildsystem3/src/util/SignalHandler.h:2663-2709
/branches/ceguilua/src/orxonox/SignalHandler.h:1803-1809
/branches/core3/src/orxonox/SignalHandler.h:1573-1606
/branches/gcc43/src/orxonox/SignalHandler.h:1581
/branches/gui/src/orxonox/SignalHandler.h:1636-1724
/branches/gui/src/util/SignalHandler.h:2796-2895
/branches/input/src/orxonox/SignalHandler.h:1630-1637
/branches/lodfinal/src/util/SignalHandler.h:2373-2412
/branches/miniprojects/src/util/SignalHandler.h:2755-2825
/branches/network/src/util/SignalHandler.h:2357
/branches/network64/src/util/SignalHandler.h:2211-2356
/branches/objecthierarchy/src/util/SignalHandler.h:2101,2111-2170
/branches/objecthierarchy2/src/util/SignalHandler.h:2172-2480
/branches/overlay/src/util/SignalHandler.h:2118-2386
/branches/physics/src/util/SignalHandler.h:2108-2440
/branches/physics_merge/src/util/SignalHandler.h:2437-2458
/branches/pickups2/src/util/SignalHandler.h:2108-2498
/branches/presentation/src/util/SignalHandler.h:2370-2653,2655-2661
/branches/questsystem2/src/util/SignalHandler.h:2108-2260
/branches/questsystem5/src/util/SignalHandler.h:2777-2906
/branches/script_trigger/src/orxonox/SignalHandler.h:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.h:2108-2489
/branches/weaponsystem/src/util/SignalHandler.h:2743-2891
/trunk/src/util/SignalHandler.h:2-2086
+ /branches/buildsystem2/src/util/SignalHandler.h:2507-2659
/branches/buildsystem3/src/util/SignalHandler.h:2663-2709
/branches/ceguilua/src/orxonox/SignalHandler.h:1803-1809
/branches/core3/src/orxonox/SignalHandler.h:1573-1606
/branches/gcc43/src/orxonox/SignalHandler.h:1581
/branches/gui/src/orxonox/SignalHandler.h:1636-1724
/branches/gui/src/util/SignalHandler.h:2796-2895
/branches/input/src/orxonox/SignalHandler.h:1630-1637
/branches/lodfinal/src/util/SignalHandler.h:2373-2412
/branches/miniprojects/src/util/SignalHandler.h:2755-2825
/branches/netp2/src/util/SignalHandler.h:2836-2989
/branches/network/src/util/SignalHandler.h:2357
/branches/network64/src/util/SignalHandler.h:2211-2356
/branches/objecthierarchy/src/util/SignalHandler.h:2101,2111-2170
/branches/objecthierarchy2/src/util/SignalHandler.h:2172-2480
/branches/overlay/src/util/SignalHandler.h:2118-2386
/branches/physics/src/util/SignalHandler.h:2108-2440
/branches/physics_merge/src/util/SignalHandler.h:2437-2458
/branches/pickups2/src/util/SignalHandler.h:2108-2498
/branches/presentation/src/util/SignalHandler.h:2370-2653,2655-2661
/branches/questsystem2/src/util/SignalHandler.h:2108-2260
/branches/questsystem5/src/util/SignalHandler.h:2777-2906
/branches/script_trigger/src/orxonox/SignalHandler.h:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.h:2108-2489
/branches/weaponsystem/src/util/SignalHandler.h:2743-2891
/trunk/src/util/SignalHandler.h:2-2086
More information about the Orxonox-commit
mailing list