Changeset 9629 for code/branches/core6/src/modules/overlays/hud

Timestamp:

Aug 9, 2013, 9:26:46 PM (11 years ago)

Author:

landauf

Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:

code/branches/core6/src/modules/overlays/hud

Files:

• AnnounceMessage.cc (modified) (1 diff)
• AnnounceMessage.h (modified) (1 diff)
• ChatOverlay.cc (modified) (1 diff)
• ChatOverlay.h (modified) (1 diff)
• DeathMessage.cc (modified) (1 diff)
• DeathMessage.h (modified) (1 diff)
• GametypeFadingMessage.cc (modified) (1 diff)
• GametypeFadingMessage.h (modified) (1 diff)
• GametypeStaticMessage.cc (modified) (1 diff)
• GametypeStaticMessage.h (modified) (1 diff)
• HUDBar.cc (modified) (2 diffs)
• HUDBar.h (modified) (2 diffs)
• HUDBoostBar.cc (modified) (1 diff)
• HUDBoostBar.h (modified) (1 diff)
• HUDEnemyHealthBar.cc (modified) (1 diff)
• HUDEnemyHealthBar.h (modified) (1 diff)
• HUDHealthBar.cc (modified) (2 diffs)
• HUDHealthBar.h (modified) (1 diff)
• HUDNavigation.cc (modified) (1 diff)
• HUDNavigation.h (modified) (1 diff)
• HUDRadar.cc (modified) (1 diff)
• HUDRadar.h (modified) (1 diff)
• HUDSpeedBar.cc (modified) (1 diff)
• HUDSpeedBar.h (modified) (1 diff)
• HUDTimer.cc (modified) (1 diff)
• HUDTimer.h (modified) (1 diff)
• KillMessage.cc (modified) (1 diff)
• KillMessage.h (modified) (1 diff)
• LastManStandingInfos.cc (modified) (1 diff)
• LastManStandingInfos.h (modified) (1 diff)
• LastTeamStandingInfos.cc (modified) (1 diff)
• LastTeamStandingInfos.h (modified) (1 diff)
• PauseNotice.cc (modified) (1 diff)
• PauseNotice.h (modified) (1 diff)
• TeamBaseMatchScore.cc (modified) (1 diff)
• TeamBaseMatchScore.h (modified) (1 diff)

code/branches/core6/src/modules/overlays/hud/AnnounceMessage.cc

@@ -36 +36 @@
     CreateFactory(AnnounceMessage);
 
