Changeset 2976 for code/branches/netp2
- Timestamp:
- May 13, 2009, 3:14:08 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.cc
r2974 r2976 334 334 { 335 335 MobileEntity::tick(dt); 336 // COUT(0) << this->common_angular_velocity_ << endl;337 336 338 337 if (this->isActive()) … … 347 346 this->common_linear_velocity_ = this->getVelocity(); 348 347 this->common_angular_velocity_ = this->getAngularVelocity(); 349 COUT(0) << "tick " << this->common_angular_velocity_ << endl;350 348 // } 351 349 // else if (this->bHasLocalController_) … … 381 379 registerVariable(this->common_linear_velocity_, variableDirection::serverMaster, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerLinearVelocity), true); 382 380 registerVariable(this->common_orientation_, variableDirection::serverMaster, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerOrientation), true); 383 //registerVariable(this->common_angular_velocity_, variableDirection::serverMaster, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerAngularVelocity), true);381 registerVariable(this->common_angular_velocity_, variableDirection::serverMaster, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processServerAngularVelocity), true); 384 382 385 383 registerVariable(this->playerID_, variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedplayerID)); … … 409 407 if (!this->bHasLocalController_) 410 408 MobileEntity::setAngularVelocity(this->common_angular_velocity_); 411 COUT(0) << "process " << this->common_angular_velocity_ << endl;412 409 } 413 410 … … 512 509 MobileEntity::setAngularVelocity(velocity); 513 510 this->common_angular_velocity_ = this->getAngularVelocity(); 514 COUT(0) << "setav " << this->common_angular_velocity_ << endl;515 511 // ++this->server_overwrite_; 516 512 // } … … 531 527 this->common_linear_velocity_ = this->getVelocity(); 532 528 this->common_angular_velocity_ = this->getAngularVelocity(); 533 COUT(0) << "setwt " << this->common_angular_velocity_ << endl;534 529 // } 535 530 // else if (this->bHasLocalController_)
Note: See TracChangeset
for help on using the changeset viewer.