Changeset 9002 in orxonox.OLD for trunk/src

Timestamp:

Jul 2, 2006, 12:47:18 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: redirect everything to see into the dof of the _centerNode

Location:

trunk/src/world_entities

Files:

• elements/glgui_radar.cc (modified) (2 diffs)
• player.h (modified) (2 diffs)
• weapons/test_gun.cc (modified) (1 diff)

trunk/src/world_entities/elements/glgui_radar.cc

@@ -114 +114 @@
         if (_centerNode->distance(*it) < this->_range)
         {
-          this->_dotLists[i].positions.push_back(Vector2D(this->getSizeX2D() / 2.0f, this->getSizeY2D() / 2.0f) + Vector2D((_centerNode->getAbsCoor().x - (*it)->getAbsCoor().x) * this->getSizeX2D(), (_centerNode->getAbsCoor().z - (*it)->getAbsCoor().z) * this->getSizeY2D())/ (2.0f * _range));
+          this->_dotLists[i].positions.push_back(Vector2D(((*it)->getAbsCoor().x - _centerNode->getAbsCoor().x) * this->getSizeX2D() ,
+                                                 ((*it)->getAbsCoor().z - _centerNode->getAbsCoor().z) * this->getSizeY2D()  )
+                                                 / (2.0f * _range));
         }
 
@@ -128 +130 @@
     GLGuiWidget::draw();
 
-    glPointSize(2.0f);
-    for (unsigned int i = 0; i < this->_dotLists.size(); ++i)
+    if (likely(this->_centerNode != NULL))
     {
-      glColor4fv(&_dotLists[i].dotColor[0]);
-      for (unsigned int j = 0; j < this->_dotLists[i].positions.size(); ++j)
+      glTranslatef(this->getSizeX2D()/2.0f, this->getSizeY2D()/2.0f, 0);
+      glRotatef((this->_centerNode->getAbsDir().getHeading() - M_PI_2)* 180.0 /M_PI , 0, 0, 1);
+
+      glPointSize(2.0f);
+      for (unsigned int i = 0; i < this->_dotLists.size(); ++i)
       {
-        glBegin(GL_POINTS);
-        glVertex2f(this->_dotLists[i].positions[j].x, this->_dotLists[i].positions[j].y);
-        glEnd();
+        glColor4fv(&_dotLists[i].dotColor[0]);
+        for (unsigned int j = 0; j < this->_dotLists[i].positions.size(); ++j)
+        {
+          glBegin(GL_POINTS);
+          glVertex2f(this->_dotLists[i].positions[j].x, this->_dotLists[i].positions[j].y);
+          glEnd();
+        }
       }
     }

trunk/src/world_entities/player.h

@@ -32 +32 @@
     inline Playable*  getPlayable() const  { return this->playable; };
 
+//     inline Hud& hud() { return this->_hud; };
+//     inline const Hud& hud() const { return this->_hud; };
+
+
     void              weaponConfigChanged();
 
@@ -38 +42 @@
 
   private:
-    Playable*         playable;                  //!< The one we controll or NULL if none
-    Hud               hud;                       //!< The HUD to be displayed for this Player.
+    Playable*         playable;                 //!< The one we controll or NULL if none
+    Hud               hud;                      //!< The HUD to be displayed for this Player.
 };
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -120 +120 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setEnergyMax(1000);
-  this->increaseEnergy(1000);
+  this->setEnergyMax(10000);
+  this->increaseEnergy(10000);
   //this->minCharge = 2;