Changeset 10689 in orxonox.OLD

Timestamp:

Jun 13, 2007, 5:51:40 PM (17 years ago)

Author:

retolu

Message:

first shooting of the turret

Location:

branches/adm/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• npcs/adm_turret.cc (modified) (6 diffs)
• npcs/adm_turret.h (modified) (3 diffs)
• weapons/aiming_system.cc (modified) (2 diffs)
• weapons/bsp_weapon.cc (added)
• weapons/bsp_weapon.h (added)

branches/adm/src/world_entities/WorldEntities.am

@@ -34 +34 @@
                 world_entities/weapons/spike_thrower.cc \
                 world_entities/weapons/acid_launcher.cc \
+                world_entities/weapons/bsp_weapon.cc \
                 \
                 world_entities/projectiles/lbolt.cc \
@@ -187 +188 @@
                 weapons/spike_thrower.h \
                 weapons/acid_launcher.h \
+                weapons/bsp_weapon.h \
                 \
                 projectiles/lbolt.h \

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

@@ -139 +139 @@
         this->bFire = false;
         this->playerVisible = false;
+
+        
 }
 
@@ -151 +153 @@
 
 
-  Vector playerPos = this->myTarget->getAbsCoor();
+  Vector playerPos = this->myTarget->getAbsCoor() + Vector(0, 12, 0);
   Vector ds = playerPos - ( this->cannons->getAbsCoor() );
-  if ( isActive && ds.len() <= range )
+  if ( isActive && ds.len() <= range && playerVisible )
+  {
     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();
+        }
+  }
   else
     this->moveTowards( Vector(0, -1, 0), dt );
@@ -212 +227 @@
 }
 
-bool AdmTurret::isVisible(const WorldEntity myTarget)
-{
-return true;
-}
-
-float AdmTurret::aim(const WorldEntity Target)
-{
-return 0;
-}
-
 void AdmTurret::fire()
 {
-        // Projectile* pj =  this->getProjectile();
-        // if (pj == NULL) return;
-
-        //pj->setOwner(this->getOwner());
-        //pj->setParent(PNode::getNullParent());
-        //pj->setVelocity(this->getAbsDir().apply(Vector( , , )) );
-        //pj->setAbsCoor(this->getEmissionPoint());
-        //pj->setAbsDir(this->getAbsDir());
-        //pj->activate();
 }
 
@@ -245 +241 @@
         
         this->cannons->toList( getOMListNumber() );
+
+        this->weapon = new BspWeapon();
+        this->weapon->setParent( this->cannons );
+        this->weapon->toList( getOMListNumber() );
+        this->weapon->setAbsCoor( this->cannons->getAbsCoor() );
+        this->weapon->setAbsDir( this->weapon->getAbsDir() * Quaternion( PI, Vector(0, 1, 0) ) );
 }
 
@@ -257 +259 @@
         this->sensor->toList( getOMListNumber() );
 }
-
 
 void AdmTurret::moveTowards( Vector targetDir, float dt )
@@ -336 +337 @@
   Vector dir = this->myTarget->getAbsCoor() - pos;
 
+
   this->playerVisible = true;
   for( ObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();

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

@@ -11 +11 @@
 
 #include "world_entity.h"
-#include "weapons/light_blaster.h"
+#include "weapons/bsp_weapon.h"
 
 class AdmTurret : public WorldEntity
@@ -37 +37 @@
                    WorldEntity* sensor;
                    WorldEntity* myTarget;
-                   bool isVisible(const WorldEntity myTarget);
-                   float aim(const WorldEntity Target);
                    void fire();
 
@@ -58 +56 @@
                    bool playerVisible;
                    void updatePlayerVisible();
+
+                BspWeapon* weapon;
       };
 

branches/adm/src/world_entities/weapons/aiming_system.cc

@@ -112 +112 @@
 void AimingSystem::hit(float damage, WorldEntity* killer)
 {
-  if( this->owner != killer)
+  if( this->owner != killer && killer != this && !killer->isA( AimingSystem::staticClassID() ) )
   {
     //PRINTF(0)("real hit: %s\n", killer->getClassCName());
@@ -127 +127 @@
 void AimingSystem::tick(float dt)
 {
-
-
 }