Changeset 6813 in orxonox.OLD for trunk

Timestamp:

Jan 28, 2006, 5:01:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: particles, player etc.

Location:

trunk/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• world_entities/projectiles/hyperblast.cc (modified) (2 diffs)
• world_entities/space_ships/hover.cc (modified) (1 diff)

trunk/src/lib/event/event_handler.cc

@@ -262 +262 @@
     SDL_WM_GrabInput(SDL_GRAB_OFF);
   else
-    ;//SDL_WM_GrabInput(SDL_GRAB_ON);
+    SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -71 +71 @@
   if (unlikely(Hyperblast::explosionParticles == NULL))
   {
-    Hyperblast::explosionParticles = new SparkParticles(200);
+    Hyperblast::explosionParticles = new SparkParticles(2000);
     Hyperblast::explosionParticles->setName("HyperblastExplosionParticles");
-    Hyperblast::explosionParticles->setLifeSpan(.5, .3);
-    Hyperblast::explosionParticles->setRadius(0.0, 10);
-    Hyperblast::explosionParticles->setRadius(.5, 15.0);
-    Hyperblast::explosionParticles->setRadius(1.0, 10.0);
+    Hyperblast::explosionParticles->setLifeSpan(5, .3);
+    Hyperblast::explosionParticles->setRadius(100.0, 10);
+    Hyperblast::explosionParticles->setRadius(20, 15.0);
+    Hyperblast::explosionParticles->setRadius(50.0, 10.0);
     Hyperblast::explosionParticles->setColor(0.0, 0,1,0,1);
-    Hyperblast::explosionParticles->setColor(0.5, .8,.8,0,.8);
-    Hyperblast::explosionParticles->setColor(0.8, .8,.8,.3,.8);
+    Hyperblast::explosionParticles->setColor(0.5, .8,.8,0,.99);
+    Hyperblast::explosionParticles->setColor(0.8, .8,.8,.3,.99);
     Hyperblast::explosionParticles->setColor(1.0, 1,1,1,.0);
   }
@@ -85 +85 @@
   this->emitter->setSystem(Hyperblast::explosionParticles);
 
+  Hyperblast::explosionParticles->debug();
   this->updateNode(0);
   this->emitter->setEmissionRate(245.0);
-  this->emitter->setEmissionVelocity(0.0);
+  this->emitter->setEmissionVelocity(10.0);
 }
 

trunk/src/world_entities/space_ships/hover.cc

@@ -287 +287 @@
   }
 
-  velocity += accel * 3.0;
+  velocity += accel * 30.0;
 
   this->setRelDirSoft(this->direction * Quaternion(-accel.x, Vector(0,0,1)) * Quaternion(accel.z, Vector(1,0,0)), 5);