Changeset 9159 for code/branches

Timestamp:

May 4, 2012, 4:09:25 PM (13 years ago)

Author:

scmoritz

Message:

3DScene added. creation of the arrow doesnt work.

Location:

code/branches/waypoints/src

Files:

• modules/overlays/hud/HUDNavigation.cc (modified) (2 diffs)
• orxonox/overlays/OrxonoxOverlay.cc (modified) (3 diffs)
• orxonox/overlays/OrxonoxOverlay.h (modified) (4 diffs)

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

@@ -36 +36 @@
 #include <OgreTextAreaOverlayElement.h>
 #include <OgrePanelOverlayElement.h>
+#include <OgreEntity.h>
 
 #include "util/Math.h"
@@ -80 +81 @@
     this->setNavMarkerSize ( 0.05f );
     this->setDetectionLimit( 10000.0f ); 
+
+    Ogre::Entity* ent = this->getScene()->getSceneManager()->createEntity("Arrow3D", "Arrow3D.mesh");
+    this->add3DMesh(ent);
+    this->overlay3d_->setPosition(0, 0, -10);
 }
 

code/branches/waypoints/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/waypoints/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_;
+
   };