Changeset 9232 for code/branches/captureTheFlag/src/orxonox

Timestamp:

May 23, 2012, 5:56:57 PM (13 years ago)

Author:

decapitb

Message:

safety checkin

Location:

code/branches/captureTheFlag

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (3 diffs)
• src/orxonox/overlays/OrxonoxOverlay.h (modified) (4 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

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

@@ -42 +42 @@
 #include <OgreTechnique.h>
 #include <OgrePass.h>
+#include <OgreEntity.h>
 
 #include "util/Convert.h"
@@ -83 +84 @@
             "OrxonoxOverlay_background_" + multi_cast<std::string>(hudOverlayCounter_s++)));
         this->overlay_->add2D(this->background_);
+
+        overlay3d_ = new Ogre::SceneNode(NULL);
+        this->overlay_->add3D(overlay3d_);
 
         // Get aspect ratio from the render window. Later on, we get informed automatically
@@ -448 +452 @@
         tempTx->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, colour);
     }
+    void OrxonoxOverlay::add3DMesh(Ogre::Entity* entity)
+    {
+        this->overlay3d_->attachObject(entity);
+    }
+
 }

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

@@ -44 +44 @@
 #include "core/Super.h"
 #include "core/WindowEventListener.h"
+
 
 namespace orxonox
@@ -186 +187 @@
         virtual void changedOverlayGroup()
             { this->changedVisibility(); }
+        void add3DMesh(Ogre::Entity* entity);
+
 
     protected:
@@ -195 +198 @@
         Ogre::Overlay* overlay_;                   //!< The overlay the entire class is about.
         Ogre::PanelOverlayElement* background_;    //!< Background image (blank per default).
+        Ogre::SceneNode* overlay3d_;                               //!< The scene where one can add 3D objects to the overlay
 
         float windowAspectRatio_;                  //!< Screen.width / screen.height
@@ -215 +219 @@
         OverlayGroup* group_;
         Ogre::Pass* backgroundAlphaPass_;
+
   };
 

code/branches/captureTheFlag/src/orxonox/worldentities/pawns/Pawn.h

@@ -161 +161 @@
             inline unsigned int getExplosionChunks() const
                 { return this->numexplosionchunks_; }
+            inline bool hasFlag() const
+                { return this->hasFlag_; }
+            inline void setHasFlag(bool hasFlag)
+                { this->hasFlag_ = hasFlag; }
 
             virtual void startLocalHumanControl();
@@ -207 +211 @@
             float reloadWaitTime_;
             float reloadWaitCountdown_;
+            bool hasFlag_;
 
             WeakPtr<Pawn> lastHitOriginator_;