Changeset 9219 for code/branches/waypoints

Timestamp:

May 18, 2012, 5:08:35 PM (13 years ago)

Author:

scmoritz

Message:

3D arrow added. Spinns around like crazy. the partyarrow needs a fix

Location:

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

Files:

• HUDNavigation.cc (modified) (3 diffs)
• HUDNavigation.h (modified) (1 diff)

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

@@ -87 +87 @@
 
     Model* arrow = new Model(this);
-    MovableEntity* arrowEntity = new MovableEntity(this);
+    this->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_);
+    arrow->setSyncMode(0);
+    this->arrowEntity->attach(arrow);
+    this->arrowEntity->scale(1);
+    this->arrowEntity->setVisible(true);
+    this->arrowEntity->setPosition(0, +30, -100);
+    this->arrowEntity->setSyncMode(0);
+    this->arrowEntity->attachToNode(this->overlay3d_);
     //this->add3DMesh(arrowEntity);
 
-    this->overlay3d_->setPosition(0, 0, -200);
-    this->overlay3d_->setVisible(false, true);
+    //this->overlay3d_->setPosition(0, 0, 0);
+    //this->overlay3d_->setVisible(false, true);
+    this->overlay_->setZOrder(0);
+    this->overlay_->show();
+    hideArrow3D();
 }
 
@@ -198 +203 @@
 
     //for the first element of sortedObjectList_ / the closest waypoint show the Arrow3D
+    //set the direction of the arrow to the closest waypoint
     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);
-    }
+
+                Ogre::Vector3 pos1 = camTransform * firstIt->first->getRVWorldPosition();
+                orxout(user_info, context::events()) << pos1 << endl;
+                this->arrowEntity->setDirection(1-pos1.x, 1 - pos1.y, 1 - pos1.z);
+
+                //this->arrowEntity->rotate(quat);
+                //this->overlay3d_->setDirection(pos1);
+    }
+    else{hideArrow3D();}
 
 
@@ -413 +422 @@
     this->background_->addChild ( text );
 
-    sortedObjectList_.push_front ( std::make_pair ( object, ( unsigned int ) 0 ) );
+    Ogre::Vector3 temp = object->getWorldEntity()->getPosition();
+    unsigned int distance = sqrt(temp.x*temp.x+temp.y*temp.y+temp.z*temp.z);
+
+
+
+    sortedObjectList_.push_front ( std::make_pair ( object, distance ) );
 
 

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

@@ -87 +87 @@
     void hideArrow3D();
 
+    orxonox::MovableEntity* arrowEntity;
+
     bool showObject( RadarViewable* rv );