[Orxonox-commit 6075] r10733 - in code/branches/cpp11_v2: . cmake src/external/ois/linux src/libraries/core/config src/libraries/core/object src/libraries/tools src/libraries/util src/modules/invader src/modules/jump src/orxonox/chat src/orxonox/controllers
landauf at orxonox.net
landauf at orxonox.net
Sat Oct 31 18:11:53 CET 2015
Author: landauf
Date: 2015-10-31 18:11:53 +0100 (Sat, 31 Oct 2015)
New Revision: 10733
Modified:
code/branches/cpp11_v2/
code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake
code/branches/cpp11_v2/src/external/ois/linux/LinuxJoyStickEvents.cpp
code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc
code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h
code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h
code/branches/cpp11_v2/src/modules/invader/Invader.cc
code/branches/cpp11_v2/src/modules/invader/Invader.h
code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc
code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc
code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc
code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc
code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h
code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc
code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h
code/branches/cpp11_v2/src/modules/jump/Jump.cc
code/branches/cpp11_v2/src/modules/jump/Jump.h
code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc
code/branches/cpp11_v2/src/modules/jump/JumpBoots.h
code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc
code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h
code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc
code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h
code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc
code/branches/cpp11_v2/src/modules/jump/JumpItem.cc
code/branches/cpp11_v2/src/modules/jump/JumpItem.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc
code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.cc
code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.cc
code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.cc
code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.cc
code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc
code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.cc
code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h
code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc
code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc
code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h
code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc
code/branches/cpp11_v2/src/modules/jump/JumpRocket.h
code/branches/cpp11_v2/src/modules/jump/JumpScore.cc
code/branches/cpp11_v2/src/modules/jump/JumpShield.cc
code/branches/cpp11_v2/src/modules/jump/JumpShield.h
code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc
code/branches/cpp11_v2/src/modules/jump/JumpSpring.h
code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc
code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc
Log:
merged branch cpp11 to cpp11_v2
Property changes on: code/branches/cpp11_v2
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/clangenb:10385-10609
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/core7:10328-10623
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/formation:8885-8991
/code/branches/formationFS15:10320-10610
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/multiplayerFS15:10324-10611
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/pickupsFS14:10000-10259
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationFS15:10499
/code/branches/presentationFS15merge:10595-10621
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/presentationHS14merge:10222-10257
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/storymodeHS14:10085-10254
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/towerdefenseFS15:10283-10614
/code/branches/towerdefenseHS14:10086-10247
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weaponFS15:10302-10615
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
+ /code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/clangenb:10385-10609
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/core7:10328-10623
/code/branches/cpp11:10439-10732
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/formation:8885-8991
/code/branches/formationFS15:10320-10610
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/multiplayerFS15:10324-10611
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/pickupsFS14:10000-10259
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationFS15:10499
/code/branches/presentationFS15merge:10595-10621
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/presentationHS14merge:10222-10257
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/storymodeHS14:10085-10254
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/towerdefenseFS15:10283-10614
/code/branches/towerdefenseHS14:10086-10247
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weaponFS15:10302-10615
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
Modified: code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake
===================================================================
--- code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake 2015-10-31 17:11:53 UTC (rev 10733)
@@ -63,6 +63,10 @@
ADD_COMPILER_FLAGS("-O3" Release CACHE)
ADD_COMPILER_FLAGS("-Os" MinSizeRel CACHE)
+# Introducing c++11
+# Note: there is also 'std=gnu++11', but that might not be portable to windows
+ADD_COMPILER_FLAGS("-std=c++0x" CACHE)
+
# CMake doesn't seem to set the PIC flags right on certain 64 bit systems
IF(NOT MINGW AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
ADD_COMPILER_FLAGS("-fPIC" CACHE)
Modified: code/branches/cpp11_v2/src/external/ois/linux/LinuxJoyStickEvents.cpp
===================================================================
--- code/branches/cpp11_v2/src/external/ois/linux/LinuxJoyStickEvents.cpp 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/external/ois/linux/LinuxJoyStickEvents.cpp 2015-10-31 17:11:53 UTC (rev 10733)
@@ -33,8 +33,8 @@
#include <fcntl.h> //Needed to Open a file descriptor
#include <cassert>
#include <linux/input.h>
+#include <unistd.h>
-
#include <sstream>
# include <iostream>
using namespace std;
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -35,6 +35,9 @@
#include <boost/filesystem.hpp>
+#include <iterator>
+#include <algorithm>
+
#include "util/Convert.h"
#include "util/StringUtils.h"
#include "core/ConfigurablePaths.h"
@@ -92,7 +95,9 @@
// Try to copy default file from the data folder
try
{
- boost::filesystem::copy_file(defaultFilepath, filepath);
+ std::ifstream input(defaultFilepath.string().c_str(), std::ifstream::in | std::ifstream::binary);
+ std::ofstream output(filepath.string().c_str(), std::ofstream::out | std::ofstream::binary);
+ copy(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>(), std::ostream_iterator<char>(output));
orxout(internal_info, context::config) << "Copied " << this->filename_ << " from the default config folder." << endl;
}
catch (const boost::filesystem::filesystem_error& ex)
Modified: code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -92,6 +92,11 @@
this->removeFromList();
}
+ operator T*()
+ {
+ return object_;
+ }
+
T* object_; //!< The object
};
Modified: code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -12,6 +12,8 @@
#include <btBulletCollisionCommon.h>
#include <OgreFrameListener.h>
+#include <OgreVector3.h>
+#include <OgreColourValue.h>
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -9,6 +9,11 @@
#define _OgreBulletUtils_H__
#include "tools/ToolsPrereqs.h"
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
+#include <OgreMatrix3.h>
+#include <OgreMatrix4.h>
namespace orxonox
{
@@ -41,7 +46,7 @@
inline Ogre::Matrix3 matrix3(const btMatrix3x3& matrix)
{
- return Matrix3(
+ return Ogre::Matrix3(
matrix[0][0], matrix[0][1], matrix[0][2],
matrix[1][0], matrix[1][1], matrix[1][2],
matrix[2][0], matrix[2][1], matrix[2][2]
Modified: code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -76,6 +76,7 @@
#include "UtilPrereqs.h"
#include <vector>
+#include <cstdio>
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/invader/Invader.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/Invader.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/Invader.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -128,6 +128,11 @@
}
}
+ void Invader::setCenterpoint(InvaderCenterPoint* center)
+ {
+ this->center_ = center;
+ }
+
void Invader::costLife()
{
lives--;
Modified: code/branches/cpp11_v2/src/modules/invader/Invader.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/Invader.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/Invader.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -38,9 +38,6 @@
#include "invader/InvaderPrereqs.h"
#include "gametypes/Deathmatch.h"
-
-#include "InvaderCenterPoint.h"
-
#include "tools/Timer.h"
namespace orxonox
@@ -57,8 +54,7 @@
void spawnEnemy();
- void setCenterpoint(InvaderCenterPoint* center)
- { this->center_ = center; }
+ void setCenterpoint(InvaderCenterPoint* center);
int getLives(){return this->lives;}
int getLevel(){return this->level;}
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -31,8 +31,10 @@
@brief Declaration of the InvaderEnemy class.
*/
-#include "invader/InvaderPrereqs.h"
#include "InvaderEnemy.h"
+
+#include "core/CoreIncludes.h"
+#include "Invader.h"
#include "InvaderShip.h"
namespace orxonox
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -36,7 +36,7 @@
#include "invader/InvaderPrereqs.h"
-#include "worldentities/pawns/SpaceShip.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -31,10 +31,13 @@
@brief Declaration of the InvaderEnemyShooter class.
*/
-#include "invader/InvaderPrereqs.h"
#include "InvaderEnemyShooter.h"
-// #include "worldentities/pawns/SpaceShip.h"
+#include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
+#include "Invader.h"
+#include "InvaderShip.h"
+
namespace orxonox
{
RegisterClass(InvaderEnemyShooter);
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,7 +29,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "util/Convert.h"
-// #include "Invader.h"
+#include "Invader.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -36,6 +36,9 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "Invader.h"
+#include "InvaderEnemy.h"
+#include "graphics/Camera.h"
+#include "weapons/projectiles/Projectile.h"
namespace orxonox
{
@@ -138,6 +141,12 @@
{
isFireing = bBoost;
}
+ void InvaderShip::rotateRoll(const Vector2& value)
+ {
+ if (getGame())
+ if (getGame()->bEndGame)
+ getGame()->end();
+ }
inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
{
// orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -36,9 +36,8 @@
#include "invader/InvaderPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include "worldentities/pawns/SpaceShip.h"
-#include "graphics/Camera.h"
-#include "weapons/projectiles/Projectile.h"
namespace orxonox
{
@@ -60,7 +59,7 @@
virtual void rotateYaw(const Vector2& value){};
virtual void rotatePitch(const Vector2& value){};
//return to main menu if game has ended.
- virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+ virtual void rotateRoll(const Vector2& value);
virtual void updateLevel();
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -34,11 +34,11 @@
#ifndef _InvaderWeapon_H__
#define _InvaderWeapon_H__
+#include "invader/InvaderPrereqs.h"
+
+#include "weapons/WeaponsPrereqs.h"
#include "weapons/weaponmodes/HsW01.h"
-#include "weapons/WeaponsPrereqs.h"
-#include "tools/Timer.h"
-
namespace orxonox
{
class _InvaderExport InvaderWeapon : public HsW01
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -33,6 +33,9 @@
#include "InvaderWeaponEnemy.h"
+#include "core/CoreIncludes.h"
+#include "weapons/projectiles/Projectile.h"
+
namespace orxonox
{
RegisterClass(InvaderWeaponEnemy);
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -34,9 +34,9 @@
#ifndef _InvaderWeaponEnemy_H__
#define _InvaderWeaponEnemy_H__
-// #include "weapons/weaponmodes/HsW01.h"
-// #include "weapons/WeaponsPrereqs.h"
-#include "invader/InvaderWeapon.h"
+#include "invader/InvaderPrereqs.h"
+
+#include "InvaderWeapon.h"
#include "tools/Timer.h"
namespace orxonox
Modified: code/branches/cpp11_v2/src/modules/jump/Jump.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/Jump.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/Jump.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -33,11 +33,7 @@
#include "Jump.h"
#include "core/CoreIncludes.h"
-#include "core/EventIncludes.h"
-#include "core/command/Executor.h"
-#include "core/config/ConfigValueIncludes.h"
-#include "gamestates/GSLevel.h"
-#include "chat/ChatManager.h"
+
#include "JumpCenterpoint.h"
#include "JumpPlatform.h"
#include "JumpPlatformStatic.h"
@@ -55,7 +51,10 @@
#include "JumpPropeller.h"
#include "JumpBoots.h"
#include "JumpShield.h"
+
+#include "gamestates/GSLevel.h"
#include "infos/PlayerInfo.h"
+#include "graphics/Camera.h"
namespace orxonox
{
@@ -69,8 +68,6 @@
figure_ = 0;
camera = 0;
setHUDTemplate("JumpHUD");
-
- setConfigValues();
}
Jump::~Jump()
@@ -1299,4 +1296,10 @@
{
return figure_->dead_;
}
+
+ void Jump::setCenterpoint(JumpCenterpoint* center)
+ {
+ center_ = center;
+ }
+
}
Modified: code/branches/cpp11_v2/src/modules/jump/Jump.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/Jump.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/Jump.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -30,11 +30,7 @@
#define _Jump_H__
#include "jump/JumpPrereqs.h"
-#include "tools/Timer.h"
-#include "graphics/Camera.h"
#include "gametypes/Deathmatch.h"
-#include "JumpCenterpoint.h"
-#include <list>
namespace orxonox
{
@@ -50,8 +46,7 @@
int getScore(PlayerInfo* player) const;
float getFuel() const;
bool getDead(PlayerInfo* player) const;
- void setCenterpoint(JumpCenterpoint* center)
- { center_ = center; }
+ void setCenterpoint(JumpCenterpoint* center);
PlayerInfo* getPlayer() const;
protected:
Modified: code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -34,15 +34,9 @@
#include "JumpBoots.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpBoots);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpBoots.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpBoots.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpBoots.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,11 +29,9 @@
#ifndef _JumpBoots_H__
#define _JumpBoots_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
-
namespace orxonox
{
class _JumpExport JumpBoots : public JumpItem
Modified: code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,6 +32,7 @@
*/
#include "JumpCenterpoint.h"
+
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "Jump.h"
Modified: code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -30,11 +30,6 @@
#define _JumpCenterpoint_H__
#include "jump/JumpPrereqs.h"
-
-#include <string>
-
-#include <util/Math.h>
-
#include "worldentities/StaticEntity.h"
namespace orxonox
Modified: code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -34,15 +34,9 @@
#include "JumpEnemy.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpEnemy);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -36,12 +36,8 @@
#define _JumpEnemy_H__
#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
#include "worldentities/MovableEntity.h"
-
namespace orxonox
{
class _JumpExport JumpEnemy : public MovableEntity
Modified: code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -35,6 +35,11 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "graphics/Model.h"
+#include "JumpRocket.h"
+#include "JumpPropeller.h"
+#include "JumpBoots.h"
+#include "JumpShield.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpItem.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpItem.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpItem.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -34,15 +34,9 @@
#include "JumpItem.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpItem);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpItem.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpItem.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpItem.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -36,9 +36,6 @@
#define _JumpItem_H__
#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
#include "worldentities/MovableEntity.h"
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -35,14 +35,10 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
+#include "sound/WorldSound.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpPlatform);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -35,8 +35,7 @@
#ifndef _JumpPlatform_H__
#define _JumpPlatform_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
+#include "JumpPrereqs.h"
#include "worldentities/MovableEntity.h"
namespace orxonox
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -34,15 +34,9 @@
#include "JumpPlatformDisappear.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpPlatformDisappear);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -35,9 +35,8 @@
#ifndef _JumpPlatformDisappear_H__
#define _JumpPlatformDisappear_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,11 +32,8 @@
*/
#include "JumpPlatformFake.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
namespace orxonox
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -35,13 +35,9 @@
#ifndef _JumpPlatformFake_H__
#define _JumpPlatformFake_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpPlatformFake : public JumpPlatform
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,12 +32,10 @@
*/
#include "JumpPlatformHMove.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,13 +29,9 @@
#ifndef _JumpPlatformHMove_H__
#define _JumpPlatformHMove_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,12 +32,10 @@
*/
#include "JumpPlatformStatic.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,13 +29,9 @@
#ifndef _JumpPlatformStatic_H__
#define _JumpPlatformStatic_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpPlatformStatic : public JumpPlatform
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,12 +32,11 @@
*/
#include "JumpPlatformTimer.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "graphics/ParticleSpawner.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -35,14 +35,9 @@
#ifndef _JumpPlatformTimer_H__
#define _JumpPlatformTimer_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-#include "graphics/ParticleSpawner.h"
-
-
namespace orxonox
{
class _JumpExport JumpPlatformTimer : public JumpPlatform
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,12 +32,10 @@
*/
#include "JumpPlatformVMove.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,9 +29,8 @@
#ifndef _JumpPlatformVMove_H__
#define _JumpPlatformVMove_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,13 +32,11 @@
*/
#include "JumpProjectile.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
+#include "JumpEnemy.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -34,15 +34,9 @@
#include "JumpPropeller.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpPropeller);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,13 +29,9 @@
#ifndef _JumpPropeller_H__
#define _JumpPropeller_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpPropeller : public JumpItem
Modified: code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,13 +32,10 @@
*/
#include "JumpRocket.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpRocket.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpRocket.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpRocket.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,9 +29,8 @@
#ifndef _JumpRocket_H__
#define _JumpRocket_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpScore.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpScore.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpScore.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,12 +32,12 @@
*/
#include "JumpScore.h"
+
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "util/Convert.h"
#include "infos/PlayerInfo.h"
#include "Jump.h"
-#include "sound/WorldSound.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpShield.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpShield.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpShield.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -34,15 +34,9 @@
#include "JumpShield.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpShield);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpShield.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpShield.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpShield.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,13 +29,9 @@
#ifndef _JumpShield_H__
#define _JumpShield_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpShield : public JumpItem
Modified: code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -32,13 +32,10 @@
*/
#include "JumpSpring.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/jump/JumpSpring.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpSpring.h 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/modules/jump/JumpSpring.h 2015-10-31 17:11:53 UTC (rev 10733)
@@ -29,13 +29,9 @@
#ifndef _JumpSpring_H__
#define _JumpSpring_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpSpring : public JumpItem
Modified: code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -106,8 +106,8 @@
}
// notify all listeners
- for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
- it->incomingChat(text, name);
+ for (ChatListener* listener : ObjectList<ChatListener>())
+ listener->incomingChat(text, name);
}
Modified: code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc 2015-10-31 16:41:17 UTC (rev 10732)
+++ code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc 2015-10-31 17:11:53 UTC (rev 10733)
@@ -206,8 +206,8 @@
void ArtificialController::setAllBotLevel(float level)
{
- for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it != ObjectList<ArtificialController>::end(); ++it)
- it->setBotLevel(level);
+ for (ArtificialController* controller : ObjectList<ArtificialController>())
+ controller->setBotLevel(level);
}
void ArtificialController::setPreviousMode()
@@ -230,10 +230,10 @@
int ArtificialController::getFiremode(std::string name)
{
- for (std::map< std::string, int >::iterator it = this->weaponModes_.begin(); it != this->weaponModes_.end(); ++it)
+ for (auto firemode : this->weaponModes_)
{
- if (it->first == name)
- return it->second;
+ if (firemode.first == name)
+ return firemode.second;
}
return -1;
}
@@ -258,19 +258,19 @@
void ArtificialController::updatePointsOfInterest(std::string name, float searchDistance)
{
WorldEntity* waypoint = NULL;
- for (ObjectList<WorldEntity>::iterator it = ObjectList<WorldEntity>::begin(); it != ObjectList<WorldEntity>::end(); ++it)
+ for (WorldEntity* we : ObjectList<WorldEntity>())
{
- if((*it)->getIdentifier() == ClassByString(name))
+ if(we->getIdentifier() == ClassByString(name))
{
ControllableEntity* controllable = this->getControllableEntity();
if(!controllable) continue;
- float actualDistance = ( (*it)->getPosition() - controllable->getPosition() ).length();
+ float actualDistance = ( we->getPosition() - controllable->getPosition() ).length();
if(actualDistance > searchDistance || actualDistance < 5.0f) continue;
// TODO: PickupSpawner: adjust waypoint accuracy to PickupSpawner's triggerdistance
// TODO: ForceField: analyze is angle between forcefield boost and own flying direction is acceptable
else
{
- waypoint = *it;
+ waypoint = we;
break;
}
}
More information about the Orxonox-commit
mailing list