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

Timestamp:

Dec 8, 2005, 12:22:53 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Factory-Redesign on the wish of manuel

Location:

trunk/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (5 diffs)
• weapons/ground_turret.cc (modified) (2 diffs)
• weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -88 +88 @@
   Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
-  Weapon* cannon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(CL_CANNON));
+  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
 
   cannon->setName("BFG");
@@ -118 +118 @@
   xMouse = yMouse = 0;
   mouseSensitivity = 0.001;
-  
+
   cycle = 0.0;
-  
+
 
   travelSpeed = 15.0;
@@ -271 +271 @@
 
   //orient the spaceship model in the direction of movement.
-  
+
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.01;
-  
+
   this->shiftCoor(Vector(0,1,0)*cos(this->cycle*2.0)*0.02);
-  
+
   //SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
 
@@ -327 +327 @@
     //rotVal += .4;
   }
-  
+
   if( this->bRollL /* > -this->getRelCoor().z*2*/)
   {
@@ -385 +385 @@
 void SpaceShip::process(const Event &event)
 {
-  
-  
+
+
   if( event.type == SDLK_a)
       this->bRollL = event.bPressed;

trunk/src/world_entities/weapons/ground_turret.cc

@@ -85 +85 @@
   element = root->FirstChildElement("weapon-left");
   if (element != NULL) element = element->FirstChildElement();
-  this->left = dynamic_cast<Weapon*>( Factory::getFirst()->fabricate( element) );
+  this->left = dynamic_cast<Weapon*>( Factory::fabricate( element) );
   if (this->left)
   {
@@ -94 +94 @@
   element = root->FirstChildElement("weapon-right");
   if (element != NULL)  if (element != NULL) element = element->FirstChildElement();
-  this->right = dynamic_cast<Weapon*>( Factory::getFirst()->fabricate( element) );
+  this->right = dynamic_cast<Weapon*>( Factory::fabricate( element) );
   if (this->right)
   {

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -140 +140 @@
   LOAD_PARAM_START_CYCLE(root, element);
 
-  Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(element));
+  Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::fabricate(element));
   /// @todo implement this !!