Changeset 11052 for code/trunk/src/orxonox/overlays

Timestamp:

Jan 9, 2016, 6:26:20 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationHS15 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (1 diff)
• src/orxonox/overlays/OrxonoxOverlay.h (modified) (2 diffs)
• src/orxonox/overlays/OverlayGroup.cc (modified) (1 diff)

code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -450 +450 @@
         tempTx->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, colour);
     }
+
+    void OrxonoxOverlay::setZOrder(unsigned short order)
+    {
+        if (this->overlay_)
+        {
+            this->overlay_->setZOrder(order);
+        }
+    }
 }

code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

@@ -65 +65 @@
           only for displaying a picture).
         - Reacts to changes of the window aspect
-        - Last but not least: On demand you can tell the overlay to automatically resale to correct for
+        - Last but not least: On demand you can tell the overlay to automatically rescale to correct for
           aspect distortion. E.g. if you play 1024x768 you wouldn't want a round object to be oval.
           Remark: This can (due to the Ogre::Overlay transformation order) only work for angle that are
@@ -186 +186 @@
         virtual void changedOverlayGroup()
             { this->changedVisibility(); }
+        virtual void setZOrder(unsigned short order);
 
     protected:

code/trunk/src/orxonox/overlays/OverlayGroup.cc

@@ -42 +42 @@
 namespace orxonox
 {
+    namespace autocompletion
+    {
+        /**
+            @brief Returns the names of all currently existing OverlayGroups.
+        */
+        ARGUMENT_COMPLETION_FUNCTION_DECLARATION(overlaygroupnames)();
+        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(overlaygroupnames)()
+        {
+            ArgumentCompletionList names;
+            for (ObjectList<OverlayGroup>::iterator it = ObjectList<OverlayGroup>::begin(); it; ++it)
+                names.push_back(ArgumentCompletionListElement(it->getName(), getLowercase(it->getName())));
+            return names;
+        }
+    }
+
+    SetConsoleCommand("OverlayGroup", "toggleVisibility", &OverlayGroup::toggleVisibility).argumentCompleter(0, autocompletion::overlaygroupnames());
+    SetConsoleCommand("OverlayGroup", "show",             &OverlayGroup::show            ).argumentCompleter(0, autocompletion::overlaygroupnames());
+    SetConsoleCommand("OverlayGroup", "scaleGroup",       &OverlayGroup::scaleGroup      ).argumentCompleter(0, autocompletion::overlaygroupnames());
+    SetConsoleCommand("OverlayGroup", "scrollGroup",      &OverlayGroup::scrollGroup     ).argumentCompleter(0, autocompletion::overlaygroupnames());
+
     RegisterClass(OverlayGroup);
-
-    SetConsoleCommand("OverlayGroup", "toggleVisibility", &OverlayGroup::toggleVisibility);
-    SetConsoleCommand("OverlayGroup", "show", &OverlayGroup::show);
-    SetConsoleCommand("OverlayGroup", "scaleGroup",       &OverlayGroup::scaleGroup);
-    SetConsoleCommand("OverlayGroup", "scrollGroup",      &OverlayGroup::scrollGroup);
 
     OverlayGroup::OverlayGroup(Context* context)