Changeset 10281 in orxonox.OLD for branches

Timestamp:

Jan 17, 2007, 7:44:00 PM (18 years ago)

Author:

marcscha

Message:

xml parsing of cam data

Location:

branches/playability/src/world_entities

Files:

• projectiles/spike_ball.cc (modified) (9 diffs)
• space_ships/space_ship.cc (modified) (1 diff)
• weapons/heavy_blaster.cc (modified) (1 diff)

branches/playability/src/world_entities/projectiles/spike_ball.cc

@@ -179 +179 @@
 {
   Spike* pj = NULL;
-
-  updateFireDir();
-
+/*  printf( "KA-" );*/
   for ( int i = 0; i < this->getFragments(); i++)
   {
     pj  = new Spike();
     assert( pj );
+/*    printf(" %i", i);*/
     pj->setParent(PNode::getNullParent());
 
-    dynamic_cast<Spike*>(pj)->setVelocity(this->launcher[i].getNormalized() * 250.0);
+    pj->setVelocity(this->launcher[i].getNormalized() * 250.0);
 
     pj->setParent(PNode::getNullParent());
     pj->setAbsCoor(this->getAbsCoor() + this->launcher[i] * this->size);
-//     Quaternion q;
-//     pj->setAbsDir(q.lookAt(Vector(), this->launcher[i], VECTOR_RAND(1)));
-    pj->setRelDir(Quaternion(0, this->launcher[i]));
+    Quaternion q;
+    pj->setAbsDir(q.lookAt(Vector(), this->launcher[i], VECTOR_RAND(1)));
 
     pj->toList(this->getOMListNumber());
 
+/*
+    pj->setAbsCoor(this->getAbsCoor() + VECTOR_RAND(3));
+    pj->setAbsDir(this->getAbsDir());*/
     pj->activate();
   }
+/*  printf( "BOOM\n" );*/
 }
 
@@ -217 +219 @@
   ca = cos (this->getAngle());
   sa = sin (this->getAngle());
+// final version below... easier to to cheat with the one above.
 
   m[0][0] = nx * nx * (1 - ca) + ca;
@@ -230 +233 @@
   float x, y, z;
   for (int i = 0; i < this->getFragments(); i++){
+//     printf("%i ", i);
     x = m[0][0] * this->launcher[i].x + m[0][1] * this->launcher[i].y + m[0][2] * this->launcher[i].z;
     y = m[1][0] * this->launcher[i].x + m[1][1] * this->launcher[i].y + m[1][2] * this->launcher[i].z;
@@ -236 +240 @@
     this->launcher[i] = Vector (x, y, z);
   }
+//   printf("\n");
 
   for( int i = 0; i < 3 ; i++)
@@ -249 +254 @@
 void SpikeBall::tick (float dt)
 {
-  Vector v = this->velocity * dt;
+  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
+  Vector v = this->getVelocity() * dt;
   this->shiftCoor(v);
 
+//   if(this->lifeCycle > .9){
+// /*    printf("time to blow:  ");*/
+// //     this->weaponMan->fire();
+// /*    this->blow();*/
+//   }
 
   if (this->tickLifeCycle(dt)){
@@ -259 +270 @@
 
   this->updateAngle( dt );
+//   angle += rotationSpeed * dt;
 }
 
@@ -277 +289 @@
 {
   glPushAttrib(GL_ENABLE_BIT);
+  //glDisable(GL_LIGHTING);
+
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -282 +296 @@
   float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-
-  this->halo->draw();
 
   glRotatef(angle, this->getRotationAxis().x, this->getRotationAxis().y, this->getRotationAxis().z);
@@ -290 +302 @@
   this->getModel()->draw();
 
+  this->halo->draw();
+
   glPopMatrix();
+
   glPopAttrib();
 }

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -397 +397 @@
   LoadParam(root, "cameraDistance", this, SpaceShip, setCameraDistance);
   LoadParam(root, "cameraFovy", this, SpaceShip, setCameraFovy);
+
+  State::getCamera()->setViewMode(Camera::ViewTop);
 }
 

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -41 +41 @@
   }
   delete [] this->emissionPoint;
-  delete [] this->shootAnim;
-  delete [] this->objComp;
+  
+   delete [] this->shootAnim;
+   delete [] this->objComp;
 /*
     for(int j = 0; j < this->getSegs(); j++)