[Orxonox-commit 6543] r11184 - in code/branches/tgidronFS16: . cmake data/levels data/levels/includes data/levels/templates src/libraries/core/command src/modules/hover src/orxonox src/orxonox/gametypes src/orxonox/weaponsystem src/orxonox/worldentities/pawns test/util
tgidron at orxonox.net
tgidron at orxonox.net
Thu May 12 16:02:21 CEST 2016
Author: tgidron
Date: 2016-05-12 16:02:21 +0200 (Thu, 12 May 2016)
New Revision: 11184
Modified:
code/branches/tgidronFS16/
code/branches/tgidronFS16/cmake/CompilerConfigClang.cmake
code/branches/tgidronFS16/data/levels/Hover.oxw
code/branches/tgidronFS16/data/levels/emptyLevel.oxw
code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi
code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt
code/branches/tgidronFS16/src/libraries/core/command/TclThreadManager.cc
code/branches/tgidronFS16/src/modules/hover/Hover.cc
code/branches/tgidronFS16/src/modules/hover/HoverFlag.cc
code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc
code/branches/tgidronFS16/src/orxonox/Scene.h
code/branches/tgidronFS16/src/orxonox/gametypes/TeamGametype.cc
code/branches/tgidronFS16/src/orxonox/weaponsystem/WeaponSystem.h
code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.cc
code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.h
code/branches/tgidronFS16/test/util/StringUtilsTest.cc
Log:
New Pickup + try to create ground from separate tiles
Property changes on: code/branches/tgidronFS16
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/AI_HS15:10640-10832
/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/campaignHS15:10639-10973
/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/cpp11_v2:10732-11067
/code/branches/cpp11_v3:11053-11070
/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/explosionChunksHS15:10641-10961
/code/branches/fabienHS15:10685-11033
/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/hoverHS15:10633-10959
/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/particleEffectsHS15:10644-10962
/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/planetLevelHS15:10637-10966
/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/presentationHS15:10959-11055
/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/shaders:9379-11072
/code/branches/shaders_merge:11072-11079
/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/soundEffects:9382-11020
/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/AI_HS15:10640-10832
/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/campaignHS15:10639-10973
/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/cpp11_v2:10732-11067
/code/branches/cpp11_v3:11053-11070
/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/explosionChunksHS15:10641-10961
/code/branches/fabienHS15:10685-11033
/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/hoverHS15:10633-10959
/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/particleEffectsHS15:10644-10962
/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/planetLevelHS15:10637-10966
/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/presentationHS15:10959-11055
/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/shaders:9379-11072
/code/branches/shaders_merge:11072-11079
/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/soundEffects:9382-11020
/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/trunk:11140-11182
Modified: code/branches/tgidronFS16/cmake/CompilerConfigClang.cmake
===================================================================
--- code/branches/tgidronFS16/cmake/CompilerConfigClang.cmake 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/cmake/CompilerConfigClang.cmake 2016-05-12 14:02:21 UTC (rev 11184)
@@ -63,9 +63,6 @@
# Don't display hundreds of annoying deprecated messages
ADD_COMPILER_FLAGS("-Wno-deprecated" CXX CACHE)
-# Triggers lots of warnings in boost headers
-ADD_COMPILER_FLAGS("-Wno-unused-local-typedefs" CXX CACHE)
-
# Clang doesn't like some narrowing bullet does
ADD_COMPILER_FLAGS("-Wno-c++11-narrowing" CXX CACHE)
Modified: code/branches/tgidronFS16/data/levels/Hover.oxw
===================================================================
--- code/branches/tgidronFS16/data/levels/Hover.oxw 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/data/levels/Hover.oxw 2016-05-12 14:02:21 UTC (rev 11184)
@@ -19,8 +19,9 @@
<?lua
MAZE_NUM_CELLS = 10
-MAZE_CELL_SIZE = 100
-MAZE_CELL_HEIGHT = 30
+MAZE_CELL_SIZE = 600
+MAZE_CELL_HEIGHT = 180
+MAZE_WALL_THICKNESS = 10
MAZE_SIZE = MAZE_NUM_CELLS*MAZE_CELL_SIZE
?>
<!--
@@ -57,7 +58,7 @@
<spawner-representation>
<StaticEntity>
<attached>
- <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
+ <Billboard position="0,50,0" colour="1.0,0.55,1.0" material="Sphere2" scale=1>
<attached>
<Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.35 />
</attached>
@@ -86,7 +87,7 @@
<spawner-representation>
<StaticEntity>
<attached>
- <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
+ <Billboard position="0,50,0" colour="0.99,0.96,0.52" material="Sphere2" scale=1>
<attached>
<Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.7 />
</attached>
@@ -115,7 +116,7 @@
<spawner-representation>
<StaticEntity>
<attached>
- <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=0.1>
+ <Billboard position="0,50,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=1>
<attached>
<Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Asterisk" scale=0.65 />
</attached>
@@ -135,10 +136,10 @@
<Template name=obstacle baseclass=Pawn>
<Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
<attached>
- <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
+ <Model position="0,50,0" mesh="crate.mesh" scale3D="15,15,15" />
</attached>
<collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+ <BoxCollisionShape position="0,0,0" halfExtents="70,70,70" />
</collisionShapes>
</Pawn>
</Template>
@@ -155,12 +156,41 @@
<?lua include("includes/notifications.oxi") ?>
+ <?lua
+ for i = 1, 10, 1 do
+ for j = 1,10 ,1 do
+ ?>
+ <StaticEntity position="0,0,0" collisionType="static">
+ <attached>
+ <Model
+ position="<?lua print(MAZE_CELL_SIZE*i)?>, -16, <?lua print(MAZE_CELL_SIZE*j)?>"
+ scale3D="<?lua print(MAZE_CELL_SIZE*i)?>, 16, <?lua print(MAZE_CELL_SIZE*j)?>"
+ mesh="CubeGround.mesh"
+ />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape
+ position="<?lua print(MAZE_CELL_SIZE*i)?>, <?lua print(MAZE_CELL_HEIGHT+1)?>, <?lua print(MAZE_CELL_SIZE*j)?>"
+ halfExtents="<?lua print(MAZE_CELL_SIZE*i)?>,1,<?lua print(MAZE_CELL_SIZE*j)?>"
+ />
+ <BoxCollisionShape
+ position="<?lua print(MAZE_CELL_SIZE*i)?>,-1,<?lua print(MAZE_CELL_SIZE*j)?>"
+ halfExtents="<?lua print(MAZE_CELL_SIZE*i)?>,1,<?lua print(MAZE_CELL_SIZE*j)?>"
+ />
+ </collisionShapes>
+ <?lua
+ end
+ end
+ ?>
+
+ </StaticEntity>
+
<Scene
ambientlight = "0.8, 0.8, 0.8"
skybox = "Orxonox/Starbox"
- gravity = "0, -200, 0"
+ gravity = "0, -300, 0"
>
<PickupRepresentation
@@ -209,22 +239,8 @@
pickuptemplateshrink=smallshrinkpickup
pickuprepresentationtemplateshrink=smallshrinkpickupRepresentation
/>
- <Model
- position="<?lua print(MAZE_SIZE/2)?>,-16,<?lua print(MAZE_SIZE/2)?>"
- scale3D="<?lua print(MAZE_SIZE/2)?>,16,<?lua print(MAZE_SIZE/2)?>"
- mesh="CubeGround.mesh"
- />
- </attached>
- <collisionShapes>
- <BoxCollisionShape
- position="<?lua print(MAZE_SIZE/2)?>,<?lua print(MAZE_CELL_HEIGHT+1)?>,<?lua print(MAZE_SIZE/2)?>"
- halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
- />
- <BoxCollisionShape
- position="<?lua print(MAZE_SIZE/2)?>,-1,<?lua print(MAZE_SIZE/2)?>"
- halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
- />
- </collisionShapes>
+ </attached>
+
</StaticEntity>
<Light
@@ -237,8 +253,8 @@
<SpawnPoint
team=0
- position="50,20,50"
- lookat="100,20,100"
+ position="300,120,300"
+ lookat="600,120,600"
spawnclass=HoverShip
pawndesign=spaceshiphover
/>
@@ -246,3 +262,22 @@
</Scene>
</Level>
+
+
+<!--<<Model
+ position="<?lua print(MAZE_SIZE/2)?>,-16,<?lua print(MAZE_SIZE/2)?>"
+ scale3D="<?lua print(MAZE_SIZE/2)?>,16,<?lua print(MAZE_SIZE/2)?>"
+ mesh="ss_wall.mesh"
+ />
+ </attached>
+
+ <collisionShapes>
+ <BoxCollisionShape
+ position="<?lua print(MAZE_SIZE/2)?>,<?lua print(MAZE_CELL_HEIGHT+1)?>,<?lua print(MAZE_SIZE/2)?>"
+ halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
+ />
+ <BoxCollisionShape
+ position="<?lua print(MAZE_SIZE/2)?>,-1,<?lua print(MAZE_SIZE/2)?>"
+ halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
+ />
+ </collisionShapes> -->
\ No newline at end of file
Modified: code/branches/tgidronFS16/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/tgidronFS16/data/levels/emptyLevel.oxw 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/data/levels/emptyLevel.oxw 2016-05-12 14:02:21 UTC (rev 11184)
@@ -13,6 +13,7 @@
<?lua
include("templates/spaceshipEscort.oxt")
+ include("templates/spaceshipHover.oxt")
?>
<Level>
@@ -28,6 +29,14 @@
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
<SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+
+ <SpaceShip position="0,0,0" lookat="0,0,0" >
+
+ <templates>
+ <Template link=spaceshiphover />
+ </templates>
+
+ </SpaceShip>
</Scene>
</Level>
Modified: code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi
===================================================================
--- code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi 2016-05-12 14:02:21 UTC (rev 11184)
@@ -1,6 +1,6 @@
<weaponslots>
- <WeaponSlot position="-3,2,-3" />
- <WeaponSlot position=" 3,2,-3" />
+ <WeaponSlot position="-10,2,-100" />
+ <WeaponSlot position=" 10,2,-100" />
</weaponslots>
<weaponsets>
<WeaponSet firemode=0 />
Modified: code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt
===================================================================
--- code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt 2016-05-12 14:02:21 UTC (rev 11184)
@@ -17,14 +17,14 @@
reloadrate = 2
reloadwaittime = 0.5
- primaryThrust = 200
+ primaryThrust = 2000
auxilaryThrust = 1
rotationThrust = 45
- jumpBoost = 110
+ jumpBoost = 230
lift = 1;
- stallSpeed = 220;
+ stallSpeed = 1400;
boostPower = 10
boostPowerRate = 1
@@ -32,7 +32,7 @@
boostCooldownDuration = 10
collisionType = "dynamic"
- mass = 1000
+ mass = 100000
linearDamping = 0.2
angularDamping = 0.9999999
>
@@ -40,13 +40,13 @@
<MultiStateEngine position=" 0, 0, 0" template=spaceshiphoverengine />
</engines>
<attached>
- <Model position="0,0,-20" mesh="hovership_body.mesh" scale="5" yaw=180/>
- <Model position="0,0,-20" mesh="hovership_engine.mesh" scale="5" yaw=180/>
- <Model position="0,0,-20" mesh="hovership_gun.mesh" scale="5" yaw=180/>
+ <Model position="0,0,-120" mesh="hovership_body.mesh" scale="30" yaw=180/>
+ <Model position="0,0,-120" mesh="hovership_engine.mesh" scale="30" yaw=180/>
+ <Model position="0,0,-120" mesh="hovership_gun.mesh" scale="30" yaw=180/>
</attached>
<collisionShapes>
- <BoxCollisionShape position="0,-2 ,7" halfExtents="7, 4 ,30" />
+ <BoxCollisionShape position="0,-12, 42" halfExtents="42, 24 ,180" />
</collisionShapes>
<explosion>
<ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
@@ -68,8 +68,8 @@
<Template name=spaceshiphovercameras defaults=0>
<SpaceShip>
<camerapositions>
- <CameraPosition position="0,8, 5" drag=true mouselook=true />
- <CameraPosition position="0,8,5" yaw="180" drag=true mouselook=true />
+ <CameraPosition position="0, 48, 30" drag=true mouselook=true />
+ <CameraPosition position="0, 48, 30" yaw="180" drag=true mouselook=true />
</camerapositions>
</SpaceShip>
</Template>
@@ -78,15 +78,15 @@
<MultiStateEngine
boostfactor = 2
- speedfront = 150
- speedback = 40
- speedleftright = 40
- speedupdown = 40
+ speedfront = 1400
+ speedback = 800
+ speedleftright = 600
+ speedupdown = 600
- accelerationfront = 500
- accelerationbrake = 500
+ accelerationfront = 1000
+ accelerationbrake = 1000
accelerationback = 250
- accelerationleftright = 125
+ accelerationleftright = 250
accelerationupdown = 125
>
<EffectContainer condition="not idle">
Modified: code/branches/tgidronFS16/src/libraries/core/command/TclThreadManager.cc
===================================================================
--- code/branches/tgidronFS16/src/libraries/core/command/TclThreadManager.cc 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/libraries/core/command/TclThreadManager.cc 2016-05-12 14:02:21 UTC (rev 11184)
@@ -409,9 +409,9 @@
if ((source_bundle->id_ == target_bundle->id_) || source_bundle->queriers_.is_in(target_bundle->id_))
{
// This query would lead to a deadlock - return with an error
- TclThreadManager::error("Circular query (" + this->dumpList(source_bundle->queriers_.getList()) + ' ' + multi_cast<std::string>(source_bundle->id_) \
- + " -> " + multi_cast<std::string>(target_bundle->id_) \
- + "), couldn't query Tcl-interpreter with ID " + multi_cast<std::string>(target_bundle->id_) \
+ TclThreadManager::error("Circular query (" + this->dumpList(source_bundle->queriers_.getList()) + ' ' + multi_cast<std::string>(source_bundle->id_)
+ + " -> " + multi_cast<std::string>(target_bundle->id_)
+ + "), couldn't query Tcl-interpreter with ID " + multi_cast<std::string>(target_bundle->id_)
+ " from other interpreter with ID " + multi_cast<std::string>(source_bundle->id_) + '.');
}
else
Modified: code/branches/tgidronFS16/src/modules/hover/Hover.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/Hover.cc 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/modules/hover/Hover.cc 2016-05-12 14:02:21 UTC (rev 11184)
@@ -168,9 +168,10 @@
Pawn* crate = new Pawn(origin_->getContext());
+
+ crate->addTemplate(origin_->getObstacleTemplate());
crate->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
- crate->addTemplate(origin_->getObstacleTemplate());
- crate->setInitialHealth(100.0f);
+ //ate->setInitialHealth(100.0f);
Modified: code/branches/tgidronFS16/src/modules/hover/HoverFlag.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/HoverFlag.cc 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/modules/hover/HoverFlag.cc 2016-05-12 14:02:21 UTC (rev 11184)
@@ -86,13 +86,13 @@
{
model_ = new Model(this->getContext());
model_->setMeshSource("ss_flag_eu.mesh");
- model_->setScale3D(Vector3(5, 5, 5));
- model_->setPosition(Vector3(xCoordinate*cellSize*1.0f + cellSize/2,10.0f,yCoordinate*cellSize*1.0f + cellSize/2));
+ model_->setScale3D(Vector3(30, 30, 30));
+ model_->setPosition(Vector3(xCoordinate*cellSize*1.0f + cellSize/2,50.0f,yCoordinate*cellSize*1.0f + cellSize/2));
this->attach(model_);
cs_ = new BoxCollisionShape(this->getContext());
- cs_->setHalfExtents(Vector3(5, 5, 5));
+ cs_->setHalfExtents(Vector3(30, 30, 30));
cs_->setPosition(Vector3(xCoordinate*cellSize*1.0f + cellSize/2,0.0f,yCoordinate*cellSize*1.0f + cellSize/2));
this->attachCollisionShape(cs_);
Modified: code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc 2016-05-12 14:02:21 UTC (rev 11184)
@@ -47,7 +47,7 @@
//not needed
- /*pickupTemplate_ = "";
+ pickupTemplate_ = "";
pickupRepresentationTemplate_ = "";
pickupTemplateSpeed_ = "";
@@ -55,7 +55,7 @@
pickupTemplateShrink_ = "";
- pickupRepresentationTemplateShrink_ = "";*/
+ pickupRepresentationTemplateShrink_ = "";
}
void HoverOrigin::XMLPort(Element& xmlelement, XMLPort::Mode mode)
Modified: code/branches/tgidronFS16/src/orxonox/Scene.h
===================================================================
--- code/branches/tgidronFS16/src/orxonox/Scene.h 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/orxonox/Scene.h 2016-05-12 14:02:21 UTC (rev 11184)
@@ -47,6 +47,7 @@
#include "core/object/Context.h"
#include "network/synchronisable/Synchronisable.h"
#include "tools/interfaces/Tickable.h"
+#include "core/command/ConsoleCommandIncludes.h"
namespace orxonox
{
Modified: code/branches/tgidronFS16/src/orxonox/gametypes/TeamGametype.cc
===================================================================
--- code/branches/tgidronFS16/src/orxonox/gametypes/TeamGametype.cc 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/orxonox/gametypes/TeamGametype.cc 2016-05-12 14:02:21 UTC (rev 11184)
@@ -140,7 +140,7 @@
void TeamGametype::spawnDeadPlayersIfRequested()
{
- for (const auto& mapEntry : this->players_)\
+ for (const auto& mapEntry : this->players_)
{
if(allowedInGame_[mapEntry.first] == false)//check if dead player is allowed to enter
{
Modified: code/branches/tgidronFS16/src/orxonox/weaponsystem/WeaponSystem.h
===================================================================
--- code/branches/tgidronFS16/src/orxonox/weaponsystem/WeaponSystem.h 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/orxonox/weaponsystem/WeaponSystem.h 2016-05-12 14:02:21 UTC (rev 11184)
@@ -54,6 +54,8 @@
void addWeaponSlot(WeaponSlot * wSlot);
void removeWeaponSlot(WeaponSlot * wSlot);
WeaponSlot * getWeaponSlot(unsigned int index) const;
+ inline const std::vector<WeaponSlot *>& getAllWeaponSlots() const
+ { return weaponSlots_; }
// adding and removing WeaponSets
bool addWeaponSet(WeaponSet * wSet);
Modified: code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.cc 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.cc 2016-05-12 14:02:21 UTC (rev 11184)
@@ -48,6 +48,7 @@
#include "weaponsystem/WeaponSet.h"
#include "weaponsystem/Munition.h"
#include "sound/WorldSound.h"
+#include "core/object/ObjectListIterator.h"
#include "controllers/FormationController.h"
@@ -55,6 +56,8 @@
{
RegisterClass(Pawn);
+ SetConsoleCommand("Pawn", "debugDrawWeapons", &Pawn::consoleCommand_debugDrawWeapons).addShortcut();
+
Pawn::Pawn(Context* context)
: ControllableEntity(context)
, RadarViewable(this, static_cast<WorldEntity*>(this))
@@ -167,6 +170,7 @@
void Pawn::registerVariables()
{
registerVariable(this->bAlive_, VariableDirection::ToClient);
+ registerVariable(this->bVulnerable_, VariableDirection::ToClient);
registerVariable(this->health_, VariableDirection::ToClient);
registerVariable(this->maxHealth_, VariableDirection::ToClient);
registerVariable(this->shieldHealth_, VariableDirection::ToClient);
@@ -591,4 +595,57 @@
assert(0);
return BLANKSTRING;
}
-}
+
+ void Pawn::drawWeapons(bool bDraw)
+ {
+ if (bDraw)
+ {
+ std::vector<WeaponSlot*> weaponSlots = weaponSystem_->getAllWeaponSlots();
+ int numWeaponSlots = weaponSlots.size();
+ Vector3 slotPosition = Vector3::ZERO;
+ Quaternion slotOrientation = Quaternion::IDENTITY;
+ Model* slotModel = nullptr;
+
+ for (int i = 0; i < numWeaponSlots; ++i)
+ {
+ slotPosition = weaponSlots.at(i)->getPosition();
+ slotOrientation = weaponSlots.at(i)->getOrientation();
+ slotModel = new Model(this->getContext());
+ slotModel->setMeshSource("Coordinates.mesh");
+ slotModel->setScale(3.0f);
+ slotModel->setOrientation(slotOrientation);
+ slotModel->setPosition(slotPosition);
+
+ this->attach(slotModel);
+ debugWeaponSlotModels_.push_back(slotModel);
+ }
+ }
+ else
+ {
+ // delete all debug models
+ for(Model* model : debugWeaponSlotModels_)
+ {
+ model->destroy();
+ }
+ debugWeaponSlotModels_.clear();
+ }
+ }
+
+ /*static*/ void Pawn::consoleCommand_debugDrawWeapons(bool bDraw)
+ {
+ if (bDraw)
+ {
+ orxout() << "WeaponSlot visualization enabled." << endl;
+ }
+ else
+ {
+ orxout() << "WeaponSlot visualization disabled." << endl;
+ }
+
+ ObjectList<Pawn> pawnList;
+ for (ObjectListIterator<Pawn> it = pawnList.begin(); it != pawnList.end(); ++it)
+ {
+ it->drawWeapons(bDraw);
+ }
+ }
+}
\ No newline at end of file
Modified: code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.h 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.h 2016-05-12 14:02:21 UTC (rev 11184)
@@ -217,6 +217,8 @@
inline const WeaponSystem* getWeaponSystem() const
{ return this->weaponSystem_; }
+ static void consoleCommand_debugDrawWeapons(bool bDraw);
+
protected:
virtual void preDestroy() override;
@@ -232,7 +234,7 @@
virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = nullptr, const btCollisionShape* cs = nullptr);
bool bAlive_;
- bool bVulnerable_; ///< If false the pawn may not ged damaged
+ bool bVulnerable_; ///< If this is false, then the pawn may not take damage
virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const override
{ return new std::vector<PickupCarrier*>(); }
@@ -268,11 +270,14 @@
void registerVariables();
inline void setWeaponSystem(WeaponSystem* weaponsystem)
{ this->weaponSystem_ = weaponsystem; }
+ void drawWeapons(bool bDraw);
Vector3 aimPosition_;
WorldSound* explosionSound_; // TODO: Does this really belong here? Maybe move it to BigExplosion?
+ std::vector<Model*> debugWeaponSlotModels_;
+
}; // tolua_export
} // tolua_export
Modified: code/branches/tgidronFS16/test/util/StringUtilsTest.cc
===================================================================
--- code/branches/tgidronFS16/test/util/StringUtilsTest.cc 2016-05-12 13:28:30 UTC (rev 11183)
+++ code/branches/tgidronFS16/test/util/StringUtilsTest.cc 2016-05-12 14:02:21 UTC (rev 11184)
@@ -266,9 +266,9 @@
EXPECT_EQ(0, nocaseCmp("tESt", "test"));
EXPECT_EQ(0, nocaseCmp("TesT", "teST"));
- EXPECT_EQ(strcmp("a", "b"), nocaseCmp("a", "b"));
- EXPECT_EQ(strcmp("b", "a"), nocaseCmp("b", "a"));
- EXPECT_EQ(strcmp("hello", "world"), nocaseCmp("hello", "world"));
+ EXPECT_EQ(strcmp("a", "b") < 0, nocaseCmp("a", "b") < 0);
+ EXPECT_EQ(strcmp("b", "a") > 0, nocaseCmp("b", "a") > 0);
+ EXPECT_EQ(strcmp("hello", "world") < 0, nocaseCmp("hello", "world") < 0);
}
// _UtilExport int nocaseCmp(const std::string& s1, const std::string& s2, size_t len);
More information about the Orxonox-commit
mailing list