Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6059 for code


Ignore:
Timestamp:
Nov 13, 2009, 2:32:27 PM (15 years ago)
Author:
cdaniel
Message:
 
Location:
code/branches/particles2
Files:
12 added
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/particles2/data/levels/empty_level.oxw

    r5781 r6059  
    1717    skybox       = "Orxonox/Starbox"
    1818  >
     19
     20<Rocket position="-10, 3.5,800" velocity="0,0,-100">
     21      <attached>
     22        <Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >
     23          <attached>
     24           <ParticleEmitter pitch=0 roll=0 position="0,5,0" source="Orxonox/laser" lifetime=2.0 loop=1 startdelay=3.0/>
     25           <ParticleEmitter pitch=-90 roll=0 position="0,-5,0" source="Orxonox/particlecanon" lifetime=2.0 loop=1 startdelay=3.0/>
     26           <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/rocketfire" lifetime=2.0 loop=1 startdelay=3.0 />
     27           <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/smoke" lifetime=2.0 loop=1 startdelay=3.0 />
     28          </attached>
     29          </Model>
     30        </attached>
     31    </Rocket>
     32   
     33   
    1934    <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" />
    20     <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshippirate />
     35    <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
    2136  </Scene>
    2237</Level>

  • code/branches/particles2/src/orxonox/OrxonoxPrereqs.h

    r5929 r6059  
    8686    class WaypointController;
    8787    class WaypointPatrolController;
     88        class RocketController;
    8889
    8990    // gametypes
    … …  
    176177    class TeamSpawnPoint;
    177178    class WorldEntity;
     179        class Rocket;
    178180    // worldentities, pawns
    179181    class Destroyer;

  • code/branches/particles2/src/orxonox/controllers/CMakeLists.txt

    r5781 r6059  
    77  WaypointController.cc
    88  WaypointPatrolController.cc
     9  RocketController.cc
    910)

  • code/branches/particles2/src/orxonox/worldentities/CMakeLists.txt

    r5781 r6059  
    55  MobileEntity.cc
    66  ControllableEntity.cc
     7  Rocket.cc
    78
    89  BigExplosion.cc
Note: See TracChangeset for help on using the changeset viewer.