Changeset 1000 for code/branches

Timestamp:

Apr 6, 2008, 6:06:32 PM (17 years ago)

Author:

rgrieder

Message:

• added a Factory to create OverlayElements by the ourselves
• added a 3D ogre head to demonstrate the ability to use 3D content in an Overlay (could be used in a radar or whatever needs 3D)

Location:

code/branches/hud2

Files:

• src/orxonox/hud/Bar.cc (modified) (2 diffs)
• src/orxonox/hud/HUD.cc (modified) (2 diffs)
• src/orxonox/hud/HUD.h (modified) (3 diffs)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/hud2/src/orxonox/hud/Bar.cc

@@ -25 +25 @@
 *
 */
+
+#include "OrxonoxStableHeaders.h"
 
 #include <OgreOverlayManager.h>
@@ -94 +96 @@
 
   SmartBar::SmartBar(Ogre::Real left, Ogre::Real top, Ogre::Real width, Ogre::Real height,
-        int dir, std::string name) : Bar::Bar(left, top, width, height, dir, Bar::YELLOW, name){
+        int dir, std::string name) : Bar(left, top, width, height, dir, Bar::YELLOW, name){
   }
 

code/branches/hud2/src/orxonox/hud/HUD.cc

@@ -31 +31 @@
 #include <OgreOverlayContainer.h>
 #include <OgreOverlayManager.h>
+#include <OgreSceneNode.h>
 
 #include "HUD.h"
 #include "Bar.h"
+#include "TestElement.h"
+// ugly hack
+#include "Orxonox.h"
 
 
@@ -60 +64 @@
     energyCounterPanel->addChild(energyCounter->element);
 
+    TestOverlayElementFactory *factory = new TestOverlayElementFactory();
+    overlayManager.addOverlayElementFactory(factory);
+    Ogre::OverlayElement* testElement = overlayManager.createOverlayElementFromFactory("Test", "testElement");
+
     Ogre::Overlay* orxonoxOverlay = overlayManager.create("Orxonox/HUD"); 
     orxonoxOverlay->add2D(energyCounterPanel);
+
+    // important: don't use SceneManager to create the node! but register the creator scene manager.
+    ogreNode_ = new Ogre::SceneNode(Orxonox::getSingleton()->getSceneManager(), "hudNoedely");
+    
+    ogreNode_->setPosition(80,-60,-200);
+    ogreNode_->setScale(0.4,0.4,0.4);
+    // ugly hack, but I haven't figured out yet how we could change this, since we really need the
+    // scene manager..
+    ogreNode_->attachObject(Orxonox::getSingleton()->getSceneManager()->createEntity("head", "ogrehead.mesh"));
+    orxonoxOverlay->add3D(ogreNode_);
+
     orxonoxOverlay->show();
+  }
+
+  void HUD::tick(float dt)
+  {
+    if (this->ogreNode_)
+    {
+      this->ogreNode_->roll(Ogre::Degree(dt*200),Ogre::Node::TS_LOCAL);
+      this->ogreNode_->yaw(Ogre::Degree(dt*200),Ogre::Node::TS_LOCAL);      
+      this->ogreNode_->pitch(Ogre::Degree(dt*200),Ogre::Node::TS_LOCAL);      
+    }
   }
 

code/branches/hud2/src/orxonox/hud/HUD.h

@@ -34 +34 @@
 #include <OgreTextAreaOverlayElement.h>
 #include <OgrePrerequisites.h>
-#include "../OrxonoxPrereqs.h"
 
+#include "OrxonoxPrereqs.h"
+
+#include "core/Tickable.h"
 #include "Bar.h"
 
@@ -41 +43 @@
 namespace orxonox
 {
-  class _OrxonoxExport HUD
+  class _OrxonoxExport HUD : Tickable
   {
   private:
@@ -49 +51 @@
     ~HUD();
 
+    virtual void tick(float);
+
     Bar* energyCounter;
+    Ogre::SceneNode* ogreNode_;
   };
 }       

code/branches/hud2/visual_studio/vc8/orxonox.vcproj

@@ -195 +195 @@
                                         >
                                 </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\hud\TestElement.cc"
+                                        >
+                                </File>
                         </Filter>
                         <Filter
@@ -345 +349 @@
                                         >
                                 </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\hud\TestElement.h"
+                                        >
+                                </File>
                         </Filter>
                         <Filter