Changeset 8120 in orxonox.OLD for branches

Timestamp:

Jun 2, 2006, 4:19:10 PM (18 years ago)

Author:

rennerc

Message:

spectator movement works now
old Playables will be deleted
teamchoice random works now

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• lib/network/network_game_manager.h (modified) (3 diffs)
• lib/network/network_manager.cc (modified) (2 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/spectator.cc (modified) (2 diffs)
• world_entities/spectator.h (modified) (1 diff)

branches/network/src/lib/network/network_game_manager.cc

@@ -161 +161 @@
     {
       if ( (*it)->isA(CL_PLAYABLE) )
+      {
+        getInstance()->playablesToDelete.push_back( dynamic_cast<Playable*>(*it) );
         return true;
+      }
         
       delete dynamic_cast<Synchronizeable*>(*it);
@@ -238 +241 @@
 }
 
-
-
-
+/**
+ * this function will be called periodically by networkManager
+ * @param ds time elapsed since last call of tick
+ */
+void NetworkGameManager::tick( float ds )
+{
+  //delete playables if they are not assigned to local player anymore
+  for ( std::list<Playable*>::iterator it = playablesToDelete.begin(); it != playablesToDelete.end();  )
+  {
+    if ( State::getPlayer()->getPlayable() != *it )
+    {
+      PRINTF(0)("Delete unused playable: %s owner: %d\n", (*it)->getClassName(), (*it)->getOwner() );
+      std::list<Playable*>::iterator delit = it;
+      it++;
+      delete *delit;
+      playablesToDelete.erase( delit );
+      continue;
+    }
+    it++;
+  }
+}
+
+
+
+

branches/network/src/lib/network/network_game_manager.h

@@ -12 +12 @@
 /* include base_object.h since all classes are derived from this one */
 #include "synchronizeable.h"
+#include "playable.h"
 #include "message_manager.h"
 
@@ -61 +62 @@
     inline void setGameState( int gameState ){ this->gameState = gameState; }
     inline int getGameState(){ return this->gameState; }
+    
+    void tick( float ds );
 
   private:
@@ -73 +76 @@
     
     int                           gameState;
+    
+    std::list<Playable*>          playablesToDelete;
 };
 

branches/network/src/lib/network/network_manager.cc

@@ -30 +30 @@
 #include "preferences.h"
 #include "network_log.h"
+#include "network_game_manager.h"
 
 
@@ -149 +150 @@
         static_cast<NetworkStream*>(*stream)->processData();
   }
+  
+  NetworkGameManager::getInstance()->tick( this->elapsedTime );
 }
 

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -431 +431 @@
       if ( stats.getPreferedTeamId() == TEAM_RANDOM )
       {
-        stats.setPreferedTeamId( getTeamForNewUser() );
+        stats.setPreferedTeamId( getRandomTeam() );
         teamChange( stats.getUserId() );
       }

branches/network/src/world_entities/playable.cc

@@ -79 +79 @@
   // this->setPlayer(NULL);
   // IN ITS DESTRUCTOR.
-  detachCamera();
+  
   assert(this->currentPlayer == NULL);
 }
@@ -283 +283 @@
 void  Playable::detachCamera()
 {
-  PRINTF(0)("detach camera\n");
-  if ( (PNode*)(State::getCameraTarget()) == this )
-  {
-    PRINTF(0)("lookAt nullParent\n");
-    
-    State::getCameraNode()->setParentSoft(PNode::getNullParent());
-    State::getCameraTargetNode()->setParentSoft(PNode::getNullParent());
-    
-    State::getCamera()->lookAt( PNode::getNullParent() );
-  }
 }
 

branches/network/src/world_entities/spectator.cc

@@ -71 +71 @@
 {
   this->mouseDir =  rot;
-  this->rotY = Quaternion( rot.getHeading(), Vector( 0, 1, 0) );
-  this->rotAxis = Quaternion( rot.getAttitude(), Vector( 0, 0, 1 ) );
+  this->angleY = rot.getHeading();
+  this->angleX = rot.getAttitude();
 }
 
@@ -104 +104 @@
     yMouse *= time / 10;
     
-    this->rotY *= Quaternion(-M_PI/4.0*this->xMouse, Vector(0,1,0));
-    this->rotAxis *= Quaternion(-M_PI/4.0*this->yMouse, Vector(0,0,1) );
-
-    this->mouseDir = rotY * rotAxis;
-    //this->mouseDir *= Quaternion(-M_PI/4.0*this->yMouse, Vector(0,0,1));
+    angleX -= xMouse;
+    angleY -= yMouse;
+    
+    if ( angleY > 2.05 )
+      angleY = 2.05;
+    
+    if ( angleY < -1.15 )
+      angleY = -1.15;
+    
+    this->mouseDir = Quaternion( angleX, Vector( 0, 1, 0 ) ) * Quaternion( angleY, Vector( 0, 0, 1 ) );
+    
     xMouse = yMouse = 0;
   }
   
   this->setAbsDir( this->mouseDir );
+  
+  Vector velocity;
+  
+  if ( this->bForward )
+  {
+    velocity += this->getAbsDirX();
+  }
+  
+  if ( this->bBackward )
+  {
+    velocity -= this->getAbsDirX();
+  }
+  
+  if ( this->bRight )
+  {
+    velocity += this->getAbsDirZ();
+  }
+  
+  if ( this->bLeft )
+  {
+    velocity -= this->getAbsDirZ();
+  }
+  
+  velocity *= 100;
+  
+  this->shiftCoor( velocity*time );
 }
 

branches/network/src/world_entities/spectator.h

@@ -35 +35 @@
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
 
-    Quaternion            rotY;
-    Quaternion            rotAxis;
+    //Quaternion            rotY;
+    //Quaternion            rotAxis;
+    float                 angleX;
+    float                 angleY;
 };