Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10485


Ignore:
Timestamp:
May 26, 2015, 12:40:33 PM (9 years ago)
Author:
maxima
Message:

ParticleEffects branch merged to presentation. New level PresentationFS15. New SpaceShip spaceshipFS15 with both RocketFire and RocketFireOld

Location:
code/branches/presentationFS15
Files:
3 added
11 edited
15 copied

Legend:

Unmodified
Added
Removed

  • code/branches/presentationFS15

  • code/branches/presentationFS15/data/defaultConfig/keybindings.ini

    r10281 r10485  
    142142KeyWebStop=
    143143KeyX="selectClosest"
    144 KeyY=
     144KeyY="onpress fire 4"
    145145KeyYen=
    146146KeyZ="selectNext"

  • code/branches/presentationFS15/data/levels/emptyLevel.oxw

    r9415 r10485  
    1313
    1414<?lua
    15   include("templates/spaceshipAssff2.oxt")
     15  include("templates/spaceshipAssff.oxt")
    1616  include("templates/spaceshipPirate.oxt")
    1717  include("templates/spaceshipEscort.oxt")
    … …  
    3030
    3131    <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"/>
    32     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     32    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     33   
     34   
     35   
     36    <SpaceShip position="0,500,500" lookat="0,0,0" team=1 >
     37      <templates>
     38        <Template link=spaceshipassff />
     39      </templates>
     40    </SpaceShip>
    3341   
    3442  </Scene>

  • code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi

    r8868 r10485  
    3939        </Weapon>
    4040        <Weapon>
    41           <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
     41          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
    4242          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
    4343        </Weapon>

  • code/branches/presentationFS15/src/external/ogreceguirenderer/CMakeLists.txt

    r8729 r10485  
    3838    ${OCR_FILES}
    3939)
     40
     41TARGET_LINK_LIBRARIES(ogreceguirenderer_orxonox
     42    pthread
     43    boost_system   
     44)

  • code/branches/presentationFS15/src/modules/weapons/CMakeLists.txt

    r7163 r10485  
    1919  SOURCE_FILES ${WEAPONS_SRC_FILES}
    2020)
     21
     22#TARGET_LINK_LIBRARIES(weapons
     23#    particleuniverse_orxonox
     24#)

  • code/branches/presentationFS15/src/modules/weapons/WeaponsPrereqs.h

    r8855 r10485  
    8282    class Projectile;
    8383    class Rocket;
     84    class RocketOld;
    8485    class SimpleRocket;
    8586
    … …  
    9192    class LightningGun;
    9293    class RocketFire;
     94    class RocketFireOld;
    9395    class SimpleRocketFire;
    9496}

  • code/branches/presentationFS15/src/modules/weapons/projectiles/CMakeLists.txt

    r8855 r10485  
    66  LightningGunProjectile.cc
    77  Rocket.cc
     8  RocketOld.cc
    89  SimpleRocket.cc
    910)

  • code/branches/presentationFS15/src/modules/weapons/projectiles/Rocket.cc

    r10216 r10485  
    4848#include "worldentities/CameraPosition.h"
    4949#include "worldentities/pawns/Pawn.h"
     50//#include "particleuniverse/include/ParticleUniverseSystemManager.h"
    5051
    5152namespace orxonox
    … …  
    8384            fire->setOrientation(this->getOrientation());
    8485            fire->setSource("Orxonox/rocketfire");
     86           
     87            // Add Particle Universe Effects
     88                //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
     89                //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
     90                //this->attachOgreObject(pSys1);
    8591
    8692            this->enableCollisionCallback();
    … …  
    223229    void Rocket::destructionEffect()
    224230    {
    225         ParticleSpawner *effect1, *effect2;
     231        ParticleSpawner *effect1, *effect2, *effect3, *effect4, *effect5;
    226232        if(this->getShooter())
    227233        {
    228234            effect1 = new ParticleSpawner(this->getShooter()->getContext());
    229235            effect2 = new ParticleSpawner(this->getShooter()->getContext());
     236            effect3 = new ParticleSpawner(this->getShooter()->getContext());
     237            effect4 = new ParticleSpawner(this->getShooter()->getContext());
     238            effect5 = new ParticleSpawner(this->getShooter()->getContext());
    230239        }
    231240        else
    … …  
    233242            effect1 = new ParticleSpawner(this->getContext());
    234243            effect2 = new ParticleSpawner(this->getContext());
     244            effect3 = new ParticleSpawner(this->getContext());
     245            effect4 = new ParticleSpawner(this->getContext());
     246            effect5 = new ParticleSpawner(this->getContext());
    235247        }
    236248
    … …  
    238250        effect1->setOrientation(this->getOrientation());
    239251        effect1->setDestroyAfterLife(true);
    240         effect1->setSource("Orxonox/explosion4");
     252        effect1->setSource("orxonox/explosion_flash");
    241253        effect1->setLifetime(2.0f);
    242254
    … …  
    244256        effect2->setOrientation(this->getOrientation());
    245257        effect2->setDestroyAfterLife(true);
    246         effect2->setSource("Orxonox/smoke4");
     258        effect2->setSource("orxonox/explosion_flame");
    247259        effect2->setLifetime(3.0f);
     260
     261        effect3->setPosition(this->getPosition());
     262        effect3->setOrientation(this->getOrientation());
     263        effect3->setDestroyAfterLife(true);
     264        effect3->setSource("orxonox/explosion_shockwave");
     265        effect3->setLifetime(3.0f);
     266
     267        effect4->setPosition(this->getPosition());
     268        effect4->setOrientation(this->getOrientation());
     269        effect4->setDestroyAfterLife(true);
     270        effect4->setSource("orxonox/explosion_sparks");
     271        effect4->setLifetime(3.0f);
     272
     273        effect5->setPosition(this->getPosition());
     274        effect5->setOrientation(this->getOrientation());
     275        effect5->setDestroyAfterLife(true);
     276        effect5->setSource("orxonox/explosion_streak1");
     277        effect5->setLifetime(3.0f);
    248278    }
    249279

  • code/branches/presentationFS15/src/modules/weapons/weaponmodes/CMakeLists.txt

    r7163 r10485  
    66  LightningGun.cc
    77  RocketFire.cc
     8  RocketFireOld.cc
    89  SimpleRocketFire.cc
    910)

  • code/branches/presentationFS15/src/orxonox/worldentities/pawns/Pawn.cc

    r10216 r10485  
    367367            if (GameMode::isMaster())
    368368            {
    369 //                this->deathEffect();
     369                this->deatheffect();
    370370                this->goWithStyle();
    371371            }
    … …  
    387387    {
    388388        // play death effect
    389         {
     389        /*{
    390390            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    391391            effect->setPosition(this->getPosition());
    … …  
    410410            effect->setSource("Orxonox/sparks");
    411411            effect->setLifetime(4.0f);
    412         }
     412        }*/
     413       
     414       
     415        {
     416            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
     417            effect->setPosition(this->getPosition());
     418            effect->setOrientation(this->getOrientation());
     419            effect->setDestroyAfterLife(true);
     420            effect->setSource("orxonox/explosion_flash2");
     421            effect->setLifetime(5.0f);
     422        }
     423        {
     424            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
     425            effect->setPosition(this->getPosition());
     426            effect->setOrientation(this->getOrientation());
     427            effect->setDestroyAfterLife(true);
     428            effect->setSource("orxonox/explosion_flame2");
     429            effect->setLifetime(5.0f);
     430        }
     431        {
     432            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
     433            effect->setPosition(this->getPosition());
     434            effect->setOrientation(this->getOrientation());
     435            effect->setDestroyAfterLife(true);
     436            effect->setSource("orxonox/explosion_shockwave2");
     437            effect->scale(20);
     438            effect->setLifetime(5.0f);
     439        }{
     440            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
     441            effect->setPosition(this->getPosition());
     442            effect->setOrientation(this->getOrientation());
     443            effect->setDestroyAfterLife(true);
     444            effect->setSource("orxonox/explosion_sparks2");
     445            effect->setLifetime(5.0f);
     446        }
     447        {
     448            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
     449            effect->setPosition(this->getPosition());
     450            effect->setOrientation(this->getOrientation());
     451            effect->setDestroyAfterLife(true);
     452            effect->setSource("orxonox/explosion_streak2");
     453            effect->setLifetime(5.0f);
     454        }
     455        {
     456            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
     457            effect->setPosition(this->getPosition());
     458            effect->setOrientation(this->getOrientation());
     459            effect->setDestroyAfterLife(true);
     460            effect->setSource("orxonox/explosion_afterglow");
     461            effect->scale(20);
     462            effect->setLifetime(5.0f);
     463        }
     464       
     465       
    413466        for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
    414467        {
Note: See TracChangeset for help on using the changeset viewer.