Changeset 10771 in orxonox.OLD for branches/presentation/src/world_entities/projectiles

Timestamp:

Jun 27, 2007, 7:01:08 PM (18 years ago)

Author:

nicolasc

Message:

huge diff
cleaned the individual weapons, moved stuff to weapon.{cc,h}
and some minor fixes which popped up then and when

Location:

branches/presentation/src/world_entities/projectiles

Files:

• projectile_weapon.cc (modified) (2 diffs)
• projectile_weapon.h (modified) (1 diff)
• test_bullet.cc (modified) (2 diffs)

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

@@ -147 +147 @@
 }
 
-
+/*
 void ProjectileWeapon::collidesWith (WorldEntity* target, const Vector& location)
 {
@@ -154 +154 @@
   this->destroy(target);
 }
-
+*/
 
 

branches/presentation/src/world_entities/projectiles/projectile_weapon.h

@@ -59 +59 @@
     virtual void destroy (WorldEntity* killer);
 
-    virtual void collidesWith (WorldEntity* target, const Vector& location);  //!< collision handler; used against SpaceShip as most target will be
+//    virtual void collidesWith (WorldEntity* target, const Vector& location);  //!< collision handler; used against SpaceShip as most target will be
 
 

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

@@ -35 +35 @@
   this->registerObject(this, TestBullet::_objectList);
 
-  this->loadModel("models/projectiles/orx-rocket.obj", .3);
+  this->loadModel("models/projectiles/orx-rocket.obj", .6); // FIXME model no longer avaiable
 
   this->setMinEnergy(1);
@@ -170 +170 @@
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  glScalef(2.0, 2.0, 2.0);
+//   glScalef(2.0, 2.0, 2.0); // no double rescale, changed size in modelloader
   this->getModel()->draw();