[Csp-commits] svn:csp r1033 - trunk/CSP/CSPSim/Include

[<sv...@ww...>]

Author: wolverine
Date: 2004-06-13 07:36:27 -0700 (Sun, 13 Jun 2004)
New Revision: 1033

Modified:
   trunk/CSP/CSPSim/Include/Networking.h
   trunk/CSP/CSPSim/Include/SimObject.h
Log:
Added DispatchMessageHandler.cpp to handle incoming messages and forward them to the correct object.

Modified: trunk/CSP/CSPSim/Include/Networking.h
===================================================================
--- trunk/CSP/CSPSim/Include/Networking.h	2004-06-13 14:36:13 UTC (rev 1032)
+++ trunk/CSP/CSPSim/Include/Networking.h	2004-06-13 14:36:27 UTC (rev 1033)
@@ -33,14 +33,19 @@
 
 #include <sys/types.h>
 #include <list>
+#include <map>
 
 #include <SimData/Vector3.h>
 #include <SimData/String.h>
 #include <SimData/Uniform.h>
 #include <SimData/Quat.h>
+#include <SimData/DataManager.h>
 #include <SimData/Date.h>
 #include <stdio.h>
 
+#include "DynamicObject.h"
+#include "VirtualBattlefield.h"
+
 typedef int SockFd;
 typedef simdata::uint16 Port;
 class NetworkNode;
@@ -267,6 +272,39 @@
 
 };
 
+class DynamicObject;
+
+class RemoteObjectWrapper 
+{
+  public:
+   RemoteObjectWrapper(simdata::Ref<DynamicObject> & object) { m_Object = object; }
+   NetworkNode * getObjectHost() { return m_Host; }
+   simdata::Ref<DynamicObject> getWrappedObject() { return m_Object; }
+  private:
+   simdata::Ref<DynamicObject> m_Object;
+   NetworkNode   * m_Host;
+	 
+
+};
+
+class RemoteObjectTable
+{
+  public:
+  RemoteObjectWrapper * getRemoteObject(int ipaddr, short port, int id)
+  {
+    return m_table[ipaddr][port][id];
+  }
+
+  void putRemoteObject(int ipaddr, short port, int id, RemoteObjectWrapper * object)
+  {
+    m_table[ipaddr][port][id] = object;
+  }
+
+  private:
+    std::map< int , std::map < short, std::map < short, RemoteObjectWrapper * > > > m_table;
+
+};
+
 class NetworkMessageHandler;
 
 class NetworkMessenger
@@ -283,7 +321,7 @@
     int m_messageReceiveArrayGrow;
     NetworkNode * m_originatorNode;
     std::list<NetworkMessage*> m_messagePool;
-    NetworkMessageHandler * m_ReceiveHandler;
+    std::list<NetworkMessageHandler *> m_ReceiveHandlerList;
       
     ost::UDPSocket * m_UDPReceiverSocket;
     ost::UDPSocket * m_UDPSenderSocket;	
@@ -335,7 +373,9 @@
 {
 
 	public: 
+		EchoMessageHandler();
 		virtual void process(NetworkMessage * message, NetworkMessenger * messenger);
+		virtual ~EchoMessageHandler();
 	
 };
 
@@ -345,13 +385,39 @@
 		int m_frequency;
 		int m_count;
 	public:
-		PrintMessageHandler() { m_frequency = 1; m_count = 0;}
+		PrintMessageHandler(); 
 		virtual void process(NetworkMessage * message, NetworkMessenger * messenger);
+		virtual ~PrintMessageHandler();
 
 		void setFrequency(int frequency) { m_frequency = frequency; }
 		int getFrequency() { return m_frequency; }
 };
 
+class DispatchMessageHandler : public NetworkMessageHandler
+{
+  public:
+    DispatchMessageHandler();
+    virtual void process(NetworkMessage * message, NetworkMessenger * messenger);
+    virtual ~DispatchMessageHandler();
+    void setLocalAddress(unsigned int addr) { _addr = addr; }
+    void setLocalPort(unsigned short port) { _port = port; }
+    void setVirtualBattlefield(VirtualBattlefield * battlefield) { _virtualBattlefield = battlefield; }
+    void setDataManager(simdata::DataManager & dataManager) { _dataManager = dataManager; }
+    
+  protected:
+    bool isLocal(unsigned int addr, unsigned short port);
+    simdata::Ref<DynamicObject> addRemoteObject( NetworkMessage * message );
+    
+  private:
+	  
+    RemoteObjectTable m_RemoteObjectTable;
+    unsigned int _addr;
+    unsigned short _port; 
+    VirtualBattlefield * _virtualBattlefield;
+    simdata::DataManager _dataManager;
+
+};
+
 // not currently using these below
 
 class NetworkBroadcaster

Modified: trunk/CSP/CSPSim/Include/SimObject.h
===================================================================
--- trunk/CSP/CSPSim/Include/SimObject.h	2004-06-13 14:36:13 UTC (rev 1032)
+++ trunk/CSP/CSPSim/Include/SimObject.h	2004-06-13 14:36:27 UTC (rev 1033)
@@ -111,6 +111,11 @@
 		m_ID = id; 
 	}
 
+	void setType(unsigned int type) {
+		assert(m_Type == 0);
+		m_Type = type;
+	}
+
 	/** Update callback. 
 	 *
 	 *  @param dt time since elapsed last call to onUpdate()
@@ -133,6 +138,7 @@
 	/** Get the unique object id of this instance.
 	 */
 	unsigned int getID() const { return m_ID; }
+	unsigned int getType() const { return m_Type; }
 
 	/** Called before an object is added to the scene graph.
 	 *
@@ -161,7 +167,10 @@
 protected:
 
 	unsigned int m_ID;
+	unsigned int m_Type;
 	unsigned int m_Flags;
+
+	static unsigned int localObjectInstance;
 };