Changeset 4592 in orxonox.OLD for orxonox/trunk/src/world_entities/test_gun.cc

Timestamp:

Jun 10, 2005, 7:17:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: derivations work.
now the only thing to do is specify all the classes, and DO it CLEAN.

@patrick: is it ok, how i treated your ObjectManager??

File:

• orxonox/trunk/src/world_entities/test_gun.cc (modified) (17 diffs)

orxonox/trunk/src/world_entities/test_gun.cc

@@ -1 +1 @@
 
 
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -13 +13 @@
    ### File Specific
    main-programmer: Patrick Boenzli
-   co-programmer: 
+   co-programmer:
 
 
@@ -43 +43 @@
    creates a new weapon
 */
-TestGun::TestGun (PNode* parent, const Vector& coordinate, const Quaternion& direction, int leftRight) 
-  :  Weapon (parent, coordinate, direction) 
+TestGun::TestGun (PNode* parent, const Vector& coordinate, const Quaternion& direction, int leftRight)
+  :  Weapon (parent, coordinate, direction)
 {
   this->setClassID(CL_TEST_GUN, "TestGun");
@@ -65 +65 @@
       this->projectileOffset = Vector(1.0, 0.0, -0.35);
 
-      this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
       this->animation1->addKeyFrame(Vector(-0.4, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
       this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_CONSTANT);
 
-      this->animation2->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
       this->animation2->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
 
       this->animation3->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
-      this->animation3->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     }
   else if( this->leftRight == W_RIGHT)
@@ -80 +80 @@
 
       this->objectComponent1->setRelCoor(Vector(0,0,0.35));
-      this->animation1->addKeyFrame(Vector(0, 0, .5), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation1->addKeyFrame(Vector(0, 0, .5), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
       this->animation1->addKeyFrame(Vector(-0.4, 0, .5), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
       this->animation1->addKeyFrame(Vector(0, 0, .5), Quaternion(), 0.0, ANIM_LINEAR, ANIM_CONSTANT);
 
-      this->animation2->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
       this->animation2->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
 
       this->animation3->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
-      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     }
-  
+
   this->fireSound = (SoundBuffer*)ResourceManager::getInstance()->load("sound/shot1.wav", WAV);
   this->weaponSource = new SoundSource(this->fireSound, this);
@@ -103 +103 @@
    \brief standard deconstructor
 */
-TestGun::~TestGun () 
+TestGun::~TestGun ()
 {
   // model will be deleted from WorldEntity-destructor
@@ -112 +112 @@
    \brief this activates the weapon
 
-   This is needed, since there can be more than one weapon on a ship. the 
-   activation can be connected with an animation. for example the weapon is 
-   been armed out. 
+   This is needed, since there can be more than one weapon on a ship. the
+   activation can be connected with an animation. for example the weapon is
+   been armed out.
 */
 void TestGun::activate()
@@ -125 +125 @@
    \brief this deactivates the weapon
 
-   This is needed, since there can be more than one weapon on a ship. the 
-   activation can be connected with an animation. for example the weapon is 
+   This is needed, since there can be more than one weapon on a ship. the
+   activation can be connected with an animation. for example the weapon is
    been armed out.
 */
@@ -137 +137 @@
 /**
    \brief fires the weapon
-   
+
    this is called from the player.cc, when fire-button is been pushed
    \todo: the ObjectManager deliveres Projectiles not TestBullets! this should be diffrent
@@ -149 +149 @@
     }
 
-  Projectile* pj = dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
+  Projectile* pj = dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
   weaponSource->play();
 
@@ -157 +157 @@
   this->worldEntities->add(pj);
   this->localTime = 0;
-  
+
   this->animation1->replay();
 }
@@ -170 +170 @@
    can destroy the weapons of enemies or vice versa.
 */
-void TestGun::hit (WorldEntity* entity, Vector* position) 
+void TestGun::hit (WorldEntity* entity, Vector* position)
 {}
 
@@ -180 +180 @@
    hit, it can also be destoryed.
 */
-void TestGun::destroy () 
+void TestGun::destroy ()
 {}
 
@@ -187 +187 @@
    \brief tick signal for time dependent/driven stuff
 */
-void TestGun::tick (float time) 
+void TestGun::tick (float time)
 {
   this->localTime += time;
@@ -203 +203 @@
    \brief this will draw the weapon
 */
-void TestGun::draw () 
+void TestGun::draw ()
 {
   /* draw gun body */
@@ -209 +209 @@
   glPushMatrix();
   float matrix[4][4];
-  glTranslatef (this->getAbsCoor ().x, 
-                this->getAbsCoor ().y, 
-                this->getAbsCoor ().z);  
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
   this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
@@ -222 +222 @@
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  glTranslatef (this->objectComponent1->getAbsCoor ().x, 
-                this->objectComponent1->getAbsCoor ().y, 
-                this->objectComponent1->getAbsCoor ().z);
+  glTranslatef (this->objectComponent1->getAbsCoor ().x,
+                this->objectComponent1->getAbsCoor ().y,
+                this->objectComponent1->getAbsCoor ().z);
   this->objectComponent1->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);