Changeset 5557 in orxonox.OLD for trunk

Timestamp:

Nov 13, 2005, 3:00:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more around the aim-class

Location:

trunk/src/world_entities/weapons

Files:

• aim.cc (modified) (2 diffs)
• aim.h (modified) (2 diffs)

trunk/src/world_entities/weapons/aim.cc

@@ -46 +46 @@
 {
   if (this->material)
-  delete this->material;
-
-  // delete what has to be deleted here
-
-  GraphicsEngine::showMouse(true);
-  GraphicsEngine::stealWMEvents(false);
+    delete this->material;
 }
 
@@ -68 +63 @@
 //  this->setBindNode(this);
   this->material = new Material;
-
-  // center the mouse on the screen, and also hide the cursors
-  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
-  GraphicsEngine::showMouse(false);
-  GraphicsEngine::stealWMEvents(true);
 }
 

trunk/src/world_entities/weapons/aim.h

@@ -9 +9 @@
 #include "p_node.h"
 #include "element_2d.h"
+
 // FORWARD DECLARATION
 class Model;
@@ -24 +25 @@
   void loadParams(const TiXmlElement* root);
 
+  inline void selectTarget(PNode* target) { this->setParent(target); };
+  inline PNode* getTarget(PNode* target) { return this->getParent(); };
+
+
   void setSize(float size);
   void setTexture(const char* textureFile);
   /** @param rotationSpeed the speed at what the crosshair should rotate */
-  void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };
+  inline void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };
 
   virtual void tick(float dt);