[Csp-commits] svn:csp r1098 - in trunk/CSP/CSPSim/Source: . SimNet

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

Author: wolverine
Date: 2004-06-28 20:50:48 -0700 (Mon, 28 Jun 2004)
New Revision: 1098

Modified:
   trunk/CSP/CSPSim/Source/Makefile.in
   trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp
   trunk/CSP/CSPSim/Source/SimNet/EchoMessageHandler.cpp
   trunk/CSP/CSPSim/Source/SimNet/MessageSocketDuplex.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkAddress.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkBroadcaster.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkListener.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkMessage.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkMessenger.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkNode.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkSocket.cpp
   trunk/CSP/CSPSim/Source/SimNet/ObjectUpdateMessage.cpp
   trunk/CSP/CSPSim/Source/SimNet/PrintMessageHandler.cpp
   trunk/CSP/CSPSim/Source/SimNet/RedirectMessageHandler.cpp
   trunk/CSP/CSPSim/Source/cCSP.i
Log:
moved networking to a new subdirectory

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1098

Modified: trunk/CSP/CSPSim/Source/Makefile.in
===================================================================
--- trunk/CSP/CSPSim/Source/Makefile.in	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/Makefile.in	2004-06-29 03:50:48 UTC (rev 1098)
@@ -2,7 +2,7 @@
 
 BIN = $(TOPDIR)/Bin
 
-SUBDIRS = Theater Networking Views 
+SUBDIRS = Theater SimNet Views Systems
 
 DEMETER_PREFIX = $(TOPDIR)/$(DEMETER_RELATIVE)
 DEMETER_INCLUDE = -I$(DEMETER_PREFIX)
@@ -68,19 +68,19 @@
 	LogoScreen.cpp \
 	MenuScreen.cpp \
  	Message.cpp \
-	Networking/NetworkNode.cpp \
-	Networking/NetworkMessage.cpp \
-	Networking/ObjectUpdateMessage.cpp \
-	Networking/NetworkMessenger.cpp \
-	Networking/NetworkBroadcaster.cpp \
-	Networking/NetworkListener.cpp \
-	Networking/NetworkSocket.cpp \
-	Networking/MessageSocketDuplex.cpp \
-	Networking/NetworkAddress.cpp \
-	Networking/PrintMessageHandler.cpp \
-	Networking/RedirectMessageHandler.cpp \
-	Networking/EchoMessageHandler.cpp \
-	Networking/DispatchMessageHandler.cpp \
+	SimNet/NetworkNode.cpp \
+	SimNet/NetworkMessage.cpp \
+	SimNet/ObjectUpdateMessage.cpp \
+	SimNet/NetworkMessenger.cpp \
+	SimNet/NetworkBroadcaster.cpp \
+	SimNet/NetworkListener.cpp \
+	SimNet/NetworkSocket.cpp \
+	SimNet/MessageSocketDuplex.cpp \
+	SimNet/NetworkAddress.cpp \
+	SimNet/PrintMessageHandler.cpp \
+	SimNet/RedirectMessageHandler.cpp \
+	SimNet/EchoMessageHandler.cpp \
+	SimNet/DispatchMessageHandler.cpp \
 	NumericalMethod.cpp \
 	ObjectModel.cpp \
 	ObjectRangeInfo.cpp \
@@ -126,7 +126,7 @@
 SWDEP = $(SWIG) -M $(SWOPTS)
 DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep
 DEPFILTER = 
-DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR)/Systems $(DEPDIR)/Networking $(DEPDIR)/Views > /dev/null 2>&1 || :)
+DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR)/Systems $(DEPDIR)/SimNet $(DEPDIR)/Views > /dev/null 2>&1 || :)
 
 .PHONY: clean-deps clean all default
 

Modified: trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -1,4 +1,4 @@
-#include "Networking.h"
+#include <SimNet/Networking.h>
 #include "DynamicObject.h"
 
 #include "Config.h"

