Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1443 for code/branches


Ignore:
Timestamp:
May 27, 2008, 10:44:39 PM (16 years ago)
Author:
scheusso
Message:

the client stops now when conenction establishment fails —- testing with spaceship

Location:
code/branches/network/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/network/src/network/ClientConnection.h

    r1409 r1443  
    5454#define NETWORK_PORT 55556
    5555#define NETWORK_CLIENT_MAX_CONNECTIONS 5
    56 #define NETWORK_CLIENT_TIMEOUT 10000
     56#define NETWORK_CLIENT_TIMEOUT 1000
    5757#define NETWORK_SEND_WAIT 500
    5858#define NETWORK_CLIENT_CHANNELS 2
  • code/branches/network/src/orxonox/Orxonox.cc

    r1432 r1443  
    404404      client_g = network::Client::createSingleton(serverIp_, serverPort_);
    405405
    406     client_g->establishConnection();
     406    if(!client_g->establishConnection())
     407      return false;
    407408    client_g->tick(0);
    408409
  • code/branches/network/src/orxonox/objects/SpaceShip.cc

    r1431 r1443  
    484484        SpaceShip* this_ = getLocalShip();
    485485        this_->momentum_ = Radian(-this_->rotationAccelerationRadian_ * val);
     486        COUT(3) << "rotating val: " << val << " acceleration: " << this_->rotationAccelerationRadian_.valueDegrees() << std::endl;
    486487    }
    487488
  • code/branches/network/src/orxonox/objects/WorldEntity.cc

    r1425 r1443  
    8585            this->rotationRate_ += (dt * this->momentum_);
    8686            this->rotate(this->rotationAxis_, dt * this->rotationRate_);
     87            COUT(3) << "rotationrate: " << this->rotationRate_.valueDegrees() << " momentum: " << this->momentum_.valueDegrees() << std::endl;
    8788        }
    8889    }
     
    138139      registerVar( (void*) &(this->getOrientation().z), sizeof(this->getOrientation().z), network::DATA, 0x3);
    139140      // register velocity_
    140       registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA, 0x3);
     141      /*registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA, 0x3);
    141142      registerVar( (void*) &(this->getVelocity().y), sizeof(this->getVelocity().y), network::DATA, 0x3);
    142143      registerVar( (void*) &(this->getVelocity().z), sizeof(this->getVelocity().z), network::DATA, 0x3);
     
    145146      registerVar( (void*) &(this->getRotationAxis().x), sizeof(this->getRotationAxis().x), network::DATA, 0x3);
    146147      registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA, 0x3);
    147       registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA, 0x3);
     148      registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA, 0x3);*/
    148149      // register scale of node
    149150      registerVar( (void*) &(this->getScale().x), sizeof(this->getScale().x), network::DATA, 0x3);
Note: See TracChangeset for help on using the changeset viewer.