Changeset 654 for code/branches

Timestamp:

Dec 19, 2007, 12:41:31 PM (17 years ago)

Author:

rgrieder

Message:

• removed barrel rotation

Location:

code/branches/FICN/src/orxonox/objects/weapon_system

Files:

• barrel_gun.cc (modified) (3 diffs)
• bullet_manager.cc (modified) (1 diff)

code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.cc

@@ -55 +55 @@
     secondaryFiringRate_ = 1.0/2.0;
     primaryBulletSpeed_ = 800;
-    secondaryBulletSpeed_ = 300;
+    secondaryBulletSpeed_ = 500;
     magazineSize_ = 25;
   }
@@ -84 +84 @@
     speed += getVelocity();
 
-          temp->setScale(Vector3(1, 1, 1) * 2);
-          temp->yaw(Degree(-90));
+          temp->setScale(Vector3(1, 1, 1) * 1.5);
+    temp->roll(Degree(90));
 
     Bullet* bullet = new Bullet();
@@ -126 +126 @@
     speed += getVelocity();
 
-          temp->setScale(Vector3(1, 1, 1) * 4);
-          temp->yaw(Degree(-90));
+          temp->setScale(Vector3(1, 1, 1) * 3);
+          temp->roll(Degree(90));
 
     Bullet* bullet = new Bullet();

code/branches/FICN/src/orxonox/objects/weapon_system/bullet_manager.cc

@@ -81 +81 @@
     {
       bullets_[i]->getNode()->translate(bullets_[i]->getVelocity()*dt);
-      bullets_[i]->getNode()->yaw(Degree(dt*100));
-      bullets_[i]->getNode()->roll(Degree(dt*300));
+      //bullets_[i]->getNode()->yaw(Degree(dt*100));
+      //bullets_[i]->getNode()->roll(Degree(dt*300));
     }
   }