Changeset 10694 in orxonox.OLD for branches/adm/src/world_entities/npcs

Timestamp:

Jun 14, 2007, 3:50:14 PM (18 years ago)

Author:

retolu

Message:

adm working

Location:

branches/adm/src/world_entities/npcs

Files:

• adm_turret.cc (modified) (10 diffs)
• adm_turret.h (modified) (3 diffs)

branches/adm/src/world_entities/npcs/adm_turret.cc

@@ -76 +76 @@
                 LoadParamXML(root, "Sensor", this, AdmTurret, addSensor)
                         .describe("add sensor to ADM");
+                LoadParamXML(root, "Weapon", this, AdmTurret, addWeapon)
+                        .describe("add weapon to ADM");
 
         }
@@ -137 +139 @@
         this->range = 400;
         this->isCeil = false;
-        this->bFire = false;
         this->playerVisible = false;
 
@@ -146 +147 @@
 {
   WorldEntity::tick(dt);
-  
+  this->weapon->fire(false);
   this->updatePlayerVisible();
 
@@ -158 +159 @@
   {
     this->moveTowards( ds,  dt);
-
-  //if target within +/- 2.5 degrees of aim -> fire
-  Vector dv1 = ds;
-  dv1.normalize();
-  Vector dv2 = this->cannons->getAbsDir().apply( Vector(-1, 0, 0));
-  dv2.normalize();
-  float angle = dv1.dot(dv2);
-  if (angle > 0.999)
-        {
-        this->fire();
-        }
+    
+    //if target within +/- 2.5 degrees of aim -> fire
+    Vector dv1 = ds;
+    dv1.normalize();
+    Vector dv2 = this->cannons->getAbsDir().apply( Vector(-1, 0, 0));
+    dv2.normalize();
+    float angle = dv1.dot(dv2);
+    if (angle > 0.999)
+          {
+     this->weapon->fire(true);
+          }
   }
   else
@@ -178 +179 @@
   WorldEntity::draw();
 
-
+#if 0
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -212 +213 @@
   glPopAttrib();
   glPopMatrix();
-  
+#endif
 }
 
@@ -227 +228 @@
 }
 
-void AdmTurret::fire()
-{
-}
-
 void AdmTurret::addCannons( const TiXmlElement * root )
 {
-        this->cannons = new WorldEntity();
+  this->cannons = new WorldEntity();
         this->cannons->setParent(this);
         this->cannons->loadParams( root );
@@ -242 +239 @@
         this->cannons->toList( getOMListNumber() );
 
+
+}
+
+void AdmTurret::addWeapon( const TiXmlElement * root )
+{
         this->weapon = new BspWeapon();
+        this->weapon->setParent( this->cannons );
         this->weapon->loadParams(root);
-        this->weapon->setParent( this->cannons );
         this->weapon->toList( getOMListNumber() );
-        this->weapon->setAbsCoor( this->cannons->getAbsCoor() );
+        //this->weapon->setAbsCoor( this->cannons->getAbsCoor() );
         this->weapon->setAbsDir( this->weapon->getAbsDir() * Quaternion( PI, Vector(0, 1, 0) ) );
 }
@@ -252 +254 @@
 void AdmTurret::addSensor( const TiXmlElement * root )
 {
-        this->sensor = new WorldEntity();
+  this->sensor = new WorldEntity();
         this->sensor->setParent(this);
         this->sensor->loadParams( root );
@@ -285 +287 @@
    if ( isCeil )
    {
-     printf( "ceil\n" );
      baseRot = Quaternion( PI, Vector( 1, 0, 0 ) );
    }

branches/adm/src/world_entities/npcs/adm_turret.h

@@ -37 +37 @@
                    WorldEntity* sensor;
                    WorldEntity* myTarget;
-                   void fire();
 
                    void addCannons(const TiXmlElement* root);
                    void addSensor(const TiXmlElement* root);
+                   void addWeapon(const TiXmlElement* root);
 
                    void moveTowards( Vector targetDir, float dt );
@@ -53 +53 @@
                    void setType( const std::string& type );
                    
-                   bool bFire;
                    bool playerVisible;
                    void updatePlayerVisible();
@@ -61 +60 @@
 
 #endif
+