Changeset 9629 for code/branches/core6/src/orxonox/overlays

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/orxonox/overlays

Files:

• GUISheet.cc (modified) (1 diff)
• GUISheet.h (modified) (1 diff)
• OrxonoxOverlay.cc (modified) (1 diff)
• OrxonoxOverlay.h (modified) (1 diff)
• OverlayGroup.cc (modified) (1 diff)
• OverlayGroup.h (modified) (1 diff)

code/branches/core6/src/orxonox/overlays/GUISheet.cc

@@ -38 +38 @@
     CreateFactory(GUISheet);
 
-    GUISheet::GUISheet(BaseObject* creator)
-        : BaseObject(creator)
+    GUISheet::GUISheet(Context* context)
+        : BaseObject(context)
         , bShowOnLoad_(false)
         , bHidePrevious_(false)

code/branches/core6/src/orxonox/overlays/GUISheet.h

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

code/branches/core6/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -63 +63 @@
     SetConsoleCommand("OrxonoxOverlay", "rotateOverlay",    &OrxonoxOverlay::rotateOverlay);
 
-    OrxonoxOverlay::OrxonoxOverlay(BaseObject* creator)
-        : BaseObject(creator)
+    OrxonoxOverlay::OrxonoxOverlay(Context* context)
+        : BaseObject(context)
     {
         RegisterObject(OrxonoxOverlay);

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

@@ -87 +87 @@
 
     public:
-        OrxonoxOverlay(BaseObject* creator);
+        OrxonoxOverlay(Context* context);
         virtual ~OrxonoxOverlay();
 

code/branches/core6/src/orxonox/overlays/OverlayGroup.cc

@@ -48 +48 @@
     SetConsoleCommand("OverlayGroup", "scrollGroup",      &OverlayGroup::scrollGroup);
 
-    OverlayGroup::OverlayGroup(BaseObject* creator)
-        : BaseObject(creator)
+    OverlayGroup::OverlayGroup(Context* context)
+        : BaseObject(context)
     {
         RegisterObject(OverlayGroup);

code/branches/core6/src/orxonox/overlays/OverlayGroup.h

@@ -54 +54 @@
     {
     public:
-        OverlayGroup(BaseObject* creator);
+        OverlayGroup(Context* context);
         //! Empty destructor.
         ~OverlayGroup();