Changeset 9177

Timestamp:

May 11, 2012, 4:20:50 PM (13 years ago)

Author:

scmoritz

Message:

3D arrow trial

Location:

code/branches/waypoints/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (4 diffs)
• HUDNavigation.h (modified) (3 diffs)

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

@@ -46 +46 @@
 #include "Radar.h"
 #include "graphics/Camera.h"
+#include "graphics/Model.h"
+#include "worldentities/MovableEntity.h"
 #include "controllers/HumanController.h"
 #include "worldentities/pawns/Pawn.h"
@@ -82 +84 @@
     this->setDetectionLimit( 10000.0f ); 
 
-    Ogre::Entity* ent = this->getScene()->getSceneManager()->createEntity("Arrow3D", "Arrow3D.mesh");
-    this->add3DMesh(ent);
-    this->overlay3d_->setPosition(0, 0, -10);
+    //Ogre::Entity* ent = this->getScene()->getSceneManager()->createEntity("Arrow3D", "Arrow3D.mesh");
+
+    Model* arrow = new Model(this);
+    MovableEntity* arrowEntity = new MovableEntity(this);
+    arrow->setMeshSource("Arrow3D.mesh");
+    arrowEntity->attach(arrow);
+    arrowEntity->setVisible(true);
+    arrowEntity->scale(1);
+    arrowEntity->setPosition(0, 0, -200);
+    arrowEntity->attachToNode(this->overlay3d_);
+    //this->add3DMesh(arrowEntity);
+
+    this->overlay3d_->setPosition(0, 0, -200);
+    this->overlay3d_->setVisible(false, true);
 }
 
@@ -183 +196 @@
     unsigned int markerCount_ = 0;
     bool closeEnough_ = false; //only display objects that are close enough to be relevant for the player
+
+    //for the first element of sortedObjectList_ / the closest waypoint show the Arrow3D
+    if(!sortedObjectList_.empty())
+    {
+        showArrow3D();
+                sortedList::iterator firstIt = sortedObjectList_.begin();
+                Ogre::Vector3 pos1 = firstIt->first->getRVWorldPosition();
+                Ogre::Vector3 pos2 = cam->getPosition();
+                Ogre::Quaternion quat = pos2.getRotationTo(pos1);
+                this->overlay3d_->rotate(quat);
+                //this->overlay3d_->setDirection(pos1-pos2);
+    }
+
 
 //         for (ObjectMap::iterator it = activeObjectList_.begin(); it != activeObjectList_.end(); ++it)
@@ -450 +476 @@
     }
 }
-
-}
+void HUDNavigation::showArrow3D()
+                { this->overlay3d_->setVisible(true, true);}
+void HUDNavigation::hideArrow3D()
+                { this->overlay3d_->setVisible(false, true);}
+
+
+}

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

@@ -42 +42 @@
 #include "overlays/OrxonoxOverlay.h"
 
+
 namespace orxonox
 {
@@ -51 +52 @@
 
     void setConfigValues();
+
+
 
     virtual void XMLPort ( Element& xmlelement, XMLPort::Mode mode );
@@ -80 +83 @@
 
     };
+
+    void showArrow3D();
+    void hideArrow3D();
 
     bool showObject( RadarViewable* rv );