[Orxonox-commit 1669] r6387 - in code/branches/presentation2: cmake data/gui/layouts data/gui/scripts data/levels data/levels/old data/overlays doc/api src/external/ceguilua src/external/ceguilua/ceguilua-0.5.0 src/libraries/core src/libraries/core/input src/libraries/network src/libraries/network/packet src/libraries/network/synchronisable src/libraries/tools src/libraries/tools/interfaces src/libraries/util src/modules/objects/eventsystem src/modules/overlays src/modules/overlays/hud src/modules/overlays/stats src/modules/pong src/modules/questsystem src/modules/questsystem/notifications src/modules/weapons/projectiles src/orxonox src/orxonox/controllers src/orxonox/gamestates src/orxonox/gametypes src/orxonox/infos src/orxonox/interfaces src/orxonox/items src/orxonox/overlays src/orxonox/pickup src/orxonox/sound src/orxonox/weaponsystem src/orxonox/worldentities src/orxonox/worldentities/pawns
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Dec 21 13:18:37 CET 2009
Author: rgrieder
Date: 2009-12-21 13:18:36 +0100 (Mon, 21 Dec 2009)
New Revision: 6387
Modified:
code/branches/presentation2/cmake/FindLua.cmake
code/branches/presentation2/cmake/FindPackageHandleAdvancedArgs.cmake
code/branches/presentation2/cmake/LibraryConfig.cmake
code/branches/presentation2/cmake/LibraryConfigApple.cmake
code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake
code/branches/presentation2/data/gui/layouts/PickupInventory.layout
code/branches/presentation2/data/gui/scripts/GUITools.lua
code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua
code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
code/branches/presentation2/data/gui/scripts/PickupInventory.lua
code/branches/presentation2/data/gui/scripts/QuestGUI.lua
code/branches/presentation2/data/levels/empty_level.oxw
code/branches/presentation2/data/levels/events.oxw
code/branches/presentation2/data/levels/old/spaceshiptemplates_physics.oxw
code/branches/presentation2/data/levels/presentation09.oxw
code/branches/presentation2/data/levels/presentation09b.oxw
code/branches/presentation2/data/levels/presentationHS09.oxw
code/branches/presentation2/data/levels/presentation_dm.oxw
code/branches/presentation2/data/levels/questsystem2.oxw
code/branches/presentation2/data/levels/sound.oxw
code/branches/presentation2/data/levels/test_ghost.oxw
code/branches/presentation2/data/overlays/debug.oxo
code/branches/presentation2/data/overlays/stats.oxo
code/branches/presentation2/doc/api/CMakeLists.txt
code/branches/presentation2/src/external/ceguilua/CMakeLists.txt
code/branches/presentation2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt
code/branches/presentation2/src/libraries/core/BaseObject.cc
code/branches/presentation2/src/libraries/core/BaseObject.h
code/branches/presentation2/src/libraries/core/ConfigFileManager.cc
code/branches/presentation2/src/libraries/core/Event.cc
code/branches/presentation2/src/libraries/core/Event.h
code/branches/presentation2/src/libraries/core/EventIncludes.h
code/branches/presentation2/src/libraries/core/GUIManager.cc
code/branches/presentation2/src/libraries/core/OrxonoxClass.h
code/branches/presentation2/src/libraries/core/SmartPtr.h
code/branches/presentation2/src/libraries/core/Thread.cc
code/branches/presentation2/src/libraries/core/Thread.h
code/branches/presentation2/src/libraries/core/ThreadPool.cc
code/branches/presentation2/src/libraries/core/ThreadPool.h
code/branches/presentation2/src/libraries/core/WeakPtr.h
code/branches/presentation2/src/libraries/core/input/InputManager.h
code/branches/presentation2/src/libraries/core/input/InputPrereqs.h
code/branches/presentation2/src/libraries/core/input/InputState.cc
code/branches/presentation2/src/libraries/core/input/KeyBinder.cc
code/branches/presentation2/src/libraries/core/input/KeyBinder.h
code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc
code/branches/presentation2/src/libraries/network/Client.cc
code/branches/presentation2/src/libraries/network/ClientConnection.cc
code/branches/presentation2/src/libraries/network/ClientConnection.h
code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc
code/branches/presentation2/src/libraries/network/ClientConnectionListener.h
code/branches/presentation2/src/libraries/network/ClientInformation.cc
code/branches/presentation2/src/libraries/network/Connection.cc
code/branches/presentation2/src/libraries/network/Connection.h
code/branches/presentation2/src/libraries/network/FunctionCallManager.cc
code/branches/presentation2/src/libraries/network/FunctionCallManager.h
code/branches/presentation2/src/libraries/network/GamestateClient.cc
code/branches/presentation2/src/libraries/network/GamestateHandler.cc
code/branches/presentation2/src/libraries/network/GamestateManager.cc
code/branches/presentation2/src/libraries/network/NetworkFunction.cc
code/branches/presentation2/src/libraries/network/NetworkFunction.h
code/branches/presentation2/src/libraries/network/Server.cc
code/branches/presentation2/src/libraries/network/Server.h
code/branches/presentation2/src/libraries/network/ServerConnection.cc
code/branches/presentation2/src/libraries/network/ServerConnection.h
code/branches/presentation2/src/libraries/network/TrafficControl.cc
code/branches/presentation2/src/libraries/network/TrafficControl.h
code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc
code/branches/presentation2/src/libraries/network/packet/Chat.cc
code/branches/presentation2/src/libraries/network/packet/ClassID.h
code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc
code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc
code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc
code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h
code/branches/presentation2/src/libraries/network/packet/Gamestate.cc
code/branches/presentation2/src/libraries/network/packet/Packet.cc
code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.h
code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc
code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.h
code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc
code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h
code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h
code/branches/presentation2/src/libraries/tools/Timer.cc
code/branches/presentation2/src/libraries/tools/Timer.h
code/branches/presentation2/src/libraries/tools/interfaces/TimeFactorListener.h
code/branches/presentation2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc
code/branches/presentation2/src/libraries/util/Clock.cc
code/branches/presentation2/src/libraries/util/Math.cc
code/branches/presentation2/src/libraries/util/MultiType.h
code/branches/presentation2/src/libraries/util/MultiTypeValue.h
code/branches/presentation2/src/libraries/util/Serialise.h
code/branches/presentation2/src/libraries/util/mbool.h
code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc
code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.h
code/branches/presentation2/src/modules/overlays/GUIOverlay.cc
code/branches/presentation2/src/modules/overlays/hud/UnderAttackHealthBar.cc
code/branches/presentation2/src/modules/overlays/stats/CreateLines.cc
code/branches/presentation2/src/modules/pong/Pong.cc
code/branches/presentation2/src/modules/pong/PongAI.cc
code/branches/presentation2/src/modules/pong/PongBall.cc
code/branches/presentation2/src/modules/questsystem/AddQuestHint.cc
code/branches/presentation2/src/modules/questsystem/AddReward.cc
code/branches/presentation2/src/modules/questsystem/ChangeQuestStatus.cc
code/branches/presentation2/src/modules/questsystem/CompleteQuest.cc
code/branches/presentation2/src/modules/questsystem/FailQuest.cc
code/branches/presentation2/src/modules/questsystem/GlobalQuest.cc
code/branches/presentation2/src/modules/questsystem/LocalQuest.cc
code/branches/presentation2/src/modules/questsystem/Quest.cc
code/branches/presentation2/src/modules/questsystem/QuestDescription.cc
code/branches/presentation2/src/modules/questsystem/QuestEffect.cc
code/branches/presentation2/src/modules/questsystem/QuestGUI.cc
code/branches/presentation2/src/modules/questsystem/QuestGUI.h
code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc
code/branches/presentation2/src/modules/questsystem/QuestGUINode.h
code/branches/presentation2/src/modules/questsystem/QuestHint.cc
code/branches/presentation2/src/modules/questsystem/QuestItem.cc
code/branches/presentation2/src/modules/questsystem/QuestListener.cc
code/branches/presentation2/src/modules/questsystem/QuestNotification.cc
code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc
code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc
code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h
code/branches/presentation2/src/orxonox/MoodManager.cc
code/branches/presentation2/src/orxonox/PlayerManager.cc
code/branches/presentation2/src/orxonox/Scene.h
code/branches/presentation2/src/orxonox/Test.h
code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc
code/branches/presentation2/src/orxonox/controllers/ArtificialController.h
code/branches/presentation2/src/orxonox/controllers/Controller.h
code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc
code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc
code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc
code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc
code/branches/presentation2/src/orxonox/gametypes/Gametype.cc
code/branches/presentation2/src/orxonox/gametypes/Gametype.h
code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc
code/branches/presentation2/src/orxonox/interfaces/Rewardable.h
code/branches/presentation2/src/orxonox/items/MultiStateEngine.h
code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc
code/branches/presentation2/src/orxonox/overlays/OverlayGroup.cc
code/branches/presentation2/src/orxonox/pickup/ModifierPickup.h
code/branches/presentation2/src/orxonox/pickup/UsableItem.cc
code/branches/presentation2/src/orxonox/sound/AmbientSound.cc
code/branches/presentation2/src/orxonox/sound/BaseSound.cc
code/branches/presentation2/src/orxonox/sound/SoundManager.cc
code/branches/presentation2/src/orxonox/sound/SoundManager.h
code/branches/presentation2/src/orxonox/sound/WorldSound.cc
code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc
code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc
code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h
code/branches/presentation2/src/orxonox/worldentities/StaticEntity.cc
code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc
code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h
Log:
Found some non empty new lines.
Modified: code/branches/presentation2/cmake/FindLua.cmake
===================================================================
--- code/branches/presentation2/cmake/FindLua.cmake 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/cmake/FindLua.cmake 2009-12-21 12:18:36 UTC (rev 6387)
@@ -135,7 +135,7 @@
SET(LUA_5.0_LIBRARIES ${LUA_5.0_LUA_LIBRARY} ${LUA_5.0_LUALIB_LIBRARY})
ENDIF()
ENDIF(${LUA_5.0_LUA_LIBRARY} MATCHES "framework")
-
+
IF(LUA_5.0_LIBRARIES)
SET(LUA_5.0_FOUND TRUE)
ENDIF()
Modified: code/branches/presentation2/cmake/FindPackageHandleAdvancedArgs.cmake
===================================================================
--- code/branches/presentation2/cmake/FindPackageHandleAdvancedArgs.cmake 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/cmake/FindPackageHandleAdvancedArgs.cmake 2009-12-21 12:18:36 UTC (rev 6387)
@@ -24,7 +24,7 @@
# This function also checks the version requirements. Also regards the
# EXACT keyword if specified in FIND_PACKAGE(...).
#
-
+
INCLUDE(FindPackageHandleStandardArgs)
INCLUDE(CompareVersionStrings)
Modified: code/branches/presentation2/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/presentation2/cmake/LibraryConfig.cmake 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/cmake/LibraryConfig.cmake 2009-12-21 12:18:36 UTC (rev 6387)
@@ -24,7 +24,7 @@
# from the CMake module path are used, but that required some adjustments
# for certain libraries (Boost, OpenAL, TCL)
#
-
+
INCLUDE(CompareVersionStrings)
INCLUDE(FindPackageHandleStandardArgs)
Modified: code/branches/presentation2/cmake/LibraryConfigApple.cmake
===================================================================
--- code/branches/presentation2/cmake/LibraryConfigApple.cmake 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/cmake/LibraryConfigApple.cmake 2009-12-21 12:18:36 UTC (rev 6387)
@@ -22,7 +22,7 @@
# Description:
# Sets necessary library options and paths on Mac.
#
-
+
IF(APPLE)
MESSAGE(STATUS "Running on Apple. Using customized paths and options.")
Modified: code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake
===================================================================
--- code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake 2009-12-21 12:18:36 UTC (rev 6387)
@@ -22,7 +22,7 @@
#
INCLUDE(GetGCCCompilerFlags)
-
+
MACRO(PRECOMPILED_HEADER_FILES_PRE_TARGET _target_name _header_file_arg _sourcefile_var)
GET_FILENAME_COMPONENT(_pch_header_file ${_header_file_arg} ABSOLUTE)
Modified: code/branches/presentation2/data/gui/layouts/PickupInventory.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/PickupInventory.layout 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/gui/layouts/PickupInventory.layout 2009-12-21 12:18:36 UTC (rev 6387)
@@ -14,7 +14,7 @@
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="TabPanePosition" Value="Bottom" />
<Property Name="UnifiedAreaRect" Value="{{0,10},{0,30},{1,-10},{1,-10}}" />
-
+
<Window Type="TaharezLook/ScrollablePane" Name="orxonox/Inventory/TabControl/TabEquipment">
<Property Name="Text" Value="Equipment" />
<Property Name="UnifiedPosition" Value="{{0.0,3},{0.0,3}}"/>
Modified: code/branches/presentation2/data/gui/scripts/GUITools.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/GUITools.lua 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/gui/scripts/GUITools.lua 2009-12-21 12:18:36 UTC (rev 6387)
@@ -13,11 +13,11 @@
function getMinTextSize(window)
local size = {}
-
+
local lookAndFeel = CEGUI.WidgetLookManager:getSingleton():getWidgetLook(window:getLookNFeel())
local height = window:getFont():getLineSpacing() + window:getUnclippedPixelRect():getHeight() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getHeight()
local width = window:getFont():getTextExtent(window:getText()) + window:getUnclippedPixelRect():getWidth() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getWidth()
-
+
table.insert(size, height)
table.insert(size, width)
return size
Modified: code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua 2009-12-21 12:18:36 UTC (rev 6387)
@@ -80,7 +80,7 @@
else
hideCursor()
end
-
+
if find( activeSheets, filename ) ~= nil then
table.remove( activeSheets, find( activeSheets, filename ) )
nrOfActiveSheets = nrOfActiveSheets - 1
@@ -95,7 +95,7 @@
activeSheets[nrOfActiveSheets] = filename
bHidePrevious[filename]=hidePrevious
cursorVisibility[filename] = bCursorVisible
-
+
if hidePrevious == true then
for i=1,nrOfActiveSheets-1 do
loadedGUIs[ activeSheets[i] ]:hide()
Modified: code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua 2009-12-21 12:18:36 UTC (rev 6387)
@@ -69,10 +69,10 @@
--Calculate design parameters:
sampleWindow = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/SampleWindow")
sampleWindow:setText("SampleText")
-
+
local size = getMinTextSize(sampleWindow)
lineHeight = size[1]
-
+
commandWidth = 0
for k,v in pairs(commandList) do
sampleWindow:setText(nameList[k])
@@ -85,13 +85,13 @@
sampleWindow:setText("add")
size = getMinTextSize(sampleWindow)
addWidth = size[2]
-
+
sampleWindow:setText("X")
size = getMinTextSize(sampleWindow)
clearWidth = size[2]
spaceWidth = math.floor(1/14*commandWidth)
-
+
buttonWidth = 145
P.createLines()
@@ -165,7 +165,7 @@
end
line:setWidth(CEGUI.UDim(0, offset+clearWidth))
-
+
return line
end
@@ -177,7 +177,7 @@
table.insert(linesList, line)
window:addChildWindow(line)
end
-
+
pane = tolua.cast(window, "CEGUI::ScrollablePane")
pane:setVerticalStepSize(getScrollingStepSize(window))
end
@@ -215,7 +215,7 @@
local match = string.gmatch(name, "%d+")
local commandNr = tonumber(match())
local buttonNr = tonumber(match())
-
+
orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
P.callback()
Modified: code/branches/presentation2/data/gui/scripts/PickupInventory.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/PickupInventory.lua 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/gui/scripts/PickupInventory.lua 2009-12-21 12:18:36 UTC (rev 6387)
@@ -19,7 +19,7 @@
function P:frmUpdate(e)
local equipCount = orxonox.PickupInventory:getEquipmentCount()
local usableCount = orxonox.PickupInventory:getUsableCount()
-
+
if equipCount ~= self.lastEquipmentCount_ or usableCount ~= self.lastUsableCount_ then
self:updateTabs()
end
@@ -38,11 +38,11 @@
local name = w:getName()
local t = name:sub(25, 27)
local i = name:sub(29)
-
+
if t == "equ" then
-
+
end
-
+
if t == "use" then
if self.currentUsableID_ >= 0 then
winMgr:getWindow("orxonox/Inventory/Title/use/" .. self.currentUsableID_):setProperty("TextColours", "tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF")
@@ -59,7 +59,7 @@
local usWin = winMgr:getWindow("orxonox/Inventory/TabControl/TabUsable")
orxonox.PickupInventory:getSingleton():clearInventory(winMgr, eqWin, usWin)
orxonox.PickupInventory:getSingleton():updateTabs(winMgr, eqWin, usWin)
-
+
self.currentUsableID_ = orxonox.PickupInventory:getCurrentUsableIndex()
self.lastEquipmentCount_ = orxonox.PickupInventory:getEquipmentCount()
self.lastUsableCount_ = orxonox.PickupInventory:getUsableCount()
Modified: code/branches/presentation2/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/QuestGUI.lua 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/gui/scripts/QuestGUI.lua 2009-12-21 12:18:36 UTC (rev 6387)
@@ -14,7 +14,7 @@
self.visible = true
local questManager = orxonox.QuestManager:getInstance()
-
+
local questsList = winMgr:getWindow("orxonox/QuestGUI/QuestsList")
local window = questManager:getQuestGUI(P.filename)
Modified: code/branches/presentation2/data/levels/empty_level.oxw
===================================================================
--- code/branches/presentation2/data/levels/empty_level.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/empty_level.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -29,8 +29,8 @@
</Model>
</attached>
</Rocket-->
-
-
+
+
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
<SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
</Scene>
Modified: code/branches/presentation2/data/levels/events.oxw
===================================================================
--- code/branches/presentation2/data/levels/events.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/events.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -44,8 +44,8 @@
matter where they are in the XML-file (before or after the addressing object). Of course this also
works with all amounts of objects from zero to infinity. In the examples I used two objects each.
-->
-
+
<!-- red -->
<!--
Standard:
Modified: code/branches/presentation2/data/levels/old/spaceshiptemplates_physics.oxw
===================================================================
--- code/branches/presentation2/data/levels/old/spaceshiptemplates_physics.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/old/spaceshiptemplates_physics.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -9,7 +9,7 @@
primaryThrust = 100;
auxilaryThrust = 30;
rotationThrust = 10;
-
+
collisionType = "dynamic"
mass = 100
linearDamping = 0.7
Modified: code/branches/presentation2/data/levels/presentation09.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentation09.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/presentation09.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -33,7 +33,7 @@
do
j = math.random()
?>
-
+
<MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
<Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
@@ -47,6 +47,6 @@
?>
<?lua end ?>
<Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-
+
</Scene>
</Level>
Modified: code/branches/presentation2/data/levels/presentation09b.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentation09b.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/presentation09b.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -85,21 +85,21 @@
<WaypointPatrolController alertnessradius=100 team=0 />
</controller>
</SpaceShip>
-
+
<PickupSpawner item="JumpItem" triggerDistance="20" respawnTime="10000" position="-3800, 2500, 1500">
<attached>
<!--<Model mesh="jumpthrust.mesh" scale="1.0" />
<Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale="0.5" />-->
</attached>
</PickupSpawner>
-
+
<PickupSpawner item="HealthUsableItem" triggerDistance="20" respawnTime="10000" position="-4150,2750,1550">
<attached>
<Model mesh="gwrench.mesh" scale="1.0" />
<Billboard material="Examples/Flare" colour="0.3, 0.8, 1.0" scale="0.5" />
</attached>
</PickupSpawner>
-
+
<PickupSpawner item="HealthImmediateItem" triggerDistance="20" respawnTime="3" position="2300, 4300, 2400">
<attached>
<Model mesh="gwrench.mesh" scale="1.0" />
@@ -346,7 +346,7 @@
z = math.random() * 3000 - 1500 + (i-100) * 10
s = math.random() * 60 + 30
?>
-
+
<MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>">
<attached>
<Model position="0,0,0" scale=<?lua print(s) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
@@ -369,7 +369,7 @@
z = math.random() * 500 + 1000
e = math.floor(math.random()*elements.length()+1)
?>
-
+
<MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>">
<attached>
<Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
@@ -378,6 +378,6 @@
<?lua
end
?>
-
+
</Scene>
</Level>
Modified: code/branches/presentation2/data/levels/presentationHS09.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentationHS09.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/presentationHS09.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -27,7 +27,7 @@
<Template name="HealthUsableItem" baseclass="HealthUsable">
<HealthImmediate recoveredHealth="80" guiImage="goldwrenchpickup.jpg" guiText="Health" />
</Template>
-
+
<SpawnPoint position="-3800, 2500, 1500" direction="-0.683, -0.289, -0.670" spawnclass=SpaceShip pawndesign=spaceshipassff />
@@ -97,14 +97,14 @@
<Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale="0.5" />-->
</attached>
</PickupSpawner>
-
+
<PickupSpawner item="HealthUsableItem" triggerDistance="20" respawnTime="10000" position="-4150,2750,1550">
<attached>
<Model mesh="gwrench.mesh" scale="1.0" />
<Billboard material="Examples/Flare" colour="0.3, 0.8, 1.0" scale="0.5" />
</attached>
</PickupSpawner>
-
+
<PickupSpawner item="HealthImmediateItem" triggerDistance="20" respawnTime="3" position="2300, 4300, 2400">
<attached>
<Model mesh="gwrench.mesh" scale="1.0" />
@@ -356,7 +356,7 @@
s = math.random() * 60 + 30
e = math.floor(math.random()*elements.length()+1)
?>
-
+
<MovableEntity mass=90000 position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
<attached>
<Model position="0,0,0" scale=<?lua print(s) ?> mesh="<?lua print(elements[e])?>" />
@@ -394,7 +394,7 @@
z = math.random() * 500 + 1000
e = math.floor(math.random()*elements.length()+1)
?>
-
+
<MovableEntity mass=90000 position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30- 15) ?>">
<attached>
<Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
Modified: code/branches/presentation2/data/levels/presentation_dm.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentation_dm.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/presentation_dm.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -38,7 +38,7 @@
do
j = math.random()
?>
-
+
<MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
<Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
Modified: code/branches/presentation2/data/levels/questsystem2.oxw
===================================================================
--- code/branches/presentation2/data/levels/questsystem2.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/questsystem2.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -224,7 +224,7 @@
do
j = math.random()
?>
-
+
<MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
<Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
@@ -238,6 +238,6 @@
?>
<?lua end ?>
<Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-
+
</Scene>
</Level>
Modified: code/branches/presentation2/data/levels/sound.oxw
===================================================================
--- code/branches/presentation2/data/levels/sound.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/sound.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -40,8 +40,8 @@
</activity>
</events>
</AmbientSound>
-
+
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
<SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
</Scene>
Modified: code/branches/presentation2/data/levels/test_ghost.oxw
===================================================================
--- code/branches/presentation2/data/levels/test_ghost.oxw 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/levels/test_ghost.oxw 2009-12-21 12:18:36 UTC (rev 6387)
@@ -33,7 +33,7 @@
do
j = math.random()
?>
-
+
<MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
<Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
@@ -47,6 +47,6 @@
?>
<?lua end ?>
<Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-
+
</Scene>
</Level>
Modified: code/branches/presentation2/data/overlays/debug.oxo
===================================================================
--- code/branches/presentation2/data/overlays/debug.oxo 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/overlays/debug.oxo 2009-12-21 12:18:36 UTC (rev 6387)
@@ -34,7 +34,7 @@
font = "Monofur"
textsize = 0.03
/>
-
+
</OverlayGroup>
<Template name="defaultHUD">
Modified: code/branches/presentation2/data/overlays/stats.oxo
===================================================================
--- code/branches/presentation2/data/overlays/stats.oxo 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/data/overlays/stats.oxo 2009-12-21 12:18:36 UTC (rev 6387)
@@ -11,7 +11,7 @@
colour = "0, 0.75, 0.2, 1"
textsize = 0.04
/-->
-
+
<OverlayText
name = "descr1"
position = "0.1, 0.20"
@@ -39,7 +39,7 @@
colour = "0, 0.75, 0.2, 1"
textsize = 0.04
/>
-
+
<!--Stats
name = "Statistics"
position = "0.5, 0.7"
Modified: code/branches/presentation2/doc/api/CMakeLists.txt
===================================================================
--- code/branches/presentation2/doc/api/CMakeLists.txt 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/doc/api/CMakeLists.txt 2009-12-21 12:18:36 UTC (rev 6387)
@@ -31,7 +31,7 @@
SET(DOXY_INPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET(DOXY_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
-
+
# we need latex for doxygen because of the formulas
# Orxonox doesn't
#FIND_PACKAGE(LATEX)
@@ -44,7 +44,7 @@
#IF (NOT DVIPS_CONVERTER)
# MESSAGE(STATUS "dvips command DVIPS_CONVERTER not found but usually required.")
#ENDIF (NOT DVIPS_CONVERTER)
-
+
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in ${CMAKE_CURRENT_BINARY_DIR}/doxy.config @ONLY)
# use (configured) doxy.config from (out of place) BUILD tree:
@@ -53,9 +53,9 @@
ELSE()
MESSAGE(FATAL_ERROR "Warning: Could not find dox.config.in in the root directory.")
ENDIF()
-
+
ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG})
-
+
# create a windows help .chm file using hhc.exe
# HTMLHelp DLL must be in path!
# fallback: use hhw.exe interactively
Modified: code/branches/presentation2/src/external/ceguilua/CMakeLists.txt
===================================================================
--- code/branches/presentation2/src/external/ceguilua/CMakeLists.txt 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/external/ceguilua/CMakeLists.txt 2009-12-21 12:18:36 UTC (rev 6387)
@@ -44,7 +44,7 @@
IF(_compare_result EQUAL 1)
BREAK() # _version > CEGUI_VERSION
ENDIF()
-
+
ADD_SUBDIRECTORY(ceguilua-${_version}) # Sets parent scope variable _package_files
FOREACH(_file ${_package_files})
CONFIGURE_FILE(ceguilua-${_version}/package/${_file} ${CEGUILUA_BINARY_DIR}/${_file} COPYONLY)
Modified: code/branches/presentation2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt
===================================================================
--- code/branches/presentation2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt 2009-12-21 12:18:36 UTC (rev 6387)
@@ -19,7 +19,7 @@
elements/ScrolledItemListBase.pkg elements/Slider.pkg elements/Spinner.pkg
elements/TabButton.pkg elements/TabControl.pkg elements/Thumb.pkg
elements/Titlebar.pkg elements/Tooltip.pkg
-
+
falagard/Dimension.pkg falagard/Enums.pkg falagard/FalagardComponentBase.pkg
falagard/FrameComponent.pkg falagard/ImageryComponent.pkg
falagard/ImagerySection.pkg falagard/LayerSpecification.pkg
Modified: code/branches/presentation2/src/libraries/core/BaseObject.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/BaseObject.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/BaseObject.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -118,7 +118,7 @@
XMLPortObjectTemplate(BaseObject, Template, "templates", addTemplate, getTemplate, xmlelement, mode, Template*);
XMLPortObject(BaseObject, BaseObject, "eventlisteners", addEventListener, getEventListener, xmlelement, mode);
-
+
Element* events = 0;
if (mode == XMLPort::LoadObject || mode == XMLPort::ExpandObject)
events = xmlelement.FirstChildElement("events", false);
@@ -138,7 +138,7 @@
XMLPortEventState(BaseObject, BaseObject, "activity", setActive, xmlelement, mode);
XMLPortEventState(BaseObject, BaseObject, "visibility", setVisible, xmlelement, mode);
XMLPortEventState(BaseObject, BaseObject, "mainstate", setMainState, xmlelement, mode);
-
+
this->bRegisteredEventStates_ = true;
}
@@ -235,7 +235,7 @@
{
if (it->second != state)
continue;
-
+
if (i == index)
return it->first;
++i;
@@ -251,7 +251,7 @@
this->eventListenersXML_.insert(listener);
listener->addEventSource(this, "mainstate");
}
-
+
/**
@brief Returns an event listener with a given index.
*/
@@ -343,7 +343,7 @@
void BaseObject::processEvent(Event& event)
{
this->registerEventStates();
-
+
std::map<std::string, EventState*>::const_iterator it = this->eventStates_.find(event.statename_);
if (it != this->eventStates_.end())
it->second->process(event, this);
@@ -355,7 +355,7 @@
/**
@brief Sets the main state of the object to a given boolean value.
-
+
Note: The main state of an object can be set with the @ref setMainStateName function.
It's part of the eventsystem and used for event forwarding (when the target object can't specify a specific state,
the main state is used by default).
@@ -388,7 +388,7 @@
if (this->mainStateName_ != "")
{
this->registerEventStates();
-
+
std::map<std::string, EventState*>::const_iterator it = this->eventStates_.find(this->mainStateName_);
if (it != this->eventStates_.end() && it->second->getFunctor())
{
@@ -401,7 +401,7 @@
COUT(2) << "Warning: \"" << this->mainStateName_ << "\" is not a valid MainState." << std::endl;
}
}
-
+
/**
@brief Calls XMLEventPort with an empty XML-element to register the event states if necessary.
*/
@@ -413,7 +413,7 @@
this->XMLEventPort(xmlelement, XMLPort::NOP);
}
}
-
+
/**
@brief Manually loads all event states, even if the class doesn't officially support them. This is needed by some classes like @ref EventDispatcher or @ref EventTarget.
*/
Modified: code/branches/presentation2/src/libraries/core/BaseObject.h
===================================================================
--- code/branches/presentation2/src/libraries/core/BaseObject.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/BaseObject.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -156,7 +156,7 @@
void addEventSource(BaseObject* source, const std::string& state);
void removeEventSource(BaseObject* source);
BaseObject* getEventSource(unsigned int index, const std::string& state) const;
-
+
void addEventListener(BaseObject* listener);
BaseObject* getEventListener(unsigned int index) const;
@@ -171,7 +171,7 @@
inline void setLoaderIndentation(const std::string& indentation) { this->loaderIndentation_ = indentation; }
/** @brief Returns the indentation of the debug output in the Loader. @return The indentation */
inline const std::string& getLoaderIndentation() const { return this->loaderIndentation_; }
-
+
static void loadAllEventStates(Element& xmlelement, XMLPort::Mode mode, BaseObject* object, Identifier* identifier);
protected:
@@ -209,7 +209,7 @@
SmartPtr<Gametype> gametype_;
Gametype* oldGametype_;
std::set<Template*> templates_;
-
+
std::map<BaseObject*, std::string> eventSources_; //!< List of objects which send events to this object, mapped to the state which they affect
std::set<BaseObject*> eventListeners_; //!< List of objects which listen to the events of this object
std::set<BaseObject*> eventListenersXML_; //!< List of objects which listen to the events of this object through the "eventlisteners" subsection in XML
Modified: code/branches/presentation2/src/libraries/core/ConfigFileManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/ConfigFileManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/ConfigFileManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -56,7 +56,7 @@
}
return false;
}
-
+
std::string getConfig(const std::string& classname, const std::string& varname)
{
return ConfigFileManager::getInstance().getValue(ConfigFileType::Settings, classname, varname, "", true);
Modified: code/branches/presentation2/src/libraries/core/Event.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/Event.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/Event.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -44,7 +44,7 @@
/**
@brief Processes an event (calls the set-function if the necessary conditions are met).
-
+
@param event The fired event
@param object The object whose state is affected by the event (only needed for debug output)
*/
Modified: code/branches/presentation2/src/libraries/core/Event.h
===================================================================
--- code/branches/presentation2/src/libraries/core/Event.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/Event.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -49,16 +49,16 @@
/**
@brief The EventState contains information about an event state.
-
+
An event state is a state of an object, which can be changed by events.
Event states are changed through functions. Possible functions headers for set event states are:
- memoryless state: function()
- boolean state: function(bool state)
- individual state: function(bool state, SomeClass originator)
-
+
Note that SomeClass may be any class deriving from BaseObject. You will not receive events from originators of other classes.
The actual class for SomeClass must be specified as the second argument of the XMLPortEventState macro.
-
+
The this pointer of the affected object is hidden in the functors, because the events are processed in the BaseObject, but some
statefunctions may be from child-classes.
*/
@@ -69,7 +69,7 @@
virtual ~EventState();
void process(const Event& event, BaseObject* object);
-
+
Functor* getFunctor() const
{ return this->statefunction_; }
Modified: code/branches/presentation2/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/presentation2/src/libraries/core/EventIncludes.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/EventIncludes.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -35,7 +35,7 @@
/**
@brief Defines a new event state (a state of the object which can be changed by events).
-
+
@param classname The name of this class
@param subclassname Usually BaseObject - if different, only instances of this class can send events to this object
@param statename The name (string) of this state
@@ -68,11 +68,11 @@
static orxonox::ExecutorMember<classname>* xmlsetfunctor##name = (orxonox::ExecutorMember<classname>*)&orxonox::createExecutor(orxonox::createFunctor(&classname::addEventSource), std::string( #classname ) + "::" + "addEventSource" + "(" + statename + ")")->setDefaultValue(1, statename); \
static orxonox::ExecutorMember<classname>* xmlgetfunctor##name = (orxonox::ExecutorMember<classname>*)&orxonox::createExecutor(orxonox::createFunctor(&classname::getEventSource), std::string( #classname ) + "::" + "getEventSource" + "(" + statename + ")")->setDefaultValue(1, statename); \
XMLPortObjectGeneric(xmlport##name, classname, orxonox::BaseObject, statename, xmlsetfunctor##name, xmlgetfunctor##name, xmlelement, mode, false, true)
-
+
/**
@brief Defines a new event name for a class. Named events can only have names which were defined with this macro.
-
+
@param classname The name of the class
@param name The name of the event
*/
@@ -84,5 +84,5 @@
*/
#define FireEventName(classname, name) \
eventname##classname##name
-
+
#endif /* _EventIncludes_H__ */
Modified: code/branches/presentation2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/GUIManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/GUIManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -65,7 +65,7 @@
static void key_esc()
{ GUIManager::getInstance().keyESC(); }
SetConsoleCommandShortcutExternAlias(key_esc, "keyESC");
-
+
class CEGUILogger : public CEGUI::DefaultLogger
{
public:
@@ -245,7 +245,7 @@
{
this->executeCode("keyESC()");
}
-
+
void GUIManager::setBackground(const std::string& name)
{
this->executeCode("setBackground(\"" + name + "\")");
Modified: code/branches/presentation2/src/libraries/core/OrxonoxClass.h
===================================================================
--- code/branches/presentation2/src/libraries/core/OrxonoxClass.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/OrxonoxClass.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -148,7 +148,7 @@
if (this->referenceCount_ == 0 && this->requestedDestruction_)
this->destroy();
}
-
+
/** @brief Register a weak pointer which points to this object. */
template <class T>
inline void registerWeakPtr(WeakPtr<T>* pointer)
Modified: code/branches/presentation2/src/libraries/core/SmartPtr.h
===================================================================
--- code/branches/presentation2/src/libraries/core/SmartPtr.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/SmartPtr.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -83,7 +83,7 @@
if (this->base_)
this->base_->decrementReferenceCount();
}
-
+
inline const SmartPtr& operator=(int)
{
SmartPtr(0).swap(*this);
Modified: code/branches/presentation2/src/libraries/core/Thread.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/Thread.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/Thread.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -40,8 +40,8 @@
namespace orxonox
{
boost::posix_time::millisec THREAD_WAIT_BEFORE_DETACH(1000);
-
-
+
+
Thread::Thread():
executor_(0),
isWorking_(false),
@@ -52,7 +52,7 @@
this->stopThreadMutex_ = new boost::mutex;
this->workerThread_ = new boost::thread( boost::bind(&Thread::threadLoop, this) );
}
-
+
Thread::~Thread()
{
this->stopThreadMutex_->lock();
@@ -65,7 +65,7 @@
delete this->stopThreadMutex_;
delete this->isWorkingMutex_;
}
-
+
bool Thread::isWorking()
{
this->isWorkingMutex_->lock();
@@ -73,7 +73,7 @@
this->isWorkingMutex_->unlock();
return isWorking;
}
-
+
bool Thread::evaluateExecutor( Executor* executor )
{
this->isWorkingMutex_->lock();
@@ -84,7 +84,7 @@
this->executorMutex_->unlock();
return true;
}
-
+
void Thread::threadLoop()
{
bool stopThread = false;
@@ -113,7 +113,7 @@
//this->stopThreadMutex_->unlock();
}
}
-
+
void Thread::waitUntilFinished()
{
bool stillWorking = true;
Modified: code/branches/presentation2/src/libraries/core/Thread.h
===================================================================
--- code/branches/presentation2/src/libraries/core/Thread.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/Thread.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -49,7 +49,7 @@
private:
void threadLoop();
-
+
Executor* executor_;
bool isWorking_;
bool stopThread_;
Modified: code/branches/presentation2/src/libraries/core/ThreadPool.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/ThreadPool.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/ThreadPool.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -36,13 +36,13 @@
ThreadPool::ThreadPool()
{
}
-
+
ThreadPool::~ThreadPool()
{
unsigned int a = this->setNrOfThreads(0);
assert(a == 0);
}
-
+
void ThreadPool::addThreads( unsigned int nr )
{
for( unsigned int i=0; i<nr; i++ )
@@ -79,7 +79,7 @@
return nr;
}
}
-
+
bool ThreadPool::passFunction( Executor* executor, bool addThread )
{
std::vector<Thread*>::iterator it;
@@ -102,7 +102,7 @@
else
return false;
}
-
+
void ThreadPool::synchronise()
{
std::vector<Thread*>::iterator it;
Modified: code/branches/presentation2/src/libraries/core/ThreadPool.h
===================================================================
--- code/branches/presentation2/src/libraries/core/ThreadPool.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/ThreadPool.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -40,17 +40,17 @@
public:
ThreadPool();
virtual ~ThreadPool();
-
+
void addThreads( unsigned int nr );
unsigned int removeThreads( unsigned int nr );
unsigned int setNrOfThreads( unsigned int nr );
-
+
bool passFunction( Executor* executor, bool addThread=false );
void synchronise();
-
+
private:
std::vector<Thread*> threadPool_;
-
+
};
}
Modified: code/branches/presentation2/src/libraries/core/WeakPtr.h
===================================================================
--- code/branches/presentation2/src/libraries/core/WeakPtr.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/WeakPtr.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -43,7 +43,7 @@
class WeakPtr
{
friend class OrxonoxClass;
-
+
public:
inline WeakPtr() : pointer_(0), base_(0), callback_(0)
{
@@ -78,9 +78,9 @@
this->base_->unregisterWeakPtr(this);
if (this->callback_)
delete this->callback_;
-
+
}
-
+
inline const WeakPtr& operator=(int)
{
WeakPtr(0).swap(*this);
@@ -144,7 +144,7 @@
this->base_->unregisterWeakPtr(this);
if (other.base_)
other.base_->unregisterWeakPtr(&other);
-
+
{
T* temp = this->pointer_;
this->pointer_ = other.pointer_;
@@ -166,12 +166,12 @@
{
WeakPtr().swap(*this);
}
-
+
inline void setCallback(Functor* callback)
{
this->callback_ = callback;
}
-
+
inline Functor* getFunctor() const
{
return this->callback_;
@@ -185,7 +185,7 @@
if (this->callback_)
(*this->callback_)();
}
-
+
T* pointer_;
OrxonoxClass* base_;
Functor* callback_;
Modified: code/branches/presentation2/src/libraries/core/input/InputManager.h
===================================================================
--- code/branches/presentation2/src/libraries/core/input/InputManager.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/input/InputManager.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -82,7 +82,7 @@
/**
@brief
Loads the devices and initialises the KeyDetector and the Calibrator.
-
+
If either the OIS input system and/or the keyboard could not be created,
the constructor fails with an std::exception.
*/
@@ -169,7 +169,7 @@
//! Returns a pointer to the OIS InputManager. Only you if you know what you're doing!
OIS::InputManager* getOISInputManager() { return this->oisInputManager_; }
std::pair<int, int> getMousePosition() const;
-
+
static InputManager& getInstance() { return Singleton<InputManager>::getInstance(); } // tolua_export
private: // functions
Modified: code/branches/presentation2/src/libraries/core/input/InputPrereqs.h
===================================================================
--- code/branches/presentation2/src/libraries/core/input/InputPrereqs.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/input/InputPrereqs.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -201,7 +201,7 @@
Mail = OIS::KC_MAIL, // Mail
MediaSelect = OIS::KC_MEDIASELECT // Media Select
};
-
+
//! Key codes as strings
const char* const ByString[] =
{
Modified: code/branches/presentation2/src/libraries/core/input/InputState.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/input/InputState.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/input/InputState.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -101,7 +101,7 @@
{
if (enterFunctor_)
(*enterFunctor_)();
-
+
}
void InputState::left()
Modified: code/branches/presentation2/src/libraries/core/input/KeyBinder.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/input/KeyBinder.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/input/KeyBinder.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -282,19 +282,19 @@
return false;
}
}
-
+
void KeyBinder::addButtonToCommand(std::string command, Button* button)
{
std::ostringstream stream;
stream << button->groupName_ << "." << button->name_;
-
+
std::vector<std::string>& oldKeynames = this->allCommands_[button->bindingString_];
std::vector<std::string>::iterator it = std::find(oldKeynames.begin(), oldKeynames.end(), stream.str());
if(it != oldKeynames.end())
{
oldKeynames.erase(it);
}
-
+
if(command != "")
{
std::vector<std::string>& keynames = this->allCommands_[command];
@@ -304,7 +304,7 @@
}
}
}
-
+
/**
@brief
Return the first key name for a specific command
@@ -316,10 +316,10 @@
std::vector<std::string>& keynames = this->allCommands_[commandName];
return keynames.front();
}
-
+
return "";
}
-
+
/**
@brief
Return the key name for a specific command at a given index.
@@ -337,13 +337,13 @@
{
return keynames[index];
}
-
+
return "";
}
-
+
return "";
}
-
+
/**
@brief
Get the number of different key bindings of a specific command.
@@ -357,7 +357,7 @@
std::vector<std::string>& keynames = this->allCommands_[commandName];
return keynames.size();
}
-
+
return 0;
}
Modified: code/branches/presentation2/src/libraries/core/input/KeyBinder.h
===================================================================
--- code/branches/presentation2/src/libraries/core/input/KeyBinder.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/input/KeyBinder.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -68,7 +68,7 @@
std::string getBinding(std::string commandName); //tolua_export
std::string getBinding(std::string commandName, unsigned int index); //tolua_export
unsigned int getNumberOfBindings(std::string commandName); //tolua_export
-
+
const std::string& getBindingsFilename()
{ return this->filename_; }
void setConfigValues();
@@ -160,7 +160,7 @@
private:
void addButtonToCommand(std::string command, Button* button);
-
+
//##### ConfigValues #####
//! Whether to filter small value analog input
bool bFilterAnalogNoise_;
Modified: code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -91,12 +91,12 @@
else
this->bDefaultFileLoaded_ = false;
}
-
+
inline void KeyBinderManager::unbind(const std::string& binding)
{
this->currentBinder_->setBinding("", binding, false);
}
-
+
inline void KeyBinderManager::tunbind(const std::string& binding)
{
this->currentBinder_->setBinding("", binding, true);
Modified: code/branches/presentation2/src/libraries/network/Client.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/Client.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/Client.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -112,7 +112,7 @@
// COUT(1) << "Player " << playerID << ": " << message << std::endl;
return true;
}
-
+
void Client::printRTT(){
COUT(0) << "Round trip time to server is " << ClientConnection::getRTT() << " ms" << endl;
}
@@ -154,7 +154,7 @@
}
}
sendPackets(); // flush the enet queue
-
+
Connection::processQueue();
if(gamestate.processGamestates())
{
@@ -166,7 +166,7 @@
return;
}
-
+
void Client::connectionClosed()
{
ObjectList<Synchronisable>::iterator it;
Modified: code/branches/presentation2/src/libraries/network/ClientConnection.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/ClientConnection.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/ClientConnection.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -68,7 +68,7 @@
bool ClientConnection::establishConnection()
{
ENetEvent event;
-
+
this->host_ = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, 0, 0);
if ( this->host_ == NULL )
{
@@ -98,7 +98,7 @@
bool ClientConnection::closeConnection() {
ENetEvent event;
-
+
if ( !this->established_ )
return true;
this->established_ = false;
@@ -145,7 +145,7 @@
// server closed the connection
this->connectionClosed();
}
-
+
uint32_t ClientConnection::getRTT()
{
assert(server_);
Modified: code/branches/presentation2/src/libraries/network/ClientConnection.h
===================================================================
--- code/branches/presentation2/src/libraries/network/ClientConnection.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/ClientConnection.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
#ifndef _ClientConnection_H__
#define _ClientConnection_H__
@@ -39,10 +39,10 @@
public:
ClientConnection();
virtual ~ClientConnection();
-
+
void setServerAddress( const std::string& serverAddress );
void setPort( unsigned int port );
-
+
ENetEvent *getEvent();
// check wheter the packet queue is empty
bool queueEmpty();
@@ -58,7 +58,7 @@
private:
virtual void addPeer(ENetEvent* event);
virtual void removePeer(ENetEvent* event);
-
+
bool disconnectConnection();
// enet stuff
ENetAddress *serverAddress_;
Modified: code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -44,7 +44,7 @@
for (ObjectList<ClientConnectionListener>::iterator it = ObjectList<ClientConnectionListener>::begin(); it != ObjectList<ClientConnectionListener>::end(); ++it)
it->clientConnected(clientID);
}
-
+
void ClientConnectionListener::broadcastClientDisconnected(unsigned int clientID)
{
for (ObjectList<ClientConnectionListener>::iterator it = ObjectList<ClientConnectionListener>::begin(); it != ObjectList<ClientConnectionListener>::end(); ++it)
Modified: code/branches/presentation2/src/libraries/network/ClientConnectionListener.h
===================================================================
--- code/branches/presentation2/src/libraries/network/ClientConnectionListener.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/ClientConnectionListener.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -39,7 +39,7 @@
public:
ClientConnectionListener();
virtual ~ClientConnectionListener() {}
-
+
static void broadcastClientConnected(unsigned int clientID);
static void broadcastClientDisconnected(unsigned int clientID);
Modified: code/branches/presentation2/src/libraries/network/ClientInformation.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/ClientInformation.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/ClientInformation.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -45,8 +45,8 @@
namespace orxonox
{
-
+
ClientInformation *ClientInformation::head_=0;
ClientInformation::ClientInformation() {
Modified: code/branches/presentation2/src/libraries/network/Connection.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/Connection.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/Connection.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -74,7 +74,7 @@
void Connection::processQueue() {
ENetEvent event;
-
+
assert(this->host_);
while( enet_host_service( this->host_, &event, NETWORK_WAIT_TIMEOUT ) > 0 )
Modified: code/branches/presentation2/src/libraries/network/Connection.h
===================================================================
--- code/branches/presentation2/src/libraries/network/Connection.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/Connection.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -53,7 +53,7 @@
class _NetworkExport Connection{
public:
virtual ~Connection();
-
+
static bool addPacket(ENetPacket *packet, ENetPeer *peer);
bool sendPackets();
ENetHost* getHost(){ return this->host_; }
@@ -61,15 +61,15 @@
protected:
Connection();
static Connection* getInstance(){ return Connection::instance_; }
-
+
int service(ENetEvent* event);
virtual void disconnectPeer(ENetPeer *peer);
-
+
void processQueue();
virtual void addPeer(ENetEvent* event)=0;
virtual void removePeer(ENetEvent* event)=0;
virtual bool processPacket(ENetEvent* event);
-
+
ENetHost *host_;
private:
ENetAddress *bindAddress_;
Modified: code/branches/presentation2/src/libraries/network/FunctionCallManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/FunctionCallManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/FunctionCallManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -30,7 +30,7 @@
#include "packet/FunctionCalls.h"
namespace orxonox {
-
+
std::map<uint32_t, packet::FunctionCalls*> FunctionCallManager::clientMap_;
// Static calls
Modified: code/branches/presentation2/src/libraries/network/FunctionCallManager.h
===================================================================
--- code/branches/presentation2/src/libraries/network/FunctionCallManager.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/FunctionCallManager.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -48,16 +48,16 @@
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();
Modified: code/branches/presentation2/src/libraries/network/GamestateClient.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/GamestateClient.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/GamestateClient.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -80,10 +80,10 @@
int id = GAMESTATEID_INITIAL;
packet::Gamestate *processed = processGamestate(tempGamestate_);
assert(processed);
-
+
//now call the queued callbacks
NetworkCallbackManager::callCallbacks();
-
+
if (!processed){
sendAck(0);
return false;
Modified: code/branches/presentation2/src/libraries/network/GamestateHandler.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/GamestateHandler.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/GamestateHandler.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -32,7 +32,7 @@
namespace orxonox {
GamestateHandler *GamestateHandler::instance_=0;
-
+
GamestateHandler::GamestateHandler()
{
assert(instance_==0);
Modified: code/branches/presentation2/src/libraries/network/GamestateManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/GamestateManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/GamestateManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -125,7 +125,7 @@
}
return true;
}
-
+
void GamestateManager::sendGamestates()
{
ClientInformation *temp = ClientInformation::getBegin();
@@ -141,11 +141,11 @@
COUT(4) << "client id: " << temp->getID() << " RTT: " << temp->getRTT() << " loss: " << temp->getPacketLoss() << std::endl;
COUT(5) << "Server: doing gamestate gamestate preparation" << std::endl;
int cid = temp->getID(); //get client id
-
+
unsigned int gID = temp->getGamestateID();
if(!reference)
return;
-
+
packet::Gamestate *client=0;
if(gID != GAMESTATEID_INITIAL){
assert(gamestateMap_.find(cid)!=gamestateMap_.end());
@@ -155,7 +155,7 @@
client = it->second;
}
}
-
+
clientGamestates.push(0);
finishGamestate( cid, &clientGamestates.back(), client, reference );
//FunctorMember<GamestateManager>* functor =
@@ -164,12 +164,12 @@
// (*static_cast<Executor*>(executor))();
// this->threadPool_->passFunction( executor, true );
// (*functor)( cid, &(clientGamestates.back()), client, reference );
-
+
temp = temp->next();
}
-
+
// threadPool_->synchronise();
-
+
while( !clientGamestates.empty() )
{
if(clientGamestates.front())
@@ -184,7 +184,7 @@
//Server::sendGameState?
// save the (undiffed) gamestate in the clients gamestate map
//chose wheather the next gamestate is the first or not
-
+
packet::Gamestate *gs = gamestate->doSelection(clientID, 20000);
// packet::Gamestate *gs = new packet::Gamestate(*gamestate);
// packet::Gamestate *gs = new packet::Gamestate();
@@ -192,10 +192,10 @@
// this->threadMutex_->lock();
gamestateMap_[clientID][gamestate->getID()]=gs;
// this->threadMutex_->unlock();
-
+
if(base)
{
-
+
// COUT(3) << "diffing" << std::endl;
// packet::Gamestate* gs1 = gs;
packet::Gamestate *diffed = gs->diff(base);
@@ -209,8 +209,8 @@
else{
gs = new packet::Gamestate(*gs);
}
-
-
+
+
bool b = gs->compressData();
assert(b);
// COUT(4) << "sending gamestate with id " << gs->getID();
Modified: code/branches/presentation2/src/libraries/network/NetworkFunction.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/NetworkFunction.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/NetworkFunction.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -32,25 +32,25 @@
namespace orxonox
{
std::map<uint32_t, bool> NetworkFunctionBase::isStaticMap_;
-
+
std::map<NetworkFunctionPointer, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::functorMap_;
std::map<uint32_t, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::idMap_;
NetworkFunctionBase::NetworkFunctionBase(const std::string& name)
{
RegisterRootObject(NetworkFunctionBase);
-
+
static uint32_t networkID = 0;
this->networkID_ = networkID++;
-
+
this->name_ = name;
NetworkFunctionBase::getNameMap()[name] = this;
}
NetworkFunctionBase::~NetworkFunctionBase()
{
}
-
-
+
+
void NetworkFunctionBase::destroyAllNetworkFunctions()
{
std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionBase::getNameMap();
@@ -58,55 +58,55 @@
for( it=map.begin(); it!=map.end(); ++it )
it->second->destroy();
}
-
-
+
+
/*static*/ std::map<std::string, NetworkFunctionBase*>& NetworkFunctionBase::getNameMap()
{
static std::map<std::string, NetworkFunctionBase*> nameMap_;
return nameMap_;
}
-
-
+
+
NetworkFunctionStatic::NetworkFunctionStatic(FunctorStatic* functor, const std::string& name, const NetworkFunctionPointer& p):
NetworkFunctionBase(name)
{
RegisterObject(NetworkFunctionStatic);
-
+
this->functor_ = functor;
NetworkFunctionStatic::getFunctorMap()[p] = this;
NetworkFunctionStatic::getIdMap()[ this->getNetworkID() ] = this;
}
-
+
NetworkFunctionStatic::~NetworkFunctionStatic()
{
delete this->functor_;
}
-
+
/*static*/ std::map<NetworkFunctionPointer, NetworkFunctionStatic*>& NetworkFunctionStatic::getFunctorMap()
{
static std::map<NetworkFunctionPointer, NetworkFunctionStatic*> functorMap_;
return functorMap_;
}
-
+
/*static*/ std::map<uint32_t, NetworkFunctionStatic*>& NetworkFunctionStatic::getIdMap()
{
static std::map<uint32_t, NetworkFunctionStatic*> idMap_;
return idMap_;
}
-
-
+
+
NetworkMemberFunctionBase::NetworkMemberFunctionBase(const std::string& name, const NetworkFunctionPointer& p):
NetworkFunctionBase(name)
{
RegisterObject(NetworkMemberFunctionBase);
-
+
this->functorMap_[p] = this;
this->idMap_[ this->getNetworkID() ] = this;
}
-
+
NetworkMemberFunctionBase::~NetworkMemberFunctionBase()
{
}
-
+
}
Modified: code/branches/presentation2/src/libraries/network/NetworkFunction.h
===================================================================
--- code/branches/presentation2/src/libraries/network/NetworkFunction.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/NetworkFunction.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -73,29 +73,29 @@
public:
NetworkFunctionBase(const std::string& name);
~NetworkFunctionBase();
-
+
virtual void setNetworkID(uint32_t id) { this->networkID_ = id; }
inline uint32_t getNetworkID() const { return this->networkID_; }
inline const std::string& getName() const { return name_; }
static inline bool isStatic( uint32_t networkID ) { return isStaticMap_[networkID]; }
-
+
static inline void setNetworkID(const std::string& name, uint32_t id)
{
std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionBase::getNameMap();
assert( map.find(name)!=map.end() );
map[name]->setNetworkID(id);
}
-
+
static void destroyAllNetworkFunctions();
-
+
protected:
static std::map<uint32_t, bool> isStaticMap_;
-
+
private:
static std::map<std::string, NetworkFunctionBase*>& getNameMap();
uint32_t networkID_;
std::string name_;
-
+
};
@@ -103,14 +103,14 @@
public:
NetworkFunctionStatic(FunctorStatic* functor, const 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); }
-
+
virtual void setNetworkID( uint32_t id )
{ NetworkFunctionBase::setNetworkID( id ); NetworkFunctionStatic::getIdMap()[id] = this; }
static inline NetworkFunctionStatic* getNetworkFunction( uint32_t id)
@@ -119,12 +119,12 @@
{ assert( NetworkFunctionStatic::getIdMap().find(id) != NetworkFunctionStatic::getIdMap().end() ); return NetworkFunctionStatic::getIdMap()[id]; }
static NetworkFunctionStatic* getFunction( const NetworkFunctionPointer& p )
{ assert( NetworkFunctionStatic::getFunctorMap().find(p) != NetworkFunctionStatic::getFunctorMap().end() ); return NetworkFunctionStatic::getFunctorMap()[p]; }
-
+
private:
static std::map<NetworkFunctionPointer, NetworkFunctionStatic*>& getFunctorMap();
static std::map<uint32_t, NetworkFunctionStatic*>& getIdMap();
FunctorStatic* functor_;
-
+
};
@@ -132,12 +132,12 @@
public:
NetworkMemberFunctionBase(const std::string& name, const NetworkFunctionPointer& p);
~NetworkMemberFunctionBase();
-
+
virtual void setNetworkID( uint32_t id ){ NetworkFunctionBase::setNetworkID( id ); idMap_[id] = this; }
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;
@@ -145,7 +145,7 @@
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_;
@@ -156,7 +156,7 @@
public:
NetworkMemberFunction(FunctorMember<T>* functor, const std::string& name, const NetworkFunctionPointer& p);
~NetworkMemberFunction();
-
+
inline void call(uint32_t objectID)
{
if ( Synchronisable::getSynchronisable(objectID)!=0 )
@@ -187,7 +187,7 @@
if ( Synchronisable::getSynchronisable(objectID)!=0 )
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4, mt5);
}
-
+
private:
FunctorMember<T>* functor_;
};
Modified: code/branches/presentation2/src/libraries/network/Server.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/Server.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/Server.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -136,15 +136,15 @@
void Server::update(const Clock& time) {
// receive incoming packets
Connection::processQueue();
-
+
if ( ClientInformation::hasClients() )
{
// process incoming gamestates
GamestateManager::processGamestates();
-
+
// send function calls to clients
FunctionCallManager::sendCalls();
-
+
//this steers our network frequency
timeSinceLastUpdate_+=time.getDeltaTime();
if(timeSinceLastUpdate_>=NETWORK_PERIOD)
@@ -159,7 +159,7 @@
bool Server::queuePacket(ENetPacket *packet, int clientID){
return ServerConnection::addPacket(packet, clientID);
}
-
+
/**
* @brief: returns ping time to client in milliseconds
*/
@@ -167,7 +167,7 @@
assert(ClientInformation::findClient(clientID));
return ClientInformation::findClient(clientID)->getRTT();
}
-
+
void Server::printRTT()
{
for( ClientInformation* temp=ClientInformation::getBegin(); temp!=0; temp=temp->next() )
@@ -316,16 +316,16 @@
return false;
}
COUT(5) << "Con.Man: creating client id: " << temp->getID() << std::endl;
-
+
// synchronise class ids
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(4) << "sending welcome" << std::endl;
packet::Welcome *w = new packet::Welcome(temp->getID(), temp->getShipID());
@@ -343,7 +343,7 @@
assert(b);
return true;
}
-
+
void Server::disconnectClient( ClientInformation *client ){
ServerConnection::disconnectClient( client );
GamestateManager::removeClient(client);
Modified: code/branches/presentation2/src/libraries/network/Server.h
===================================================================
--- code/branches/presentation2/src/libraries/network/Server.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/Server.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -65,10 +65,10 @@
virtual bool isServer_(){return true;}
unsigned int shipID(){return 0;}
unsigned int playerID(){return 0;}
-
+
void addPeer(ENetEvent *event);
void removePeer(ENetEvent *event);
-
+
bool createClient(int clientID);
void disconnectClient( ClientInformation *client);
bool processPacket( ENetPacket *packet, ENetPeer *peer );
Modified: code/branches/presentation2/src/libraries/network/ServerConnection.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/ServerConnection.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/ServerConnection.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -98,12 +98,12 @@
enet_host_broadcast( Connection::getInstance()->getHost(), 0, packet);
return true;
}
-
+
void ServerConnection::disconnectClient(ClientInformation *client)
{
Connection::disconnectPeer( client->getPeer() );
}
-
+
void ServerConnection::disconnectClient(int clientID){
ClientInformation *client = ClientInformation::findClient(clientID);
if(client)
Modified: code/branches/presentation2/src/libraries/network/ServerConnection.h
===================================================================
--- code/branches/presentation2/src/libraries/network/ServerConnection.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/ServerConnection.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -49,10 +49,10 @@
class _NetworkExport ServerConnection : public Connection{
public:
~ServerConnection();
-
+
void setBindAddress( const std::string& bindAddress );
void setPort( unsigned int port );
-
+
bool openListener();
bool closeListener();
static bool addPacket(ENetPacket *packet, unsigned int ID);
Modified: code/branches/presentation2/src/libraries/network/TrafficControl.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/TrafficControl.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/TrafficControl.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -144,7 +144,7 @@
assert(clientListTemp_.find(clientID) != clientListTemp_.end() );
assert(clientListPerm_.find(clientID) != clientListPerm_.end() );
assert( clientListTemp_[clientID].find(gamestateID) != clientListTemp_[clientID].end() );
-
+
// shortcut for maps
std::map<unsigned int, objInfo >& objectListPerm = clientListPerm_[clientID];
std::map<unsigned int, std::list<obj> >& objectListTemp = clientListTemp_[clientID];
@@ -235,9 +235,9 @@
//compare listToProcess vs clientListPerm
//if listToProcess contains new Objects, add them to clientListPerm
std::list<obj>::iterator itvec;
-
+
std::map<unsigned int, objInfo >& objectListPerm = clientListPerm_[clientID];
-
+
for( itvec=list.begin(); itvec != list.end(); itvec++)
{
if ( objectListPerm.find( (*itvec).objID) != objectListPerm.end() )
@@ -255,12 +255,12 @@
}
}
//end compare listToProcess vs clientListPerm
-
+
//sort copied list according to priorities
// use boost bind here because we need to pass a memberfunction to stl sort
// sort( list.begin(), list.end(), boost::bind(&TrafficControl::prioritySort, this, clientID, _1, _2) );
list.sort( boost::bind(&TrafficControl::prioritySort, this, clientID, _1, _2) );
-
+
// list.sort(boost::bind(&TrafficControl::prioritySort, this, clientID, _1, _2) );
//now we check, that the creator of an object always exists on a client
@@ -276,7 +276,7 @@
//now sort again after objDataOffset
// sort(list.begin(), list.end(), boost::bind(&TrafficControl::dataSort, this, _1, _2) );
list.sort( boost::bind(&TrafficControl::dataSort, this, _1, _2) );
-
+
//diese Funktion updateClientList muss noch gemacht werden
updateClientListTemp(list);
//end of sorting
Modified: code/branches/presentation2/src/libraries/network/TrafficControl.h
===================================================================
--- code/branches/presentation2/src/libraries/network/TrafficControl.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/TrafficControl.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -68,10 +68,10 @@
obj();
obj( uint32_t ID, uint32_t creatorID, uint32_t size, uint32_t offset );
};
-
+
/**
*
*/
@@ -96,9 +96,9 @@
unsigned int currentClientID;
unsigned int targetSize;
bool bActive_;
-
+
void insertinClientListPerm(unsigned int clientID, obj objinf);
-
+
void cut(std::list<obj>& list, unsigned int targetsize);
void updateClientListTemp(std::list<obj>& list);//done
/**
@@ -106,12 +106,12 @@
*/
void evaluateList(unsigned int clientID, std::list<obj>& list);//done
void ack(unsigned int clientID, unsigned int gamestateID); // this function gets called when the server receives an ack from the client
-
+
//ClientConnectionListener functions
virtual void clientConnected(unsigned int clientID){};
virtual void clientDisconnected(unsigned int clientID);
-
+
protected:
static TrafficControl *instance_;
@@ -130,7 +130,7 @@
static void processAck(unsigned int clientID, unsigned int gamestateID)
{ return instance_->ack(clientID, gamestateID); }
void deleteObject(unsigned int objectID); // this function gets called when an object has been deleted (in order to clean up lists and maps)
-
+
bool prioritySort(uint32_t clientID, obj i, obj j);
bool dataSort(obj i, obj j);
void printList(std::list<obj>& list, unsigned int clientID);
Modified: code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -37,7 +37,7 @@
#define PACKET_FLAGS_ACK 0
#define _PACKETID 0
#define _ACKID _PACKETID + sizeof(packet::Type::Value)
-
+
Acknowledgement::Acknowledgement( unsigned int id, unsigned int clientID )
: Packet()
{
Modified: code/branches/presentation2/src/libraries/network/packet/Chat.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/Chat.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/Chat.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -34,7 +34,7 @@
namespace orxonox {
namespace packet {
-
+
#define PACKET_FLAGS_CHAT PacketFlag::Reliable
#define _PACKETID 0
const int _PLAYERID = _PACKETID + sizeof(Type::Value);
Modified: code/branches/presentation2/src/libraries/network/packet/ClassID.h
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/ClassID.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/ClassID.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -35,7 +35,7 @@
namespace orxonox {
namespace packet {
-
+
/**
@author
*/
Modified: code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -40,7 +40,7 @@
#define _PACKETID 0
#define _QUANTITY _PACKETID + sizeof(Type::Value)
#define _OBJECTIDS _QUANTITY + sizeof(uint32_t)
-
+
DeleteObjects::DeleteObjects()
: Packet()
{
Modified: code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -35,11 +35,11 @@
namespace orxonox {
namespace packet {
-
+
#define PACKET_FLAGS_FUNCTIONCALLS PacketFlag::Reliable
#define _PACKETID 0
const unsigned int FUNCTIONCALLS_MEM_ALLOCATION = 1000;
-
+
FunctionCalls::FunctionCalls()
: Packet()
{
@@ -170,7 +170,7 @@
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;
@@ -199,7 +199,7 @@
}
}
}
-
+
// now allocated mem if neccessary
if( currentSize_ + callsize > currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION )
{
@@ -209,7 +209,7 @@
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
@@ -239,12 +239,12 @@
}
//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;
@@ -273,7 +273,7 @@
}
}
}
-
+
// now allocated mem if neccessary
if( currentSize_ + callsize > currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION )
{
@@ -283,7 +283,7 @@
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
@@ -313,7 +313,7 @@
}
}
currentSize_ += callsize;
-
+
}
Modified: code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -52,7 +52,7 @@
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){
@@ -63,17 +63,17 @@
++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_);
*(Type::Value *)(this->data_ + _PACKETID ) = Type::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() ){
@@ -84,9 +84,9 @@
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 )
@@ -105,7 +105,7 @@
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));
@@ -120,13 +120,13 @@
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));
Modified: code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -35,7 +35,7 @@
namespace orxonox {
namespace packet {
-
+
/**
@author
*/
Modified: code/branches/presentation2/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/Gamestate.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/Gamestate.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -94,7 +94,7 @@
COUT(2) << "GameStateManager: could not allocate memory" << std::endl;
return false;
}
-
+
// create the header object
assert( header_ == 0 );
header_ = new GamestateHeader(data_);
@@ -104,13 +104,13 @@
mem += GamestateHeader::getSize();
ObjectList<Synchronisable>::iterator it;
for(it = ObjectList<Synchronisable>::begin(); it; ++it){
-
+
// tempsize=it->getSize(id, mode);
tempsize = it->getData(mem, id, mode);
if ( tempsize != 0 )
dataVector_.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
@@ -361,17 +361,17 @@
assert(this && base); assert(data_ && base->data_);
assert(!header_->isCompressed() && !base->header_->isCompressed());
assert(!header_->isDiffed());
-
+
uint8_t *basep = GAMESTATE_START(base->data_);
uint8_t *gs = GAMESTATE_START(this->data_);
uint32_t dest_length = header_->getDataSize();
-
+
if(dest_length==0)
return NULL;
-
+
uint8_t *ndata = new uint8_t[dest_length*sizeof(uint8_t)+GamestateHeader::getSize()];
uint8_t *dest = GAMESTATE_START(ndata);
-
+
rawDiff( dest, gs, basep, header_->getDataSize(), base->header_->getDataSize() );
#ifndef NDEBUG
uint8_t *dest2 = new uint8_t[dest_length];
@@ -397,19 +397,19 @@
assert(this && base); assert(data_ && base->data_);
assert(!header_->isCompressed() && !base->header_->isCompressed());
assert(header_->isDiffed());
-
+
uint8_t *basep = GAMESTATE_START(base->data_);
uint8_t *gs = GAMESTATE_START(this->data_);
uint32_t dest_length = header_->getDataSize();
-
+
if(dest_length==0)
return NULL;
-
+
uint8_t *ndata = new uint8_t[dest_length*sizeof(uint8_t)+GamestateHeader::getSize()];
uint8_t *dest = ndata + GamestateHeader::getSize();
-
+
rawDiff( dest, gs, basep, header_->getDataSize(), base->header_->getDataSize() );
-
+
Gamestate *g = new Gamestate(ndata, getClientID());
assert(g->header_);
*(g->header_) = *header_;
@@ -480,7 +480,7 @@
uint64_t* gd = (uint64_t*)data;
uint64_t* bd = (uint64_t*)basedata;
uint64_t* nd = (uint64_t*)newdata;
-
+
unsigned int i;
for( i=0; i<datalength/8; i++ )
{
Modified: code/branches/presentation2/src/libraries/network/packet/Packet.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/Packet.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/packet/Packet.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -100,7 +100,7 @@
/**
@brief
Destroys a packet completely.
-
+
That also means destroying the ENetPacket if one exists. There
*/
Packet::~Packet(){
Modified: code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.h
===================================================================
--- code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -35,9 +35,9 @@
// #include "util/MultiType.h"
namespace orxonox{
-
+
struct EmptyType{};
-
+
class _NetworkExport NetworkCallbackBase
{
public:
@@ -59,7 +59,7 @@
T* object_;
void (T::*function_) (void);
};
-
+
template <class T, class U>
class NetworkCallbackNotify: public NetworkCallbackBase
{
Modified: code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,15 +25,15 @@
* ...
*
*/
-
+
#include "NetworkCallbackManager.h"
#include "NetworkCallback.h"
namespace orxonox{
-
+
std::set<NetworkCallbackBase*> NetworkCallbackManager::callbackSet_;
std::queue<NetworkCallbackBase*> NetworkCallbackManager::triggeredCallbacks_;
-
+
void NetworkCallbackManager::registerCallback(NetworkCallbackBase *cb)
{
callbackSet_.insert(cb);
@@ -47,7 +47,7 @@
delete cb;
}
}
-
+
void NetworkCallbackManager::triggerCallback(NetworkCallbackBase *cb)
{
if (triggeredCallbacks_.empty() || triggeredCallbacks_.front() != cb)
Modified: code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.h
===================================================================
--- code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -36,7 +36,7 @@
#include <queue>
namespace orxonox{
-
+
class _NetworkExport NetworkCallbackManager{
public:
static void registerCallback(NetworkCallbackBase *cb);
@@ -47,8 +47,8 @@
static std::set<NetworkCallbackBase*> callbackSet_;
static std::queue<NetworkCallbackBase*> triggeredCallbacks_;
};
-
+
}
Modified: code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -61,7 +61,7 @@
objectID_=OBJECTID_UNKNOWN;
}
classID_ = static_cast<uint32_t>(-1);
-
+
// set dataSize to 0
this->dataSize_ = 0;
// set standard priority
@@ -276,14 +276,14 @@
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);
Modified: code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -131,13 +131,13 @@
inline uint32_t getClassID() const {return this->classID_;}
inline unsigned int getPriority() const { return this->objectFrequency_;}
inline uint8_t getSyncMode() const { return this->objectMode_; }
-
+
void setSyncMode(uint8_t mode);
protected:
Synchronisable(BaseObject* creator);
template <class T> void registerVariable(T& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false);
-
+
void setPriority(unsigned int freq){ objectFrequency_ = freq; }
@@ -147,7 +147,7 @@
bool updateData(uint8_t*& mem, uint8_t mode=0x0, bool forceCallback=false);
bool isMyData(uint8_t* mem);
bool doSync(int32_t id, uint8_t mode=0x0);
-
+
inline void setObjectID(uint32_t id){ this->objectID_ = id; objectMap_[this->objectID_] = this; }
inline void setClassID(uint32_t id){ this->classID_ = id; }
@@ -180,10 +180,10 @@
this->dataSize_ += syncList.back()->getSize(state_);
}
}
-
+
template <> _NetworkExport void Synchronisable::registerVariable( std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional);
-
+
}
#endif /* _Synchronisable_H__ */
Modified: code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h
===================================================================
--- code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -40,7 +40,7 @@
#include "network/synchronisable/NetworkCallbackManager.h"
namespace orxonox{
-
+
namespace VariableDirection{
enum Value{
ToClient=0x1,
@@ -53,7 +53,7 @@
ClientMaster=0x2
};
}
-
+
class _NetworkExport SynchronisableVariableBase
{
public:
@@ -84,14 +84,14 @@
uint8_t mode_;
NetworkCallbackBase *callback_;
};
-
+
template <class T>
class SynchronisableVariableBidirectional: public SynchronisableVariable<T>
{
public:
SynchronisableVariableBidirectional(T& variable, uint8_t master=Bidirectionality::ServerMaster, NetworkCallbackBase *cb=0);
virtual ~SynchronisableVariableBidirectional();
-
+
virtual inline uint8_t getMode(){ return 0x3; } //this basically is a hack ^^
virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode);
virtual void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false);
@@ -111,7 +111,7 @@
state_ = GameMode::isMaster() ? 0x1 : 0x2; // set the appropriate mode here
}
}
-
+
template <class T> SynchronisableVariable<T>::~SynchronisableVariable()
{
if (this->callback_)
@@ -252,8 +252,8 @@
{
return returnSize( this->variable_ ) + sizeof(varReference_);
}
-
+
}
Modified: code/branches/presentation2/src/libraries/tools/Timer.cc
===================================================================
--- code/branches/presentation2/src/libraries/tools/Timer.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/tools/Timer.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -111,7 +111,7 @@
{
this->deleteExecutor();
}
-
+
/**
@brief Initializes the Timer
*/
Modified: code/branches/presentation2/src/libraries/tools/Timer.h
===================================================================
--- code/branches/presentation2/src/libraries/tools/Timer.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/tools/Timer.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -139,7 +139,7 @@
private:
void init();
-
+
Executor* executor_; //!< The executor of the function that should be called when the time expires
long long interval_; //!< The time-interval in micro seconds
Modified: code/branches/presentation2/src/libraries/tools/interfaces/TimeFactorListener.h
===================================================================
--- code/branches/presentation2/src/libraries/tools/interfaces/TimeFactorListener.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/tools/interfaces/TimeFactorListener.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -39,7 +39,7 @@
public:
TimeFactorListener();
virtual ~TimeFactorListener() {}
-
+
static void setTimeFactor( float factor );
static void setTimeFactorInternal( float factor );
static inline float getTimeFactor(){ return TimeFactorListener::timefactor_s; }
Modified: code/branches/presentation2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc
===================================================================
--- code/branches/presentation2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -45,7 +45,7 @@
// TimeFactorListener
//----------------------------
registerStaticNetworkFunction( &TimeFactorListener::setTimeFactorInternal );
-
+
float TimeFactorListener::timefactor_s = 1.0f;
TimeFactorListener::TimeFactorListener()
@@ -59,7 +59,7 @@
callStaticNetworkFunction( &TimeFactorListener::setTimeFactorInternal, CLIENTID_UNKNOWN, factor );
TimeFactorListener::setTimeFactorInternal(factor);
}
-
+
/*static*/ void TimeFactorListener::setTimeFactorInternal( float factor )
{
float oldFactor = TimeFactorListener::timefactor_s;
Modified: code/branches/presentation2/src/libraries/util/Clock.cc
===================================================================
--- code/branches/presentation2/src/libraries/util/Clock.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/util/Clock.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -43,7 +43,7 @@
{
delete timer_;
}
-
+
/**
@remarks
Mind the types! Ogre::Timer::getMicroseconds() will return an unsigned
Modified: code/branches/presentation2/src/libraries/util/Math.cc
===================================================================
--- code/branches/presentation2/src/libraries/util/Math.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/util/Math.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -137,10 +137,10 @@
else
return orxonox::Vector2(0, 1);
}
-
+
float cos_value = clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1);
float sin_value = sqrt( 1 - cos_value*cos_value );
-
+
if ((mydirection.crossProduct(myorthonormal)).dotProduct(distance) > 0)
return orxonox::Vector2( sin_value, cos_value );
else
@@ -178,7 +178,7 @@
return orxonox::Vector2(0, 1);
}
//float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));
-
+
float cos_value = clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1);
float sin_value = sqrt( 1 - cos_value*cos_value );
Modified: code/branches/presentation2/src/libraries/util/MultiType.h
===================================================================
--- code/branches/presentation2/src/libraries/util/MultiType.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/util/MultiType.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -231,7 +231,7 @@
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;
@@ -338,7 +338,7 @@
/** @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::Value)<=8); *static_cast<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 */
Modified: code/branches/presentation2/src/libraries/util/MultiTypeValue.h
===================================================================
--- code/branches/presentation2/src/libraries/util/MultiTypeValue.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/util/MultiTypeValue.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -149,7 +149,7 @@
/** @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 */
@@ -159,7 +159,7 @@
T value_; //!< The stored value
};
-
+
// Import / Export specialisation
// ColourValue
template <> inline void MT_Value<ColourValue>::importData( uint8_t*& mem )
Modified: code/branches/presentation2/src/libraries/util/Serialise.h
===================================================================
--- code/branches/presentation2/src/libraries/util/Serialise.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/util/Serialise.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -39,7 +39,7 @@
#include "util/mbool.h"
namespace orxonox{
-
+
/** @brief returns the size of the variable in a datastream */
template <class T> inline uint32_t returnSize( const T& variable );
/** @brief loads the value of a variable out of the bytestream and increases the mem pointer */
@@ -201,7 +201,7 @@
{
return sizeof(uint32_t);
}
-
+
template <> inline void loadAndIncrease( const unsigned int& variable, uint8_t*& mem )
{
*(unsigned int*)( &variable ) = *(uint32_t*)(mem);
@@ -469,7 +469,7 @@
Ogre::Real* r = (Ogre::Real*)mem;
return variable==Degree(*r);
}
-
+
// =========== Vector2
template <> inline uint32_t returnSize( const Vector2& variable )
@@ -493,7 +493,7 @@
{
return checkEquality(variable.x, mem) && checkEquality(variable.y, mem+returnSize(variable.x));
}
-
+
// =========== Vector3
template <> inline uint32_t returnSize( const Vector3& variable )
@@ -520,7 +520,7 @@
return checkEquality(variable.x, mem) && checkEquality(variable.y, mem+returnSize(variable.x)) &&
checkEquality(variable.z, mem+returnSize(variable.x)+returnSize(variable.y));
}
-
+
// =========== Vector4
template <> inline uint32_t returnSize( const Vector4& variable )
@@ -550,7 +550,7 @@
checkEquality(variable.y, mem+returnSize(variable.w)+returnSize(variable.x)) &&
checkEquality(variable.z, mem+returnSize(variable.w)+returnSize(variable.x)+returnSize(variable.y));
}
-
+
// =========== Quaternion
template <> inline uint32_t returnSize( const Quaternion& variable )
@@ -580,7 +580,7 @@
checkEquality(variable.y, mem+returnSize(variable.w)+returnSize(variable.x)) &&
checkEquality(variable.z, mem+returnSize(variable.w)+returnSize(variable.x)+returnSize(variable.y));
}
-
+
// =========== ColourValue
template <> inline uint32_t returnSize( const ColourValue& variable )
@@ -610,7 +610,7 @@
checkEquality(variable.b, mem+returnSize(variable.r)+returnSize(variable.g)) &&
checkEquality(variable.a, mem+returnSize(variable.r)+returnSize(variable.g)+returnSize(variable.b));
}
-
+
// =========== mbool
template <> inline uint32_t returnSize( const mbool& variable )
Modified: code/branches/presentation2/src/libraries/util/mbool.h
===================================================================
--- code/branches/presentation2/src/libraries/util/mbool.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/libraries/util/mbool.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -66,7 +66,7 @@
inline bool operator!() const
{ return (!this->value_.bool_); }
-
+
inline unsigned char& getMemory(){ return value_.memory_; }
private:
Modified: code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -44,7 +44,7 @@
EventTarget::~EventTarget()
{
}
-
+
void EventTarget::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(EventTarget, XMLPort, xmlelement, mode);
@@ -71,7 +71,7 @@
void EventTarget::setTargetName(const std::string& name)
{
this->target_ = name;
-
+
for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
if (it->getName() == this->target_)
this->addEventTarget(*it);
Modified: code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.h
===================================================================
--- code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -41,9 +41,9 @@
public:
EventTarget(BaseObject* creator);
virtual ~EventTarget();
-
+
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
+
virtual void processEvent(Event& event);
void setTargetName(const std::string& name);
@@ -53,7 +53,7 @@
private:
virtual void loadedNewXMLName(BaseObject* object);
void addEventTarget(BaseObject* object);
-
+
std::string target_;
bool bActive_;
};
Modified: code/branches/presentation2/src/modules/overlays/GUIOverlay.cc
===================================================================
--- code/branches/presentation2/src/modules/overlays/GUIOverlay.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/overlays/GUIOverlay.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -61,7 +61,7 @@
void GUIOverlay::changedVisibility()
{
SUPER(GUIOverlay, changedVisibility);
-
+
//Setting player now.
if( this->getOwner() )
GUIManager::getInstance().setPlayer(this->guiName_, (orxonox_cast<ControllableEntity*>(this->getOwner()))->getPlayer());
Modified: code/branches/presentation2/src/modules/overlays/hud/UnderAttackHealthBar.cc
===================================================================
--- code/branches/presentation2/src/modules/overlays/hud/UnderAttackHealthBar.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/overlays/hud/UnderAttackHealthBar.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -93,11 +93,11 @@
}
}
}
-
+
void UnderAttackHealthBar::changedOverlayGroup()
{
SUPER(UnderAttackHealthBar, changedOverlayGroup);
-
+
this->getOverlayGroup()->addElement(this->text_.get());
}
Modified: code/branches/presentation2/src/modules/overlays/stats/CreateLines.cc
===================================================================
--- code/branches/presentation2/src/modules/overlays/stats/CreateLines.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/overlays/stats/CreateLines.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -93,7 +93,7 @@
this->playerNameText_->changedVisibility();
this->background_->changedVisibility();
}
-
+
void CreateLines::setOverlayGroup( OverlayGroup* group )
{
this->scoreText_->setOverlayGroup( group );
Modified: code/branches/presentation2/src/modules/pong/Pong.cc
===================================================================
--- code/branches/presentation2/src/modules/pong/Pong.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/pong/Pong.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -41,7 +41,7 @@
{
CreateEventName(PongCenterpoint, right);
CreateEventName(PongCenterpoint, left);
-
+
CreateUnloadableFactory(Pong);
Pong::Pong(BaseObject* creator) : Deathmatch(creator)
@@ -163,7 +163,7 @@
this->center_->fireEvent(FireEventName(PongCenterpoint, right));
else if (player == this->getLeftPlayer())
this->center_->fireEvent(FireEventName(PongCenterpoint, left));
-
+
if (player)
this->gtinfo_->sendAnnounceMessage(player->getName() + " scored");
}
Modified: code/branches/presentation2/src/modules/pong/PongAI.cc
===================================================================
--- code/branches/presentation2/src/modules/pong/PongAI.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/pong/PongAI.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -130,7 +130,7 @@
delay = true;
this->bOscillationAvoidanceActive_ = false;
}
-
+
// If the ball is close enough, calculate another random offset to accelerate the ball
if (!this->bChangedRandomOffset_)
{
@@ -205,11 +205,11 @@
{
// calculate the time until the ball reaches the other side
float totaltime = (-position.x + dimension.x / 2 * sgn(velocity.x)) / velocity.x;
-
+
// calculate wall bounce position (four possible solutions of the equation: pos.z + vel.z*t + acc.z/2*t^2 = +/- dim.z/2)
float bouncetime = totaltime;
bool bUpperWall = false;
-
+
if (acceleration.z == 0)
{
if (velocity.z > 0)
@@ -269,7 +269,7 @@
// ball bounces after <bouncetime> seconds, update the position and continue
velocity.z = velocity.z + acceleration.z * bouncetime;
-
+
if (bUpperWall)
{
position.z = dimension.y / 2;
@@ -280,7 +280,7 @@
position.z = -dimension.y / 2;
velocity.z = fabs(velocity.z) - fabs(randomErrorZ);
}
-
+
position.x = position.x + velocity.x * bouncetime + randomErrorX;
this->ballEndPosition_ = position.z;
}
Modified: code/branches/presentation2/src/modules/pong/PongBall.cc
===================================================================
--- code/branches/presentation2/src/modules/pong/PongBall.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/pong/PongBall.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -104,7 +104,7 @@
velocity.x = -velocity.x;
velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
acceleration = this->bat_[1]->getVelocity() * this->accelerationFactor_ * -1;
-
+
this->fireEvent();
}
else if (GameMode::isMaster() && position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
Modified: code/branches/presentation2/src/modules/questsystem/AddQuestHint.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/AddQuestHint.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/AddQuestHint.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -70,7 +70,7 @@
SUPER(AddQuestHint, XMLPort, xmlelement, mode);
XMLPortParam(AddQuestHint, "hintId", setHintId, getHintId, xmlelement, mode);
-
+
COUT(3) << "New AddQuestHint, with target QuestHint {" << this->getHintId() << "}, created." << std::endl;
}
@@ -89,7 +89,7 @@
COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
return false;
}
-
+
this->hintId_ = id;
return true;
}
Modified: code/branches/presentation2/src/modules/questsystem/AddReward.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/AddReward.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/AddReward.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -66,7 +66,7 @@
SUPER(AddReward, XMLPort, xmlelement, mode);
XMLPortObject(AddReward, Rewardable, "", addRewardable, getRewardables, xmlelement, mode);
-
+
COUT(3) << "New AddReward, with " << this->rewards_.size() << " Rewardables created." << std::endl;
}
@@ -103,13 +103,13 @@
bool AddReward::invoke(PlayerInfo* player)
{
COUT(3) << "AddReward on player: " << player << " ." << std::endl;
-
+
bool check = true;
for ( std::list<Rewardable*>::iterator reward = this->rewards_.begin(); reward != this->rewards_.end(); ++reward )
{
check = check && (*reward)->reward(player);
}
-
+
COUT(3) << "Rewardable successfully added to player." << player << " ." << std::endl;
return check;
Modified: code/branches/presentation2/src/modules/questsystem/ChangeQuestStatus.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/ChangeQuestStatus.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/ChangeQuestStatus.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -82,7 +82,7 @@
COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
return false;
}
-
+
this->questId_ = id;
return true;
}
Modified: code/branches/presentation2/src/modules/questsystem/CompleteQuest.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/CompleteQuest.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/CompleteQuest.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
/**
@file
@brief Implementation of the CompleteQuest class.
@@ -66,7 +66,7 @@
void CompleteQuest::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(CompleteQuest, XMLPort, xmlelement, mode);
-
+
COUT(3) << "New CompleteQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
}
Modified: code/branches/presentation2/src/modules/questsystem/FailQuest.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/FailQuest.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/FailQuest.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
/**
@file
@brief Implementation of the FailQuest class.
@@ -66,7 +66,7 @@
void FailQuest::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(FailQuest, XMLPort, xmlelement, mode);
-
+
COUT(3) << "New FailQUest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
}
@@ -102,7 +102,7 @@
COUT(2) << e.getFullDescription() << std::endl;
return false;
}
-
+
COUT(3) << "Quest {" << quest->getId() << "} failed by player: " << player << " ." << std::endl;
return true;
}
Modified: code/branches/presentation2/src/modules/questsystem/GlobalQuest.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/GlobalQuest.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/GlobalQuest.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
/**
@file
@brief Implementation of the GlobalQuest class.
@@ -58,7 +58,7 @@
{
}
-
+
/**
@brief
Method for creating a GlobalQuest object through XML.
@@ -66,12 +66,12 @@
void GlobalQuest::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(GlobalQuest, XMLPort, xmlelement, mode);
-
+
XMLPortObject(GlobalQuest, QuestEffect, "reward-effects", addRewardEffect, getRewardEffects, xmlelement, mode);
COUT(3) << "New GlobalQuest {" << this->getId() << "} created." << std::endl;
}
-
+
/**
@brief
Fails the Quest for all players.
@@ -88,9 +88,9 @@
COUT(4) << "A non-completable quest was trying to be failed." << std::endl;
return false;
}
-
+
Quest::fail(player);
-
+
//! Iterate through all players possessing this Quest.
for(std::set<PlayerInfo*>::const_iterator it = players_.begin(); it != players_.end(); it++)
{
@@ -117,15 +117,15 @@
COUT(4) << "A non-completable quest was trying to be completed." << std::endl;
return false;
}
-
+
//! Iterate through all players possessing the Quest.
for(std::set<PlayerInfo*>::const_iterator it = players_.begin(); it != players_.end(); it++)
{
QuestEffect::invokeEffects(*it, this->getCompleteEffectList());
}
-
+
Quest::complete(player);
-
+
QuestEffect::invokeEffects(player, this->rewards_); //!< Invoke reward QuestEffects on the player completing the Quest.
return true;
}
@@ -229,11 +229,11 @@
{
this->players_.insert(player); //!< Add the player to the set.
}
-
+
this->status_ = status; //!< Set the status, which is global, remember...?
return true;
}
-
+
/**
@brief
Adds a reward QuestEffect to the list of reward QuestEffects.
@@ -255,7 +255,7 @@
COUT(3) << "Reward effect was added to Quest {" << this->getId() << "}." << std::endl;
return true;
}
-
+
/**
@brief
Returns the reward QuestEffect at the given index.
Modified: code/branches/presentation2/src/modules/questsystem/LocalQuest.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/LocalQuest.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/LocalQuest.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -86,9 +86,9 @@
COUT(4) << "A non-failable quest was trying to be failed." << std::endl;
return false;
}
-
+
Quest::fail(player);
-
+
QuestEffect::invokeEffects(player, this->getFailEffectList()); //!< Invoke the failEffects.
return true;
}
@@ -109,9 +109,9 @@
COUT(4) << "A non-completable quest was trying to be completed." << std::endl;
return false;
}
-
+
Quest::complete(player);
-
+
QuestEffect::invokeEffects(player, this->getCompleteEffectList()); //!< Invoke the complete QuestEffects.
return true;
}
@@ -187,7 +187,7 @@
{
return it->second;
}
-
+
return QuestStatus::Inactive; //!< If the player is not yet in the map, that means the status of the quest form him is 'inactive'.
}
@@ -208,7 +208,7 @@
{
return false;
}
-
+
this->playerStatus_[player] = status;
return true;
}
Modified: code/branches/presentation2/src/modules/questsystem/Quest.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/Quest.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/Quest.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
/**
@file
@brief Implementation of the Quest class.
@@ -203,7 +203,7 @@
const Quest* Quest::getSubQuest(unsigned int index) const
{
int i = index;
-
+
//! Iterate through all subquests.
for (std::list<Quest*>::const_iterator subQuest = this->subQuests_.begin(); subQuest != this->subQuests_.end(); ++subQuest)
{
@@ -213,7 +213,7 @@
}
i--;
}
-
+
return NULL; //!< If the index is greater than the number of elements in the list.
}
@@ -228,7 +228,7 @@
const QuestHint* Quest::getHint(unsigned int index) const
{
int i = index;
-
+
//! Iterate through all QuestHints.
for (std::list<QuestHint*>::const_iterator hint = this->hints_.begin(); hint != this->hints_.end(); ++hint)
{
@@ -252,7 +252,7 @@
const QuestEffect* Quest::getFailEffect(unsigned int index) const
{
int i = index;
-
+
//! Iterate through all fail QuestEffects.
for (std::list<QuestEffect*>::const_iterator effect = this->failEffects_.begin(); effect != this->failEffects_.end(); ++effect)
{
@@ -276,7 +276,7 @@
const QuestEffect* Quest::getCompleteEffect(unsigned int index) const
{
int i = index;
-
+
//! Iterate through all complete QuestEffects.
for (std::list<QuestEffect*>::const_iterator effect = this->completeEffects_.begin(); effect != this->completeEffects_.end(); ++effect)
{
@@ -349,7 +349,7 @@
{
return this->getStatus(player) == QuestStatus::Completed;
}
-
+
/**
@brief
Fails the Quest for an input player.
@@ -362,13 +362,13 @@
{
QuestListener::advertiseStatusChange(this->listeners_, "fail"); //!< Tells the QuestListeners, that the status has changed to failed.
this->setStatus(player, QuestStatus::Failed);
-
+
COUT(4) << "Quest {" << this->getId() << "} is failed for player: " << player << " ." <<std::endl;
-
+
this->getDescription()->sendFailQuestNotification();
return true;
}
-
+
/**
@brief
Completes the Quest for an input player.
@@ -381,9 +381,9 @@
{
QuestListener::advertiseStatusChange(this->listeners_, "complete"); //!< Tells the QuestListeners, that the status has changed to completed.
this->setStatus(player, QuestStatus::Completed);
-
+
COUT(4) << "Quest {" << this->getId() << "} is completed for player: " << player << " ." <<std::endl;
-
+
this->getDescription()->sendCompleteQuestNotification();
return true;
}
@@ -403,17 +403,17 @@
COUT(4) << "A non-startable quest was trying to be started." << std::endl;
return false;
}
-
+
COUT(4) << "Quest {" << this->getId() << "} is started for player: " << player << " ." <<std::endl;
-
+
QuestListener::advertiseStatusChange(this->listeners_, "start"); //!< Tells the QuestListeners, that the status has changed to active.
-
+
this->setStatus(player, QuestStatus::Active);
-
+
this->getDescription()->sendAddQuestNotification();
return true;
}
-
+
/**
@brief
Adds a QuestListener to the list of QuestListeners listening to this Quest.
@@ -429,7 +429,7 @@
COUT(2) << "A NULL-QuestListener was trying to be added to a Quests listeners." << std::endl;
return false;
}
-
+
this->listeners_.push_back(listener);
return true;
}
Modified: code/branches/presentation2/src/modules/questsystem/QuestDescription.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestDescription.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestDescription.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -49,7 +49,7 @@
QuestDescription::QuestDescription(BaseObject* creator) : BaseObject(creator)
{
RegisterObject(QuestDescription);
-
+
this->title_ = "";
this->description_ = "";
}
@@ -78,7 +78,7 @@
COUT(3) << "New QuestDescription with title '" << this->getTitle() << "' created." << std::endl;
}
-
+
/**
@brief
This method is a helper for sending QuestDescriptions as Notifications.
@@ -123,7 +123,7 @@
COUT(2) << "Bad input in notificationHelper, this should not be happening!" << std::endl;
return false;
}
-
+
QuestNotification* notification = new QuestNotification(message);
notification->send();
return true;
Modified: code/branches/presentation2/src/modules/questsystem/QuestEffect.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestEffect.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestEffect.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -68,7 +68,7 @@
/*static*/ bool QuestEffect::invokeEffects(PlayerInfo* player, std::list<QuestEffect*> & effects)
{
bool check = true;
-
+
COUT(4) << "Invoking QuestEffects on player: " << player << " ." << std::endl;
for (std::list<QuestEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
Modified: code/branches/presentation2/src/modules/questsystem/QuestGUI.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestGUI.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestGUI.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -76,7 +76,7 @@
(*it)->destroy();
}
this->windows_.clear();
-
+
if(this->root_ != NULL)
this->root_->destroy();
}
@@ -103,7 +103,7 @@
COUT(3) << "Updating QuestGUI..." << std::endl;
this->clear(); //!< Clear the GUI.
-
+
int depth = 0;
int index = 0;
@@ -234,7 +234,7 @@
QuestGUINode* node = new QuestGUINode(this, parent, item, depth, index); //!< Create a new QuestGUINode.
this->nodes_.insert(std::pair<CEGUI::Window*, QuestGUINode*>(node->getWindow(),node)); //!< Insert the node and its window in the nodes_ map.
-
+
index++;
//! Check if the QuestItem is a Quest, if not (it's a QuestHint) it just returns.
Modified: code/branches/presentation2/src/modules/questsystem/QuestGUI.h
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestGUI.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestGUI.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -55,7 +55,7 @@
{
public:
-
+
QuestGUI(PlayerInfo* player);
virtual ~QuestGUI();
@@ -85,9 +85,9 @@
*/
inline PlayerInfo* getPlayer(void)
{ return this->player_; }
-
+
private:
-
+
int createNode(QuestGUINode* parent, QuestItem* item, int depth, int index); //!< Recursive method to create Nodes for all Quests an Hints the given Quest is a parent to.
void clear(void); //!< Clear the QuestGUI.
Modified: code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -118,7 +118,7 @@
void QuestGUINode::toggleVisibility(void)
{
-
+
}
/**
@@ -208,7 +208,7 @@
offset += height;
}
-
+
//! Create title pane for the description.
stream.str("");
stream << this->details_->getName() << "/Description";
@@ -281,7 +281,7 @@
bool QuestGUINode::openDetails(const CEGUI::EventArgs& e)
{
COUT(3) << "Open QuestItem..." << std::endl;
-
+
//CEGUI::Window* window = this->gui_->getRootWindow();
CEGUI::Window* window = this->gui_->getWindowManager()->getWindow("orxonox/QuestGUI/Background");
@@ -343,7 +343,7 @@
//! Set the height to the window.
window->setHeight(CEGUI::UDim(0, height));
-
+
//Debug
const CEGUI::Rect newArea = getStaticTextArea(window);
@@ -367,7 +367,7 @@
void QuestGUINode::createWindow(void)
{
Quest* quest = dynamic_cast<Quest*>(this->item_);
-
+
this->window_ = this->gui_->getWindow();
std::ostringstream stream;
stream << "QuestGUI/Quests/";
@@ -376,7 +376,7 @@
stream << this->parent_->index_ << "/Hints/";
}
stream << this->index_;
-
+
this->window_->rename(stream.str());
this->window_->setText(this->item_->getDescription()->getTitle());
Modified: code/branches/presentation2/src/modules/questsystem/QuestGUINode.h
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestGUINode.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestGUINode.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -43,11 +43,11 @@
{
public:
-
+
QuestGUINode(void);
QuestGUINode(QuestGUI* gui, QuestGUINode* parent, QuestItem* item, int depth, int index);
virtual ~QuestGUINode(void);
-
+
void toggleVisibility(void);
void getName(std::string & buffer); //!< Sets the input buffer to the name of the node.
Modified: code/branches/presentation2/src/modules/questsystem/QuestHint.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestHint.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestHint.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
/**
@file
@brief Implementation of the QuestHint class.
@@ -70,7 +70,7 @@
SUPER(QuestHint, XMLPort, xmlelement, mode);
QuestManager::getInstance().registerHint(this); //!< Registers the QuestHint with the QuestManager.
-
+
COUT(3) << "New QuestHint {" << this->getId() << "} created." << std::endl;
}
@@ -99,7 +99,7 @@
{
return it->second;
}
-
+
return QuestStatus::Inactive;
}
@@ -118,7 +118,7 @@
if(!(this->isActive(player))) //!< If the hint is already active, activation is pointless.
{
this->playerStatus_[player] = QuestHintStatus::Active;
-
+
this->getDescription()->sendAddHintNotification();
return true;
}
@@ -128,7 +128,7 @@
return false;
}
}
-
+
COUT(2) << "A hint of a non-active quest was trying to get activated." << std::endl;
return false;
}
Modified: code/branches/presentation2/src/modules/questsystem/QuestItem.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestItem.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestItem.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
/**
@file
@brief Implementation of the QuestItem class.
@@ -85,7 +85,7 @@
COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
return;
}
-
+
this->id_ = id;
}
Modified: code/branches/presentation2/src/modules/questsystem/QuestListener.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestListener.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestListener.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -49,11 +49,11 @@
QuestListener::QuestListener(BaseObject* creator) : BaseObject(creator)
{
RegisterObject(QuestListener);
-
+
this->mode_ = QuestListenerMode::All;
this->quest_ = NULL;
}
-
+
/**
@brief
Destructor.
@@ -61,7 +61,7 @@
QuestListener::~QuestListener()
{
}
-
+
/**
@brief
Method for creating a Quest object through XML.
@@ -74,10 +74,10 @@
XMLPortParam(QuestListener, "mode", setMode, getMode, xmlelement, mode);
this->quest_->addListener(this); //!< Adds the QuestListener to the Quests list of listeners.
-
+
COUT(3) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << std::endl;
}
-
+
/**
@brief
Makes all QuestListener in the list aware that a certain status change has occurred and executes them if the status change affects them.
@@ -97,7 +97,7 @@
}
}
}
-
+
/**
@brief
Sets the questId of the Quest the QuestListener reacts to.
@@ -109,16 +109,16 @@
bool QuestListener::setQuestId(const std::string & id)
{
this->quest_ = QuestManager::getInstance().findQuest(id); //!< Find the Quest corresponding to the given questId.
-
+
if(this->quest_ == NULL) //!< If there is no such Quest.
{
ThrowException(Argument, "This is bad! The QuestListener has not found a Quest with a corresponding id..");
return false;
}
-
+
return true;
}
-
+
/**
@brief
Sets the mode of the QuestListener.
@@ -151,10 +151,10 @@
this->mode_ = QuestListenerMode::All;
return false;
}
-
+
return true;
}
-
+
/**
@brief
Get the mode of the QuestListener.
Modified: code/branches/presentation2/src/modules/questsystem/QuestNotification.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestNotification.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/QuestNotification.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -37,15 +37,15 @@
{
this->initialize();
}
-
+
QuestNotification::QuestNotification(const std::string & message) : Notification(message)
{
this->initialize();
}
-
+
QuestNotification::~QuestNotification()
{
-
+
}
bool QuestNotification::send(void)
Modified: code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -48,7 +48,7 @@
RegisterObject(Notification);
this->initialize();
}
-
+
/**
@brief
Constructor. Creates a Notification with the input message.
@@ -59,7 +59,7 @@
{
this->message_ = message;
}
-
+
/**
@brief
Destructor.
@@ -67,7 +67,7 @@
Notification::~Notification()
{
}
-
+
/**
@brief
Registers the object and sets some default values.
@@ -78,7 +78,7 @@
this->sender_ = NotificationManager::NONE;
this->sent_ = false;
}
-
+
/**
@brief
Sends the Notification to the Notificationmanager, with sender NetificationManager::NONE.
@@ -89,7 +89,7 @@
{
return this->send(NotificationManager::NONE);
}
-
+
/**
@brief
Sends the Notification to the Notificationmanager, which then in turn distributes it to the different NotificationQueues.
@@ -105,12 +105,12 @@
if(!successful)
return false;
this->sent_ = true;
-
+
COUT(3) << "Notification \"" << this->getMessage() << "\" sent." << std::endl;
-
+
return true;
}
-
+
/**
@brief
Sets the message of the notification.
Modified: code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -42,19 +42,19 @@
this->textureIndex_ = 1;
this->maxTextureIndex_ = 8;
this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));
-
+
registerVariables();
}
-
+
void LightningGunProjectile::registerVariables()
{
registerVariable(this->materialBase_);
}
-
+
void LightningGunProjectile::setMaterial(const std::string& material)
{
this->materialBase_ = material;
-
+
BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));
}
@@ -63,7 +63,7 @@
this->textureIndex_++;
if (this->textureIndex_ > this->maxTextureIndex_)
this->textureIndex_ = 1;
-
+
this->setMaterial(this->materialBase_);
}
}
Modified: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -57,12 +57,12 @@
this->localAngularVelocity_ = 0;
this->bDestroy_ = false;
this->lifetime_ = 100;
-
+
if (GameMode::isMaster())
{
this->setCollisionType(WorldEntity::Kinematic);
this->setVelocity(0,0,-100);
-
+
Model* model = new Model(this);
model->setMeshSource("rocket.mesh");
model->scale(0.7);
@@ -71,7 +71,7 @@
this->attach(fire);
fire->setOrientation(this->getOrientation());
fire->setSource("Orxonox/rocketfire");
-
+
this->enableCollisionCallback();
this->setCollisionResponse(false);
this->setCollisionType(Kinematic);
@@ -82,7 +82,7 @@
this->attachCollisionShape(collisionShape);
this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
-
+
this->defSndWpnEngine_ = new WorldSound(this);
this->defSndWpnEngine_->setLooping(true);
this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
@@ -98,7 +98,7 @@
this->defSndWpnEngine_ = 0;
this->defSndWpnLaunch_ = 0;
}
-
+
CameraPosition* camPosition = new CameraPosition(this);
camPosition->setPosition(0,4,15);
camPosition->setAllowMouseLook(true);
@@ -133,7 +133,7 @@
// this calls the XMLPort function of the parent class
SUPER(Rocket, XMLPort, xmlelement, mode);
}
-
+
void Rocket::setOwner(Pawn* owner)
{
this->owner_ = owner;
@@ -157,25 +157,25 @@
void Rocket::tick(float dt)
{
SUPER(Rocket, tick, dt);
-
+
if( this->hasLocalController() )
{
this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
this->localAngularVelocity_ = 0;
-
+
if( this->bDestroy_ )
this->destroy();
}
}
-
+
bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
{
if (!this->bDestroy_ && GameMode::isMaster())
{
if (otherObject == this->owner_)
return false;
-
+
this->bDestroy_ = true;
if (this->owner_)
@@ -210,7 +210,7 @@
}
return false;
}
-
+
void Rocket::destroyObject()
{
if (GameMode::isMaster())
@@ -222,7 +222,7 @@
this->destroy();
}
}
-
+
void Rocket::fired(unsigned int firemode)
{
if (this->owner_)
@@ -257,7 +257,7 @@
void Rocket::rotateYaw(const Vector2& value)
{
ControllableEntity::rotateYaw(value);
-
+
if( !this->isInMouseLook() )
this->localAngularVelocity_.y += value.x;
}
@@ -271,7 +271,7 @@
void Rocket::rotatePitch(const Vector2& value)
{
ControllableEntity::rotatePitch(value);
-
+
if( !this->isInMouseLook() )
this->localAngularVelocity_.x += value.x;
}
@@ -285,9 +285,9 @@
void Rocket::rotateRoll(const Vector2& value)
{
ControllableEntity::rotateRoll(value);
-
+
if( !this->isInMouseLook() )
this->localAngularVelocity_.z += value.x;
}
-
+
}
Modified: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -53,10 +53,10 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Rocket through XML.
virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
-
+
virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
void destroyObject();
-
+
virtual void moveFrontBack(const Vector2& value){}
virtual void moveRightLeft(const Vector2& value){}
virtual void moveUpDown(const Vector2& value){}
@@ -64,7 +64,7 @@
virtual void rotateYaw(const Vector2& value);
virtual void rotatePitch(const Vector2& value);
virtual void rotateRoll(const Vector2& value);
-
+
/**
@brief Moves the Rocket in the Front/Back-direction by the specifed amount.
@param value The amount by which the Rocket is to be moved.
@@ -83,7 +83,7 @@
*/
inline void moveUpDown(float value)
{ this->moveUpDown(Vector2(value, 0)); }
-
+
/**
@brief Rotates the Rocket around the y-axis by the specifed amount.
@param value The amount by which the Rocket is to be rotated.
@@ -102,24 +102,24 @@
*/
inline void rotateRoll(float value)
{ this->rotateRoll(Vector2(value, 0)); }
-
+
void setOwner(Pawn* owner);
inline Pawn* getOwner() const
{ return this->owner_; }
-
+
inline void setDamage(float damage)
{ this->damage_ = damage; }
inline float getDamage() const
{ return this->damage_; }
virtual void fired(unsigned int firemode);
-
+
private:
WeakPtr<Pawn> owner_;
Vector3 localAngularVelocity_;
float damage_;
bool bDestroy_;
ControllableEntity* originalControllableEntity_;
-
+
WeakPtr<PlayerInfo> player_;
Timer destroyTimer_;
float lifetime_;
Modified: code/branches/presentation2/src/orxonox/MoodManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/MoodManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/MoodManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -63,7 +63,7 @@
{
ModifyConfigValue(mood_, set, mood);
}
-
+
//! Gets the current mood
const std::string& MoodManager::getMood()
{
Modified: code/branches/presentation2/src/orxonox/PlayerManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/PlayerManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/PlayerManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -89,7 +89,7 @@
player->destroy();
}
}
-
+
void PlayerManager::disconnectAllClients()
{
for( std::map<unsigned int, PlayerInfo*>::iterator it = this->clients_.begin(); it != this->clients_.end(); )
Modified: code/branches/presentation2/src/orxonox/Scene.h
===================================================================
--- code/branches/presentation2/src/orxonox/Scene.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/Scene.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -77,7 +77,7 @@
inline Radar* getRadar()
{ return this->radar_; }
-
+
inline virtual uint32_t getSceneID() const { return this->getObjectID(); }
virtual void tick(float dt);
Modified: code/branches/presentation2/src/orxonox/Test.h
===================================================================
--- code/branches/presentation2/src/orxonox/Test.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/Test.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -74,7 +74,7 @@
void checkS2();
void checkS3();
void checkS4();
-
+
void printPointer();
static void printV1(){ instance_->checkU1(); }
@@ -94,7 +94,7 @@
TYPE s2;
TYPE s3;
TYPE s4;
-
+
Test* pointer_;
static Test* instance_;
Modified: code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -45,7 +45,7 @@
this->bShooting_ = false;
this->bHasTargetPosition_ = false;
this->targetPosition_ = Vector3::ZERO;
-
+
this->target_.setCallback(createFunctor(&ArtificialController::targetDied, this));
}
@@ -142,7 +142,7 @@
this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getPosition(), hardcoded_projectile_speed, this->target_->getPosition(), this->target_->getVelocity());
this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO);
-
+
Pawn* pawn = dynamic_cast<Pawn*>(this->getControllableEntity());
if (pawn)
pawn->setAimPosition(this->targetPosition_);
Modified: code/branches/presentation2/src/orxonox/controllers/ArtificialController.h
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/ArtificialController.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/controllers/ArtificialController.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -41,7 +41,7 @@
public:
ArtificialController(BaseObject* creator);
virtual ~ArtificialController();
-
+
void abandonTarget(Pawn* target);
protected:
Modified: code/branches/presentation2/src/orxonox/controllers/Controller.h
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/Controller.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/controllers/Controller.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -50,7 +50,7 @@
{ return this->player_; }
virtual inline void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
-
+
void setGodMode( bool mode ){ this->bGodMode_ = mode; }
bool getGodMode(){ return this->bGodMode_; }
Modified: code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -139,21 +139,21 @@
arrowsOverlay1_->setPickPoint(Vector2(0.5, 0.5));
arrowsOverlay1_->setPosition(Vector2(0.5, 0.5));
arrowsOverlay1_->hide();
-
+
arrowsOverlay2_ = new OrxonoxOverlay(this);
arrowsOverlay2_->setBackgroundMaterial("Orxonox/DirectionArrows2");
arrowsOverlay2_->setSize(Vector2(0.02727, 0.59 * arrowsSize_));
arrowsOverlay2_->setPickPoint(Vector2(0.5, 0.5));
arrowsOverlay2_->setPosition(Vector2(0.5, 0.5));
arrowsOverlay2_->hide();
-
+
arrowsOverlay3_ = new OrxonoxOverlay(this);
arrowsOverlay3_->setBackgroundMaterial("Orxonox/DirectionArrows3");
arrowsOverlay3_->setSize(Vector2(0.02727, 0.77 * arrowsSize_));
arrowsOverlay3_->setPickPoint(Vector2(0.5, 0.5));
arrowsOverlay3_->setPosition(Vector2(0.5, 0.5));
arrowsOverlay3_->hide();
-
+
arrowsOverlay4_ = new OrxonoxOverlay(this);
arrowsOverlay4_->setBackgroundMaterial("Orxonox/DirectionArrows4");
arrowsOverlay4_->setSize(Vector2(0.02727, arrowsSize_));
@@ -501,9 +501,9 @@
if (showArrows_)
{
hideArrows();
-
+
float distance = sqrt(pow(static_cast<float>(this->currentYaw_)/2*-1,2) + pow(static_cast<float>(this->currentPitch_)/2*-1,2));
-
+
if (distance > 0.04 && distance <= 0.59 * arrowsSize_ / 2.0 )
{
this->arrowsOverlay1_->setRotation(Degree(-90 + -1.0 * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / (2.0f * Ogre::Math::PI) * 360.0f));
Modified: code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -63,7 +63,7 @@
*/
void GSGraphics::activate()
{
-
+
}
/**
Modified: code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -89,7 +89,7 @@
{
// level is loaded: we can start capturing the input
InputManager::getInstance().enterState("game");
-
+
// connect the HumanPlayer to the game
PlayerManager::getInstance().clientConnected(0);
}
@@ -104,7 +104,7 @@
InputManager::getInstance().leaveState("game");
}
-
+
// disconnect all HumanPlayers
PlayerManager::getInstance().disconnectAllClients();
@@ -134,7 +134,7 @@
{
for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
this->staticObjects_.insert(*it);
-
+
// call the loader
COUT(0) << "Loading level..." << std::endl;
startFile_ = new XMLFile(LevelManager::getInstance().getDefaultLevel());
Modified: code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -95,7 +95,7 @@
CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startClient), "startClient"));
CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startDedicated), "startDedicated"));
CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startMainMenu), "startMainMenu"));
-
+
// create command to change sound path
CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::setMainMenuSoundPath, this), "setMMSoundPath"));
Modified: code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -54,7 +54,7 @@
{
NetworkFunctionBase::destroyAllNetworkFunctions();
}
-
+
void GSRoot::printObjects()
{
unsigned int nr=0;
Modified: code/branches/presentation2/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/presentation2/src/orxonox/gametypes/Gametype.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/gametypes/Gametype.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -50,7 +50,7 @@
Gametype::Gametype(BaseObject* creator) : BaseObject(creator)
{
RegisterObject(Gametype);
-
+
this->gtinfo_ = new GametypeInfo(creator);
this->setGametype(SmartPtr<Gametype>(this, false));
@@ -78,7 +78,7 @@
}
else
this->scoreboard_ = 0;
-
+
/* HACK HACK HACK */
this->hackAddBots_ = createConsoleCommand( createFunctor(&Gametype::addBots, this), "hackAddBots");
this->hackKillBots_ = createConsoleCommand( createFunctor(&Gametype::killBots, this), "hackKillBots");
@@ -86,7 +86,7 @@
CommandExecutor::addConsoleCommandShortcut( this->hackKillBots_ );
/* HACK HACK HACK */
}
-
+
Gametype::~Gametype()
{
if (this->isInitialized())
Modified: code/branches/presentation2/src/orxonox/gametypes/Gametype.h
===================================================================
--- code/branches/presentation2/src/orxonox/gametypes/Gametype.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/gametypes/Gametype.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -183,7 +183,7 @@
// Config Values
std::string scoreboardTemplate_;
-
+
/* HACK HACK HACK */
ConsoleCommand* hackAddBots_;
ConsoleCommand* hackKillBots_;
Modified: code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -170,12 +170,12 @@
this->changedControllableEntity();
}
-
+
void PlayerInfo::startTemporaryControl(ControllableEntity* entity)
{
if (!entity)
return;
-
+
// assert( this->temporaryControllableEntity_==0 );
this->oldControllableEntity_ = this->controllableEntity_;
@@ -194,7 +194,7 @@
{
if ( this->oldControllableEntity_ )
this->stopTemporaryControl();
-
+
ControllableEntity* entity = this->controllableEntity_;
if (!entity)
@@ -212,7 +212,7 @@
this->changedControllableEntity();
}
-
+
void PlayerInfo::stopTemporaryControl()
{
ControllableEntity* entity = this->controllableEntity_;
@@ -230,10 +230,10 @@
if ( GameMode::isMaster() )
entity->removePlayer();
-
+
this->changedControllableEntity();
}
-
+
void PlayerInfo::networkcallback_changedcontrollableentityID()
{
if (this->controllableEntityID_ != OBJECTID_UNKNOWN)
Modified: code/branches/presentation2/src/orxonox/interfaces/Rewardable.h
===================================================================
--- code/branches/presentation2/src/orxonox/interfaces/Rewardable.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/interfaces/Rewardable.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -42,7 +42,7 @@
/**
@brief
Rewardable is an Interface, that can be implemented by any object to enable it to be given as reward to a player through QuestEffects. (With the AddReward effect.)
-
+
It just needs to inherit form Rewardable, and implement the reward() method.
@author
Damian 'Mozork' Frick
Modified: code/branches/presentation2/src/orxonox/items/MultiStateEngine.h
===================================================================
--- code/branches/presentation2/src/orxonox/items/MultiStateEngine.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/items/MultiStateEngine.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -63,7 +63,7 @@
void addEffectContainer(EffectContainer* effect);
EffectContainer* getEffectContainer(unsigned int index) const;
-
+
void setDefEngSndNormal(const std::string& engineSound);
const std::string& getDefEngSndNormal();
void setDefEngSndBoost(const std::string& engineSound);
Modified: code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc
===================================================================
--- code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -170,7 +170,7 @@
void OrxonoxOverlay::changedVisibility()
{
SUPER( OrxonoxOverlay, changedVisibility );
-
+
if (!this->overlay_)
return;
Modified: code/branches/presentation2/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- code/branches/presentation2/src/orxonox/overlays/OverlayGroup.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/overlays/OverlayGroup.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -143,7 +143,7 @@
void OverlayGroup::changedVisibility()
{
SUPER( OverlayGroup, changedVisibility );
-
+
for (std::set< SmartPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
(*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
}
Modified: code/branches/presentation2/src/orxonox/pickup/ModifierPickup.h
===================================================================
--- code/branches/presentation2/src/orxonox/pickup/ModifierPickup.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/pickup/ModifierPickup.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -128,7 +128,7 @@
{ this->setMultiplicativeModifier(ModifierType::Acceleration, value); }
void timerCallback(Pawn* pawn); //!< Method called when the timer runs out.
-
+
private:
float getAdditiveModifier(ModifierType::Value type) const; //!< Get the additive modifier for a given ModifierType.
float getMultiplicativeModifier(ModifierType::Value type) const; //!< Get the multiplicative modifier for a given ModifierType.
Modified: code/branches/presentation2/src/orxonox/pickup/UsableItem.cc
===================================================================
--- code/branches/presentation2/src/orxonox/pickup/UsableItem.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/pickup/UsableItem.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
/**
@file
@brief Implementation of UsableItem.
Modified: code/branches/presentation2/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/AmbientSound.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/sound/AmbientSound.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -60,7 +60,7 @@
SoundManager::getInstance().unregisterAmbientSound(this);
}
}
-
+
void AmbientSound::registerVariables()
{
registerVariable(ambientSource_, ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::ambientSourceChanged));
@@ -100,7 +100,7 @@
if (GameMode::playsSound())
SoundManager::getInstance().pauseAmbientSound(this);
}
-
+
float AmbientSound::getRealVolume()
{
assert(GameMode::playsSound());
Modified: code/branches/presentation2/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/BaseSound.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/sound/BaseSound.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -149,7 +149,7 @@
COUT(2) << "Sound warning: volume out of range, clamping value." << std::endl;
this->updateVolume();
}
-
+
void BaseSound::updateVolume()
{
if (alIsSource(this->audioSource_))
@@ -251,7 +251,7 @@
}
}
}
-
+
void BaseSound::stateChanged()
{
switch (this->state_)
Modified: code/branches/presentation2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundManager.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/sound/SoundManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -133,7 +133,7 @@
COUT(4) << "Sound: --- Supported MIME Types: " << types << std::endl;
else
COUT(2) << "Sound Warning: MIME Type retrieval failed: " << alutGetErrorString(alutGetError()) << std::endl;
-
+
this->mute_[SoundType::All] = 1.0f;
this->mute_[SoundType::Music] = 1.0f;
this->mute_[SoundType::Effects] = 1.0f;
@@ -430,13 +430,13 @@
void SoundManager::processCrossFading(float dt)
{
-
+
// Hacky solution to the fade delay while loading a level.
if(dt > 0.2)
{
return;
}
-
+
// FADE IN
for (std::list<SmartPtr<AmbientSound> >::iterator it= this->fadeInList_.begin(); it != this->fadeInList_.end(); )
{
Modified: code/branches/presentation2/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundManager.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/sound/SoundManager.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -74,7 +74,7 @@
void preUpdate(const Clock& time);
void setConfigValues();
-
+
// tolua_begin
static SoundManager& getInstance() { return Singleton<SoundManager>::getInstance(); }
Modified: code/branches/presentation2/src/orxonox/sound/WorldSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/WorldSound.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/sound/WorldSound.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -50,7 +50,7 @@
this->bPooling_ = true;
this->registerVariables();
}
-
+
void WorldSound::registerVariables()
{
registerVariable(volume_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::volumeChanged));
Modified: code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc
===================================================================
--- code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -66,7 +66,7 @@
this->reloadTimer_.stopTimer();
this->damage_ = 0;
-
+
this->muzzleOffset_ = Vector3::ZERO;
this->muzzlePosition_ = Vector3::ZERO;
this->muzzleOrientation_ = Quaternion::IDENTITY;
@@ -140,7 +140,7 @@
{
this->defSndWpnFire_->play();
}
-
+
this->fire();
return true;
Modified: code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -237,7 +237,7 @@
if (this->bMouseLook_)
this->cameraPositionRootNode_->roll(Radian(value.y * this->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
}
-
+
void ControllableEntity::fire(unsigned int firemode)
{
if(GameMode::isMaster())
@@ -249,7 +249,7 @@
callMemberNetworkFunction(ControllableEntity, fire, this->getObjectID(), 0, firemode);
}
}
-
+
void ControllableEntity::setTarget( WorldEntity* target )
{
this->target_ = target;
@@ -265,7 +265,7 @@
}
}
}
-
+
void ControllableEntity::setTargetInternal( uint32_t targetID )
{
this->setTarget( orxonox_cast<WorldEntity*>(Synchronisable::getSynchronisable(targetID)) );
Modified: code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h
===================================================================
--- code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -144,7 +144,7 @@
{ return this->controller_; }
inline void setController(Controller* val)
{ this->controller_ = val; }
-
+
virtual void setTarget( WorldEntity* target );
virtual WorldEntity* getTarget()
{ return this->target_.get(); }
Modified: code/branches/presentation2/src/orxonox/worldentities/StaticEntity.cc
===================================================================
--- code/branches/presentation2/src/orxonox/worldentities/StaticEntity.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/worldentities/StaticEntity.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -41,7 +41,7 @@
StaticEntity::StaticEntity(BaseObject* creator) : WorldEntity(creator)
{
RegisterObject(StaticEntity);
-
+
this->setPriority(Priority::VeryLow);
this->registerVariables();
Modified: code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc 2009-12-21 12:18:36 UTC (rev 6387)
@@ -67,7 +67,7 @@
this->lastHitOriginator_ = 0;
this->spawnparticleduration_ = 3.0f;
-
+
this->aimPosition_ = Vector3::ZERO;
this->getPickups().setOwner(this);
Modified: code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h 2009-12-21 11:52:43 UTC (rev 6386)
+++ code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h 2009-12-21 12:18:36 UTC (rev 6387)
@@ -115,7 +115,7 @@
{ this->pickups_.useItem(); }
virtual void startLocalHumanControl();
-
+
void setAimPosition( Vector3 position )
{ this->aimPosition_ = position; }
Vector3 getAimPosition()
@@ -152,7 +152,7 @@
private:
inline void setWeaponSystem(WeaponSystem* weaponsystem)
{ this->weaponSystem_ = weaponsystem; }
-
+
Vector3 aimPosition_;
};
}
More information about the Orxonox-commit
mailing list