Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1290


Ignore:
Timestamp:
May 15, 2008, 4:55:05 PM (17 years ago)
Author:
FelixSchulthess
Message:

corrected syntax

Location:
code/branches/hud3
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/hud3/bin/levels/sample.oxw

    r1279 r1290  
    1111<!--Ambient colourvalue="1,1,1" /-->
    1212<Skybox src="Orxonox/StarSkyBox" />
    13 <SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assf3.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
     13<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
    1414
    1515<NPC position="0,100,400" scale="1" mesh="razor.mesh"/>

  • code/branches/hud3/src/orxonox/console/InGameConsole.cc

    r1263 r1290  
    4343#include "core/InputManager.h"
    4444#include "GraphicsEngine.h"
     45// just for testing purposes
     46//#include "SpaceShip.h"
    4547
    4648#define LINES 20
    … …  
    8284
    8385    void InGameConsole::execute(){
     86/*// just for testing purposes
     87        if(consoleOverlayTextAreas[0]->getCaption() == ">")
     88                consoleOverlayTextAreas[0]->setCaption(SpaceShip::instance_s->getPosition().x
     89                        + "__" + SpaceShip::instance_s->getPosition().y
     90                        + "__" + SpaceShip::instance_s->getPosition().z);*/
    8491        newline();
    8592        if (!CommandExecutor::execute(this->ib_->get())){

  • code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc

    r1286 r1290  
    101101  }
    102102   
    103   void RadarOverlayElement::setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY, ortZ){
     103  void RadarOverlayElement::setMainShipPosition(int dirX, int dirY, int dirZ, int ortX, int ortY, int ortZ){
    104104    dirX_=dirX;
    105105    dirY_=dirY;

  • code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~

    r1286 r1290  
    101101  }
    102102   
    103   void setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY, ortZ){
     103  void RadarOverlayElement::setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY, ortZ){
    104104    dirX_=dirX;
    105105    dirY_=dirY;

  • code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h

    r1286 r1290  
    5454    bool right_;                //checks whether the object is on the right side (since cos is not bijective)
    5555   
    56     static int ID = 0;
     56    //static int ID = 0;
    5757
    5858  public:
    … …  
    6363
    6464    void initRadarOverlayElement(Real left, Real top, int dim, Ogre::OverlayContainer* container);
    65     void setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY, ortZ);
     65    void setMainShipPosition(int dirX, int dirY, int dirZ, int ortX, int ortY, int ortZ);
    6666   
    6767    int newShip(int X, int Y, int Z);

  • code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~

    r1286 r1290  
    5454    bool right_;                //checks whether the object is on the right side (since cos is not bijective)
    5555   
    56     static int ID;
     56    //static int ID = 0;
    5757
    5858  public:
Note: See TracChangeset for help on using the changeset viewer.