Changeset 9159 in orxonox.OLD for branches/presentation/src/world_entities/space_ships/spacecraft_2d.cc

Timestamp:

Jul 4, 2006, 5:38:24 PM (18 years ago)

Author:

bensch

Message:

added laser-cannon

File:

• branches/presentation/src/world_entities/space_ships/spacecraft_2d.cc (modified) (7 diffs)

branches/presentation/src/world_entities/space_ships/spacecraft_2d.cc

@@ -91 +91 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(0);
+  Weapon* wpRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_LASER_CANNON));
   wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
+  Weapon* wpLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_LASER_CANNON));
   wpLeft->setName("testGun Left");
   //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
@@ -123 +123 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
-  this->acceleration = 10.0f;
+  this->acceleration = 20.0f;
   this->airFriction = 0.0f;
 
@@ -136 +136 @@
   this->travelNode = new PNode();
 
+  this->loadModel("models/ships/mantawing.obj", 5.0f);
 
   // camera - issue
@@ -180 +181 @@
   this->getWeaponManager().setSlotCount(5);
 
-  this->getWeaponManager().setSlotPosition(0, Vector(-0.28, 1.186, -2.750));
+  this->getWeaponManager().setSlotPosition(0, Vector(1.843, -0.335, 2.029) * 5.0);
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager().setSlotPosition(1, Vector(-0.28, 1.186, 2.750));
+  this->getWeaponManager().setSlotPosition(1, Vector(1.843, -0.335, -2.029) * 5.0);
   this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
@@ -207 +208 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+
+
+
 }
 
@@ -454 +458 @@
         this->velocity += (accelerationDir - damping)* dt;
 
-        if (this->getRelCoor().z > this->travelDistance.y && accel.z > 0.0)
+        if (this->getRelCoor().z > this->travelDistance.y && velocity.z > 0.0)
           this->velocity.z = 0.0f;
-        if (this->getRelCoor().z < -this->travelDistance.y && accel.z < 0.0)
+        if (this->getRelCoor().z < -this->travelDistance.y && velocity.z < 0.0)
           this->velocity.z = 0.0f;
 
-        if (this->getRelCoor().x > this->travelDistance.x && accel.x > 0.0)
+        if (this->getRelCoor().x > this->travelDistance.x && velocity.x > 0.0)
           this->velocity.x = 0.0f;
-        if (this->getRelCoor().x < -this->travelDistance.x && accel.x < 0.0)
+        if (this->getRelCoor().x < -this->travelDistance.x && velocity.x < 0.0)
           this->velocity.x = 0.0f;
 
@@ -467 +471 @@
         this->shiftCoor (this->velocity * dt);
         if (accel.z == 0)
-          this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 3.0f);
+          this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 5.0f);
         else
-          this->setRelDirSoft(Quaternion(this->velocity.z * .01, Vector(1,0,0)), 2.0f);
+          this->setRelDirSoft(Quaternion(this->velocity.z * .004, Vector(1,0,0)), 4.5f);
       }
       break;