-    AnnounceMessage::AnnounceMessage(BaseObject* creator) : FadeoutText(creator)
+    AnnounceMessage::AnnounceMessage(Context* context) : FadeoutText(context)
     {
         RegisterObject(AnnounceMessage);

code/branches/core6/src/modules/overlays/hud/AnnounceMessage.h

@@ -40 +40 @@
     {
         public:
-            AnnounceMessage(BaseObject* creator);
+            AnnounceMessage(Context* context);
             virtual ~AnnounceMessage() {}
 

code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc

@@ -46 +46 @@
     CreateFactory(ChatOverlay);
 
-    ChatOverlay::ChatOverlay(BaseObject* creator)
-        : OverlayText(creator)
+    ChatOverlay::ChatOverlay(Context* context)
+        : OverlayText(context)
     {
         RegisterObject(ChatOverlay);

code/branches/core6/src/modules/overlays/hud/ChatOverlay.h

@@ -43 +43 @@
     {
         public:
-            ChatOverlay(BaseObject* creator);
+            ChatOverlay(Context* context);
             virtual ~ChatOverlay();
 

code/branches/core6/src/modules/overlays/hud/DeathMessage.cc

@@ -36 +36 @@
     CreateFactory(DeathMessage);
 
-    DeathMessage::DeathMessage(BaseObject* creator) : FadeoutText(creator)
+    DeathMessage::DeathMessage(Context* context) : FadeoutText(context)
     {
         RegisterObject(DeathMessage);

code/branches/core6/src/modules/overlays/hud/DeathMessage.h

@@ -40 +40 @@
     {
         public:
-            DeathMessage(BaseObject* creator);
+            DeathMessage(Context* context);
             virtual ~DeathMessage() {}
 

code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.cc

@@ -36 +36 @@
     CreateFactory(GametypeFadingMessage);
 
-    GametypeFadingMessage::GametypeFadingMessage(BaseObject* creator) : FadeoutText(creator)
+    GametypeFadingMessage::GametypeFadingMessage(Context* context) : FadeoutText(context)
     {
         RegisterObject(GametypeFadingMessage);

code/branches/core6/src/modules/overlays/hud/GametypeFadingMessage.h

@@ -40 +40 @@
     {
         public:
-            GametypeFadingMessage(BaseObject* creator);
+            GametypeFadingMessage(Context* context);
             virtual ~GametypeFadingMessage();
 

code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.cc

@@ -39 +39 @@
 
 
-    GametypeStaticMessage::GametypeStaticMessage(BaseObject* creator) : OverlayText(creator)
+    GametypeStaticMessage::GametypeStaticMessage(Context* context) : OverlayText(context)
     {
         RegisterObject(GametypeStaticMessage);

code/branches/core6/src/modules/overlays/hud/GametypeStaticMessage.h

@@ -43 +43 @@
     {
         public:
-            GametypeStaticMessage(BaseObject* creator);
+            GametypeStaticMessage(Context* context);
             virtual ~GametypeStaticMessage();
 

code/branches/core6/src/modules/overlays/hud/HUDBar.cc

@@ -47 +47 @@
     CreateFactory(BarColour);
 
-    BarColour::BarColour(BaseObject* creator)
-        : BaseObject(creator)
+    BarColour::BarColour(Context* context)
+        : BaseObject(context)
     {
         RegisterObject(BarColour);
@@ -67 +67 @@
     unsigned int HUDBar::materialcount_s = 0;
 
-    HUDBar::HUDBar(BaseObject* creator)
-        : OrxonoxOverlay(creator), right2Left_(false), autoColour_(false)
+    HUDBar::HUDBar(Context* context)
+        : OrxonoxOverlay(context), right2Left_(false), autoColour_(false)
     {
         RegisterObject(HUDBar);

code/branches/core6/src/modules/overlays/hud/HUDBar.h

@@ -48 +48 @@
     {
     public:
-        BarColour(BaseObject* creator);
+        BarColour(Context* context);
         virtual ~BarColour() { }
 
@@ -68 +68 @@
     {
     public:
-        HUDBar(BaseObject* creator);
+        HUDBar(Context* context);
         virtual ~HUDBar();
 

code/branches/core6/src/modules/overlays/hud/HUDBoostBar.cc

@@ -37 +37 @@
     CreateFactory(HUDBoostBar);
 
-    HUDBoostBar::HUDBoostBar(BaseObject* creator)
-        : HUDBar(creator)
+    HUDBoostBar::HUDBoostBar(Context* context)
+        : HUDBar(context)
     {
         RegisterObject(HUDBoostBar);

code/branches/core6/src/modules/overlays/hud/HUDBoostBar.h

@@ -40 +40 @@
     {
     public:
-        HUDBoostBar(BaseObject* creator);
+        HUDBoostBar(Context* context);
         virtual ~HUDBoostBar();
 

code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc

@@ -36 +36 @@
     CreateFactory(HUDEnemyHealthBar);
 
-    HUDEnemyHealthBar::HUDEnemyHealthBar(BaseObject* creator) : HUDHealthBar(creator)
+    HUDEnemyHealthBar::HUDEnemyHealthBar(Context* context) : HUDHealthBar(context)
     {
         RegisterObject(HUDEnemyHealthBar);

code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.h

@@ -37 +37 @@
     {
         public:
-            HUDEnemyHealthBar(BaseObject* creator);
+            HUDEnemyHealthBar(Context* context);
             virtual ~HUDEnemyHealthBar();
 

code/branches/core6/src/modules/overlays/hud/HUDHealthBar.cc

@@ -39 +39 @@
     CreateFactory(HUDHealthBar);
 
-    HUDHealthBar::HUDHealthBar(BaseObject* creator) : HUDBar(creator)
+    HUDHealthBar::HUDHealthBar(Context* context) : HUDBar(context)
     {
         RegisterObject(HUDHealthBar);
@@ -46 +46 @@
         this->bUseBarColour_ = false;
 
-        this->textoverlay_ = new OverlayText(this);
+        this->textoverlay_ = new OverlayText(this->getContext());
 
         assert(this->textoverlay_.get());

code/branches/core6/src/modules/overlays/hud/HUDHealthBar.h

@@ -42 +42 @@
     {
         public:
-            HUDHealthBar(BaseObject* creator);
+            HUDHealthBar(Context* context);
             virtual ~HUDHealthBar();
 

code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc

@@ -71 +71 @@
     HUDNavigation* HUDNavigation::localHUD_s = 0;
 
-    HUDNavigation::HUDNavigation(BaseObject* creator) :
-        OrxonoxOverlay(creator)
+    HUDNavigation::HUDNavigation(Context* context) :
+        OrxonoxOverlay(context)
     {
         RegisterObject(HUDNavigation)

code/branches/core6/src/modules/overlays/hud/HUDNavigation.h

@@ -46 +46 @@
     {
         public:
-            HUDNavigation(BaseObject* creator);
+            HUDNavigation(Context* context);
             virtual ~HUDNavigation();
 

code/branches/core6/src/modules/overlays/hud/HUDRadar.cc

@@ -46 +46 @@
     CreateFactory(HUDRadar);
 
-    HUDRadar::HUDRadar(BaseObject* creator)
-        : OrxonoxOverlay(creator)
+    HUDRadar::HUDRadar(Context* context)
+        : OrxonoxOverlay(context)
     {
         RegisterObject(HUDRadar);

code/branches/core6/src/modules/overlays/hud/HUDRadar.h

@@ -46 +46 @@
     {
     public:
-        HUDRadar(BaseObject* creator);
+        HUDRadar(Context* context);
         virtual ~HUDRadar();
 

code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.cc

@@ -38 +38 @@
     CreateFactory(HUDSpeedBar);
 
-    HUDSpeedBar::HUDSpeedBar(BaseObject* creator)
-        : HUDBar(creator)
+    HUDSpeedBar::HUDSpeedBar(Context* context)
+        : HUDBar(context)
     {
         RegisterObject(HUDSpeedBar);

code/branches/core6/src/modules/overlays/hud/HUDSpeedBar.h

@@ -41 +41 @@
     {
     public:
-        HUDSpeedBar(BaseObject* creator);
+        HUDSpeedBar(Context* context);
         virtual ~HUDSpeedBar();
 

code/branches/core6/src/modules/overlays/hud/HUDTimer.cc

@@ -38 +38 @@
     CreateFactory(HUDTimer);
 
-    HUDTimer::HUDTimer(BaseObject* creator) : OverlayText(creator)
+    HUDTimer::HUDTimer(Context* context) : OverlayText(context)
     {
         RegisterObject(HUDTimer);

code/branches/core6/src/modules/overlays/hud/HUDTimer.h

@@ -40 +40 @@
     {
     public:
-        HUDTimer(BaseObject* creator);
+        HUDTimer(Context* context);
         virtual ~HUDTimer();
 

code/branches/core6/src/modules/overlays/hud/KillMessage.cc

@@ -36 +36 @@
     CreateFactory(KillMessage);
 
-    KillMessage::KillMessage(BaseObject* creator) : FadeoutText(creator)
+    KillMessage::KillMessage(Context* context) : FadeoutText(context)
     {
         RegisterObject(KillMessage);

code/branches/core6/src/modules/overlays/hud/KillMessage.h

@@ -40 +40 @@
     {
         public:
-            KillMessage(BaseObject* creator);
+            KillMessage(Context* context);
             virtual ~KillMessage() {}
 

code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.cc

@@ -39 +39 @@
     CreateFactory(LastManStandingInfos);
 
-    LastManStandingInfos::LastManStandingInfos(BaseObject* creator) : OverlayText(creator)
+    LastManStandingInfos::LastManStandingInfos(Context* context) : OverlayText(context)
     {
         RegisterObject(LastManStandingInfos);

code/branches/core6/src/modules/overlays/hud/LastManStandingInfos.h

@@ -40 +40 @@
     {
         public:
-            LastManStandingInfos(BaseObject* creator);
+            LastManStandingInfos(Context* context);
             virtual ~LastManStandingInfos();
 

code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.cc

@@ -39 +39 @@
     CreateFactory(LastTeamStandingInfos);
 
-    LastTeamStandingInfos::LastTeamStandingInfos(BaseObject* creator) : OverlayText(creator)
+    LastTeamStandingInfos::LastTeamStandingInfos(Context* context) : OverlayText(context)
     {
         RegisterObject(LastTeamStandingInfos);

code/branches/core6/src/modules/overlays/hud/LastTeamStandingInfos.h

@@ -40 +40 @@
     {
         public:
-            LastTeamStandingInfos(BaseObject* creator);
+            LastTeamStandingInfos(Context* context);
             virtual ~LastTeamStandingInfos();
 

code/branches/core6/src/modules/overlays/hud/PauseNotice.cc

@@ -36 +36 @@
     CreateFactory(PauseNotice);
 
-    PauseNotice::PauseNotice(BaseObject* creator) : OverlayText(creator)
+    PauseNotice::PauseNotice(Context* context) : OverlayText(context)
     {
         RegisterObject(PauseNotice);

code/branches/core6/src/modules/overlays/hud/PauseNotice.h

@@ -40 +40 @@
     {
         public:
-            PauseNotice(BaseObject* creator);
+            PauseNotice(Context* context);
 
             virtual void changedOwner();

code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.cc

@@ -39 +39 @@
     CreateFactory(TeamBaseMatchScore);
 
-    TeamBaseMatchScore::TeamBaseMatchScore(BaseObject* creator) : OverlayText(creator)
+    TeamBaseMatchScore::TeamBaseMatchScore(Context* context) : OverlayText(context)
     {
         RegisterObject(TeamBaseMatchScore);

code/branches/core6/src/modules/overlays/hud/TeamBaseMatchScore.h

@@ -40 +40 @@
     {
         public:
-            TeamBaseMatchScore(BaseObject* creator);
+            TeamBaseMatchScore(Context* context);
             virtual ~TeamBaseMatchScore();