[Orxonox-commit 1670] r6388 - in code/branches/presentation2: . data/gui/scripts data/levels data/levels/old data/overlays doc doc/api src/libraries/core src/libraries/core/input src/libraries/network src/libraries/network/packet src/libraries/network/synchronisable src/libraries/util src/modules/objects/collisionshapes src/modules/questsystem src/modules/weapons/projectiles src/modules/weapons/weaponmodes src/orxonox/controllers src/orxonox/overlays src/orxonox/pickup src/orxonox/sound src/orxonox/worldentities
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Dec 21 13:28:11 CET 2009
Author: rgrieder
Date: 2009-12-21 13:28:10 +0100 (Mon, 21 Dec 2009)
New Revision: 6388
Modified:
code/branches/presentation2/README
code/branches/presentation2/data/gui/scripts/AudioMenu.lua
code/branches/presentation2/data/gui/scripts/GameplayMenu.lua
code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua
code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua
code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua
code/branches/presentation2/data/levels/empty_level.oxw
code/branches/presentation2/data/levels/gametype_asteroids.oxw
code/branches/presentation2/data/levels/old/physicstest.oxw
code/branches/presentation2/data/levels/old/tutorial_hs08.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/teambasematchlevel.oxw
code/branches/presentation2/data/levels/test_ghost.oxw
code/branches/presentation2/data/overlays/OrxonoxLoading.overlay
code/branches/presentation2/doc/CMakeLists.txt
code/branches/presentation2/doc/api/CMakeLists.txt
code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h
code/branches/presentation2/src/libraries/core/EventIncludes.h
code/branches/presentation2/src/libraries/core/GUIManager.h
code/branches/presentation2/src/libraries/core/MemoryArchive.cc
code/branches/presentation2/src/libraries/core/MemoryArchive.h
code/branches/presentation2/src/libraries/core/Resource.h
code/branches/presentation2/src/libraries/core/input/InputCommands.h
code/branches/presentation2/src/libraries/core/input/InputManager.cc
code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h
code/branches/presentation2/src/libraries/core/input/KeyBinder.cc
code/branches/presentation2/src/libraries/network/ClientConnection.cc
code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc
code/branches/presentation2/src/libraries/network/FunctionCallManager.cc
code/branches/presentation2/src/libraries/network/GamestateManager.cc
code/branches/presentation2/src/libraries/network/NetworkFunction.h
code/branches/presentation2/src/libraries/network/Server.cc
code/branches/presentation2/src/libraries/network/TrafficControl.h
code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc
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/NetworkCallbackManager.cc
code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h
code/branches/presentation2/src/libraries/util/Serialise.h
code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc
code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc
code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc
code/branches/presentation2/src/modules/questsystem/QuestGUI.cc
code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc
code/branches/presentation2/src/modules/questsystem/QuestGUINode.h
code/branches/presentation2/src/modules/questsystem/QuestListener.cc
code/branches/presentation2/src/modules/questsystem/QuestManager.h
code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc
code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc
code/branches/presentation2/src/orxonox/controllers/HumanController.h
code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.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/WorldSound.cc
code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h
Log:
Found some end of line leftover spaces.
Modified: code/branches/presentation2/README
===================================================================
--- code/branches/presentation2/README 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/README 2009-12-21 12:28:10 UTC (rev 6388)
@@ -2,7 +2,7 @@
We are proud to present you Orxonox - the most ferious 3D space shooter ever to exist.
-This game is free, if you have paid for this, get your money back! The source code of this game is licensed under the GPL (GNU General Public License).
+This game is free, if you have paid for this, get your money back! The source code of this game is licensed under the GPL (GNU General Public License).
The game content is licensed under the Creative Commons Attribution-Sharealike 2.5 license. For more information read LICENSE in the same folder you found this file.
For directions to install this game, please check out the file INSTALL or http://www.orxonox.net/wiki/Running
Modified: code/branches/presentation2/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/AudioMenu.lua 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/gui/scripts/AudioMenu.lua 2009-12-21 12:28:10 UTC (rev 6388)
@@ -41,7 +41,7 @@
table.insert(themeList, "Default")
table.insert(themeList, "Drum n' Bass")
for k,v in pairs(themeList) do
- item = CEGUI.createListboxTextItem(v)
+ item = CEGUI.createListboxTextItem(v)
item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
CEGUI.toListbox(listboxwindow):addItem(item)
end
Modified: code/branches/presentation2/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/GameplayMenu.lua 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/gui/scripts/GameplayMenu.lua 2009-12-21 12:28:10 UTC (rev 6388)
@@ -18,7 +18,7 @@
table.insert(themeList, "Theme 2")
table.insert(themeList, "Theme 3")
for k,v in pairs(themeList) do
- item = CEGUI.createListboxTextItem(v)
+ item = CEGUI.createListboxTextItem(v)
item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
CEGUI.toCombobox(dropdown):addItem(item)
end
Modified: code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua 2009-12-21 12:28:10 UTC (rev 6388)
@@ -60,7 +60,7 @@
table.insert(resolutionList, "1280 x 768")
table.insert(resolutionList, "1440 x 900")
for k,v in pairs(resolutionList) do
- item = CEGUI.createListboxTextItem(v)
+ item = CEGUI.createListboxTextItem(v)
item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
CEGUI.toListbox(listboxwindow):addItem(item)
end
Modified: code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua 2009-12-21 12:28:10 UTC (rev 6388)
@@ -28,7 +28,7 @@
end
table.sort(levelList)
for k,v in pairs(levelList) do
- item = CEGUI.createListboxTextItem(v)
+ item = CEGUI.createListboxTextItem(v)
item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
CEGUI.toListbox(listbox):addItem(item)
if v .. ".oxw" == preselect then
Modified: code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua 2009-12-21 12:28:10 UTC (rev 6388)
@@ -28,7 +28,7 @@
end
table.sort(levelList)
for k,v in pairs(levelList) do
- item = CEGUI.createListboxTextItem(v)
+ item = CEGUI.createListboxTextItem(v)
item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
CEGUI.toListbox(listbox):addItem(item)
if v .. ".oxw" == preselect then
Modified: code/branches/presentation2/data/levels/empty_level.oxw
===================================================================
--- code/branches/presentation2/data/levels/empty_level.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/empty_level.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -17,7 +17,7 @@
skybox = "Orxonox/Starbox"
>
-<!--Rocket position="-10, 3.5,800" velocity="0,0,-100">
+<!--Rocket position="-10, 3.5,800" velocity="0,0,-100">
<attached>
<Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >
<attached>
Modified: code/branches/presentation2/data/levels/gametype_asteroids.oxw
===================================================================
--- code/branches/presentation2/data/levels/gametype_asteroids.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/gametype_asteroids.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -27,11 +27,11 @@
j = math.random()
?>
- <MovableEntity
- position="<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>" collisionType=dynamic
+ <MovableEntity
+ position="<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>" collisionType=dynamic
linearDamping=0.8
angularDamping=0
- scale=<?lua print(j * 150)?>
+ scale=<?lua print(j * 150)?>
collisiondamage=1
enablecollisiondamage=true>
<attached>
Modified: code/branches/presentation2/data/levels/old/physicstest.oxw
===================================================================
--- code/branches/presentation2/data/levels/old/physicstest.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/old/physicstest.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -11,9 +11,9 @@
<?lua
-for i = 1, 226, 1
+for i = 1, 226, 1
do ?>
<Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua
+<?lua
end
?>
Modified: code/branches/presentation2/data/levels/old/tutorial_hs08.oxw
===================================================================
--- code/branches/presentation2/data/levels/old/tutorial_hs08.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/old/tutorial_hs08.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -18,9 +18,9 @@
<!-- Embedded lua code (creates random asteroids) -->
<?lua
-for i = 1, 226, 1
+for i = 1, 226, 1
do ?>
<Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua
+<?lua
end
?>
Modified: code/branches/presentation2/data/levels/presentation09.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentation09.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/presentation09.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -23,18 +23,18 @@
<?lua
max = 20
for i = 1, max, 1
-do
+do
x = math.sin(i/max*6)*40000
y = math.cos(i/max*6)*40000
z = i*100
?>
<?lua
-for k = 1, 25, 1
+for k = 1, 25, 1
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) ?>">
+ <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" />
</attached>
@@ -42,7 +42,7 @@
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
</collisionShapes> <?lua end ?>
</MovableEntity>
-<?lua
+<?lua
end
?>
<?lua end ?>
Modified: code/branches/presentation2/data/levels/presentation09b.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentation09b.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/presentation09b.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -120,7 +120,7 @@
</EventDispatcher>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do
?>
<SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
@@ -135,12 +135,12 @@
</WaypointPatrolController>
</controller>
</SpaceShip>
-<?lua
+<?lua
end
?>
<?lua
-for i = 1, 12, 1
+for i = 1, 12, 1
do
?>
<SpaceShip position="<?lua print(2800 + math.random() * 2000 - 1000) ?>,<?lua print(2500+ math.random() * 1000 - 500) ?>,<?lua print(2500 + math.random() * 1000 - 500) ?>" >
@@ -155,7 +155,7 @@
</WaypointPatrolController>
</controller>
</SpaceShip>
-<?lua
+<?lua
end
?>
@@ -172,7 +172,7 @@
</EventDispatcher>
<?lua
-for i = 1, 12, 1
+for i = 1, 12, 1
do
?>
<SpaceShip position="<?lua print(2500 + math.random() * 500 - 250) ?>,<?lua print(4800 + math.random() * 500 - 250) ?>,<?lua print(2500 + math.random() * 500 - 250) ?>" >
@@ -189,7 +189,7 @@
</WaypointPatrolController>
</controller>
</SpaceShip>
-<?lua
+<?lua
end
?>
@@ -319,7 +319,7 @@
</Destroyer>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do
?>
<SpaceShip position="<?lua print(6200 + math.random() * 2000 - 1000) ?>,<?lua print(-1500 + math.random() * 1000 - 500) ?>,<?lua print(-700 + math.random() * 1000 - 500) ?>" >
@@ -334,12 +334,12 @@
</WaypointPatrolController>
</controller>
</SpaceShip>
-<?lua
+<?lua
end
?>
<?lua
-for i = 1, 200, 1
+for i = 1, 200, 1
do
x = math.random() * 100 + (i-70) * 100
y = math.random() * 3000 - 1500
@@ -347,12 +347,12 @@
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) ?>">
+ <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" />
</attached>
</MovableEntity>
-<?lua
+<?lua
end
?>
@@ -362,7 +362,7 @@
elements.length = function()
return table.getn(elements)
end
-for i = 1, 150, 1
+for i = 1, 150, 1
do
x = math.random() * 750 - 4500
y = math.random() * 1000 + 2000
@@ -370,12 +370,12 @@
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) ?>">
+ <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]) ?>" />
</attached>
</MovableEntity>
-<?lua
+<?lua
end
?>
Modified: code/branches/presentation2/data/levels/presentationHS09.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentationHS09.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/presentationHS09.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -125,7 +125,7 @@
</EventDispatcher>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do
?>
<SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
@@ -140,12 +140,12 @@
</WaypointPatrolController>
</controller>
</SpaceShip>
-<?lua
+<?lua
end
?>
<?lua
-for i = 1, 12, 1
+for i = 1, 12, 1
do
?>
<SpaceShip position="<?lua print(2800 + math.random() * 2000 - 1000) ?>,<?lua print(2500+ math.random() * 1000 - 500) ?>,<?lua print(2500 + math.random() * 1000 - 500) ?>" >
@@ -160,7 +160,7 @@
</WaypointPatrolController>
</controller>
</SpaceShip>
-<?lua
+<?lua
end
?>
@@ -177,7 +177,7 @@
</EventDispatcher>
<?lua
-for i = 1, 12, 1
+for i = 1, 12, 1
do
?>
<SpaceShip position="<?lua print(2500 + math.random() * 500 - 250) ?>,<?lua print(4800 + math.random() * 500 - 250) ?>,<?lua print(2500 + math.random() * 500 - 250) ?>" >
@@ -194,7 +194,7 @@
</WaypointPatrolController>
</controller>
</SpaceShip>
-<?lua
+<?lua
end
?>
@@ -324,7 +324,7 @@
</Destroyer>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do
?>
<SpaceShip position="<?lua print(6200 + math.random() * 2000 - 1000) ?>,<?lua print(-1500 + math.random() * 1000 - 500) ?>,<?lua print(-700 + math.random() * 1000 - 500) ?>" >
@@ -339,7 +339,7 @@
</WaypointPatrolController>
</controller>
</SpaceShip>
-<?lua
+<?lua
end
?>
@@ -348,7 +348,7 @@
elements.length = function()
return table.getn(elements)
end
-for i = 1, 100, 1
+for i = 1, 100, 1
do
x = math.random() * 100 + (i) * 100
y = math.random() * 3000 - 1500
@@ -357,17 +357,17 @@
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) ?>">
+ <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])?>" />
</attached>
</MovableEntity>
-<?lua
+<?lua
end
?>
<?lua
-for i = 1, 100, 1
+for i = 1, 100, 1
do
x = math.random() * 200 + i*200
y = math.random() * 3000 - 1500
@@ -377,7 +377,7 @@
<ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
<!-- <Billboard material="Test/Fog" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" color="1, 1, 1, 0.01" scale="20" />
-->
-<?lua
+<?lua
end
?>
@@ -387,7 +387,7 @@
elements.length = function()
return table.getn(elements)
end
-for i = 1, 150, 1
+for i = 1, 150, 1
do
x = math.random() * 750 - 4500
y = math.random() * 1000 + 2000
@@ -395,16 +395,16 @@
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) ?>">
+ <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]) ?>" />
</attached>
</MovableEntity>
-<?lua
+<?lua
end
?>
<!--
<Planet position="1000,0,0" mass=900000 scale=1000 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/presentation_dm.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentation_dm.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/presentation_dm.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -17,10 +17,10 @@
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do ?>
<SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-<?lua
+<?lua
end
?>
@@ -34,12 +34,12 @@
<?lua
-for i = 1, 100, 1
+for i = 1, 100, 1
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) ?>">
+ <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" />
</attached>
@@ -47,7 +47,7 @@
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
</collisionShapes>
</MovableEntity>
-<?lua
+<?lua
end
?>
Modified: code/branches/presentation2/data/levels/questsystem2.oxw
===================================================================
--- code/branches/presentation2/data/levels/questsystem2.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/questsystem2.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -36,7 +36,7 @@
<QuestHint id="93d0bdcb-9ce1-4f96-bc69-8d04e659fb31">
<QuestDescription title="The super Hint.3" description="Be proud of yourself.3" />
</QuestHint>
- </hints>
+ </hints>
<subquests>
<GlobalQuest id="e17f5245-f95b-44a8-b6cf-402274435ed4">
<QuestDescription title="The Main QUest2" description="This is the main quest hooray. Solve it!" failMessage="You fail. Looser." completeMessage="You Win." />
@@ -214,18 +214,18 @@
<?lua
max = 20
for i = 1, max, 1
-do
+do
x = math.sin(i/max*6)*40000
y = math.cos(i/max*6)*40000
z = i*100
?>
<?lua
-for k = 1, 25, 1
+for k = 1, 25, 1
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) ?>">
+ <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" />
</attached>
@@ -233,7 +233,7 @@
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
</collisionShapes> <?lua end ?>
</MovableEntity>
-<?lua
+<?lua
end
?>
<?lua end ?>
Modified: code/branches/presentation2/data/levels/teambasematchlevel.oxw
===================================================================
--- code/branches/presentation2/data/levels/teambasematchlevel.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/teambasematchlevel.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -40,12 +40,12 @@
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do ?>
<ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events><spawn><EventListener event="base 1" /></spawn></events>
</ParticleSpawner>
-<?lua
+<?lua
end
?>
</attached>
@@ -77,12 +77,12 @@
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do ?>
<ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events><spawn><EventListener event="base 2" /></spawn></events>
</ParticleSpawner>
-<?lua
+<?lua
end
?>
</attached>
@@ -114,12 +114,12 @@
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do ?>
<ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events><spawn><EventListener event="base 3" /></spawn></events>
</ParticleSpawner>
-<?lua
+<?lua
end
?>
</attached>
@@ -150,12 +150,12 @@
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do ?>
<ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events><spawn><EventListener event="base 4" /></spawn></events>
</ParticleSpawner>
-<?lua
+<?lua
end
?>
</attached>
@@ -187,12 +187,12 @@
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
<Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
<?lua
-for i = 1, 10, 1
+for i = 1, 10, 1
do ?>
<ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events><spawn><EventListener event="base 5" /></spawn></events>
</ParticleSpawner>
-<?lua
+<?lua
end
?>
</attached>
Modified: code/branches/presentation2/data/levels/test_ghost.oxw
===================================================================
--- code/branches/presentation2/data/levels/test_ghost.oxw 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/levels/test_ghost.oxw 2009-12-21 12:28:10 UTC (rev 6388)
@@ -23,18 +23,18 @@
<?lua
max = 20
for i = 1, max, 1
-do
+do
x = math.sin(i/max*6)*40000
y = math.cos(i/max*6)*40000
z = i*100
?>
<?lua
-for k = 1, 25, 1
+for k = 1, 25, 1
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) ?>">
+ <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" />
</attached>
@@ -42,7 +42,7 @@
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
</collisionShapes> <?lua end ?>
</MovableEntity>
-<?lua
+<?lua
end
?>
<?lua end ?>
Modified: code/branches/presentation2/data/overlays/OrxonoxLoading.overlay
===================================================================
--- code/branches/presentation2/data/overlays/OrxonoxLoading.overlay 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/data/overlays/OrxonoxLoading.overlay 2009-12-21 12:28:10 UTC (rev 6388)
@@ -10,4 +10,4 @@
height 300
material Orxonox/LoadingScreenSample
}
-}
\ No newline at end of file
+}
\ No newline at end of file
Modified: code/branches/presentation2/doc/CMakeLists.txt
===================================================================
--- code/branches/presentation2/doc/CMakeLists.txt 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/doc/CMakeLists.txt 2009-12-21 12:28:10 UTC (rev 6388)
@@ -1,4 +1,4 @@
-# Add a "doc" target with CMake build system.
+# Add a "doc" target with CMake build system.
# And configure doxy.config.in to doxy.config
#
# target "doc" allows building the documentation with doxygen/dot on WIN32 and Linux
Modified: code/branches/presentation2/doc/api/CMakeLists.txt
===================================================================
--- code/branches/presentation2/doc/api/CMakeLists.txt 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/doc/api/CMakeLists.txt 2009-12-21 12:28:10 UTC (rev 6388)
@@ -1,8 +1,8 @@
-# Add a "doc" target with CMake build system.
+# Add a "doc" target with CMake build system.
# And configure doxy.config.in to doxy.config
#
# target "doc" allows building the documentation with doxygen/dot on WIN32 and Linux
-# Creates .chm windows help file if MS HTML help workshop
+# Creates .chm windows help file if MS HTML help workshop
# (available from http://msdn.microsoft.com/workshop/author/htmlhelp)
# is installed with its DLLs in PATH.
#
@@ -11,7 +11,7 @@
# doxygen, dot, latex, dvips, makeindex, gswin32, etc.
# must be in path.
#
-# Note about Visual Studio Projects:
+# Note about Visual Studio Projects:
# MSVS hast its own path environment which may differ from the shell.
# See "Menu Tools/Options/Projects/VC++ Directories" in VS 7.1
#
@@ -61,7 +61,7 @@
# fallback: use hhw.exe interactively
IF(WIN32)
FIND_PACKAGE(HTMLHelp)
- IF(HTML_HELP_COMPILER)
+ IF(HTML_HELP_COMPILER)
SET(TMP ${DOXY_OUTPUT_DIR}/html/index.hhp)
STRING(REGEX REPLACE "/" "\\\\" HHP_FILE ${TMP})
ADD_CUSTOM_TARGET(doc_chm ${HTML_HELP_COMPILER} ${HHP_FILE})
@@ -69,7 +69,7 @@
# Adding a dependency somehow adds doc target as default build target
SET_TARGET_PROPERTIES(doc doc_chm PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
ENDIF(HTML_HELP_COMPILER)
- ENDIF (WIN32)
+ ENDIF (WIN32)
# Installation
Modified: code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h
===================================================================
--- code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -173,6 +173,6 @@
Arguments for the modifier function
*/
#define ModifyConfigValue(varname, modifier, ...) \
- ModifyConfigValueGeneric(this, &varname, #varname, modifier, __VA_ARGS__)
+ ModifyConfigValueGeneric(this, &varname, #varname, modifier, __VA_ARGS__)
#endif /* _ConfigValueIncludes_H__ */
Modified: code/branches/presentation2/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/presentation2/src/libraries/core/EventIncludes.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/EventIncludes.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -81,7 +81,7 @@
/**
@brief This macro is needed to fire an event with this name. The event name must previously be declared with @ref CreateEventName.
-*/
+*/
#define FireEventName(classname, name) \
eventname##classname##name
Modified: code/branches/presentation2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/presentation2/src/libraries/core/GUIManager.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/GUIManager.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -66,7 +66,7 @@
GUIManager(Ogre::RenderWindow* renderWindow, const std::pair<int, int>& mousePosition, bool bFullScreen);
~GUIManager();
- void preUpdate(const Clock& time);
+ void preUpdate(const Clock& time);
static void showGUI(const std::string& name, bool hidePrevious=false, bool showCursor=true);
void showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious=false, bool showCursor=true);
Modified: code/branches/presentation2/src/libraries/core/MemoryArchive.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/MemoryArchive.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/MemoryArchive.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -63,7 +63,7 @@
return MemoryDataStreamPtr(new MemoryDataStream(itFile->second.first.get(), itFile->second.second));
}
- void MemoryArchive::findFiles(const String& pattern, bool bRecursive,
+ void MemoryArchive::findFiles(const String& pattern, bool bRecursive,
bool bDirs, StringVector* simpleList, FileInfoList* detailList)
{
const FileMap& files = archives_s[this->getName()];
@@ -117,7 +117,7 @@
return ret;
}
- FileInfoListPtr MemoryArchive::findFileInfo(const String& pattern,
+ FileInfoListPtr MemoryArchive::findFileInfo(const String& pattern,
bool recursive, bool dirs)
{
FileInfoListPtr ret(new FileInfoList());
Modified: code/branches/presentation2/src/libraries/core/MemoryArchive.h
===================================================================
--- code/branches/presentation2/src/libraries/core/MemoryArchive.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/MemoryArchive.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -78,7 +78,7 @@
{ archives_s[archiveName][filename] = std::make_pair(content, size); }
private:
- void findFiles(const Ogre::String& pattern, bool bRecursive,
+ void findFiles(const Ogre::String& pattern, bool bRecursive,
bool bDirs, Ogre::StringVector* simpleList, Ogre::FileInfoList* detailList);
typedef std::map<std::string, std::pair<shared_array<char>, size_t> > FileMap;
Modified: code/branches/presentation2/src/libraries/core/Resource.h
===================================================================
--- code/branches/presentation2/src/libraries/core/Resource.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/Resource.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -72,10 +72,10 @@
Even if resource locations are added recursively, you
must provide a fully qualified name to this method.
@param groupName
- The name of the resource group; this determines which
- locations are searched.
+ The name of the resource group; this determines which
+ locations are searched.
@param searchGroupsIfNotFound
- If true, if the resource is not found in
+ If true, if the resource is not found in
the group specified, other groups will be searched.
@return
Shared pointer to data stream containing the data. Will be
@@ -95,7 +95,7 @@
/**
@brief
Open all resources matching a given pattern (which can contain
- the character '*' as a wildcard), and return a collection of
+ the character '*' as a wildcard), and return a collection of
DataStream objects on them.
@param pattern
The pattern to look for. If resource locations have been
@@ -111,7 +111,7 @@
static DataStreamListPtr openMulti(const std::string& pattern, const std::string& group = Resource::DEFAULT_GROUP);
/**
- Find out if the named file exists in a group.
+ Find out if the named file exists in a group.
@param filename
Fully qualified name of the file to test for
@param group
Modified: code/branches/presentation2/src/libraries/core/input/InputCommands.h
===================================================================
--- code/branches/presentation2/src/libraries/core/input/InputCommands.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/input/InputCommands.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -70,7 +70,7 @@
/**
@brief
Executes a simple command with no additional paramters.
- @return
+ @return
True if command execution was successful, false otherwise.
*/
inline bool SimpleCommand::execute(float abs, float rel)
Modified: code/branches/presentation2/src/libraries/core/input/InputManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/input/InputManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/input/InputManager.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -507,7 +507,7 @@
std::vector<InputState*>& mouseStates = devices_[InputDeviceEnumerator::Mouse]->getStateListRef();
if (mouseStates.empty())
requestedMode = MouseMode::Nonexclusive;
- else
+ else
requestedMode = mouseStates.front()->getMouseMode();
if (requestedMode != MouseMode::Dontcare && mouseMode_ != requestedMode)
{
@@ -553,7 +553,7 @@
COUT(0) << "Calibration has been stored." << std::endl;
}
- //! Gets called by WindowEventListener upon focus change --> clear buffers
+ //! Gets called by WindowEventListener upon focus change --> clear buffers
void InputManager::windowFocusChanged()
{
this->clearBuffers();
Modified: code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h
===================================================================
--- code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -28,7 +28,7 @@
/**
@file
- at brief
+ at brief
*/
#ifndef _JoyStickQuantityListener_H__
Modified: code/branches/presentation2/src/libraries/core/input/KeyBinder.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/input/KeyBinder.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/core/input/KeyBinder.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -284,7 +284,7 @@
}
void KeyBinder::addButtonToCommand(std::string command, Button* button)
- {
+ {
std::ostringstream stream;
stream << button->groupName_ << "." << button->name_;
Modified: code/branches/presentation2/src/libraries/network/ClientConnection.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/ClientConnection.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/ClientConnection.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -147,7 +147,7 @@
}
uint32_t ClientConnection::getRTT()
- {
+ {
assert(server_);
return server_->roundTripTime;
}
Modified: code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -35,8 +35,8 @@
namespace orxonox
{
ClientConnectionListener::ClientConnectionListener()
- {
- RegisterRootObject(ClientConnectionListener);
+ {
+ RegisterRootObject(ClientConnectionListener);
}
void ClientConnectionListener::broadcastClientConnected(unsigned int clientID)
Modified: code/branches/presentation2/src/libraries/network/FunctionCallManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/FunctionCallManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/FunctionCallManager.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -36,57 +36,57 @@
// Static calls
void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager::clientMap_[clientID]->addCallStatic(functionID);
}
void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1);
}
void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2);
}
void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3);
}
void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3, &mt4);
}
void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3, &mt4, &mt5);
}
@@ -94,57 +94,57 @@
// MemberCalls
void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID);
}
void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1);
}
void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2);
}
void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3);
}
void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3, &mt4);
}
void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
-{
- if(clientMap_.find(clientID)==clientMap_.end())
+{
+ if(clientMap_.find(clientID)==clientMap_.end())
{
- FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
- FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
- }
+ FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
+ FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
+ }
FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3, &mt4, &mt5);
}
Modified: code/branches/presentation2/src/libraries/network/GamestateManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/GamestateManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/GamestateManager.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -158,7 +158,7 @@
clientGamestates.push(0);
finishGamestate( cid, &clientGamestates.back(), client, reference );
- //FunctorMember<GamestateManager>* functor =
+ //FunctorMember<GamestateManager>* functor =
// ExecutorMember<GamestateManager>* executor = createExecutor( createFunctor(&GamestateManager::finishGamestate, this) );
// executor->setDefaultValues( cid, &clientGamestates.back(), client, reference );
// (*static_cast<Executor*>(executor))();
Modified: code/branches/presentation2/src/libraries/network/NetworkFunction.h
===================================================================
--- code/branches/presentation2/src/libraries/network/NetworkFunction.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/NetworkFunction.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -82,7 +82,7 @@
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() );
+ assert( map.find(name)!=map.end() );
map[name]->setNetworkID(id);
}
@@ -138,7 +138,7 @@
static NetworkMemberFunctionBase* getFunction( uint32_t id ){ assert( idMap_.find(id) != idMap_.end() ); return idMap_[id]; }
static NetworkMemberFunctionBase* getFunction( const NetworkFunctionPointer& p ){ assert( functorMap_.find(p) != functorMap_.end() ); return functorMap_[p]; }
- //
+ //
virtual void call(uint32_t objectID)=0;
virtual void call(uint32_t objectID, const MultiType& mt1)=0;
virtual void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)=0;
@@ -158,32 +158,32 @@
~NetworkMemberFunction();
inline void call(uint32_t objectID)
- {
+ {
if ( Synchronisable::getSynchronisable(objectID)!=0 )
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)));
}
inline void call(uint32_t objectID, const MultiType& mt1)
- {
+ {
if ( Synchronisable::getSynchronisable(objectID)!=0 )
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1);
}
inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)
- {
+ {
if ( Synchronisable::getSynchronisable(objectID)!=0 )
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2);
}
inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
- {
+ {
if ( Synchronisable::getSynchronisable(objectID)!=0 )
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3);
}
inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
- {
+ {
if ( Synchronisable::getSynchronisable(objectID)!=0 )
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4);
}
inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
- {
+ {
if ( Synchronisable::getSynchronisable(objectID)!=0 )
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4, mt5);
}
Modified: code/branches/presentation2/src/libraries/network/Server.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/Server.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/Server.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -161,7 +161,7 @@
}
/**
- * @brief: returns ping time to client in milliseconds
+ * @brief: returns ping time to client in milliseconds
*/
unsigned int Server::getRTT(unsigned int clientID){
assert(ClientInformation::findClient(clientID));
Modified: code/branches/presentation2/src/libraries/network/TrafficControl.h
===================================================================
--- code/branches/presentation2/src/libraries/network/TrafficControl.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/TrafficControl.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -104,7 +104,7 @@
/**
*evaluates Data given (list) and produces result(->Data to be updated)
*/
- void evaluateList(unsigned int clientID, std::list<obj>& list);//done
+ 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
@@ -120,7 +120,7 @@
virtual ~TrafficControl();
/**
*is being used by GSManager from Server:
- *list contains: ObjIds, CreatorIds, Size (in this order) from Client XY
+ *list contains: ObjIds, CreatorIds, Size (in this order) from Client XY
*Elements of list are accessed by *list[i]
*Elements of struct i are therefore: *list[i].objID
*/
Modified: code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -47,7 +47,7 @@
FunctionIDs::FunctionIDs( ) : Packet(){
std::string functionname;
- unsigned int nrOfFunctions=0;
+ unsigned int nrOfFunctions=0;
unsigned int packetSize=2*sizeof(uint32_t); //space for the packetID and for the nroffunctions
uint32_t networkID;
flags_ = flags_ | PACKET_FLAGS_FUNCTIONIDS;
Modified: code/branches/presentation2/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/Gamestate.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/packet/Gamestate.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -436,8 +436,8 @@
// return NULL;
// uint8_t *ndata = new uint8_t[dest_length*sizeof(uint8_t)+GamestateHeader::getSize()];
// uint8_t *dest = ndata + GamestateHeader::getSize();
-//
-//
+//
+//
// // LOOP-UNROLLED DIFFING
// uint32_t *dest32 = (uint32_t*)dest, *base32 = (uint32_t*)basep, *gs32 = (uint32_t*)gs;
// // diff in 4-byte steps
@@ -464,7 +464,7 @@
// *(dest+4*of+of2)=*(gs+4*of+of2); // same as 0 ^ *(gs32+of)
// }
// }
-//
+//
// Gamestate *g = new Gamestate(ndata, getClientID());
// *(g->header_) = *header_;
// g->header_->setDiffed( true );
Modified: code/branches/presentation2/src/libraries/network/packet/Packet.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/packet/Packet.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/packet/Packet.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -101,7 +101,7 @@
@brief
Destroys a packet completely.
- That also means destroying the ENetPacket if one exists. There
+ That also means destroying the ENetPacket if one exists. There
*/
Packet::~Packet(){
// Deallocate data_ memory if necessary.
Modified: code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -35,8 +35,8 @@
std::queue<NetworkCallbackBase*> NetworkCallbackManager::triggeredCallbacks_;
void NetworkCallbackManager::registerCallback(NetworkCallbackBase *cb)
- {
- callbackSet_.insert(cb);
+ {
+ callbackSet_.insert(cb);
}
void NetworkCallbackManager::deleteCallback(NetworkCallbackBase *cb)
{
Modified: code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -65,8 +65,8 @@
}
/**
- * @brief: stores information about a Synchronisable
- *
+ * @brief: stores information about a Synchronisable
+ *
* This class stores the information about a Synchronisable (objectID_, classID_, creatorID_, dataSize)
* in an emulated bitset.
* Bit 1 to 31 store the size of the Data the synchronisable consumes in the stream
Modified: code/branches/presentation2/src/libraries/util/Serialise.h
===================================================================
--- code/branches/presentation2/src/libraries/util/Serialise.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/libraries/util/Serialise.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -615,7 +615,7 @@
template <> inline uint32_t returnSize( const mbool& variable )
{
- return returnSize( (unsigned char&)((mbool&)variable).getMemory() );
+ return returnSize( (unsigned char&)((mbool&)variable).getMemory() );
}
template <> inline void saveAndIncrease( const mbool& variable, uint8_t*& mem )
Modified: code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -65,8 +65,8 @@
XMLPortParam(BoxCollisionShape, "halfExtents", setHalfExtents, getHalfExtents, xmlelement, mode);
XMLPortParamLoadOnly(BoxCollisionShape, "width", setWidth, xmlelement, mode);
- XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode);
- XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode);
+ XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode);
+ XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode);
}
btCollisionShape* BoxCollisionShape::createNewShape() const
Modified: code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -65,7 +65,7 @@
SUPER(ConeCollisionShape, XMLPort, xmlelement, mode);
XMLPortParam(ConeCollisionShape, "radius", setRadius, getRadius, xmlelement, mode);
- XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);
+ XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);
}
btCollisionShape* ConeCollisionShape::createNewShape() const
Modified: code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc
===================================================================
--- code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -66,7 +66,7 @@
SUPER(PlaneCollisionShape, XMLPort, xmlelement, mode);
XMLPortParam(PlaneCollisionShape, "normal", setNormal, getNormal, xmlelement, mode);
- XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);
+ XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);
}
btCollisionShape* PlaneCollisionShape::createNewShape() const
Modified: code/branches/presentation2/src/modules/questsystem/QuestGUI.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestGUI.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/questsystem/QuestGUI.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -267,7 +267,7 @@
}
index = tempIndex; //!< Reset the index to the original level.
- return index;
+ return index;
}
}
Modified: code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -70,7 +70,7 @@
*/
QuestGUINode::QuestGUINode(QuestGUI* gui, QuestGUINode* parent, QuestItem* item, int depth, int index)
{
- this->initialize();
+ this->initialize();
this->gui_ = gui;
this->parent_ = parent;
@@ -153,7 +153,7 @@
{
if(this->details_ == NULL) //!< If the details window was not already created.
- {
+ {
std::ostringstream stream;
//! Create the main window for the details.
@@ -296,7 +296,7 @@
Close the details window.
*/
bool QuestGUINode::closeDetails(const CEGUI::EventArgs& e)
- {
+ {
//CEGUI::Window* window = this->gui_->getRootWindow();
CEGUI::Window* window = this->gui_->getWindowManager()->getWindow("orxonox/QuestGUI/Background");
window->removeChildWindow(this->details_);
Modified: code/branches/presentation2/src/modules/questsystem/QuestGUINode.h
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestGUINode.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/questsystem/QuestGUINode.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -53,7 +53,7 @@
void getName(std::string & buffer); //!< Sets the input buffer to the name of the node.
/**
@brief Retreive the window of this node.
- @return The CEGUI Window of this node.
+ @return The CEGUI Window of this node.
*/
inline CEGUI::Window* getWindow(void)
{ return this->window_; }
Modified: code/branches/presentation2/src/modules/questsystem/QuestListener.cc
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestListener.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/questsystem/QuestListener.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -192,7 +192,7 @@
@return
Returns the questId of the Quest the QuestListener reacts to.
*/
- const std::string & QuestListener::getQuestId(void)
+ const std::string & QuestListener::getQuestId(void)
{
return this->quest_->getId();
}
Modified: code/branches/presentation2/src/modules/questsystem/QuestManager.h
===================================================================
--- code/branches/presentation2/src/modules/questsystem/QuestManager.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/questsystem/QuestManager.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -71,7 +71,7 @@
//! Returns a reference to the single instance of the Quest Manager.
static QuestManager& getInstance() { return Singleton<QuestManager>::getInstance(); } // tolua_export
- //! Retreive the main window for the GUI.
+ //! Retreive the main window for the GUI.
CEGUI::Window* getQuestGUI(const std::string & guiName); // tolua_export
bool registerQuest(Quest* quest); //!< Registers a Quest in the QuestManager.
Modified: code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -53,7 +53,7 @@
void LightningGunProjectile::setMaterial(const std::string& material)
{
- this->materialBase_ = material;
+ this->materialBase_ = material;
BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));
}
Modified: code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -56,7 +56,7 @@
}
void LightningGun::fire()
- {
+ {
LightningGunProjectile* projectile = new LightningGunProjectile(this);
projectile->setMaterial("Flares/LightningBall_");
Modified: code/branches/presentation2/src/orxonox/controllers/HumanController.h
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/HumanController.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/controllers/HumanController.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -37,7 +37,7 @@
// tolua_begin
namespace orxonox
{
- class _OrxonoxExport HumanController
+ class _OrxonoxExport HumanController
// tolua_end
: public Controller, public Tickable
{ // tolua_export
Modified: code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -247,7 +247,7 @@
if (this->accelerating_)
HumanController::moveFrontBack(Vector2(1, 0));
else
- HumanController::moveFrontBack(Vector2(this->acceleration_, 0));
+ HumanController::moveFrontBack(Vector2(this->acceleration_, 0));
this->accelerating_ = false;
//HumanController::moveFrontBack(Vector2(clamp(this->acceleration_ + this->currentAcceleration_, 0.0f, 1.0f), 0));
}
Modified: code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -176,7 +176,7 @@
void setOverlayGroup(OverlayGroup* group);
inline OverlayGroup* getOverlayGroup() const
{ return this->group_; }
- virtual void changedOverlayGroup()
+ virtual void changedOverlayGroup()
{ this->changedVisibility(); }
protected:
Modified: code/branches/presentation2/src/orxonox/pickup/UsableItem.cc
===================================================================
--- code/branches/presentation2/src/orxonox/pickup/UsableItem.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/pickup/UsableItem.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -40,7 +40,7 @@
@brief Constructor. Registers the UsableItem.
@param creator Pointer to the object which created this item.
*/
- UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator)
+ UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator)
{
RegisterObject(UsableItem);
}
Modified: code/branches/presentation2/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/AmbientSound.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/sound/AmbientSound.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -117,7 +117,7 @@
if (fileInfo != NULL)
this->setSource(path);
else
- COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
+ COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
}
}
@@ -133,7 +133,7 @@
SUPER(AmbientSound, changedActivity);
if (this->isActive())
this->play();
- else
+ else
this->stop();
}
}
Modified: code/branches/presentation2/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/BaseSound.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/sound/BaseSound.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -176,7 +176,7 @@
COUT(2) << "Sound warning: pitch out of range, cropping value." << std::endl;
pitch = pitch > 2 ? 2 : pitch;
pitch = pitch < 0.5 ? 0.5 : pitch;
- }
+ }
this->pitch_ = pitch;
if (alIsSource(this->audioSource_))
{
@@ -223,7 +223,7 @@
if (alIsSource(this->audioSource_)) // already playing or paused
{
- // Set new buffer
+ // Set new buffer
alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
if (ALuint error = alGetError())
{
Modified: code/branches/presentation2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundManager.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/sound/SoundManager.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -253,14 +253,14 @@
this->checkVolumeValidity(type);
}
- float SoundManager::getVolume(SoundType::Value type)
+ float SoundManager::getVolume(SoundType::Value type)
{
if (type < 0 || type > SoundType::Effects)
return 0.0f;
return this->volume_[type];
}
- float SoundManager::getRealVolume(SoundType::Value type)
+ float SoundManager::getRealVolume(SoundType::Value type)
{
if (type != SoundType::Music && type != SoundType::Effects)
return 0.0f;
@@ -338,7 +338,7 @@
}
}
- if (!this->ambientSounds_.empty())
+ if (!this->ambientSounds_.empty())
{
this->fadeOut(ambientSounds_.front().first);
}
@@ -353,7 +353,7 @@
if (oldAmbient == NULL || ambientSounds_.empty())
return;
- if (this->ambientSounds_.front().first == oldAmbient)
+ if (this->ambientSounds_.front().first == oldAmbient)
{
this->fadeOut(oldAmbient);
this->ambientSounds_.pop_front();
Modified: code/branches/presentation2/src/orxonox/sound/WorldSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/WorldSound.cc 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/sound/WorldSound.cc 2009-12-21 12:28:10 UTC (rev 6388)
@@ -109,12 +109,12 @@
}
}
- void WorldSound::changedActivity()
+ void WorldSound::changedActivity()
{
SUPER(WorldSound, changedActivity);
if (this->isActive())
this->play();
- else
+ else
this->stop();
}
Modified: code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h
===================================================================
--- code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h 2009-12-21 12:18:36 UTC (rev 6387)
+++ code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h 2009-12-21 12:28:10 UTC (rev 6388)
@@ -69,10 +69,10 @@
{ return this->collisionDamage_; }
inline void setEnableCollisionDamage(bool c)
- {
- this->enableCollisionDamage_ = c;
+ {
+ this->enableCollisionDamage_ = c;
this->enableCollisionCallback();
- }
+ }
inline bool getEnableCollisionDamage()
{ return this->enableCollisionDamage_; }
More information about the Orxonox-commit
mailing list