Changeset 10092 in orxonox.OLD

Timestamp:

Dec 18, 2006, 8:39:38 PM (17 years ago)

Author:

muellmic

Message:

work of last week: radar set-up, Gui- Widget class draws itself according to Dir of 2d- element.

Location:

branches/playability/src

Files:

• lib/gui/gl/glgui_widget.cc (modified) (1 diff)
• lib/gui/gl/glgui_widget.h (modified) (1 diff)
• util/hud.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/playability/src/lib/gui/gl/glgui_widget.cc

@@ -915 +915 @@
   }
 
+  void GLGuiWidget::beginDraw() const 
+  { 
+    glPushMatrix(); 
+    glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
+    glRotatef(this->getAbsDir2D(), 0, 0, 1);
+  }
+
 
 }

branches/playability/src/lib/gui/gl/glgui_widget.h

@@ -244 +244 @@
 
     /// RENDERING
-    inline void beginDraw() const { glPushMatrix(); glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0); };
+    void beginDraw() const;
     inline void endDraw() const { glPopMatrix(); };
 

branches/playability/src/util/hud.cc

@@ -105 +105 @@
   {
     this->energyWidget->show();
-    this->energyWidget->setBackgroundTexture( "hud_energy_background.png");
+    //this->energyWidget->setBackgroundTexture( "hud_energy_background.png");
+    this->energyWidget->shiftDir2D(270);
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
         this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
@@ -219 +220 @@
     PRINTF(4)("UPDATING RADAR\n");
     this->_radar->setCenterNode(State::getPlayer()->getPlayable());
-    this->_radar->addEntityList(&State::getObjectManager()->getEntityList((OM_LIST)(State::getPlayer()->getPlayable()->getOMListNumber()+1)), Color(.4, .4, 1.0));
-    this->_radar->addEntityList(&State::getObjectManager()->getEntityList(OM_GROUP_02), Color(1.0, .2, .2));
+    //this->_radar->addEntityList(&State::getObjectManager()->getEntityList((OM_LIST)(State::getPlayer()->getPlayable()->getOMListNumber()+1)), Color(.4, .4, 1.0));
+    this->_radar->addEntityList(&State::getObjectManager()->getEntityList(OM_GROUP_00), Color(1, 0, 0));
+    this->_radar->addEntityList(&State::getObjectManager()->getEntityList(OM_GROUP_01), Color(0, 0, 1));
     this->_radar->setAbsCoor2D(0.8 * this->resX, 0.01 * this->resY);
     this->_radar->setWidgetSize(0.2 * this->resX, 0.2 * this->resY);
@@ -230 +232 @@
   if (this->energyWidget != NULL)
   {
-    this->energyWidget->setAbsCoor2D(0.0 * this->resX, 0.85 * this->resY);
+    this->energyWidget->setAbsCoor2D(0.2 * this->resX, 0.85 * this->resY);
     this->energyWidget->setWidgetSize(.25 * this->resX, 0.1 * this->resY);
   }

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -953 +953 @@
       PRINTF(4)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassCName());
   }
+  
+  this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
+  this->shiftCoor (this->velocity * dt);
+  
+  float angle = this->velocity.z / travelSpeed * pi / 3;
+  if (angle > pi/4) angle = pi/4;
+  if (angle < -pi/4) angle = -pi/4;
+  this->setRelDirSoft(Quaternion(angle, Vector(1,0,0)), 5.0f);
 }