Changeset 1245 for code/branches/network3/src/orxonox

Timestamp:

May 7, 2008, 4:39:42 PM (17 years ago)

Author:

scheusso

Message:

different enhancements in input/network handling and synchronisation

Location:

code/branches/network3/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (11 diffs)
• WorldEntity.cc (modified) (2 diffs)

code/branches/network3/src/orxonox/objects/SpaceShip.cc

@@ -104 +104 @@
         this->setRotationAxis(1, 0, 0);
         this->setStatic(false);
-/*
-        this->moveForward_ = 0;
-        this->rotateUp_ = 0;
-        this->rotateDown_ = 0;
-        this->rotateRight_ = 0;
-        this->rotateLeft_ = 0;
-        this->loopRight_ = 0;
-        this->loopLeft_ = 0;
-        this->brakeForward_ = 0;
-        this->brakeRotate_ = 0;
-        this->brakeLoop_ = 0;
-        this->speedForward_ = 0;
-        this->speedRotateUpDown_ = 0;
-        this->speedRotateRightLeft_ = 0;
-        this->speedLoopRightLeft_ = 0;
-        this->maxSpeedForward_ = 0;
-        this->maxSpeedRotateUpDown_ = 0;
-        this->maxSpeedRotateRightLeft_ = 0;
-        this->maxSpeedLoopRightLeft_ = 0;
-        this->accelerationForward_ = 0;
-        this->accelerationRotateUpDown_ = 0;
-        this->accelerationRotateRightLeft_ = 0;
-        this->accelerationLoopRightLeft_ = 0;
-
-        this->speed = 250;
-        this->loop = 100;
-        this->rotate = 10;
-        this->mouseX = 0;
-        this->mouseY = 0;
-        this->maxMouseX = 0;
-        this->minMouseX = 0;
-        this->moved = false;
-
-        this->brakeRotate(rotate*10);
-        this->brakeLoop(loop);
-*/
-//         this->create();
 
 
@@ -161 +124 @@
 
     void SpaceShip::registerAllVariables(){
-      registerVar( &camName_, camName_.length()+1, network::STRING);
+      registerVar( &camName_, camName_.length()+1, network::STRING, 0x1);
+      registerVar( &maxSpeed_, sizeof(maxSpeed_), network::DATA, 0x1);
+      registerVar( &maxSideAndBackSpeed_, sizeof(maxSideAndBackSpeed_), network::DATA, 0x1);
+      registerVar( &maxRotation_, sizeof(maxRotation_), network::DATA, 0x1);
+      registerVar( &translationAcceleration_, sizeof(translationAcceleration_), network::DATA, 0x1);
+      registerVar( &rotationAcceleration_, sizeof(rotationAcceleration_), network::DATA, 0x1);
+      registerVar( &rotationAccelerationRadian_, sizeof(rotationAccelerationRadian_), network::DATA, 0x1);
+      registerVar( &translationDamping_, sizeof(translationDamping_), network::DATA, 0x1);
+      registerVar( &rotationDamping_, sizeof(rotationDamping_), network::DATA, 0x1);
+      registerVar( &rotationDampingRadian_, sizeof(rotationDampingRadian_), network::DATA, 0x1);
+      
     }
 
     void SpaceShip::init()
     {
-        COUT(4) << "================ \t\t\t\tspaceship::init" << std::endl;
+//         COUT(4) << "================ \t\t\t\tspaceship::init" << std::endl;
         // START CREATING THRUSTER
         this->tt_ = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
@@ -197 +170 @@
         this->greenNode_->setInheritScale(false);
 
-        COUT(4) << "attaching red billboard" << std::endl;
+//         COUT(4) << "attaching red billboard" << std::endl;
         this->redNode_->attachObject(this->redBillboard_.getBillboardSet());
         this->redNode_->setScale(0.3, 0.3, 0.3);
 
-        COUT(4) << "attaching green billboard" << std::endl;
+//         COUT(4) << "attaching green billboard" << std::endl;
         this->greenNode_->attachObject(this->greenBillboard_.getBillboardSet());
         this->greenNode_->setScale(0.3, 0.3, 0.3);
@@ -215 +188 @@
         this->chFarNode_->setInheritScale(false);
 
-        COUT(4) << "attaching crosshair near billboard" << std::endl;
+//         COUT(4) << "attaching crosshair near billboard" << std::endl;
         this->chNearNode_->attachObject(this->crosshairNear_.getBillboardSet());
         this->chNearNode_->setScale(0.2, 0.2, 0.2);
 
-        COUT(4) << "attaching crosshair far billboard" << std::endl;
+//         COUT(4) << "attaching crosshair far billboard" << std::endl;
         this->chFarNode_->attachObject(this->crosshairFar_.getBillboardSet());
         this->chFarNode_->setScale(0.4, 0.4, 0.4);
-        COUT(4) << "attaching camera" << std::endl;
+//         COUT(4) << "attaching camera" << std::endl;
         
         createCamera();
@@ -237 +210 @@
     void SpaceShip::loadParams(TiXmlElement* xmlElem)
     {
-      COUT(4) << "using loadparams" << std::endl;
+//       COUT(4) << "using loadparams" << std::endl;
         Model::loadParams(xmlElem);
         this->create();
@@ -303 +276 @@
     
     void SpaceShip::createCamera(){
-      COUT(4) << "begin camera creation" << std::endl;
+//       COUT(4) << "begin camera creation" << std::endl;
       this->camNode_ = this->getNode()->createChildSceneNode(camName_);
       COUT(4) << "position: (this)" << this->getNode()->getPosition() << std::endl;
@@ -313 +286 @@
       cam->lookAt(Vector3(0,20,0));
       cam->roll(Degree(0));
-      */COUT(4) << "creating new camera" << std::endl;
+      *//*COUT(4) << "creating new camera" << std::endl;*/
       cam_ = new Camera(this->camNode_);
-      COUT(4) << "setting target node" << std::endl;
+//       COUT(4) << "setting target node" << std::endl;
       cam_->setTargetNode(this->getNode());
       // this only applies to clients
-      if(network::Client::getSingleton()!=0 && network::Client::getSingleton()->getShipID()==objectID)
+      if(network::Client::getSingleton()!=0 && network::Client::getSingleton()->getShipID()==objectID){
+        this->setBacksync(true);
         CameraHandler::getInstance()->requestFocus(cam_);
+      }
 //        cam->setPosition(Vector3(0,-350,0));
       //cam->roll(Degree(-90));
 
       //this->camNode_->attachObject(cam);
-      COUT(4) << "created camera" << std::endl;
+//       COUT(4) << "created camera" << std::endl;
     }
 
@@ -460 +435 @@
     {
         // only do this if not client TODO: remove this hack
-      if (!network::Client::getSingleton() && InputManager::getSingleton().getMouse()->getEventCallback() != this)
+      if ((!network::Client::getSingleton() || network::Client::getSingleton()->getShipID()==objectID ) && InputManager::getSingleton().getMouse()->getEventCallback() != this)
         {
             if (InputManager::getSingleton().getMouse())
@@ -485 +460 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
-            new Projectile(this);
+            Projectile *p = new Projectile(this);
+            p->setBacksync(true);
             this->timeToReload_ = this->reloadTime_;
         }
@@ -560 +536 @@
 
         if(!network::Client::getSingleton() || network::Client::getSingleton()->getShipID() == objectID){
+          COUT(4) << "steering our ship: " << objectID << " mkeyboard: " << mKeyboard << std::endl;
           if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
               this->acceleration_.x = this->translationAcceleration_;
@@ -580 +557 @@
           else
               this->momentum_ = 0;
-        }
+        }/*else
+          COUT(4) << "not steering ship: " << objectID << " our ship: " << network::Client::getSingleton()->getShipID() << std::endl;*/
 
         WorldEntity::tick(dt);

code/branches/network3/src/orxonox/objects/WorldEntity.cc

@@ -81 +81 @@
         if (!this->bStatic_)
         {
+//             COUT(4) << "acceleration: " << this->acceleration_ << " velocity: " << this->velocity_ << std::endl;
             this->velocity_ += (dt * this->acceleration_);
             this->translate(dt * this->velocity_, Ogre::Node::TS_LOCAL);
@@ -222 +223 @@
       //register acceleration
       // register velocity_
-      registerVar( (void*) &(this->getAcceleration().x), sizeof(this->getAcceleration().x), network::DATA, 0x3);
-      registerVar( (void*) &(this->getAcceleration().y), sizeof(this->getAcceleration().y), network::DATA, 0x3);
-      registerVar( (void*) &(this->getAcceleration().z), sizeof(this->getAcceleration().z), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getAcceleration().x), sizeof(this->getAcceleration().x), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getAcceleration().y), sizeof(this->getAcceleration().y), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getAcceleration().z), sizeof(this->getAcceleration().z), network::DATA, 0x3);
     }