Changeset 2977 for code/branches/map/src

Timestamp:

May 14, 2009, 2:35:54 PM (16 years ago)

Author:

Naaduun

Message:

=movable plane

Location:

code/branches/map/src

Files:

• orxonox/objects/RadarViewable.cc (modified) (1 diff)
• orxonox/overlays/map/Map.cc (modified) (5 diffs)
• orxonox/overlays/map/Map.h (modified) (2 diffs)
• util/SubString.cc (modified) (1 diff)

code/branches/map/src/orxonox/objects/RadarViewable.cc

@@ -117 +117 @@
 //Vector3 v = this->getRVWorldPosition();
             //this->line_->setPoint(1, Vector3(0,v.y,0) );
-            this->line_->setPoint(1, Vector3(0, -this->getRVWorldPosition().y ,0) );
+            this->line_->setPoint(1, Vector3( 0, (int) -Map::getSingletonPtr()->movablePlane_->getDistance( this->getRVWorldPosition() ) ,0 ));
             this->line_->update();
-            this->LineNode_->setDirection(Vector3::UNIT_Y,Ogre::Node::TS_WORLD,Vector3::UNIT_Y);
+            if( Map::getSingletonPtr()->playerShipNode_ )
+                this->LineNode_->setDirection( Map::getSingletonPtr()->playerShipNode_->getLocalAxes().GetColumn(1) ,Ogre::Node::TS_WORLD,Vector3::UNIT_Y);
         }
     }

code/branches/map/src/orxonox/overlays/map/Map.cc

@@ -47 +47 @@
 
 #include <OgreOverlay.h>
+#include <OgreMovablePlane.h>
 #include <OgreOverlayElement.h>
 #include <OgreOverlayManager.h>
@@ -169 +170 @@
         overlay_->hide();
 
-        //Create plane in map
+        //Create plane to show grid
         Ogre::Entity* plane_ent = Map::getMapSceneManager()->createEntity( "MapPlane", "plane.mesh");
         planeNode_ = Map::getMapSceneManager()->getRootSceneNode()->createChildSceneNode();
-        
+        //Create plane for calculations
+        movablePlane_ = new Ogre::MovablePlane( Vector3::UNIT_Y, 0 );
+        movablePlane_->normalise();
+
         //Ogre::MaterialPtr plane_mat = Ogre::MaterialManager::getSingleton().create("mapgrid", "General");
         //plane_mat->getTechnique(0)->getPass(0)->createTextureUnitState("mapgrid.tga");
@@ -178 +182 @@
         plane_ent->setMaterialName("Map/Grid");
         planeNode_->attachObject(plane_ent);
+        
         planeNode_->scale(10,1,10);
+        planeNode_->attachObject(movablePlane_);
         //Ogre::Material plane_mat = Ogre::MaterialManager::getSingletonPtr()->getByName("rock");
         
@@ -272 +278 @@
                 this->Cam_->setPosition(0, 0, DISTANCE);
                 this->Cam_->pitch( (Degree)PITCH );
-                //this->CamNodeHelper_->lookAt(Vector3(0,0,0), Ogre::Node::TS_PARENT);
-                this->Cam_->setAutoTracking(true, this->playerShipNode_);
+                this->Cam_->lookAt(Vector3(0,0,0));
+                //this->Cam_->setAutoTracking(true, this->playerShipNode_);
             }
             
@@ -364 +370 @@
         Map::singletonMap_s->CamNodeHelper_->lookAt(Vector3(0,0,0), Ogre::Node::TS_PARENT);
 */
-        singletonMap_s->CamNode_->pitch( (Degree)(value.y * singletonMap_s->mouseLookSpeed_), Ogre::Node::TS_PARENT);
+        singletonMap_s->CamNode_->pitch( (Degree)(value.y * singletonMap_s->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
         
     }

code/branches/map/src/orxonox/overlays/map/Map.h

@@ -38 +38 @@
 #include <OgreOverlayManager.h>
 #include <OgreOverlayContainer.h>
+#include <OgreMovablePlane.h>
 
 #include <OgreBorderPanelOverlayElement.h>
@@ -114 +115 @@
         Ogre::SceneNode* playerShipNode_;
         Ogre::SceneNode* planeNode_;
-        
+        Ogre::MovablePlane* movablePlane_;
         int mouseLookSpeed_;
         bool isVisible_;
+     
+    friend class RadarViewable;
     };
 }

code/branches/map/src/util/SubString.cc

@@ -39 +39 @@
 
 #include "SubString.h"
+#include <stdio.h>
 
 namespace orxonox