[Orxonox-commit 5954] r10613 - in code/branches/presentationFS15merge: . data/levels/includes data/particle src/modules/weapons src/modules/weapons/projectiles src/modules/weapons/weaponmodes src/orxonox/worldentities/pawns
landauf at orxonox.net
landauf at orxonox.net
Sun Oct 4 12:15:43 CEST 2015
Author: landauf
Date: 2015-10-04 12:15:43 +0200 (Sun, 04 Oct 2015)
New Revision: 10613
Added:
code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle
code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle
code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc
code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h
Modified:
code/branches/presentationFS15merge/
code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi
code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h
code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt
code/branches/presentationFS15merge/src/modules/weapons/projectiles/Rocket.cc
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt
code/branches/presentationFS15merge/src/orxonox/worldentities/pawns/Pawn.cc
Log:
merged branch ParticleEffectsFS15 (but without changes in CMakeLists.txt for particle universe plugin)
Property changes on: code/branches/presentationFS15merge
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/Racingbot:9388-9513
/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/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/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/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/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/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/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/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/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/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
Modified: code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi
===================================================================
--- code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi 2015-10-04 10:13:42 UTC (rev 10612)
+++ code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi 2015-10-04 10:15:43 UTC (rev 10613)
@@ -39,7 +39,7 @@
<LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
</Weapon>
<Weapon>
- <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+ <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
<RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
</Weapon>
</WeaponPack>
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionAfterglow.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,47 @@
+
+particle_system orxonox/explosion_afterglow
+{
+ quota 200
+ material PE/Flare
+ particle_width 40
+ particle_height 40
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 0.664063 0.917969 0.925781 1
+ colour_range_start 0.664063 0.917969 0.925781 1
+ colour_range_end 0.0820313 0.757813 0.980469 1
+ direction 0 1 0
+ emission_rate 700
+ position 0 0 0
+ velocity 20
+ velocity_min 20
+ velocity_max 75
+ time_to_live 0.2
+ time_to_live_min 0.2
+ time_to_live_max 5
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector ColourFader
+ {
+ red -0.7273
+ green -0.7049
+ blue -0.6216
+ alpha 0
+ }
+
+ affector Scaler
+ {
+ rate 20
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlame.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,58 @@
+
+particle_system orxonox/explosion_flame
+{
+ quota 500
+ material PE/bigFlame
+ particle_width 20.52
+ particle_height 20.25
+ cull_each false
+ renderer billboard
+ billboard_type point
+
+ emitter Box
+ {
+ angle 180
+ colour 1 0.533333 0.0631577 1
+ colour_range_start 1 0.533333 0.0631577 1
+ colour_range_end 0.441667 0 0 1
+ direction 1 0 0
+ emission_rate 2000
+ position 0 0 0
+ velocity 30
+ velocity_min 30
+ velocity_max 80
+ time_to_live 0.2
+ time_to_live_min 0.2
+ time_to_live_max 3
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ width 2
+ height 2
+ depth 2
+ }
+
+ affector Scaler
+ {
+ rate 20
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -1
+ alpha -1
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start -360
+ rotation_speed_range_end 360
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+}
\ No newline at end of file
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlame2.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,58 @@
+
+particle_system orxonox/explosion_flame2
+{
+ quota 500
+ material PE/bigFlame
+ particle_width 20.52
+ particle_height 20.25
+ cull_each false
+ renderer billboard
+ billboard_type point
+
+ emitter Box
+ {
+ angle 180
+ colour 1 0.566667 0.5 1
+ colour_range_start 1 0.566667 0.5 1
+ colour_range_end 1 0.566667 0.5 1
+ direction 1 0 0
+ emission_rate 2000
+ position 0 0 0
+ velocity 30
+ velocity_min 30
+ velocity_max 80
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 3
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ width 2
+ height 2
+ depth 2
+ }
+
+ affector Scaler
+ {
+ rate 20
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -0.7027
+ alpha -1
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start -360
+ rotation_speed_range_end 360
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlash.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,55 @@
+
+particle_system orxonox/explosion_flash
+{
+ quota 50
+ material orxonox/explosion_flash
+ particle_width 50
+ particle_height 50
+ cull_each false
+ renderer billboard
+ billboard_type point
+
+ emitter Point
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction 0 0 0
+ emission_rate 10
+ position 0 0 0
+ velocity 0
+ velocity_min 0
+ velocity_max 0
+ time_to_live 0.05
+ time_to_live_min 0.05
+ time_to_live_max 0.05
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 100000
+ repeat_delay_min 100000
+ repeat_delay_max 100000
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start 0
+ rotation_speed_range_end 0
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+
+ affector Scaler
+ {
+ rate 1000
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -1
+ alpha -1
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlash2.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,47 @@
+
+particle_system orxonox/explosion_flash2
+{
+ quota 50
+ material orxonox/explosion_flash
+ particle_width 50
+ particle_height 50
+ cull_each false
+ renderer billboard
+ billboard_type point
+
+ emitter Point
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction 0 0 0
+ emission_rate 10
+ position 0 0 0
+ velocity 0
+ velocity_min 0
+ velocity_max 0
+ time_to_live 0.05
+ time_to_live_min 0.05
+ time_to_live_max 0.05
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector Rotator
+ {
+ rotation_speed_range_start 0
+ rotation_speed_range_end 0
+ rotation_range_start 0
+ rotation_range_end 360
+ }
+
+ affector Scaler
+ {
+ rate 100
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionShockwave.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,48 @@
+
+particle_system orxonox/explosion_shockwave
+{
+ quota 4000
+ material orxonox/explosion_shockwave
+ particle_width 20
+ particle_height 20
+ cull_each false
+ renderer billboard
+ billboard_type oriented_common
+ common_direction 0 0.25 0.5
+
+ emitter Point
+ {
+ angle 0
+ colour 0.441667 0.441667 0.441667 1
+ colour_range_start 0.441667 0.441667 0.441667 1
+ colour_range_end 0.441667 0.441667 0.441667 1
+ direction 0 1 0
+ emission_rate 10
+ position 0 0 0
+ velocity 0
+ velocity_min 0
+ velocity_max 0
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 100000
+ repeat_delay_min 100000
+ repeat_delay_max 100000
+ }
+
+ affector Scaler
+ {
+ rate 500
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -1
+ alpha 0
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionShockwave2.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,48 @@
+
+particle_system orxonox/explosion_shockwave2
+{
+ quota 4000
+ material orxonox/explosion_shockwave
+ particle_width 20
+ particle_height 20
+ cull_each false
+ renderer billboard
+ billboard_type oriented_common
+ common_direction 0 0.25 0.5
+
+ emitter Point
+ {
+ angle 0
+ colour 0.85 0.85 1 1
+ colour_range_start 0.85 0.85 1 1
+ colour_range_end 0.85 0.85 1 1
+ direction 0 1 0
+ emission_rate 10
+ position 0 0 0
+ velocity 0
+ velocity_min 0
+ velocity_max 0
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 1
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector Scaler
+ {
+ rate 500
+ }
+
+ affector ColourFader
+ {
+ red -1
+ green -1
+ blue -1
+ alpha 0
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionSparks.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,42 @@
+
+particle_system orxonox/explosion_sparks
+{
+ quota 2000
+ material PE/explosion
+ particle_width 1.5
+ particle_height 12.33
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction -0.684313 -0.325257 0.652628
+ emission_rate 1000
+ position 0 0 0
+ velocity 100
+ velocity_min 100
+ velocity_max 200
+ time_to_live 0.2
+ time_to_live_min 0.2
+ time_to_live_max 0.5
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 100000
+ repeat_delay_min 100000
+ repeat_delay_max 100000
+ }
+
+ affector ColourFader
+ {
+ red 0.2432
+ green -1
+ blue -1
+ alpha -1
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionSparks2.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,42 @@
+
+particle_system orxonox/explosion_sparks2
+{
+ quota 2000
+ material PE/explosion
+ particle_width 1.5
+ particle_height 13.98
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 1 1 1 1
+ colour_range_start 1 1 1 1
+ colour_range_end 1 1 1 1
+ direction -0.684313 -0.325257 0.652628
+ emission_rate 1000
+ position 0 0 0
+ velocity 150
+ velocity_min 150
+ velocity_max 200
+ time_to_live 0.2
+ time_to_live_min 0.2
+ time_to_live_max 0.75
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector ColourFader
+ {
+ red 0.2432
+ green -1
+ blue -1
+ alpha -1
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionStreak1.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,42 @@
+
+particle_system orxonox/explosion_streak1
+{
+ quota 4000
+ material orxonox/explosion_streak1
+ particle_width 12.15
+ particle_height 82.13
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 0.191667 0.191667 0.191667 1
+ colour_range_start 0.191667 0.191667 0.191667 1
+ colour_range_end 0.191667 0.191667 0.191667 1
+ direction 0 1 0
+ emission_rate 400
+ position 0 0 0
+ velocity 30
+ velocity_min 30
+ velocity_max 100
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 2
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector ColourFader
+ {
+ red -0.2
+ green -0.2
+ blue -0.2
+ alpha 0
+ }
+}
Copied: code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle (from rev 10612, code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionStreak2.particle)
===================================================================
--- code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle (rev 0)
+++ code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,47 @@
+
+particle_system orxonox/explosion_streak2
+{
+ quota 4000
+ material orxonox/explosion_streak1
+ particle_width 14
+ particle_height 75
+ cull_each false
+ renderer billboard
+ billboard_type oriented_self
+
+ emitter Point
+ {
+ angle 180
+ colour 0.466667 0.341667 0.216667 1
+ colour_range_start 0.466667 0.341667 0.216667 1
+ colour_range_end 0.466667 0.341667 0.216667 1
+ direction 0 1 0
+ emission_rate 400
+ position 0 0 0
+ velocity 50
+ velocity_min 50
+ velocity_max 80
+ time_to_live 1
+ time_to_live_min 1
+ time_to_live_max 2
+ duration 0.1
+ duration_min 0.1
+ duration_max 0.1
+ repeat_delay 20
+ repeat_delay_min 20
+ repeat_delay_max 20
+ }
+
+ affector ColourFader
+ {
+ red -0.3
+ green -0.25
+ blue -0.2
+ alpha 0
+ }
+
+ affector Scaler
+ {
+ rate 10
+ }
+}
Modified: code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h 2015-10-04 10:13:42 UTC (rev 10612)
+++ code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h 2015-10-04 10:15:43 UTC (rev 10613)
@@ -81,6 +81,7 @@
class ParticleProjectile;
class Projectile;
class Rocket;
+ class RocketOld;
class SimpleRocket;
// weaponmodes
@@ -90,6 +91,7 @@
class LaserFire;
class LightningGun;
class RocketFire;
+ class RocketFireOld;
class SimpleRocketFire;
}
Modified: code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt 2015-10-04 10:13:42 UTC (rev 10612)
+++ code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt 2015-10-04 10:15:43 UTC (rev 10613)
@@ -5,5 +5,6 @@
Projectile.cc
LightningGunProjectile.cc
Rocket.cc
+ RocketOld.cc
SimpleRocket.cc
)
Modified: code/branches/presentationFS15merge/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/projectiles/Rocket.cc 2015-10-04 10:13:42 UTC (rev 10612)
+++ code/branches/presentationFS15merge/src/modules/weapons/projectiles/Rocket.cc 2015-10-04 10:15:43 UTC (rev 10613)
@@ -47,6 +47,7 @@
#include "sound/WorldSound.h"
#include "worldentities/CameraPosition.h"
#include "worldentities/pawns/Pawn.h"
+//#include "particleuniverse/include/ParticleUniverseSystemManager.h"
namespace orxonox
{
@@ -82,6 +83,11 @@
this->attach(fire);
fire->setOrientation(this->getOrientation());
fire->setSource("Orxonox/rocketfire");
+
+ // Add Particle Universe Effects
+ //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
+ //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
+ //this->attachOgreObject(pSys1);
this->enableCollisionCallback();
this->setCollisionResponse(false);
@@ -222,29 +228,53 @@
*/
void Rocket::destructionEffect()
{
- ParticleSpawner *effect1, *effect2;
+ ParticleSpawner *effect1, *effect2, *effect3, *effect4, *effect5;
if(this->getShooter())
{
effect1 = new ParticleSpawner(this->getShooter()->getContext());
effect2 = new ParticleSpawner(this->getShooter()->getContext());
+ effect3 = new ParticleSpawner(this->getShooter()->getContext());
+ effect4 = new ParticleSpawner(this->getShooter()->getContext());
+ effect5 = new ParticleSpawner(this->getShooter()->getContext());
}
else
{
effect1 = new ParticleSpawner(this->getContext());
effect2 = new ParticleSpawner(this->getContext());
+ effect3 = new ParticleSpawner(this->getContext());
+ effect4 = new ParticleSpawner(this->getContext());
+ effect5 = new ParticleSpawner(this->getContext());
}
effect1->setPosition(this->getPosition());
effect1->setOrientation(this->getOrientation());
effect1->setDestroyAfterLife(true);
- effect1->setSource("Orxonox/explosion4");
+ effect1->setSource("orxonox/explosion_flash");
effect1->setLifetime(2.0f);
effect2->setPosition(this->getPosition());
effect2->setOrientation(this->getOrientation());
effect2->setDestroyAfterLife(true);
- effect2->setSource("Orxonox/smoke4");
+ effect2->setSource("orxonox/explosion_flame");
effect2->setLifetime(3.0f);
+
+ effect3->setPosition(this->getPosition());
+ effect3->setOrientation(this->getOrientation());
+ effect3->setDestroyAfterLife(true);
+ effect3->setSource("orxonox/explosion_shockwave");
+ effect3->setLifetime(3.0f);
+
+ effect4->setPosition(this->getPosition());
+ effect4->setOrientation(this->getOrientation());
+ effect4->setDestroyAfterLife(true);
+ effect4->setSource("orxonox/explosion_sparks");
+ effect4->setLifetime(3.0f);
+
+ effect5->setPosition(this->getPosition());
+ effect5->setOrientation(this->getOrientation());
+ effect5->setDestroyAfterLife(true);
+ effect5->setSource("orxonox/explosion_streak1");
+ effect5->setLifetime(3.0f);
}
/**
Copied: code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc (from rev 10612, code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/RocketOld.cc)
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc (rev 0)
+++ code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,298 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * simonmie
+ *
+ */
+
+/**
+ @file RocketOld.h
+ @brief Implementation of the RocketOld class.
+*/
+
+#include "RocketOld.h"
+
+#include <BulletDynamics/Dynamics/btRigidBody.h>
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+#include "Scene.h"
+#include "controllers/Controller.h"
+#include "graphics/Model.h"
+#include "graphics/ParticleSpawner.h"
+#include "infos/PlayerInfo.h"
+#include "objects/collisionshapes/ConeCollisionShape.h"
+#include "sound/WorldSound.h"
+#include "worldentities/CameraPosition.h"
+#include "worldentities/pawns/Pawn.h"
+//#include "particleuniverse/include/ParticleUniverseSystemManager.h"
+
+namespace orxonox
+{
+ RegisterClass(RocketOld);
+
+ /**
+ @brief
+ Constructor. Registers the object and initializes some default values.
+ */
+ RocketOld::RocketOld(Context* context)
+ : ControllableEntity(context)
+ , BasicProjectile()
+ , RadarViewable(this, static_cast<WorldEntity*>(this))
+ {
+ RegisterObject(RocketOld);// Register the RocketOld class to the core
+
+ this->localAngularVelocity_ = 0;
+ this->lifetime_ = 100.0f;
+
+ if (GameMode::isMaster())
+ {
+ this->setCollisionType(WorldEntity::Kinematic);
+ this->setVelocity(0,0,-100);
+
+ // Create RocketOld model
+ Model* model = new Model(this->getContext());
+ model->setMeshSource("rocket.mesh");
+ model->scale(0.7f);
+ this->attach(model);
+
+ // Add effects.
+ ParticleEmitter* fire = new ParticleEmitter(this->getContext());
+ this->attach(fire);
+ fire->setOrientation(this->getOrientation());
+ fire->setSource("Orxonox/rocketfire");
+
+ // Add Particle Universe Effects
+ //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
+ //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
+ //this->attachOgreObject(pSys1);
+
+ this->enableCollisionCallback();
+ this->setCollisionResponse(false);
+ this->setCollisionType(Kinematic);
+
+ // Add collision shape
+ ConeCollisionShape* collisionShape = new ConeCollisionShape(this->getContext());
+ collisionShape->setRadius(3);
+ collisionShape->setHeight(500);
+ this->attachCollisionShape(collisionShape);
+
+ this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
+
+ // Add sound
+ this->defSndWpnEngine_ = new WorldSound(this->getContext());
+ this->defSndWpnEngine_->setLooping(true);
+ this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
+ this->defSndWpnEngine_->setVolume(1.0f);
+ this->attach(defSndWpnEngine_);
+
+ this->defSndWpnLaunch_ = new WorldSound(this->getContext());
+ this->defSndWpnLaunch_->setLooping(false);
+ this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
+ this->defSndWpnLaunch_->setVolume(1.0f);
+ this->attach(defSndWpnLaunch_);
+ }
+ else
+ {
+ this->defSndWpnEngine_ = 0;
+ this->defSndWpnLaunch_ = 0;
+ }
+
+ // Add camera
+ CameraPosition* camPosition = new CameraPosition(this->getContext());
+ camPosition->setPosition(0,4,15);
+ camPosition->setAllowMouseLook(true);
+ this->addCameraPosition(camPosition);
+
+ this->setRadarObjectColour(ColourValue(1.0, 0.5, 0.0)); // orange
+ this->setRadarObjectShape(RadarViewable::Triangle);
+ this->setRadarObjectScale(0.5f);
+ }
+
+ /**
+ @brief
+ Destructor. Destroys controller, if present and kills sounds, if playing.
+ */
+ RocketOld::~RocketOld()
+ {
+ if(this->isInitialized())
+ {
+ if (GameMode::isMaster())
+ {
+ this->destructionEffect();
+
+ if (this->getPlayer() && this->getController())
+ this->player_->stopTemporaryControl();
+ }
+
+ if ( this->defSndWpnEngine_ )
+ this->defSndWpnEngine_->destroy();
+
+ if ( this->defSndWpnLaunch_ )
+ this->defSndWpnLaunch_->destroy();
+ }
+ }
+
+ /**
+ @brief
+ Sets the entity that fired the RocketOld.
+ @param shooter
+ A pointer to the Pawn that fired the RocketOld.
+ */
+ void RocketOld::setShooter(Pawn* shooter)
+ {
+ this->BasicProjectile::setShooter(shooter);
+
+ this->player_ = this->getShooter()->getPlayer();
+ if(this->player_)
+ this->player_->startTemporaryControl(this);
+
+ if( GameMode::isMaster() )
+ {
+ this->defSndWpnEngine_->play();
+ this->defSndWpnLaunch_->play();
+ }
+ }
+
+ /**
+ @brief
+ Defines which actions the RocketOld has to take in each tick.
+ @param dt
+ The length of the tick.
+ */
+ void RocketOld::tick(float dt)
+ {
+ SUPER(RocketOld, tick, dt);
+
+ if( this->hasLocalController() )
+ {
+ this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
+ this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
+ this->localAngularVelocity_ = 0;
+ }
+
+ this->destroyCheck();
+ }
+
+ bool RocketOld::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
+ {
+ return this->processCollision(otherObject, contactPoint, cs);
+ }
+
+ /**
+ @brief
+ Destroys the RocketOld and stops the sound,
+ */
+ void RocketOld::destroyObject(void)
+ {
+ if (GameMode::isMaster() && this->defSndWpnEngine_->isPlaying())
+ this->defSndWpnEngine_->stop();
+
+ this->BasicProjectile::destroyObject();
+ }
+
+ /**
+ @brief
+ Destroys the RocketOld upon pressing "fire".
+ */
+ void RocketOld::fired(unsigned int firemode)
+ {
+ this->destroyObject();
+ }
+
+ /**
+ @brief
+ The effects that are displayed, when the RocketOld is destroyed.
+ */
+ void RocketOld::destructionEffect()
+ {
+ ParticleSpawner *effect1, *effect2;
+ if(this->getShooter())
+ {
+ effect1 = new ParticleSpawner(this->getShooter()->getContext());
+ effect2 = new ParticleSpawner(this->getShooter()->getContext());
+ }
+ else
+ {
+ effect1 = new ParticleSpawner(this->getContext());
+ effect2 = new ParticleSpawner(this->getContext());
+ }
+
+ effect1->setPosition(this->getPosition());
+ effect1->setOrientation(this->getOrientation());
+ effect1->setDestroyAfterLife(true);
+ effect1->setSource("Orxonox/explosion4");
+ effect1->setLifetime(2.0f);
+
+ effect2->setPosition(this->getPosition());
+ effect2->setOrientation(this->getOrientation());
+ effect2->setDestroyAfterLife(true);
+ effect2->setSource("Orxonox/smoke4");
+ effect2->setLifetime(3.0f);
+ }
+
+ /**
+ @brief
+ Rotates the RocketOld around the y-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void RocketOld::rotateYaw(const Vector2& value)
+ {
+ ControllableEntity::rotateYaw(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.y += value.x;
+ }
+
+ /**
+ @brief
+ Rotates the RocketOld around the x-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void RocketOld::rotatePitch(const Vector2& value)
+ {
+ ControllableEntity::rotatePitch(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.x += value.x;
+ }
+
+ /**
+ @brief
+ Rotates the RocketOld around the z-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void RocketOld::rotateRoll(const Vector2& value)
+ {
+ ControllableEntity::rotateRoll(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.z += value.x;
+ }
+
+}
Copied: code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h (from rev 10612, code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/RocketOld.h)
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h (rev 0)
+++ code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,134 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * simonmie
+ *
+ */
+
+/**
+ @file RocketOld.h
+ @brief Definition of the RocketOld class.
+*/
+
+#ifndef _RocketOld_H__
+#define _RocketOld_H__
+
+#include "weapons/WeaponsPrereqs.h"
+
+#include "tools/Timer.h"
+
+#include "interfaces/RadarViewable.h"
+#include "worldentities/ControllableEntity.h"
+
+#include "BasicProjectile.h"
+
+namespace orxonox
+{
+ class ConeCollisionShape;
+
+ /**
+ @brief
+ RocketOld that can be steered by the player.
+
+ @author
+ Oli Scheuss
+ @ingroup WeaponsProjectiles
+ */
+ class _WeaponsExport RocketOld : public ControllableEntity, public BasicProjectile, public RadarViewable
+ {
+ public:
+ RocketOld(Context* context);
+ virtual ~RocketOld();
+
+ virtual void tick(float dt); //!< Defines which actions the RocketOld has to take in each tick.
+
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+ virtual void destroyObject(void);
+ void destructionEffect();
+
+ virtual void moveFrontBack(const Vector2& value) {}
+ virtual void moveRightLeft(const Vector2& value) {}
+ virtual void moveUpDown(const Vector2& value) {}
+
+ virtual void rotateYaw(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value);
+ virtual void rotateRoll(const Vector2& value);
+
+ /**
+ @brief Moves the RocketOld in the Front/Back-direction by the specifed amount.
+ @param value The amount by which the RocketOld is to be moved.
+ */
+ inline void moveFrontBack(float value)
+ { this->moveFrontBack(Vector2(value, 0)); }
+ /**
+ @brief Moves the RocketOld in the Right/Left-direction by the specifed amount.
+ @param value The amount by which the RocketOld is to be moved.
+ */
+ inline void moveRightLeft(float value)
+ { this->moveRightLeft(Vector2(value, 0)); }
+ /**
+ @brief Moves the RocketOld in the Up/Down-direction by the specifed amount.
+ @param value The amount by which the RocketOld is to be moved.
+ */
+ inline void moveUpDown(float value)
+ { this->moveUpDown(Vector2(value, 0)); }
+
+ /**
+ @brief Rotates the RocketOld around the y-axis by the specifed amount.
+ @param value The amount by which the RocketOld is to be rotated.
+ */
+ inline void rotateYaw(float value)
+ { this->rotateYaw(Vector2(value, 0)); }
+ /**
+ @brief Rotates the RocketOld around the x-axis by the specifed amount.
+ @param value The amount by which the RocketOld is to be rotated.
+ */
+ inline void rotatePitch(float value)
+ { this->rotatePitch(Vector2(value, 0)); }
+ /**
+ @brief Rotates the RocketOld around the z-axis by the specifed amount.
+ @param value The amount by which the RocketOld is to be rotated.
+ */
+ inline void rotateRoll(float value)
+ { this->rotateRoll(Vector2(value, 0)); }
+
+ virtual void setShooter(Pawn* shooter);
+
+ virtual void fired(unsigned int firemode);
+
+ private:
+ Vector3 localAngularVelocity_; //!< Variable to temporarily store accumulated steering command input.
+
+ WeakPtr<PlayerInfo> player_; //!< The player that controls the RocketOld.
+ //WeakPtr<Pawn> pawn_; //!< The pawn that controls the RocketOld. TODO
+ Timer destroyTimer_; //!< Timer to destroy the projectile after its lifetime has run out.
+ float lifetime_; //!< The time the projectile exists.
+
+ WorldSound* defSndWpnEngine_; //!< Engine sound.
+ WorldSound* defSndWpnLaunch_; //!< Launch sound.
+ };
+
+}
+
+#endif /* _RocketOld_H__ */
Modified: code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt 2015-10-04 10:13:42 UTC (rev 10612)
+++ code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt 2015-10-04 10:15:43 UTC (rev 10613)
@@ -5,5 +5,6 @@
HsW01.cc
LightningGun.cc
RocketFire.cc
+ RocketFireOld.cc
SimpleRocketFire.cc
)
Copied: code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc (from rev 10612, code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/RocketFireOld.cc)
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc (rev 0)
+++ code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,86 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * simonmie
+ *
+ */
+
+/**
+ @file RocketFire.h
+ @brief Implementation of the RocketFire class.
+*/
+
+#include "RocketFireOld.h"
+
+#include "core/CoreIncludes.h"
+#include "util/Math.h"
+
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
+#include "worldentities/pawns/Pawn.h"
+
+#include "weapons/projectiles/RocketOld.h"
+
+namespace orxonox
+{
+ RegisterClass(RocketFireOld);
+
+ RocketFireOld::RocketFireOld(Context* context) : WeaponMode(context)
+ {
+ RegisterObject(RocketFireOld);
+
+ this->reloadTime_ = 0.20f;
+ this->bParallelReload_ = false;
+ this->damage_ = 0.0f;
+ this->speed_ = 500.0f;
+
+ this->setMunitionName("RocketMunition");
+ // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+ }
+
+ RocketFireOld::~RocketFireOld()
+ {
+ }
+
+ /**
+ @brief
+ Fires the weapon. Creates the Rocket and fires it.
+ */
+ void RocketFireOld::fire()
+ {
+ RocketOld* rocket = new RocketOld(this->getContext());
+
+ this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+ rocket->setOrientation(this->getMuzzleOrientation());
+ rocket->setPosition(this->getMuzzlePosition());
+ rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
+ rocket->scale(2);
+
+ rocket->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+ rocket->setDamage(this->getDamage());
+ rocket->setShieldDamage(this->getShieldDamage());
+ rocket->setHealthDamage(this->getHealthDamage());
+ }
+}
Copied: code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h (from rev 10612, code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/RocketFireOld.h)
===================================================================
--- code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h (rev 0)
+++ code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h 2015-10-04 10:15:43 UTC (rev 10613)
@@ -0,0 +1,63 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file RocketFireOld.h
+ @brief Definition of the RocketFire class.
+*/
+
+#ifndef _RocketFireOld_H__
+#define _RocketFireOld_H__
+
+#include "weapons/WeaponsPrereqs.h"
+#include "weaponsystem/WeaponMode.h"
+
+namespace orxonox
+{
+
+ /**
+ @brief
+ Fires the (steerable) RocketOld.
+ @author
+ Oliver Scheuss
+ @ingroup WeaponsWeaponModes
+ */
+ class _WeaponsExport RocketFireOld : public WeaponMode
+ {
+ public:
+ RocketFireOld(Context* context);
+ virtual ~RocketFireOld();
+
+ virtual void fire();
+
+ private:
+ float speed_; //!< The speed of the Rocket.
+ };
+}
+
+#endif /* _RocketFireOld_H__ */
Modified: code/branches/presentationFS15merge/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/presentationFS15merge/src/orxonox/worldentities/pawns/Pawn.cc 2015-10-04 10:13:42 UTC (rev 10612)
+++ code/branches/presentationFS15merge/src/orxonox/worldentities/pawns/Pawn.cc 2015-10-04 10:15:43 UTC (rev 10613)
@@ -366,7 +366,7 @@
}
if (GameMode::isMaster())
{
-// this->deathEffect();
+ this->deatheffect();
this->goWithStyle();
}
}
@@ -386,7 +386,7 @@
void Pawn::deatheffect()
{
// play death effect
- {
+ /*{
ParticleSpawner* effect = new ParticleSpawner(this->getContext());
effect->setPosition(this->getPosition());
effect->setOrientation(this->getOrientation());
@@ -409,7 +409,60 @@
effect->setDestroyAfterLife(true);
effect->setSource("Orxonox/sparks");
effect->setLifetime(4.0f);
+ }*/
+
+
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("orxonox/explosion_flash2");
+ effect->setLifetime(5.0f);
}
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("orxonox/explosion_flame2");
+ effect->setLifetime(5.0f);
+ }
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("orxonox/explosion_shockwave2");
+ effect->scale(20);
+ effect->setLifetime(5.0f);
+ }{
+ ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("orxonox/explosion_sparks2");
+ effect->setLifetime(5.0f);
+ }
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("orxonox/explosion_streak2");
+ effect->setLifetime(5.0f);
+ }
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("orxonox/explosion_afterglow");
+ effect->scale(20);
+ effect->setLifetime(5.0f);
+ }
+
+
for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
{
ExplosionChunk* chunk = new ExplosionChunk(this->getContext());
More information about the Orxonox-commit
mailing list