Changeset 7567 in orxonox.OLD

Timestamp:

May 10, 2006, 1:44:33 PM (18 years ago)

Author:

rennerc

Message:

removed some output of heightMap. commented out old code in networkGameManager

Location:

branches/network/src/lib

Files:

• graphics/importer/height_map.cc (modified) (1 diff)
• network/network_game_manager.cc (modified) (27 diffs)
• network/network_game_manager.h (modified) (5 diffs)

branches/network/src/lib/graphics/importer/height_map.cc

@@ -595 +595 @@
  float c = normalVectorField [(xInt)][yInt].y;
 
- PRINTF(0)("a: %f \n" ,a);
-  PRINTF(0)("b: %f \n" ,b);
-   PRINTF(0)("c: %f \n" ,c);
+// PRINTF(0)("a: %f \n" ,a);
+//  PRINTF(0)("b: %f \n" ,b);
+//   PRINTF(0)("c: %f \n" ,c);
 
  height -= ( (a/c)*(x) + (b/c)*(y));
 
- PRINTF(0)("height: %f \n" ,height );
+// PRINTF(0)("height: %f \n" ,height );
  return (height + offsetZ);
 }

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

@@ -61 +61 @@
 NetworkGameManager::~NetworkGameManager()
 {
+#if 0
   for ( int i = 0; i<outBuffer.size(); i++)
   {
@@ -66 +67 @@
       delete outBuffer[i].buffer;
   }
-
-}
-
-
+#endif
+
+}
+
+#if 0
 int NetworkGameManager::writeBytes(const byte* data, int length, int sender)
 {
@@ -154 +156 @@
   return i;
 }
-
+#endif
+
+#if 0
 int NetworkGameManager::readBytes(byte* data, int maxLength, int * reciever)
 {
@@ -186 +190 @@
   return 0;
 }
-
+#endif
+
+#if 0
 void NetworkGameManager::writeDebug() const
 {
@@ -194 +200 @@
 {
 }
+#endif
 
 
@@ -214 +221 @@
   else
   {
+#if 0
     this->requestCreateEntity( classID );
+#endif
     return -1;
   }
@@ -282 +291 @@
   else
   {
+#if 0
     this->requestRemoveEntity( uniqueID );
-  }
-}
-
-
-
+#endif
+  }
+}
+
+
+#if 0
 /*!
  * Creates the needed entity on the server if possible
@@ -305 +316 @@
   }
 }
-
+#endif
+
+#if 0
 /*!
  * Removes the specified entity on the server
@@ -323 +336 @@
   }
 }
+#endif
 
 /*!
@@ -331 +345 @@
 int NetworkGameManager::executeCreateEntity(ClassID classID, int uniqueID, int owner)
 {
+#if 0
   for ( int i = 0; i<outBuffer.size(); i++)
   {
@@ -345 +360 @@
       return -1;
   }
-
+#endif
   PRINTF(0)("ExecuteCreateEntity: server side: classID: %x, uniqueID: %i, owner: %i\n", classID, uniqueID, owner);
   doCreateEntity( classID, uniqueID, owner );
@@ -359 +374 @@
 void NetworkGameManager::executeRemoveEntity(int uniqueID)
 {
+#if 0
   for ( int i = 0; i<outBuffer.size(); i++)
   {
@@ -369 +385 @@
       return;
   }
+#endif
 
   doRemoveEntity(uniqueID);
@@ -382 +399 @@
 }
 
+#if 0
 /*!
  * Sends the Entities to the new connected client
@@ -437 +455 @@
   signalNewPlayer( userID );
 }
+#endif
 
 
@@ -442 +461 @@
 bool NetworkGameManager::signalNewPlayer(int userId)
 {
+#if 0
   if ( userId >= outBuffer.size() )
     resizeBufferVector( userId );
@@ -450 +470 @@
   PRINTF(0)("Request for creation: userid: %i, uniqueid: %i\n", userId, uniqueId);
   this->sendYouAre(uniqueId, userId);
-
+#endif
 }
 
@@ -472 +492 @@
 }
 
-
+#if 0
 /**
  * Creates a buffer for user n
@@ -492 +512 @@
   }
 }
+#endif
 
 /**
@@ -594 +615 @@
 }
 
-
+#if 0
 /**
  * Copies length bytes to the clientBuffer with error checking
@@ -613 +634 @@
   return true;
 }
-
+#endif
+
+#if 0
 /**
  * Reads data from clientBuffer with error checking
@@ -632 +655 @@
   return true;
 }
+#endif
 
 /**
@@ -685 +709 @@
   if ( !isServer() )
     return;
-
+#if 0
   if ( userID != 0 )
   {
@@ -696 +720 @@
   else
   {
+#endif
     doYouAre(uniqueID);
-  }
+#if 0
+  }
+#endif
+
 }
 
@@ -911 +939 @@
 }
 
-
+#if 0
 bool NetworkGameManager::writeToClientBuffer( clientBuffer & cb, byte b )
 {
@@ -924 +952 @@
   return true;
 }
+
 
 bool NetworkGameManager::writeToClientBuffer( clientBuffer & cb, int i )
@@ -938 +967 @@
   return true;
 }
-
-
+#endif
+
+

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

@@ -76 +76 @@
     { if (!NetworkGameManager::singletonRef) NetworkGameManager::singletonRef = new NetworkGameManager(); return NetworkGameManager::singletonRef; }
 
+#if 0
     virtual int writeBytes(const byte* data, int length, int sender);
     virtual int readBytes(byte* data, int maxLength, int * reciever);
     virtual void writeDebug() const;
     virtual void readDebug() const;
+#endif
 
     int createEntity( ClassID classID, int owner = 0 );
@@ -86 +88 @@
     void sendYouAre( int uniqueID, int userID );
 
+#if 0
     void sendEntityList(int userID);
+#endif
 
     bool signalNewPlayer(int userId);
@@ -109 +113 @@
 
     /* some network handlers helper functions */
-    void requestCreateEntity(ClassID classID);
+//    void requestCreateEntity(ClassID classID);
     int executeCreateEntity(ClassID classID, int uniqueID = 0, int owner = 0);
     BaseObject* doCreateEntity(ClassID classID, int uniqueID, int owner);
 
-    void requestRemoveEntity(int uniqueID);
+//    void requestRemoveEntity(int uniqueID);
     void executeRemoveEntity(int uniqueID);
     void doRemoveEntity(int uniqueID);
@@ -119 +123 @@
     void doYouAre( int uniqueID );
 
-    void requestPNodePath(const PNode* node1, const PNode* node2);
+//    void requestPNodePath(const PNode* node1, const PNode* node2);
     void executeRequestPNodePath(const PNode* node2, const PNode* node2);
     void doRequestPNodePath(const PNode* node1, const PNode* node2);
 
     bool canCreateEntity(ClassID classID);
+#if 0
+    void resizeBufferVector(int n);
 
-    void resizeBufferVector(int n);
 
     bool writeToClientBuffer( clientBuffer &cb, byte*data, int length );
@@ -131 +136 @@
     bool writeToClientBuffer( clientBuffer &cb, int i );
     bool readFromClientBuffer( clientBuffer &cb, byte*data, int length );
-
+#endif
 
   private:
+#if 0
     std::vector<clientBuffer>     outBuffer;
     //clientBuffer                  allOutBuffer;
+#endif
     static NetworkGameManager*    singletonRef;
     bool                          hasRequestedWorld;