Changeset 9167 in orxonox.OLD

Timestamp:

Jul 4, 2006, 8:20:52 PM (18 years ago)

Author:

bensch

Message:

new rail-proj

Location:

branches/presentation/src

Files:

• defs/class_id.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/environments/model_entity.cc (modified) (2 diffs)
• world_entities/projectiles/rail_projectile.cc (moved) (moved from branches/presentation/src/world_entities/projectiles/rail_projectiles.cc) (1 diff)
• world_entities/projectiles/rail_projectile.h (moved) (moved from branches/presentation/src/world_entities/projectiles/rail_projectiles.h)
• world_entities/space_ships/spacecraft_2d.cc (modified) (3 diffs)
• world_entities/weapons/laser_cannon.cc (modified) (1 diff)

branches/presentation/src/defs/class_id.h

@@ -226 +226 @@
   CL_ROCKET                     =    0x000003e1,
   CL_LASER                      =    0x000003e2,
-  CL_BOMB                       =    0x000003e3,
-  CL_GROUND_TURRET              =    0x000003e4,
-  CL_GUIDED_MISSILE             =    0x000003e5,
-  CL_HYPERBLAST                 =    0x000003e6,
+  CL_RAIL_PROJECTILE            =    0x000003e3,
+  CL_BOMB                       =    0x000003e4,
+  CL_GROUND_TURRET              =    0x000003e5,
+  CL_GUIDED_MISSILE             =    0x000003e6,
+  CL_HYPERBLAST                 =    0x000003e7,
 
   // NPC's

branches/presentation/src/world_entities/WorldEntities.am

@@ -34 +34 @@
                 world_entities/projectiles/bomb.cc \
                 world_entities/projectiles/laser.cc \
+                world_entities/projectiles/rail_projectile.cc \
                 world_entities/projectiles/test_bullet.cc \
                 world_entities/projectiles/rocket.cc \
@@ -101 +102 @@
                 projectiles/bomb.h \
                 projectiles/laser.h \
+                projectiles/rail_projectile.h \
                 projectiles/test_bullet.h \
                 projectiles/rocket.h \

branches/presentation/src/world_entities/environments/model_entity.cc

@@ -32 +32 @@
 {
   this->setClassID(CL_MODEL_ENTITY, "ModelEntity");
-  this->toList(OM_ENVIRON_NOTICK);
+  this->toList(OM_ENVIRON);
 
   this->speed = NULL;
@@ -71 +71 @@
 void ModelEntity::setMomentum (float angle, float x, float y, float z)
 {
+  Vector v(x,y,z);
+  v.normalize();
   if (this->momentum == NULL)
     this->momentum = new Quaternion;
-  *this->momentum = Quaternion(angle, Vector(x, y, z));
+  *this->momentum = Quaternion(angle, v);
 }
 
 void ModelEntity::tick(float dt)
 {
+  printf("TEST\n");
   if (this->speed != NULL)
     this->shiftCoor(*this->speed * dt);

branches/presentation/src/world_entities/projectiles/rail_projectile.cc

@@ -39 +39 @@
   this->setClassID(CL_RAIL_PROJECTILE, "RailProjectile");
 
-  this->loadModel("models/projectiles/rail_projectile.obj");
+  this->loadModel("models/projectiles/test_projectile.obj", 100);
 
   this->setMinEnergy(10);
   this->setHealthMax(10);
-  this->lifeSpan = 5.0;
+  this->lifeSpan = .5f;
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);

branches/presentation/src/world_entities/space_ships/spacecraft_2d.cc

@@ -424 +424 @@
         if (this->toTravelHeight != NULL)
         {
-          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt, 0));
+          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt * 10.0, 0));
           if (fabsf(this->travelNode->getAbsCoor().y - *this->toTravelHeight) < .1)
           {
@@ -435 +435 @@
         accel.y = 0.0;
 
-
         Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
         accelerationDir.y = 0.0;
-
-
-        /*
-                if (this->getRelCoor().z > this->travelDistance.y && accel.z > 0.0)
-                accel.z = 0.0f;
-                if (this->getRelCoor().z < -this->travelDistance.y && accel.z < 0.0)
-                accel.z = 0.0f;
-
-                if (this->getRelCoor().x > this->travelDistance.x && accel.x > 0.0)
-                accel.x = 0.0f;
-                if (this->getRelCoor().x < -this->travelDistance.x && accel.x < 0.0)
-                accel.x = 0.0f;*/
-
 
         // this is the air friction (necessary for a smooth control)
@@ -523 +509 @@
       else if (cameraLook < -M_PI_4)
         cameraLook = -M_PI_4;
-      //this->cameraNode.setRelDirSoft(this->direction,10);
     }
   }

branches/presentation/src/world_entities/weapons/laser_cannon.cc

@@ -72 +72 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->setProjectileType(CL_LASER);
+  this->setProjectileType(CL_RAIL_PROJECTILE);
   this->prepareProjectiles(100);
   this->setEmissionPoint(Vector(2.8,0,0) * 5.0);