Changeset 10099 in orxonox.OLD for branches/playability/src

Timestamp:

Dec 19, 2006, 5:13:25 PM (18 years ago)

Author:

muellmic

Message:

conflict at end of movement switch resolved for 10012312112th time =S. but now: track implementation causes SIGSEV crash.

Location:

branches/playability/src/world_entities

Files:

• elements/glgui_energywidget.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (3 diffs)

branches/playability/src/world_entities/elements/glgui_energywidget.h

@@ -26 +26 @@
     void setValue(float value);
 
+    inline GLGuiWidget* getNameWidget() {return &this->_name;};
+    inline GLGuiWidget* getValueWidget() {return &this->_valueText;};
+    inline GLGuiWidget* getBarWidget() {return &this->_bar;};
+
   protected:
     virtual void resize();

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

@@ -926 +926 @@
         this->setRelDirSoft(Quaternion(0, Vector(1,0,0)), 6);
       }
-      
-
-      this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
-      this->shiftCoor (this->travelVelocity * dt);
 
     //normalisation of the vectors (vector sum must be <= travelspeed)
@@ -939 +935 @@
     }
 
-    //this moves camera and ship along the travel path. 
+    //this moves camera and ship along the travel path.
     this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
-    
-    //set new coordinates calculated through key- events. 
-    this->shiftCoor (this->travelVelocity * dt);
+
     break;
     }
@@ -951 +945 @@
       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));
+   //set new coordinates calculated through key- events.
   this->shiftCoor (this->travelVelocity * dt);
-
-  float angle = this->travelVelocity.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);
-*/
-  
 }