Changeset 5000 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Aug 13, 2005, 9:07:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: smooth-rotation is better now
PNODE_MOVEMENT_ROTATE-children are correcly smooth-reparented
some other minor fixes

THIS IS 5000
so
generated the endOfTheWorld-function
implemented de-generic recapitualisation Procedures
imported magnificizer
dezentralized obscurities
some other minor stuff
flush
eliminated deamons

man… i must have to much time

Location:

orxonox/trunk/src/world_entities

Files:

• camera.cc (modified) (1 diff)
• player.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (3 diffs)
• weapons/turret.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/camera.cc

@@ -142 +142 @@
     case VIEW_FRONT:
       this->toFovy = 120.0;
-//       this->softReparent("Player");
-//       this->target->softReparent("Player");
-//       this->setRelCoorSoft(4, 0, 0);
-//       this->target->setRelCoorSoft(10,0,0);
-      this->target->setRelDirSoft(Quaternion(M_PI/4.0, Vector(0,1,0)));
+       this->softReparent("Player");
+       this->target->softReparent("Player");
+       this->setRelCoorSoft(4, 0, 0);
+       this->target->setRelCoorSoft(10,0,0);
+      //this->target->setRelDirSoft(Quaternion(M_PI/4.0, Vector(0,1,0)));
       break;
     case VIEW_LEFT:

orxonox/trunk/src/world_entities/player.cc

@@ -121 +121 @@
 void Player::init()
 {
-  this->setAbsDir(0,1,0);
+//  this->setAbsDir(0,1,0);
 
   this->setClassID(CL_PLAYER, "Player");

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -178 +178 @@
 
   pj->setParent(NullParent::getInstance());
-/*
-  PNode* target = this->getWeaponManager()->getFixedTarget();
-  if (target != NULL)
-  {
-    pj->setVelocity(this->getVelocity()+(target->getAbsCoor() - this->getAbsCoor())*.5);//this->getVelocity());
-  }
-  else*/
+
   pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*20);
 
@@ -219 +213 @@
 void TestGun::draw ()
 {
-  this->getWeaponManager()->getFixedTarget()->debugDraw(10);
-
   /* draw gun body */
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x,
                 this->getAbsCoor ().y,
                 this->getAbsCoor ().z);
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
+
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
   if( this->leftRight == W_RIGHT)
     glScalef(1.0, 1.0, -1.0);
@@ -241 +234 @@
                 this->objectComponent1->getAbsCoor ().y,
                 this->objectComponent1->getAbsCoor ().z);
-  this->objectComponent1->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
+  tmpRot = this->objectComponent1->getAbsDir().getSpacialAxis();
+  glRotatef (this->objectComponent1->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   this->model->draw(0);
   glPopMatrix();

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -164 +164 @@
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x,
                 this->getAbsCoor ().y,
                 this->getAbsCoor ().z);
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
   this->model->draw();