Changeset 6928

Timestamp:

May 20, 2010, 11:33:07 AM (14 years ago)

Author:

scheusso

Message:

mergine chat2 into presentation merger branch

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• data/defaultConfig/keybindings.ini (modified) (1 diff)
• data/gui/layouts/ChatBox-inputonly.layout (copied) (copied from code/branches/chat2/data/gui/layouts/ChatBox-inputonly.layout)
• data/gui/layouts/ChatBox.layout (copied) (copied from code/branches/chat2/data/gui/layouts/ChatBox.layout)
• data/gui/schemes/OrxonoxGUIScheme.scheme (modified) (1 diff)
• data/gui/scripts/ChatBox-inputonly.lua (copied) (copied from code/branches/chat2/data/gui/scripts/ChatBox-inputonly.lua)
• data/gui/scripts/ChatBox.lua (copied) (copied from code/branches/chat2/data/gui/scripts/ChatBox.lua)
• src/libraries/network/ChatListener.cc (modified) (1 diff)
• src/libraries/network/ChatListener.h (modified) (1 diff)
• src/libraries/network/Host.h (modified) (1 diff)
• src/libraries/network/packet/Chat.cc (modified) (2 diffs)
• src/libraries/network/packet/Chat.h (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/ChatHistory.cc (copied) (copied from code/branches/chat2/src/orxonox/ChatHistory.cc)
• src/orxonox/ChatHistory.h (copied) (copied from code/branches/chat2/src/orxonox/ChatHistory.h)
• src/orxonox/ChatInputHandler.cc (copied) (copied from code/branches/chat2/src/orxonox/ChatInputHandler.cc)
• src/orxonox/ChatInputHandler.h (copied) (copied from code/branches/chat2/src/orxonox/ChatInputHandler.h)
• src/orxonox/graphics/CEGuiSample.cc (copied) (copied from code/branches/chat2/src/orxonox/graphics/CEGuiSample.cc)
• src/orxonox/graphics/CEGuiSample.h (copied) (copied from code/branches/chat2/src/orxonox/graphics/CEGuiSample.h)

code/branches/presentation3/data/defaultConfig/keybindings.ini

@@ -7 +7 @@
 KeyApostrophe=
 KeyApps=
-KeyB=
+KeyB =
 KeyBack=
 KeyBackslash=

code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme

@@ -6 +6 @@
     <Font Name="BlueHighway-10" Filename="bluehighway-10.font" />
     <Font Name="BlueHighway-8"  Filename="bluehighway-8.font"  />
+    <Font Name="Monofur-10"     Filename="Monofur-10.font" />
 </GUIScheme>

code/branches/presentation3/src/libraries/network/ChatListener.cc

@@ -36 +36 @@
         RegisterRootObject(ChatListener);
     }
+
+    //void ChatListener::incomingChat( const std::string& message,
+      //unsigned int senderID )
+    //{
+      //COUT(0) << "Chat: \"" << message << "\"\n";
+
+
+    //}
+
+
 }
 

code/branches/presentation3/src/libraries/network/ChatListener.h

@@ -38 +38 @@
     {
         public:
+            /* constructor, destructor */
             ChatListener();
             virtual ~ChatListener() {}
 
+            /* What to do with incoming chat */
             virtual void incomingChat(const std::string& message, unsigned int senderID) = 0;
     };

code/branches/presentation3/src/libraries/network/Host.h

@@ -49 +49 @@
 class _NetworkExport Host{
   private:
-    //TODO add theese functions or adequate
+    //TODO add these functions or adequate
     //virtual bool processChat(packet::Chat *message, unsigned int clientID)=0;
     //virtual bool sendChat(packet::Chat *chat)=0;

code/branches/presentation3/src/libraries/network/packet/Chat.cc

@@ -37 +37 @@
 
 #define   PACKET_FLAGS_CHAT PacketFlag::Reliable
+
+/* Some lengths */
 #define   _PACKETID         0
 const int _PLAYERID     =   _PACKETID + sizeof(Type::Value);
@@ -45 +47 @@
  : Packet()
 {
+  /* Add chat flag to packet flags */
   flags_ = flags_ | PACKET_FLAGS_CHAT;
+
+  /* set message length to length of input string + 1 */
   messageLength_ = message.length()+1;
+
+  /* allocate memory for the data */
   data_=new unsigned char[ getSize() ];
+
   *(Type::Value *)(data_ + _PACKETID ) = Type::Chat;
   *(unsigned int *)(data_ + _PLAYERID ) = playerID;
   *(unsigned int *)(data_ + _MESSAGELENGTH ) = messageLength_;
+
+  /* cast the hell out of the message string, and copy it into the 
+   * data buffer. 
+   */
   memcpy( data_+_MESSAGE, static_cast<void*>(const_cast<char*>(message.c_str())), messageLength_ );
 }

code/branches/presentation3/src/libraries/network/packet/Chat.h

@@ -41 +41 @@
 {
 public:
+  /* constructors */
   Chat( const std::string& message, unsigned int playerID );
   Chat( uint8_t* data, unsigned int clientID );
+
+  /* destructor */
   ~Chat();
 
+  /* get size of packet */
   inline unsigned int getSize() const;
+
+  /* process chat message packet and remove it afterwards */
   bool process();
 
+  /* Get the length of the message (not the full size of the packet) */
   unsigned int getMessageLength(){ return messageLength_; };
+
+  /* return message content */
   unsigned char *getMessage();
+
 private:
+
+  /* Message length */
   uint32_t messageLength_;
+
+  /* Client ID (an integral value for identification) */
   unsigned int clientID_;
 };

code/branches/presentation3/src/orxonox/CMakeLists.txt

@@ -32 +32 @@
   PlayerManager.cc
   Radar.cc
+  ChatHistory.cc
+  ChatInputHandler.cc
 COMPILATION_BEGIN SceneCompilation.cc
   CameraManager.cc