Changeset 10721 in orxonox.OLD for branches

Timestamp:

Jun 18, 2007, 7:40:40 PM (18 years ago)

Author:

nicolasc

Message:

bump, minor fixes

Location:

branches/presentation/src

Files:

• util/hud.cc (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (6 diffs)
• world_entities/space_ships/space_ship.h (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (1 diff)
• world_entities/weapons/nadion_laser.cc (modified) (1 diff)
• world_entities/weapons/weapon_manager.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

branches/presentation/src/util/hud.cc

@@ -536 +536 @@
               statWidgetsNumber++;
         
-            if (expectedHealthSizeY * statWidgetsNumber > overlayWidth)
+            if ((expectedHealthSizeY * statWidgetsNumber) > overlayWidth)
             {
               newSizeY = overlayWidth / float(statWidgetsNumber);

branches/presentation/src/world_entities/npcs/npc.cc

@@ -407 +407 @@
       {
         int slot = ws->getWeaponSlot();
-//         int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used
+//         int side = ws->getWeaponSide(); //FIXME / REMOVED: is not used
         this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
         this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());

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

@@ -205 +205 @@
 
   this->mouseSensitivity = 4;
+  this->xMouse = this->yMouse = 0;
+
 
   this->weaponMan.changeWeaponConfig(0);
@@ -222 +224 @@
   loadEngine(15);
 
-//   this->loadModel("models/spaceships/fighter_redesign9.obj");
-  //this->setVisibiliy(false);
-
   bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
-
-//   this->setHealthMax(shieldMax);
-//   this->setHealth(shieldCur);
 
   this->travelNode = new PNode();
@@ -261 +257 @@
 
   this->secWeaponMan.getFixedTarget()->setParent(this);
-  this->secWeaponMan.getFixedTarget()->setRelCoor(100000,0,0);
+  this->secWeaponMan.getFixedTarget()->setRelCoor(50000,0,0);
   this->secWeaponMan.setRotationSpeed(0);
 
@@ -289 +285 @@
   //this->airFriction = 0.0f;
 
-  srand(time(0));  //initaialize RNG
+//   srand(time(0));  //initaialize RNG
 
   this->travelNode->debugDraw();
@@ -377 +373 @@
   this->resetElectronic();
   this->velocity = Vector(0.0, 0.0, 0.0);
+  this->xMouse = this->yMouse = 0;
 }
 
@@ -593 +590 @@
 //     printf("Mouse Coord: %f, %f\n", this->xMouse, this->yMouse);
     this->weaponMan.getFixedTarget()->setRelCoor(100000, -100 * this->mouseSensitivity * yMouse, 100 * this->mouseSensitivity * xMouse);
-    this->secWeaponMan.getFixedTarget()->setRelCoor(100000, -100 * this->mouseSensitivity * yMouse, 100 * this->mouseSensitivity * xMouse);
+    this->secWeaponMan.getFixedTarget()->setRelCoor(50000, -50 * this->mouseSensitivity * yMouse, 50 * this->mouseSensitivity * xMouse);
   }
   else if (!(State::getCamera()->getEventHandling()))

branches/presentation/src/world_entities/space_ships/space_ship.h

@@ -202 +202 @@
 
 
-    Quaternion            mouseDir;           //!< the direction where the player wants to fly
+    //Quaternion            mouseDir;           //!< the direction where the player wants to fly
     /*Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly
     float                 shipInertia;        //!< the inertia of the ship(how fast the ship reacts to a mouse input)

branches/presentation/src/world_entities/weapons/crosshair.cc

@@ -64 +64 @@
   this->material = new Material;
 
-  //this->subscribeEvent(ES_GAME, EV_MOUSE_MOTION);
+//   this->subscribeEvent(ES_GAME, EV_MOUSE_MOTION);
 
   // center the mouse on the screen, and also hide the cursors
-  /*  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
-  GraphicsEngine::showMouse(false);
-  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);*/
+/*  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);*/
+//   GraphicsEngine::showMouse(false);
+//   SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
 }
 

branches/presentation/src/world_entities/weapons/nadion_laser.cc

@@ -147 +147 @@
 
   pj->setAbsCoor(this->getEmissionPoint());
-//   pj->setAbsDir(this->getAbsDir());
+//   pj->setAbsDir(Quaternion(this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor(), Vector(0,0,0)));
+  pj->setAbsDir(this->getAbsDir());
   pj->activate();
 

branches/presentation/src/world_entities/weapons/weapon_manager.h

@@ -91 +91 @@
     Weapon* getWeapon(int slotID) const;
 
-    // FIXME ::
 //    bool hasFreeSlot(int configID, long capability = WTYPE_ALL) { return ( getNextFreeSlot(configID, capability ) != -1)? true : false; };
 

branches/presentation/src/world_entities/world_entity.cc

@@ -1184 +1184 @@
   increaseHealth(time * this->healthRegen);
   increaseShield(time * this->shieldRegen);
-//   updateHealthWidget();
-//   updateShieldWidget();
-
-  //this->setHealth( this->shieldCur);      // FIXME currently just to test share system
+
 
   if (this->electronic != this->electronicMax || this->electronicRegen != 0){

branches/presentation/src/world_entities/world_entity.h

@@ -208 +208 @@
 
   /* --- Misc Stuff Block --- */
-  void debugWE() { this->debugEntity(); }
-  ;  ///FIXME
+  void debugWE() { this->debugEntity(); };  ///FIXME
   void debugEntity() const;