Changeset 6059 for code/branches/particles2

Timestamp:

Nov 13, 2009, 2:32:27 PM (15 years ago)

Author:

cdaniel

Message:

 

Location:

code/branches/particles2

Files:

• data/levels/empty_level.oxw (modified) (1 diff)
• data/particle/Ogre.log (added)
• data/particle/laser.particle (added)
• data/particle/load.particle (added)
• data/particle/particlecanon.particle (added)
• data/particle/rocketfire.particle (added)
• data/particle/smoke.particle (added)
• data/particle/tes3.particle (added)
• data/tcl/plane.mesh_lod0_prepshadow.log (added)
• src/orxonox/OrxonoxPrereqs.h (modified) (2 diffs)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/RocketController.cc (added)
• src/orxonox/controllers/RocketController.h (added)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/Rocket.cc (added)
• src/orxonox/worldentities/Rocket.h (added)

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

@@ -17 +17 @@
     skybox       = "Orxonox/Starbox"
   >
+
+<Rocket position="-10, 3.5,800" velocity="0,0,-100"> 
+      <attached>
+        <Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >
+          <attached>
+           <ParticleEmitter pitch=0 roll=0 position="0,5,0" source="Orxonox/laser" lifetime=2.0 loop=1 startdelay=3.0/>
+           <ParticleEmitter pitch=-90 roll=0 position="0,-5,0" source="Orxonox/particlecanon" lifetime=2.0 loop=1 startdelay=3.0/>
+           <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/rocketfire" lifetime=2.0 loop=1 startdelay=3.0 />
+           <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/smoke" lifetime=2.0 loop=1 startdelay=3.0 />
+          </attached>
+          </Model>
+        </attached>
+    </Rocket>
+    
+    
     <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 position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshippirate />
+    <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
   </Scene>
 </Level>

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

@@ -86 +86 @@
     class WaypointController;
     class WaypointPatrolController;
+        class RocketController;
 
     // gametypes
@@ -176 +177 @@
     class TeamSpawnPoint;
     class WorldEntity;
+        class Rocket;
     // worldentities, pawns
     class Destroyer;

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

@@ -7 +7 @@
   WaypointController.cc
   WaypointPatrolController.cc
+  RocketController.cc
 )

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

@@ -5 +5 @@
   MobileEntity.cc
   ControllableEntity.cc
+  Rocket.cc
 
   BigExplosion.cc