Modified: trunk/CSP/CSPSim/Source/SimNet/EchoMessageHandler.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/EchoMessageHandler.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/EchoMessageHandler.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -29,7 +29,7 @@
 
 #include <SimData/LogStream.h>
 #include "Log.h"
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 EchoMessageHandler::EchoMessageHandler()
 {

Modified: trunk/CSP/CSPSim/Source/SimNet/MessageSocketDuplex.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/MessageSocketDuplex.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/MessageSocketDuplex.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -21,7 +21,7 @@
  * @file NetworkSocket.cpp:
  * @author Scott Flicker (Wolverine)
  */
-#include "Networking.h"
+#include <SimNet/Networking.h>
 #include "Log.h"
 
 MessageSocketDuplex::MessageSocketDuplex()

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkAddress.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkAddress.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkAddress.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -24,7 +24,7 @@
  * This class encapsulates a node in the simulation network.
  */
 
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 NetworkAddress::NetworkAddress()
 {

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkBroadcaster.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkBroadcaster.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkBroadcaster.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -23,7 +23,7 @@
  * 
  * Broadcasts network messages
  */
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 NetworkBroadcaster::NetworkBroadcaster()
 {

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkListener.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkListener.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkListener.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -24,7 +24,7 @@
  * Listens for network messages
  */
 
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 
 NetworkListener::NetworkListener()

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkMessage.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkMessage.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkMessage.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -25,7 +25,7 @@
  * Currently contains for header and buffer routines
  */
 
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 unsigned short NetworkMessage::m_magicNumber = 0xACDC;
 unsigned short NetworkMessage::m_HeaderLen = 16;

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkMessenger.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkMessenger.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkMessenger.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -24,7 +24,7 @@
 
 #include <SimData/LogStream.h>
 #include "Log.h"
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 NetworkMessenger::NetworkMessenger()
 {

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkNode.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkNode.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -24,7 +24,7 @@
  * This class encapsulates a node in the simulation network.
  */
 
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 NetworkNode::NetworkNode()
 {

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkSocket.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkSocket.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkSocket.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -22,7 +22,7 @@
  * @author Scott Flicker (Wolverine)
  */
 
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 NetworkSocket::NetworkSocket()
 {

Modified: trunk/CSP/CSPSim/Source/SimNet/ObjectUpdateMessage.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/ObjectUpdateMessage.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/ObjectUpdateMessage.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -22,7 +22,7 @@
  * @author Scott Flicker (Wolverine)
  */
 
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 //ObjectUpdateMessage::ObjectUpdateMessage(simdata::uint16 id, simdata::Vector3 position, simdata::Vector3 velocity)
 //{

Modified: trunk/CSP/CSPSim/Source/SimNet/PrintMessageHandler.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/PrintMessageHandler.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/PrintMessageHandler.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -29,7 +29,7 @@
 
 #include <SimData/LogStream.h>
 #include "Log.h"
-#include "Networking.h"
+#include <SimNet/Networking.h>
 #include <stdio.h>
 
 PrintMessageHandler::PrintMessageHandler()

Modified: trunk/CSP/CSPSim/Source/SimNet/RedirectMessageHandler.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/RedirectMessageHandler.cpp	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/SimNet/RedirectMessageHandler.cpp	2004-06-29 03:50:48 UTC (rev 1098)
@@ -29,7 +29,7 @@
 
 #include <SimData/LogStream.h>
 #include "Log.h"
-#include "Networking.h"
+#include <SimNet/Networking.h>
 
 RedirectMessageHandler::RedirectMessageHandler()
 {

Modified: trunk/CSP/CSPSim/Source/cCSP.i
===================================================================
--- trunk/CSP/CSPSim/Source/cCSP.i	2004-06-29 03:50:05 UTC (rev 1097)
+++ trunk/CSP/CSPSim/Source/cCSP.i	2004-06-29 03:50:48 UTC (rev 1098)
@@ -36,7 +36,7 @@
 
 %include "VirtualBattlefield.i"
 %include "VirtualScene.i"
-%include "Networking.i"
+%include "SimNet/Networking.i"
 %include "CSPSim.i"
 //%include "SimpleConfig.i"
 %include "Config.i"