Menu
▾
▴
[Csp-commits] svn:csp r1320 - in trunk/CSP: CSPSim CSPSim/Include CSPSim/Include/SimNet CSPSim/Source CSPSim/Source/SimNet SimCore/Battlefield SimData SimData/Include/SimData
Author: mkrose Date: 2004-11-14 15:12:59 -0800 (Sun, 14 Nov 2004) New Revision: 1320 Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/Include/CSPSim.h trunk/CSP/CSPSim/Include/ClientNode.h trunk/CSP/CSPSim/Include/SimNet/DispatchMessageHandler.h trunk/CSP/CSPSim/Source/CSPSim.cpp trunk/CSP/CSPSim/Source/ClientNode.cpp trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp trunk/CSP/SimCore/Battlefield/SConscript trunk/CSP/SimData/CHANGES.current trunk/CSP/SimData/Include/SimData/DataManager.h Log: Minor fix now that DataManager is a referenced type. Also undid some of the SimCore/Battlefield/SConscript changes that shouldn't have been checked in yet. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1320 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/CSPSim/CHANGES.current 2004-11-14 23:12:59 UTC (rev 1320) @@ -5,6 +5,10 @@ * Explicitly save and restore gl state when rendering the scene views. Fixes some rendering anomalies. + * Minor fix now that DataManager is a referenced type. Also undid + some of the SimCore/Battlefield/SConscript changes that shouldn't + have been checked in yet. + 2004-11-14: onsight * Moved SimObject.* to OldSimObject.*, to be replaced when the network-enabled battlefield is checked in (soon). Modified: trunk/CSP/CSPSim/Include/CSPSim.h =================================================================== --- trunk/CSP/CSPSim/Include/CSPSim.h 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/CSPSim/Include/CSPSim.h 2004-11-14 23:12:59 UTC (rev 1320) @@ -185,7 +185,7 @@ // TODO the terrain will eventually be encapsulated in a Theater class simdata::Ref<Theater> m_Theater; simdata::Ref<TerrainObject> m_Terrain; - simdata::ScopedPointer<simdata::DataManager> m_DataManager; + simdata::Ref<simdata::DataManager> m_DataManager; simdata::ScopedPointer<Atmosphere> m_Atmosphere; //PyObject* m_Console; Modified: trunk/CSP/CSPSim/Include/ClientNode.h =================================================================== --- trunk/CSP/CSPSim/Include/ClientNode.h 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/CSPSim/Include/ClientNode.h 2004-11-14 23:12:59 UTC (rev 1320) @@ -16,7 +16,7 @@ void initNetworking(); Battlefield * m_battlefield; - simdata::DataManager m_DataManager; + simdata::Ref<simdata::DataManager> m_DataManager; NetworkMessenger * m_networkMessenger; NetworkNode * m_remoteNode; NetworkNode * m_localNode; Modified: trunk/CSP/CSPSim/Include/SimNet/DispatchMessageHandler.h =================================================================== --- trunk/CSP/CSPSim/Include/SimNet/DispatchMessageHandler.h 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/CSPSim/Include/SimNet/DispatchMessageHandler.h 2004-11-14 23:12:59 UTC (rev 1320) @@ -21,8 +21,8 @@ void setBattlefield(Battlefield * battlefield) { _battlefield = battlefield; } Battlefield * getBattlefield() { return _battlefield; } - void setDataManager(simdata::DataManager & dataManager) { _dataManager = dataManager; } - simdata::DataManager getDataManager() { return _dataManager; } + void setDataManager(simdata::DataManager * dataManager) { _dataManager = dataManager; } + simdata::DataManager& getDataManager() { return *_dataManager; } protected: bool isLocal(unsigned int addr, unsigned short port); @@ -34,7 +34,7 @@ unsigned int _addr; unsigned short _port; Battlefield * _battlefield; - simdata::DataManager _dataManager; + simdata::Ref<simdata::DataManager> _dataManager; }; Modified: trunk/CSP/CSPSim/Source/CSPSim.cpp =================================================================== --- trunk/CSP/CSPSim/Source/CSPSim.cpp 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/CSPSim/Source/CSPSim.cpp 2004-11-14 23:12:59 UTC (rev 1320) @@ -461,7 +461,7 @@ DispatchMessageHandler * dispatchMessageHandler = new DispatchMessageHandler(); dispatchMessageHandler->setLocalAddress( m_localNode->getAddress().getAddress().s_addr ); dispatchMessageHandler->setLocalPort( localMessagePort ); - dispatchMessageHandler->setDataManager(*m_DataManager); + dispatchMessageHandler->setDataManager(m_DataManager.get()); dispatchMessageHandler->setBattlefield(getBattlefield()); m_NetworkMessenger->registerMessageHandler(dispatchMessageHandler); Modified: trunk/CSP/CSPSim/Source/ClientNode.cpp =================================================================== --- trunk/CSP/CSPSim/Source/ClientNode.cpp 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/CSPSim/Source/ClientNode.cpp 2004-11-14 23:12:59 UTC (rev 1320) @@ -69,7 +69,7 @@ #include "ObjectModel.h" -ClientNode::ClientNode() { +ClientNode::ClientNode(): m_DataManager(new simdata::DataManager()) { CSP_LOG(NETWORK, INFO, "ClientNode::ClientNode()"); m_battlefield = NULL; m_networkMessenger = NULL; @@ -188,7 +188,7 @@ try { simdata::DataArchive *sim = new simdata::DataArchive(archive_file.c_str(), 1); assert(sim); - m_DataManager.addArchive(sim); + m_DataManager->addArchive(sim); } catch (simdata::Exception &e) { CSP_LOG(APP, ERROR, "Error opening data archive " << archive_file); @@ -258,7 +258,7 @@ dispatchMessageHandler->setLocalAddress( m_localNode->getAddress().getAddress().s_addr ); dispatchMessageHandler->setLocalPort(m_localPort); dispatchMessageHandler->setBattlefield(m_battlefield); - dispatchMessageHandler->setDataManager(m_DataManager); + dispatchMessageHandler->setDataManager(m_DataManager.get()); m_networkMessenger->registerMessageHandler(dispatchMessageHandler); Modified: trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp =================================================================== --- trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp 2004-11-14 23:12:59 UTC (rev 1320) @@ -93,7 +93,7 @@ CSP_LOG(NETWORK, DEBUG, "DispatchMessageHandler::addRemoteObject() - calling dataManager using path: " << vehicle.c_str()); - simdata::Ref<DynamicObject> ao = _dataManager.getObject(vehicle.c_str()); + simdata::Ref<DynamicObject> ao = _dataManager->getObject(vehicle.c_str()); CSP_LOG(NETWORK, DEBUG, "DispatchMessageHandler::addRemoteObject() - asserting validity of new object"); assert(ao.valid()); Modified: trunk/CSP/SimCore/Battlefield/SConscript =================================================================== --- trunk/CSP/SimCore/Battlefield/SConscript 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/SimCore/Battlefield/SConscript 2004-11-14 23:12:59 UTC (rev 1320) @@ -24,11 +24,11 @@ LIBPATH= env.get('LIBPATH', []) + ['#/SpatialIndex/.bin'] SOURCES = [ - 'Battlefield.cpp', - 'LocalBattlefield.cpp', + 'OldBattlefield.cpp', +# 'LocalBattlefield.cpp', 'SceneManager.cpp', 'OldSimObject.cpp', - 'BattlefieldMessages.net', +# 'BattlefieldMessages.net', ] OBJECTS = build.Apply(env.StaticObject, SOURCES, LIBS=LIBS, LIBPATH=LIBPATH) Modified: trunk/CSP/SimData/CHANGES.current =================================================================== --- trunk/CSP/SimData/CHANGES.current 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/SimData/CHANGES.current 2004-11-14 23:12:59 UTC (rev 1320) @@ -14,6 +14,8 @@ * Minor tweaks to trc generation to silence vc warnings. +* Make DataManager a referenced type. + 2004-11-11: delta * Added SWIG_STD_BACKWARD_COMP to the swig command line in SimData.vcproj for swig 1.3.22. Modified: trunk/CSP/SimData/Include/SimData/DataManager.h =================================================================== --- trunk/CSP/SimData/Include/SimData/DataManager.h 2004-11-14 22:50:53 UTC (rev 1319) +++ trunk/CSP/SimData/Include/SimData/DataManager.h 2004-11-14 23:12:59 UTC (rev 1320) @@ -52,7 +52,7 @@ * * @author Mark Rose <mr...@st...> */ -class SIMDATA_EXPORT DataManager { +class SIMDATA_EXPORT DataManager: public Referenced { friend class DataArchive; public: |
