Changeset 2369 for code/branches/objecthierarchy2/src/orxonox/overlays/OrxonoxOverlay.h

Timestamp:

Dec 10, 2008, 3:37:48 AM (17 years ago)

Author:

landauf

Message:

• Added a health bar
• Some changes in CameraManager to handle the case when no camera exists after removing the last one, but this is still somehow buggy (freezes and later crashes reproducible but inexplicable after a few respawns)
• Added PawnManager to handle destruction of Pawns without using delete within tick()

File:

• code/branches/objecthierarchy2/src/orxonox/overlays/OrxonoxOverlay.h (modified) (4 diffs)

code/branches/objecthierarchy2/src/orxonox/overlays/OrxonoxOverlay.h

@@ -125 +125 @@
 
         //! Gets the rotation angle applied to this overlay in degrees.
-        const Radian& getRotation() const         { return this->angle_; }
+        const Degree& getRotation() const         { return this->angle_; }
 
         //! Rotates the overlay by angle degrees.
@@ -166 +166 @@
         virtual void changedOwner() {}
 
+        inline void setOverlayGroup(OverlayGroup* group)
+        {
+            if (group != this->group_)
+            {
+                this->group_ = group;
+                this->changedOverlayGroup();
+            }
+        }
+        inline OverlayGroup* getOverlayGroup() const
+            { return this->group_; }
+        virtual void changedOverlayGroup() {}
+
     protected:
         virtual void angleChanged();
@@ -184 +196 @@
         Vector2 position_;                         //!< Position of the pickPoint on the screen.
         Vector2 pickPoint_;                        //!< Point on the overlay to pick when translating
-        Radian angle_;                             //!< Rotation angle of the overlay
+        Degree angle_;                             //!< Rotation angle of the overlay
         RotationState rotState_;             //!< horizontal, vertical or inbetween
 
@@ -195 +207 @@
         static std::map<std::string, OrxonoxOverlay*> overlays_s;
         ControllableEntity* owner_;
+        OverlayGroup* group_;
   };
 
   SUPER_FUNCTION(7, OrxonoxOverlay, changedOwner, false);
+  SUPER_FUNCTION(8, OrxonoxOverlay, changedOverlayGroup, false);
 }