Changeset 10683 in orxonox.OLD for branches/adm

Timestamp:

Jun 10, 2007, 12:17:06 AM (18 years ago)

Author:

rennerc

Message:

adm turret works now

File:

• branches/adm/src/world_entities/npcs/adm_turret.cc (modified) (5 diffs)

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

@@ -78 +78 @@
         }
 //         this->removeNodeFlags( PNODE_ALL );
-//         this->addNodeFlags( PNODE_ROTATE_AND_MOVE );
+        this->addNodeFlags( PNODE_ROTATE_AND_MOVE );
+        this->addNodeFlags( PNODE_REPARENT_KEEP_POSITION );
+        
+        //HACK this is needed to get the correct coordinates instead (0, 0, 0)
+        this->updateNode( 0 );
         
         if ( this->isCeil )
@@ -139 +143 @@
 
   //rotate sensor 2PI/sec
-  this->sensor->setAbsDir( this->sensor->getAbsDir() * Quaternion( PI*2*dt, Vector( 0, 1, 0 ) ) );
+  this->sensor->setAbsDir( this->sensor->getAbsDir() * Quaternion( PI*2*dt, Vector( 0, -1, 0 ) ) );
 
 
@@ -252 +256 @@
 {
   if ( this->cannons->getParent() != NullParent::getNullParent() )
+  {
     this->cannons->setParent( NullParent::getNullParent() );
+    this->cannons->shiftCoor( this->getAbsCoor() );
+    
+    this->sensor->setParent( NullParent::getNullParent() );
+    this->sensor->shiftCoor( this->getAbsCoor() );
+  }
   
   targetDir.normalize();
@@ -264 +274 @@
   float bestCannonAngle = 0.0f;
   
-//   Quaternion baseRot(0, Vector);
-//   if ( isCeil )
-//   {
-//     printf( "ceil\n" );
-//     baseRot = Quaternion( PI/2, Vector( 0, 0, 1 ) );
-//   }
+   Quaternion baseRot(0, Vector(1, 0, 0));
+   if ( isCeil )
+   {
+     printf( "ceil\n" );
+     baseRot = Quaternion( PI, Vector( 1, 0, 0 ) );
+   }
   
   for ( int dBodyAngle = -1; dBodyAngle<2; dBodyAngle++ )
@@ -290 +300 @@
       Quaternion cannonRot( cannonAngle, Vector( 0, 0, 1) );
       
-//       bodyRot = baseRot * bodyRot;
-//       cannonRot = baseRot * cannonRot;
+       bodyRot = baseRot * bodyRot;
+       cannonRot = baseRot * cannonRot;
       
       float result = (bodyRot * cannonRot).apply( Vector( -1, 0, 0 ) ).dot( targetDir );