Changeset 4849 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons

Timestamp:

Jul 13, 2005, 7:03:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the crosshair now renders as element2d

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• crosshair.cc (modified) (1 diff)
• crosshair.h (modified) (3 diffs)
• weapon_manager.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/weapons/crosshair.cc

@@ -180 +180 @@
  * draws the crosshair
  */
-void Crosshair::draw()
+void Crosshair::draw() const
 {
   GraphicsEngine::storeMatrices();

orxonox/trunk/src/world_entities/weapons/crosshair.h

@@ -8 +8 @@
 #define _CROSSHAIR_H
 
+#include "p_node.h"
+#include "element_2d.h"
 #include "event_listener.h"
-#include "p_node.h"
+
 #include "vector.h"
+
 
 // FORWARD DEFINITION
@@ -18 +21 @@
 
 //! A class that enables the
-class Crosshair : public PNode, public EventListener {
+class Crosshair : public PNode, public Element2D, public EventListener {
 
  public:
@@ -33 +36 @@
 
   virtual void process(const Event &event);
-  void tick(float dt);
-  void draw();
+  virtual void tick(float dt);
+  virtual void draw() const;
 
  private:

orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

@@ -243 +243 @@
   }
 
-  crosshair->tick(dt);
   crosshair->setRotationSpeed(5);
 }
@@ -260 +259 @@
       w->draw();
   }
-  crosshair->draw();
 }