Menu
▾
▴
csp-commits — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(140) |
Feb
(98) |
Mar
(152) |
Apr
(104) |
May
(71) |
Jun
(94) |
Jul
(169) |
Aug
(83) |
Sep
(47) |
Oct
(134) |
Nov
(7) |
Dec
(20) |
| 2004 |
Jan
(41) |
Feb
(14) |
Mar
(42) |
Apr
(47) |
May
(68) |
Jun
(143) |
Jul
(65) |
Aug
(29) |
Sep
(40) |
Oct
(34) |
Nov
(33) |
Dec
(97) |
| 2005 |
Jan
(29) |
Feb
(30) |
Mar
(9) |
Apr
(37) |
May
(13) |
Jun
(31) |
Jul
(22) |
Aug
(23) |
Sep
|
Oct
(37) |
Nov
(34) |
Dec
(117) |
| 2006 |
Jan
(48) |
Feb
(6) |
Mar
(2) |
Apr
(71) |
May
(10) |
Jun
(16) |
Jul
(7) |
Aug
(1) |
Sep
(14) |
Oct
(17) |
Nov
(25) |
Dec
(26) |
| 2007 |
Jan
(8) |
Feb
(2) |
Mar
(7) |
Apr
(26) |
May
|
Jun
(12) |
Jul
(30) |
Aug
(14) |
Sep
(9) |
Oct
(4) |
Nov
(7) |
Dec
(6) |
| 2008 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(18) |
Aug
(15) |
Sep
(16) |
Oct
(5) |
Nov
(3) |
Dec
(10) |
| 2009 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
(15) |
May
(31) |
Jun
(18) |
Jul
(11) |
Aug
(26) |
Sep
(52) |
Oct
(17) |
Nov
(4) |
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@ww...> - 2005-12-05 05:57:35
|
Author: mkrose Date: 2005-12-04 21:57:28 -0800 (Sun, 04 Dec 2005) New Revision: 1728 Added: trunk/CSP/csp/data/xml/vehicles/aircraft/f16/ trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj.xml trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj/ Removed: trunk/CSP/csp/data/xml/vehicles/aircraft/F16/DJ/ trunk/CSP/csp/data/xml/vehicles/aircraft/F16DJ.xml Log: Rename f16 xml directories. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1728 Deleted: trunk/CSP/csp/data/xml/vehicles/aircraft/F16DJ.xml =================================================================== --- trunk/CSP/csp/data/xml/vehicles/aircraft/F16DJ.xml 2005-12-05 05:44:52 UTC (rev 1727) +++ trunk/CSP/csp/data/xml/vehicles/aircraft/F16DJ.xml 2005-12-05 05:57:28 UTC (rev 1728) @@ -1,29 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<!-- - F16 DJ ---> - -<Object class="AircraftObject"> - - <Path name="model">F16.DJ.model</Path> - - <!-- Mass/Inertial properties --> - <!-- empty mass = 8273 kg? f16A from nasa 1979 paper has mass = 9304 kg --> - <Float name="mass">9304.0</Float> - <!-- f16A values from nasa 1979 paper --> - <Matrix name="inertia"> - 75674.0 0.0 0.0 - 0.0 12875.0 1331.0 - 0.0 1331.0 85552.0 - </Matrix> - - <!-- initial cm offset relative to the 3d model origin --> - <!--Vector name="reference_center_of_mass_offset">0.0 -0.1 -0.07</Vector--> - <Vector name="reference_center_of_mass_offset">0.0 -0.1 -0.17</Vector> - - <Path name="human_systems">F16.DJ.systems</Path> - <Path name="remote_systems">F16.DJ.remote</Path> - <Path name="agent_systems">F16.DJ.systems</Path> - -</Object> Copied: trunk/CSP/csp/data/xml/vehicles/aircraft/f16 (from rev 1717, trunk/CSP/csp/data/xml/vehicles/aircraft/F16/DJ) Copied: trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj.xml (from rev 1717, trunk/CSP/csp/data/xml/vehicles/aircraft/F16DJ.xml) =================================================================== --- trunk/CSP/csp/data/xml/vehicles/aircraft/F16DJ.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/vehicles/aircraft/f16dj.xml 2005-12-05 05:57:28 UTC (rev 1728) @@ -0,0 +1,29 @@ +<?xml version="1.0" standalone="no"?> + +<!-- + F16 DJ +--> + +<Object class="AircraftObject"> + + <Path name="model">f16dj.model</Path> + + <!-- Mass/Inertial properties --> + <!-- empty mass = 8273 kg? f16A from nasa 1979 paper has mass = 9304 kg --> + <Float name="mass">9304.0</Float> + <!-- f16A values from nasa 1979 paper --> + <Matrix name="inertia"> + 75674.0 0.0 0.0 + 0.0 12875.0 1331.0 + 0.0 1331.0 85552.0 + </Matrix> + + <!-- initial cm offset relative to the 3d model origin --> + <!--Vector name="reference_center_of_mass_offset">0.0 -0.1 -0.07</Vector--> + <Vector name="reference_center_of_mass_offset">0.0 -0.1 -0.17</Vector> + + <Path name="human_systems">f16.systems</Path> + <Path name="remote_systems">f16.remote</Path> + <Path name="agent_systems">f16.systems</Path> + +</Object> |
|
From: <sv...@ww...> - 2005-12-05 05:44:59
|
Author: mkrose Date: 2005-12-04 21:44:52 -0800 (Sun, 04 Dec 2005) New Revision: 1727 Added: trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson01.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson02.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson03.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson04.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson05.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson06.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson07.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson08.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson09.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson10.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson11.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson12.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson13.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson14.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson15.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson16.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson17.xml Removed: trunk/CSP/csp/data/xml/theater/balkan/caisson01.xml trunk/CSP/csp/data/xml/theater/balkan/caisson02.xml trunk/CSP/csp/data/xml/theater/balkan/caisson03.xml trunk/CSP/csp/data/xml/theater/balkan/caisson04.xml trunk/CSP/csp/data/xml/theater/balkan/caisson05.xml trunk/CSP/csp/data/xml/theater/balkan/caisson06.xml trunk/CSP/csp/data/xml/theater/balkan/caisson07.xml trunk/CSP/csp/data/xml/theater/balkan/caisson08.xml trunk/CSP/csp/data/xml/theater/balkan/caisson09.xml trunk/CSP/csp/data/xml/theater/balkan/caisson10.xml trunk/CSP/csp/data/xml/theater/balkan/caisson11.xml trunk/CSP/csp/data/xml/theater/balkan/caisson12.xml trunk/CSP/csp/data/xml/theater/balkan/caisson13.xml trunk/CSP/csp/data/xml/theater/balkan/caisson14.xml trunk/CSP/csp/data/xml/theater/balkan/caisson15.xml trunk/CSP/csp/data/xml/theater/balkan/caisson16.xml trunk/CSP/csp/data/xml/theater/balkan/caisson17.xml Log: Finish caisson reorganization, moving the model xml files to the caissons directory. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1727 Diff omitted (10642 bytes). |
|
From: <sv...@ww...> - 2005-12-05 05:44:08
|
Author: mkrose Date: 2005-12-04 21:43:59 -0800 (Sun, 04 Dec 2005) New Revision: 1726 Modified: trunk/CSP/csp/data/xml/theater/balkan/airbase.xml trunk/CSP/csp/data/xml/theater/balkan/caisson01.xml trunk/CSP/csp/data/xml/theater/balkan/caisson02.xml trunk/CSP/csp/data/xml/theater/balkan/caisson03.xml trunk/CSP/csp/data/xml/theater/balkan/caisson04.xml trunk/CSP/csp/data/xml/theater/balkan/caisson05.xml trunk/CSP/csp/data/xml/theater/balkan/caisson06.xml trunk/CSP/csp/data/xml/theater/balkan/caisson07.xml trunk/CSP/csp/data/xml/theater/balkan/caisson08.xml trunk/CSP/csp/data/xml/theater/balkan/caisson09.xml trunk/CSP/csp/data/xml/theater/balkan/caisson10.xml trunk/CSP/csp/data/xml/theater/balkan/caisson11.xml trunk/CSP/csp/data/xml/theater/balkan/caisson12.xml trunk/CSP/csp/data/xml/theater/balkan/caisson13.xml trunk/CSP/csp/data/xml/theater/balkan/caisson14.xml trunk/CSP/csp/data/xml/theater/balkan/caisson15.xml trunk/CSP/csp/data/xml/theater/balkan/caisson16.xml trunk/CSP/csp/data/xml/theater/balkan/caisson17.xml Log: Partial reorganization of caisson xml files. Next submit will finish. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1726 Diff omitted (15203 bytes). |
|
From: <sv...@ww...> - 2005-12-05 05:40:44
|
Author: mkrose Date: 2005-12-04 21:40:38 -0800 (Sun, 04 Dec 2005) New Revision: 1725 Modified: trunk/CSP/csp/cspsim/CSPSim.cpp trunk/CSP/csp/cspsim/CSPSim.h Log: Remove some old SDL sound code from CSPSim. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1725 Modified: trunk/CSP/csp/cspsim/CSPSim.cpp =================================================================== --- trunk/CSP/csp/cspsim/CSPSim.cpp 2005-12-05 05:32:37 UTC (rev 1724) +++ trunk/CSP/csp/cspsim/CSPSim.cpp 2005-12-05 05:40:38 UTC (rev 1725) @@ -77,31 +77,9 @@ //--#include <Producer/RenderSurface> #include <SDL/SDL.h> -#include <SDL/SDL_audio.h> #include <SDL/SDL_joystick.h> - -/* -//////////////////////////////////////////////// -// FIXME - -//#include "AircraftObject.h" - -// -//////////////////////////////////////////////// - - -#ifndef FALSE -#define FALSE 0 -#endif - -#ifndef TRUE -#define TRUE 1 -#endif -*/ - - CSP_NAMESPACE // For network testing on a single box it's convenient to disable rendering on @@ -109,15 +87,6 @@ bool g_DisableRender = false; -struct SDLWave { - SDL_AudioSpec spec; - Uint8 *sound; /* Pointer to wave data */ - Uint32 soundlen; /* Length of wave data */ - int soundpos; /* Current play position */ -}; - -SDLWave m_audioWave; - /////////////////////////////////////////////////////////////////////// // CSPSim @@ -307,6 +276,7 @@ std::string theater = g_Config.getPath("Testing", "Theater", "sim:theater.balkan", false); m_Theater = m_DataManager->getObject(theater.c_str()); assert(m_Theater.valid()); + //CSP_VERIFY(m_Theater->initialize(*m_DataManager)); m_Terrain = m_Theater->getTerrain(); assert(m_Terrain.valid()); m_Terrain->setScreenSizeHint(m_ScreenWidth, m_ScreenHeight); @@ -427,7 +397,6 @@ m_GameScreen->onInit(); changeScreen(m_GameScreen); - } catch (Exception &e) { FatalException(e, "initialization"); @@ -712,7 +681,7 @@ m_ScreenHeight = height; m_ScreenWidth = width; - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO /* | SDL_INIT_NOPARACHUTE */ ) != 0) { + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) != 0) { std::cerr << "Unable to initialize SDL: " << SDL_GetError() << "\n"; CSPLOG(ERROR, APP) << "ERROR! Unable to initialize SDL: " << SDL_GetError(); return 1; @@ -730,8 +699,8 @@ } m_SDLScreen = SDL_SetVideoMode(width, height, bpp, flags); - SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 32 ); - SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 ); + SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 32); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); if (m_SDLScreen == NULL) { std::cerr << "Unable to set video mode: " << SDL_GetError() << "\n"; @@ -748,52 +717,12 @@ SDL_EnableUNICODE(1); - // some simple sdl sound testing - std::string sound_path = getDataPath("SoundPath"); - std::string test_sound = ospath::join(sound_path, "avionturbine5.wav"); - if (SDL_LoadWAV(test_sound.c_str(), &m_audioWave.spec, &m_audioWave.sound, - &m_audioWave.soundlen) == NULL) { - CSPLOG(WARNING, APP) << "Couldn't load '" << test_sound << "': " << SDL_GetError(); - } else { - m_audioWave.spec.callback = fillerup; - - /* Initialize fillerup() variables */ - if (SDL_OpenAudio(&m_audioWave.spec, NULL) < 0) { - CSPLOG(ERROR, APP) << "Couldn't open audio: " << SDL_GetError(); - SDL_FreeWAV(m_audioWave.sound); - } - } - bool mute = g_Config.getBool("Testing", "Mute", false, true); - SDL_PauseAudio(mute); - /* Make sure SDL_Quit gets called when the program exits. */ atexit(SDL_Quit); return 0; } - -void fillerup(void * /*unused*/, Uint8 *stream, int len) { - Uint8 *waveptr; - int waveleft; - - /* Set up the pointers */ - waveptr = m_audioWave.sound + m_audioWave.soundpos; - waveleft = m_audioWave.soundlen - m_audioWave.soundpos; - - /* Go! */ - while ( waveleft <= len ) { - SDL_MixAudio(stream, waveptr, waveleft, SDL_MIX_MAXVOLUME); - stream += waveleft; - len -= waveleft; - waveptr = m_audioWave.sound; - waveleft = m_audioWave.soundlen; - m_audioWave.soundpos = 0; - } - SDL_MixAudio(stream, waveptr, len, SDL_MIX_MAXVOLUME); - m_audioWave.soundpos += len; -} - Ref<Theater> CSPSim::getTheater() const { return m_Theater; } Modified: trunk/CSP/csp/cspsim/CSPSim.h =================================================================== --- trunk/CSP/csp/cspsim/CSPSim.h 2005-12-05 05:32:37 UTC (rev 1724) +++ trunk/CSP/csp/cspsim/CSPSim.h 2005-12-05 05:40:38 UTC (rev 1725) @@ -44,6 +44,12 @@ * */ +/** + * @namespace csp + * @brief Primary namespace for all internal code (csplib and cspsim). + */ + + #ifndef __CSPSIM_H__ #define __CSPSIM_H__ @@ -61,21 +67,19 @@ CSP_NAMESPACE class Atmosphere; -class DataManager; +class BaseScreen; class Client; -class InputEvent; -class PyShell; +class DataManager; class DynamicObject; +class EventMapIndex; +class GameScreen; +class InputEvent; +class LocalBattlefield; class TerrainObject; class Theater; -class LocalBattlefield; -class VirtualScene; class VirtualHID; -class BaseScreen; -class GameScreen; -class EventMapIndex; +class VirtualScene; -void fillerup(void *unused, unsigned char *stream, int len); /** The primary simulation engine for CSP. Also acts as a singleton to provide * direct access to shared simulation state. Do not abuse this access point; @@ -117,7 +121,6 @@ Atmosphere const * getAtmosphere() const { return m_Atmosphere.get(); } - protected: void initSim(); @@ -127,8 +130,8 @@ void updateObjects(double dt); void doStartupScript(); - private: + SDL_Surface *m_SDLScreen; SDL_Joystick* m_SDLJoystick; @@ -145,9 +148,7 @@ bool m_Finished; bool m_Clean; - /** - * The current simulation time/date - */ + // The current simulation time/date SimDate m_CurrentTime; SimTime m_FrameTime; SimTime m_FrameRate; @@ -158,16 +159,12 @@ void initTime(SimDate const &); void updateTime(); - /** - * The current input device interface - */ + // The current input device interface Ref<VirtualHID> m_Interface; Ref<EventMapIndex> m_InterfaceMaps; Ref<DynamicObject> m_ActiveObject; - /** - * The virtual battlefield - */ + // The virtual battlefield Ref<LocalBattlefield> m_Battlefield; Ref<VirtualScene> m_Scene; Ref<Client> m_NetworkClient; |
|
From: <sv...@ww...> - 2005-12-05 05:32:48
|
Author: mkrose Date: 2005-12-04 21:32:37 -0800 (Sun, 04 Dec 2005) New Revision: 1724 Modified: trunk/CSP/csp/cspsim/battlefield/GlobalBattlefield.h Log: Convert GlobalBattlefield to new directory layout. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1724 Diff omitted (17299 bytes). |
|
From: <sv...@ww...> - 2005-12-05 05:32:20
|
Author: mkrose Date: 2005-12-04 21:32:13 -0800 (Sun, 04 Dec 2005) New Revision: 1723 Modified: trunk/CSP/CSPSim/Tools/HID/README.map Log: Port input interface map format description. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1723 Modified: trunk/CSP/CSPSim/Tools/HID/README.map =================================================================== --- trunk/CSP/CSPSim/Tools/HID/README.map 2005-12-05 05:31:42 UTC (rev 1722) +++ trunk/CSP/CSPSim/Tools/HID/README.map 2005-12-05 05:32:13 UTC (rev 1723) @@ -1,10 +1,8 @@ Input mapping language description. ======================================================================== - - 1 Primary statements - + include filename Processes commands in the specified file. Included files may include additional files to arbitrary depth. The specified @@ -48,7 +46,7 @@ as needed. Use these definitions when declaring devices, and then use the identifiers, rather than the scan codes, to refer to events. - map device:event type [modes] action + map device:event type [modes] action Map an input event to an action. The device here is the label set in one of the prior device statements. The event is a combination of an event identifier for this device (see 'define' above) and @@ -63,4 +61,5 @@ this input event. See the 'script' statement below for details. script - + TODO + |
|
From: <sv...@ww...> - 2005-12-05 05:31:50
|
Author: mkrose Date: 2005-12-04 21:31:42 -0800 (Sun, 04 Dec 2005) New Revision: 1722 Modified: trunk/CSP/csp/cspsim/Bus.h trunk/CSP/csp/cspsim/ChannelMirror.h trunk/CSP/csp/cspsim/DoubleChannelMirror.cpp trunk/CSP/csp/cspsim/SConscript trunk/CSP/csp/cspsim/SmokeEffects.h trunk/CSP/csp/cspsim/battlefield/Battlefield.h trunk/CSP/csp/cspsim/f16/DataEntry.h trunk/CSP/csp/cspsim/f16/F16Engine.cpp trunk/CSP/csp/cspsim/f16/F16System.h trunk/CSP/csp/cspsim/stores/Stores.h Log: Port doxygen config and cleanup comments. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1722 Modified: trunk/CSP/csp/cspsim/Bus.h =================================================================== --- trunk/CSP/csp/cspsim/Bus.h 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/Bus.h 2005-12-05 05:31:42 UTC (rev 1722) @@ -40,6 +40,10 @@ * **/ +/** + * @namespace csp::bus + * @brief Namespace used for data channel identifiers. + */ #ifndef __CSPSIM_BUS_H__ #define __CSPSIM_BUS_H__ Modified: trunk/CSP/csp/cspsim/ChannelMirror.h =================================================================== --- trunk/CSP/csp/cspsim/ChannelMirror.h 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/ChannelMirror.h 2005-12-05 05:31:42 UTC (rev 1722) @@ -17,7 +17,9 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -/** Interfaces for replicating data channels between remote clients. +/** + * @file CSPSim.cpp + * @brief Interfaces for replicating data channels between remote clients. * * Most of the important state of an object is contained its the data channels. * Replicating selected channels from a source object to remote mirrors of Modified: trunk/CSP/csp/cspsim/DoubleChannelMirror.cpp =================================================================== --- trunk/CSP/csp/cspsim/DoubleChannelMirror.cpp 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/DoubleChannelMirror.cpp 2005-12-05 05:31:42 UTC (rev 1722) @@ -17,8 +17,9 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -/** Channel mirror specializations for double-precision floating point - * channels. +/** + * @file DoubleChannelMirror.cpp + * @brief Channel mirror specializations for double-precision floating point channels. */ Modified: trunk/CSP/csp/cspsim/SConscript =================================================================== --- trunk/CSP/csp/cspsim/SConscript 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/SConscript 2005-12-05 05:31:42 UTC (rev 1722) @@ -172,3 +172,6 @@ cspsim = env.SharedLibrary('cspsim', INTERFACES + SOURCES, SHLIBPREFIX='_') Alias(['all', 'cspsim'], [cspsim]) +env.Documentation('#/cspsim/.dox', '#/cspsim/cspsim.dox', ['#/cspsim/*.h', '#/cspsim/*.cpp', '#/cspsim/*/*.h', '#/cspsim/*/*.cpp']) + + Modified: trunk/CSP/csp/cspsim/SmokeEffects.h =================================================================== --- trunk/CSP/csp/cspsim/SmokeEffects.h 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/SmokeEffects.h 2005-12-05 05:31:42 UTC (rev 1722) @@ -22,6 +22,10 @@ * **/ +/** + * @namespace csp::fx + * @brief 3D special effects. + */ #ifndef __CSPSIM_SMOKEEFFECTS_H__ #define __CSPSIM_SMOKEEFFECTS_H__ Modified: trunk/CSP/csp/cspsim/battlefield/Battlefield.h =================================================================== --- trunk/CSP/csp/cspsim/battlefield/Battlefield.h 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/battlefield/Battlefield.h 2005-12-05 05:31:42 UTC (rev 1722) @@ -171,7 +171,7 @@ inline bool operator==(Object const &o) { return id() == o->id(); } inline bool operator!=(Object const &o) { return id() != o->id(); } - /** Get the (simdata object) path for this object. The path uniquely identifies the + /** Get the (csplib object) path for this object. The path uniquely identifies the * object type, and can used to construct an instance of the object. */ inline const Path path() const { return m_Path; } Modified: trunk/CSP/csp/cspsim/f16/DataEntry.h =================================================================== --- trunk/CSP/csp/cspsim/f16/DataEntry.h 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/f16/DataEntry.h 2005-12-05 05:31:42 UTC (rev 1722) @@ -156,7 +156,7 @@ // links between channels. for example read(A) returns Alist[B] via a pull callback, // such that write(B) will change the output of the next call to read(A). // -// the second drawback concerns data-driven programming. simdata provides fairly +// the second drawback concerns data-driven programming. csplib provides fairly // powerful ways to connect objects together at runtime based on external data. // for some systems it would be very nice to provide only very basic class types // than can then be connected in non-trivial ways via xml. for example, the f-16 @@ -166,7 +166,7 @@ // hard codes the widget layout and static text it displays. this works but requires // code changes to modify the layout and add new pages. an attractive alternative // would be to write a single, generic interface page that gets its layout from an -// xml definition via simdata. specifying static text this way is easy, but +// xml definition via csplib. specifying static text this way is easy, but // connecting input widgets to the bus is difficult unless all the channels of // interest are primitive types. for example, an elevation entry widget can take // a single channel input of type double (or int), but that requires every system Modified: trunk/CSP/csp/cspsim/f16/F16Engine.cpp =================================================================== --- trunk/CSP/csp/cspsim/f16/F16Engine.cpp 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/f16/F16Engine.cpp 2005-12-05 05:31:42 UTC (rev 1722) @@ -259,7 +259,7 @@ m_CoreTemperatureTarget = m_FanTurbineInletTemperatureTarget * m_CoreFanTurbineInletTemperatureRatio; } -// TODO fix simdata random interface to provide obvious functions like this! +// TODO fix csplib random interface to provide obvious functions like this! double gauss(double mean, double sigma) { return static_cast<double>(rd::BoxMueller(g_Random, mean, sigma)); } Modified: trunk/CSP/csp/cspsim/f16/F16System.h =================================================================== --- trunk/CSP/csp/cspsim/f16/F16System.h 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/f16/F16System.h 2005-12-05 05:31:42 UTC (rev 1722) @@ -22,6 +22,10 @@ * **/ +/** + * @namespace csp::f16 + * @brief F16 systems implementation. + */ #ifndef __CSPSIM_F16_F16SYSTEM_H__ #define __CSPSIM_F16_F16SYSTEM_H__ Modified: trunk/CSP/csp/cspsim/stores/Stores.h =================================================================== --- trunk/CSP/csp/cspsim/stores/Stores.h 2005-12-05 05:27:07 UTC (rev 1721) +++ trunk/CSP/csp/cspsim/stores/Stores.h 2005-12-05 05:31:42 UTC (rev 1722) @@ -432,9 +432,9 @@ RackMount(): m_Attitude(Quat::IDENTITY), m_Fixed(false) { } - // XXX simdata should not zero m_Attitude when the xml tag is not set. + // XXX csplib should not zero m_Attitude when the xml tag is not set. // temporary (hacked) fix for testing purposes. UPDATE: actually, - // simdata doesn't zero m_Altitude. it saved the old default value + // csplib doesn't zero m_Altitude. it saved the old default value // in the .dar file, and doesn't realize that the default has changed. virtual void postCreate() { if (m_Attitude == Quat::ZERO) m_Attitude = Quat::IDENTITY; } @@ -767,7 +767,7 @@ HardpointData(): m_External(true), m_Attitude(Quat::IDENTITY) { } - // XXX simdata should not zero m_Attitude when the xml tag is not set. temporary (hacked) fix for testing purposes. + // XXX csplib should not zero m_Attitude when the xml tag is not set. temporary (hacked) fix for testing purposes. virtual void postCreate() { if (m_Attitude == Quat::ZERO) m_Attitude = Quat::IDENTITY; } virtual Hardpoint *createHardpoint(unsigned index) const; |
|
From: <sv...@ww...> - 2005-12-05 05:27:14
|
Author: mkrose Date: 2005-12-04 21:27:07 -0800 (Sun, 04 Dec 2005) New Revision: 1721 Removed: trunk/CSP/csp/cspsim/DispatchCenter.cpp trunk/CSP/csp/cspsim/DispatchCenter.h Log: Remove DispatchCenter, which is no longer used. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1721 Deleted: trunk/CSP/csp/cspsim/DispatchCenter.cpp =================================================================== --- trunk/CSP/csp/cspsim/DispatchCenter.cpp 2005-12-05 05:26:24 UTC (rev 1720) +++ trunk/CSP/csp/cspsim/DispatchCenter.cpp 2005-12-05 05:27:07 UTC (rev 1721) @@ -1,81 +0,0 @@ -// Combat Simulator Project -// Copyright (C) 2004 The Combat Simulator Project -// http://csp.sourceforge.net -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -/** - * @file DispatchCenter.cpp - * - **/ - - -#include "DispatchCenter.h" -#include <csp/csplib/util/Log.h> -#include "Animation.h" -#include "Config.h" -#include "ObjectModel.h" -#include <csp/csplib/net/Networking.h> -#include <csp/csplib/net/NetworkMessage.h> - -#include <csp/csplib/util/Dispatch.h> -#include <SimData/TaggedRecordRegistry.h> - -DispatchCenter::DispatchCenter() { - simdata::TaggedRecordRegistry const ®istry = simdata::TaggedRecordRegistry::getConstInstance(); - // TODO will need to be sorted and validated eventually! - m_factories = registry.getFactories(); -} - -TaggedRecord::Ref DispatchCenter::decode(NetworkMessage *message) const { - assert(message); - simdata::uint16 id = message->getType(); - assert(id < m_factories.size()); - simdata::TaggedRecordFactoryBase *factory = m_factories[id]; - TaggedRecord::Ref record = factory->create(); - // TODO too much buffer copying; need to optimize - std::string payload(static_cast<char*>(message->getPayloadPtr()), message->getPayloadLen()); - simdata::StringReader reader(payload); - simdata::TagReader tag_reader(reader); - // TODO need to catch errors - record->serialize(tag_reader); - return record; -} - -bool DispatchCenter::encode(TaggedRecord::Ref record, NetworkMessage *message) const { - assert(record.valid()); - assert(message != 0); - // TODO get the id from the record. since ids are assigned dynamically, we - // need to extend the tagged record interface to allow ids to be assigned to the - // record class, and retrieved from any record instance (ie. need a class static - // field --- uint16). - //simdata::uint16 id = 0; // XXX - // TODO serialize without constructing a new writer/tagwriter each time, and - // without reallocating the write buffer. - simdata::StringWriter writer; - simdata::TagWriter tag_writer(writer); - record->serialize(tag_writer); - //std::string const &buffer = writer.str(); - // TODO message initialization from the buffer data needs to be implemented - // (requires changes to NetworkMessage) - // message->initialize(id, buffer.data(), buffer.size()); - return true; -} - -bool DispatchCenter::dispatch(TaggedRecord::Ref record, MessageDispatcher &object) const { - return object.dispatchMessage(record); -} - Deleted: trunk/CSP/csp/cspsim/DispatchCenter.h =================================================================== --- trunk/CSP/csp/cspsim/DispatchCenter.h 2005-12-05 05:26:24 UTC (rev 1720) +++ trunk/CSP/csp/cspsim/DispatchCenter.h 2005-12-05 05:27:07 UTC (rev 1721) @@ -1,120 +0,0 @@ -// Combat Simulator Project -// Copyright (C) 2004 The Combat Simulator Project -// http://csp.sourceforge.net -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -/** - * @file DispatchCenter.h - * @brief Singleton for decoding and dispatching network messsages. - * - * The dispatch center maintains an array of TaggedRecordFactories, - * indexed by message type. When a network message arrives, the - * header is parsed to determine the message type. The dispatch - * center uses the message type to retrieve the appropriate tagged - * record factory and create a tagged record instance. The tagged - * record instance then initializes itself from the network message - * payload. - * - * The message header also include a destination id, which is used - * to retrieve the object that should receive the message. If the - * object does not exist, it may be created and added to the - * battlefield. The tagged record instance then passed to the - * object's dispatch method. Handers defined in the object's - * class hierarchy may receive the record and take appropriate - * actions. If no handler is found, the record is passsed to the - * objects childDispatch method. This virtual method can be - * overridden in derived classes to selectively forward messages on - * to internal objects (e.g. the vehicle subsystems). - * - * Caveats: - * - * The message type is just a 16-bit integer id for a given tagged - * record class that all nodes agree on. Eventually this assignment - * will be managed by a centralized server, and transmitted to each - * client that joins the game. For now we simply assign these ids - * sequentially to all tagged record classes in alphabetical order by - * class name. Thus all clients must have the exact same set of - * tagged record classes to communicate properly. No validation has - * been implemented yet, so remote connections should only be initiated - * between clients sync'd to the same repository revision. - * - * Eventually, tagged record factories will return instances from an - * object pool in order to minimize allocation/deallocation overhead. - * The dispatch center will be responsible for returning the tagged - * records to the pool after dispatch. This requires that the object - * receiving the message not maintain a reference to the tagged - * record. This constraint can be enforced by testing the reference - * count after dispatch is completed. Alternatively, we can use - * a separate smart-pointer class that automatically returns an - * instance to the parent object pool when the reference count - * reaches zero (instead of deleting the instance). Such a pool + - * smart pointer system has been implemented, but not yet integrated - * with CSPSim/SimData. - * - **/ - - -#ifndef __CSPSIM_DISPATCHCENTER_H__ -#define __CSPSIM_DISPATCHCENTER_H__ - - -#include <SimData/TaggedRecord.h> -#include <SimData/Singleton.h> -#include <vector> - -// bring TaggedRecord into the global namespace -using simdata::TaggedRecord; - -// forward declarations -class NetworkMessage; -class MessageDispatcher; - -namespace simdata { - class TaggedRecordFactoryBase; -} - - -/** Singleton class for decoding network messages to tagged records, and - * dispatching these records to object handlers. - */ -class DispatchCenter: public simdata::Singleton<DispatchCenter> { - friend class simdata::Singleton<DispatchCenter>; - -public: - - DispatchCenter(); - - /** Decode a tagged record from a raw network message. - */ - TaggedRecord::Ref decode(NetworkMessage *message) const; - - /** Encode a tagged record to a raw network message. - */ - bool encode(TaggedRecord::Ref record, NetworkMessage *message) const; - - /** Dispatch a tagged record to an object handler. - */ - bool dispatch(TaggedRecord::Ref record, MessageDispatcher &object) const; - -private: - std::vector<simdata::TaggedRecordFactoryBase *> m_factories; - -}; - - -#endif // __CSPSIM_DISPATCHCENTER_H__ - |
|
From: <sv...@ww...> - 2005-12-05 05:26:31
|
Author: mkrose Date: 2005-12-04 21:26:24 -0800 (Sun, 04 Dec 2005) New Revision: 1720 Modified: trunk/CSP/csp/csplib/data/External.h trunk/CSP/csp/csplib/data/TypeAdapter.cpp trunk/CSP/csp/csplib/data/TypeAdapter.h trunk/CSP/csp/csplib/data/Types.h trunk/CSP/csp/cspsim/ChunkLodTerrain.cpp trunk/CSP/csp/cspsim/ChunkLodTerrain.h trunk/CSP/csp/cspsim/DemeterTerrain.cpp trunk/CSP/csp/cspsim/DemeterTerrain.h trunk/CSP/csp/cspsim/ObjectModel.cpp trunk/CSP/csp/cspsim/ObjectModel.h trunk/CSP/csp/cspsim/theater/FeatureQuad.cpp trunk/CSP/csp/cspsim/theater/FeatureQuad.h Log: Restore External data type (it is useful after all!). Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1720 Diff omitted (12114 bytes). |
|
From: <sv...@ww...> - 2005-12-05 02:05:26
|
Author: mkrose Date: 2005-12-04 18:05:19 -0800 (Sun, 04 Dec 2005) New Revision: 1719 Added: trunk/CSP/csp/csplib/data/External.cpp trunk/CSP/csp/csplib/data/External.h trunk/CSP/csp/csplib/data/swig/External.i trunk/CSP/csp/csplib/util/Modules.cpp trunk/CSP/csp/csplib/util/Modules.h trunk/CSP/csp/csplib/util/swig/Modules.i Modified: trunk/CSP/csp/csplib/csplib.i trunk/CSP/csp/csplib/data/SConscript trunk/CSP/csp/csplib/data/swig/Archive.i trunk/CSP/csp/csplib/data/swig/DataArchive.i trunk/CSP/csp/csplib/data/swig/DataManager.i trunk/CSP/csp/csplib/data/swig/Date.i trunk/CSP/csp/csplib/data/swig/GeoPos.i trunk/CSP/csp/csplib/data/swig/InterfaceRegistry.i trunk/CSP/csp/csplib/data/swig/Key.i trunk/CSP/csp/csplib/data/swig/LUT.i trunk/CSP/csp/csplib/data/swig/Link.i trunk/CSP/csp/csplib/data/swig/Object.i trunk/CSP/csp/csplib/data/swig/Path.i trunk/CSP/csp/csplib/data/swig/Real.i trunk/CSP/csp/csplib/data/swig/Types.i trunk/CSP/csp/csplib/data/swig/Vector3.i trunk/CSP/csp/csplib/util/swig/Conversions.i trunk/CSP/csp/csplib/util/swig/Exception.i trunk/CSP/csp/csplib/util/swig/HashUtility.i trunk/CSP/csp/csplib/util/swig/Log.i trunk/CSP/csp/csplib/util/swig/Noise.i trunk/CSP/csp/csplib/util/swig/Random.i Log: -Restore External data type. -Add dynamic module loader utility (uses cc++) -Clean up include paths in swig interface files. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1719 Diff omitted (25330 bytes). |
|
From: <sv...@ww...> - 2005-12-05 01:45:32
|
Author: mkrose Date: 2005-12-04 17:45:23 -0800 (Sun, 04 Dec 2005) New Revision: 1718 Removed: trunk/CSP/csp/data/xml/theater/airbase.xml trunk/CSP/csp/data/xml/theater/city.xml trunk/CSP/csp/data/xml/theater/hangar.xml trunk/CSP/csp/data/xml/theater/hangar/ trunk/CSP/csp/data/xml/theater/house.xml trunk/CSP/csp/data/xml/theater/house/ trunk/CSP/csp/data/xml/theater/houses.xml trunk/CSP/csp/data/xml/theater/objectives.xml trunk/CSP/csp/data/xml/theater/runway.xml trunk/CSP/csp/data/xml/theater/runway/ trunk/CSP/csp/data/xml/theater/town.xml Log: Remove obsolete xml files. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1718 Deleted: trunk/CSP/csp/data/xml/theater/airbase.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/airbase.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/theater/airbase.xml 2005-12-05 01:45:23 UTC (rev 1718) @@ -1,19 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="CustomLayoutModel"> - <List name="layout"> - <Object class="FeatureLayout"> - <Path name="model">runway</Path> - <Float name="x">0</Float> - <Float name="y">0</Float> - <Float name="orientation">-1.57</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">runway</Path> - <Float name="x">00</Float> - <Float name="y">80</Float> - <Float name="orientation">-1.57</Float> - </Object> - </List> -</Object> - Deleted: trunk/CSP/csp/data/xml/theater/city.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/city.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/theater/city.xml 2005-12-05 01:45:23 UTC (rev 1718) @@ -1,31 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="CustomLayoutModel"> - <List name="layout"> - <Object class="FeatureLayout"> - <Path name="model">town</Path> - <Float name="x">-110</Float> - <Float name="y">0</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">town</Path> - <Float name="x">110</Float> - <Float name="y">0</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">town</Path> - <Float name="x">-110</Float> - <Float name="y">220</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">town</Path> - <Float name="x">110</Float> - <Float name="y">220</Float> - <Float name="orientation">0.0</Float> - </Object> - </List> -</Object> - Deleted: trunk/CSP/csp/data/xml/theater/hangar.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/hangar.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/theater/hangar.xml 2005-12-05 01:45:23 UTC (rev 1718) @@ -1,7 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="FeatureObjectModel"> - <Path name="model">hangar.model</Path> - <Int name="hit_points">30</Int> -</Object> - Deleted: trunk/CSP/csp/data/xml/theater/house.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/house.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/theater/house.xml 2005-12-05 01:45:23 UTC (rev 1718) @@ -1,7 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="FeatureObjectModel"> - <Path name="model">house.model</Path> - <Int name="hit_points">20</Int> -</Object> - Deleted: trunk/CSP/csp/data/xml/theater/houses.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/houses.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/theater/houses.xml 2005-12-05 01:45:23 UTC (rev 1718) @@ -1,31 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="CustomLayoutModel"> - <List name="layout"> - <Object class="FeatureLayout"> - <Path name="model">house</Path> - <Float name="x">0</Float> - <Float name="y">20</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">house</Path> - <Float name="x">0</Float> - <Float name="y">70</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">house</Path> - <Float name="x">0</Float> - <Float name="y">120</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">house</Path> - <Float name="x">0</Float> - <Float name="y">170</Float> - <Float name="orientation">0.0</Float> - </Object> - </List> -</Object> - Deleted: trunk/CSP/csp/data/xml/theater/objectives.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/objectives.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/theater/objectives.xml 2005-12-05 01:45:23 UTC (rev 1718) @@ -1,34 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="FeatureGroupList"> - <List name="feature_groups"> - <!-- the format for specify objective locations - has changed from local grid coordinates to - latitude/longitude (or UTM). the following - test objects must be updated to use simdata - LLA tags before they can be added back into - the theater. --> - <!--Object class="Objective"> - <Path name="model">airbase</Path> - <Float name="x">483010</Float> - <Float name="y">499010</Float> - <Float name="orientation">-0.1744</Float> - <Int name="strategic_value_modifier">0</Int> - </Object> - <Object class="Objective"> - <Path name="model">city</Path> - <Float name="x">483010</Float> - <Float name="y">499490</Float> - <Float name="orientation">-0.1744</Float> - <Int name="strategic_value_modifier">0</Int> - </Object> - <Object class="Objective"> - <Path name="model">town</Path> - <Float name="x">483040</Float> - <Float name="y">516173</Float> - <Float name="orientation">-0.1744</Float> - <Int name="strategic_value_modifier">0</Int> - </Object--> - </List> -</Object> - Deleted: trunk/CSP/csp/data/xml/theater/runway.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/runway.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/theater/runway.xml 2005-12-05 01:45:23 UTC (rev 1718) @@ -1,7 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="FeatureObjectModel"> - <Path name="model">runway.model</Path> - <Int name="hit_points">20</Int> -</Object> - Deleted: trunk/CSP/csp/data/xml/theater/town.xml =================================================================== --- trunk/CSP/csp/data/xml/theater/town.xml 2005-12-05 01:35:44 UTC (rev 1717) +++ trunk/CSP/csp/data/xml/theater/town.xml 2005-12-05 01:45:23 UTC (rev 1718) @@ -1,31 +0,0 @@ -<?xml version="1.0" standalone="no"?> - -<Object class="CustomLayoutModel"> - <List name="layout"> - <Object class="FeatureLayout"> - <Path name="model">houses</Path> - <Float name="x">20</Float> - <Float name="y">0</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">houses</Path> - <Float name="x">70</Float> - <Float name="y">10</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">houses</Path> - <Float name="x">120</Float> - <Float name="y">20</Float> - <Float name="orientation">0.0</Float> - </Object> - <Object class="FeatureLayout"> - <Path name="model">houses</Path> - <Float name="x">170</Float> - <Float name="y">30</Float> - <Float name="orientation">0.0</Float> - </Object> - </List> -</Object> - |
Author: mkrose Date: 2005-12-04 17:35:44 -0800 (Sun, 04 Dec 2005) New Revision: 1717 Added: trunk/CSP/csp/data/ trunk/CSP/csp/data/balkans_demeter/ trunk/CSP/csp/data/fcs/ trunk/CSP/csp/data/fcs/f16/ trunk/CSP/csp/data/fcs/f16/__init__.py trunk/CSP/csp/data/fcs/f16/constants.py trunk/CSP/csp/data/fcs/f16/inputs.py trunk/CSP/csp/data/fcs/f16/leadingedge.py trunk/CSP/csp/data/fcs/f16/monitoring.py trunk/CSP/csp/data/fcs/f16/nasa.py trunk/CSP/csp/data/fcs/f16/nws.py trunk/CSP/csp/data/fcs/f16/outputs.py trunk/CSP/csp/data/fcs/f16/pitch.py trunk/CSP/csp/data/fcs/f16/roll.py trunk/CSP/csp/data/fcs/f16/sensors.py trunk/CSP/csp/data/fcs/f16/speedbrake.py trunk/CSP/csp/data/fcs/f16/trailingedge.py trunk/CSP/csp/data/fcs/f16/yaw.py trunk/CSP/csp/data/fcs/m2k/ trunk/CSP/csp/data/fcs/m2k/__init__.py trunk/CSP/csp/data/fcs/m2k/constants.py trunk/CSP/csp/data/fcs/m2k/fcs.py trunk/CSP/csp/data/fcs/m2k/inputs.py trunk/CSP/csp/data/fcs/m2k/monitoring.py trunk/CSP/csp/data/fcs/m2k/nws.py trunk/CSP/csp/data/fcs/m2k/outputs.py trunk/CSP/csp/data/fcs/m2k/pitch.py trunk/CSP/csp/data/fcs/m2k/roll.py trunk/CSP/csp/data/fcs/m2k/sensors.py trunk/CSP/csp/data/fcs/m2k/speedbrake.py trunk/CSP/csp/data/input/ trunk/CSP/csp/data/xml/ trunk/CSP/csp/data/xml/environment/ trunk/CSP/csp/data/xml/objects/ trunk/CSP/csp/data/xml/stores/ trunk/CSP/csp/data/xml/terrain/ trunk/CSP/csp/data/xml/theater/ trunk/CSP/csp/data/xml/vehicles/ Removed: trunk/CSP/csp/data/fcs/f16/__init__.py trunk/CSP/csp/data/fcs/f16/inputs.py trunk/CSP/csp/data/fcs/f16/leadingedge.py trunk/CSP/csp/data/fcs/f16/monitoring.py trunk/CSP/csp/data/fcs/f16/nasa.py trunk/CSP/csp/data/fcs/f16/outputs.py trunk/CSP/csp/data/fcs/f16/pitch.py trunk/CSP/csp/data/fcs/f16/roll.py trunk/CSP/csp/data/fcs/f16/sensors.py trunk/CSP/csp/data/fcs/f16/speedbrake.py trunk/CSP/csp/data/fcs/f16/trailingedge.py trunk/CSP/csp/data/fcs/f16/yaw.py trunk/CSP/csp/data/fcs/m2k/__init__.py trunk/CSP/csp/data/fcs/m2k/constants.py trunk/CSP/csp/data/fcs/m2k/fcs.py trunk/CSP/csp/data/fcs/m2k/inputs.py trunk/CSP/csp/data/fcs/m2k/monitoring.py trunk/CSP/csp/data/fcs/m2k/nws.py trunk/CSP/csp/data/fcs/m2k/outputs.py trunk/CSP/csp/data/fcs/m2k/pitch.py trunk/CSP/csp/data/fcs/m2k/roll.py trunk/CSP/csp/data/fcs/m2k/sensors.py trunk/CSP/csp/data/fcs/m2k/speedbrake.py trunk/CSP/csp/data/xml/environment/ trunk/CSP/csp/data/xml/objects/ trunk/CSP/csp/data/xml/stores/ trunk/CSP/csp/data/xml/terrain/ trunk/CSP/csp/data/xml/theater/ trunk/CSP/csp/data/xml/vehicles/ Modified: trunk/CSP/csp/data/xml/stores/missiles/aim9.xml trunk/CSP/csp/data/xml/stores/racks/f16/centerline.xml trunk/CSP/csp/data/xml/stores/racks/f16/wingfuel.xml trunk/CSP/csp/data/xml/stores/tanks/f16/centerline_300gal/model.xml trunk/CSP/csp/data/xml/stores/tanks/f16/wing_370gal/model.xml trunk/CSP/csp/data/xml/terrain/balkan.xml trunk/CSP/csp/data/xml/theater/balkan.xml trunk/CSP/csp/data/xml/theater/balkan/Lightpylon1/model.xml trunk/CSP/csp/data/xml/theater/balkan/bureau01/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson01/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson02/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson03/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson04/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson05/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson06/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson07/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson08/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson09/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson10/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson11/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson12/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson13/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson14/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson15/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson16/model.xml trunk/CSP/csp/data/xml/theater/balkan/caissons/caisson17/model.xml trunk/CSP/csp/data/xml/theater/balkan/flag01/model.xml trunk/CSP/csp/data/xml/theater/balkan/forest.xml trunk/CSP/csp/data/xml/theater/balkan/forest1.xml trunk/CSP/csp/data/xml/theater/balkan/hangar/model.xml trunk/CSP/csp/data/xml/theater/balkan/hangar2/model.xml trunk/CSP/csp/data/xml/theater/balkan/runway/model.xml trunk/CSP/csp/data/xml/theater/balkan/tower1/model.xml trunk/CSP/csp/data/xml/vehicles/aircraft/F16/DJ/cockpit.xml trunk/CSP/csp/data/xml/vehicles/aircraft/F16/DJ/model.xml trunk/CSP/csp/data/xml/vehicles/aircraft/m2k/model.xml trunk/CSP/csp/data/xml/vehicles/tanks/t62/model.xml Log: Port fcs definitions from CSPSim/Tools/FlightControlSystem to data/fcs. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1717 Diff omitted (78945 bytes). |
|
From: <sv...@ww...> - 2005-12-04 21:17:44
|
Author: mkrose Date: 2005-12-04 13:17:37 -0800 (Sun, 04 Dec 2005) New Revision: 1716 Removed: trunk/CSP/csp/csplib/util/test_FileUtility.cpp trunk/CSP/csp/csplib/util/test_Ref.cpp Log: Remove tests that have already been copied to the test/ subdirectory (but which should have been moved). Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1716 Deleted: trunk/CSP/csp/csplib/util/test_FileUtility.cpp =================================================================== --- trunk/CSP/csp/csplib/util/test_FileUtility.cpp 2005-12-04 21:15:53 UTC (rev 1715) +++ trunk/CSP/csp/csplib/util/test_FileUtility.cpp 2005-12-04 21:17:37 UTC (rev 1716) @@ -1,80 +0,0 @@ -/* Combat Simulator Project - * Copyright (C) 2004 Mark Rose <mk...@us...> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - -/** - * @file test_FileUtility.h - * @brief Test file utilites. - */ - - -#include <csp/lib/util/FileUtility.h> -#include <csp/lib/util/Testing.h> - -using namespace csp::ospath; - -CSP_TESTFIXTURE(FileUtility) { - - CSP_TESTCASE(PathManipulation) { - // test directory (minimal!) - DirectoryContents dc = getDirectoryContents("."); - assert(dc.size() > 0); - - // test file extension - CSP_VERIFY_EQ(getFileExtension("/foo/bar.baz"), "baz"); - CSP_VERIFY_EQ(getFileExtension("\\foo\\bar.baz"), "baz"); - CSP_VERIFY_EQ(getFileExtension("/foo/bar.baz.bif"), "bif"); - CSP_VERIFY_EQ(getFileExtension("\\foo\\bar.baz.bif"), "bif"); - CSP_VERIFY_EQ(getFileExtension("/foo.dir/bar"), ""); - CSP_VERIFY_EQ(getFileExtension("\\foo.dir\\bar"), ""); - CSP_VERIFY_EQ(getFileExtension("/foo.dir/bar.x"), "x"); - CSP_VERIFY_EQ(getFileExtension("\\foo.dir\\bar.x"), "x"); - CSP_VERIFY_EQ(getFileExtension("bar.x"), "x"); - CSP_VERIFY_EQ(getFileExtension("/bar.x"), "x"); - CSP_VERIFY_EQ(getFileExtension("\\bar.x"), "x"); - CSP_VERIFY_EQ(getFileExtension("bar"), ""); - CSP_VERIFY_EQ(getFileExtension("/bar"), ""); - CSP_VERIFY_EQ(getFileExtension("\\bar"), ""); - CSP_VERIFY_EQ(getFileExtension(""), ""); - - // test file extension stripping - std::string path; - path = "/foo/bar.baz"; - CSP_VERIFY_EQ(stripFileExtension(path), "baz"); - CSP_VERIFY_EQ(path, "/foo/bar"); - path = "\\foo\\bar.baz"; - CSP_VERIFY_EQ(stripFileExtension(path), "baz"); - CSP_VERIFY_EQ(path, "\\foo\\bar"); - path = "/foo/bar.baz.bif"; - CSP_VERIFY_EQ(stripFileExtension(path), "bif"); - CSP_VERIFY_EQ(path, "/foo/bar.baz"); - path = "foo.bif"; - CSP_VERIFY_EQ(stripFileExtension(path), "bif"); - CSP_VERIFY_EQ(path, "foo"); - path = "foobar"; - CSP_VERIFY_EQ(stripFileExtension(path), ""); - CSP_VERIFY_EQ(path, "foobar"); - path = ".foobar"; - CSP_VERIFY_EQ(stripFileExtension(path), "foobar"); - CSP_VERIFY_EQ(path, ""); - path = ""; - CSP_VERIFY_EQ(stripFileExtension(path), ""); - CSP_VERIFY_EQ(path, ""); - } -}; - Deleted: trunk/CSP/csp/csplib/util/test_Ref.cpp =================================================================== --- trunk/CSP/csp/csplib/util/test_Ref.cpp 2005-12-04 21:15:53 UTC (rev 1715) +++ trunk/CSP/csp/csplib/util/test_Ref.cpp 2005-12-04 21:17:37 UTC (rev 1716) @@ -1,64 +0,0 @@ -/* Combat Simulator Project - * Copyright (C) 2004 Mark Rose <mk...@us...> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - -/** - * @file test_Ref.h - * @brief Test reference counting. - */ - - -#include <csp/lib/util/Ref.h> -#include <csp/lib/util/Testing.h> - - -CSP_TESTFIXTURE(Ref) { - - struct R: public csp::Referenced { - int &m_count; - R(int &count): m_count(count) { ++m_count; } - ~R() { --m_count; } - }; - - typedef csp::Ref<R> Ref; - - CSP_TESTCASE(Count) { - int count = 0; - CSP_VERIFY_EQ(count, 0); - Ref x = new R(count); - CSP_VERIFY_EQ(count, 1); - { - Ref y = x; - CSP_VERIFY_EQ(count, 1); - } - CSP_VERIFY_EQ(count, 1); - { - Ref y = new R(count); - CSP_VERIFY_EQ(count, 2); - y = x; - CSP_VERIFY_EQ(count, 1); - y = new R(count); - CSP_VERIFY_EQ(count, 2); - } - CSP_VERIFY_EQ(count, 1); - x = 0; - CSP_VERIFY_EQ(count, 0); - } -}; - - |
|
From: <sv...@ww...> - 2005-12-04 21:16:04
|
Author: mkrose Date: 2005-12-04 13:15:53 -0800 (Sun, 04 Dec 2005) New Revision: 1715 Removed: trunk/CSP/csp/csplib/data/Archive.i trunk/CSP/csp/csplib/data/DataArchive.i trunk/CSP/csp/csplib/data/DataManager.i trunk/CSP/csp/csplib/data/Date.i trunk/CSP/csp/csplib/data/Enum.i trunk/CSP/csp/csplib/data/GeoPos.i trunk/CSP/csp/csplib/data/InterfaceRegistry.i trunk/CSP/csp/csplib/data/Key.i trunk/CSP/csp/csplib/data/LUT.i trunk/CSP/csp/csplib/data/Link.i trunk/CSP/csp/csplib/data/Matrix3.i trunk/CSP/csp/csplib/data/Object.i trunk/CSP/csp/csplib/data/Path.i trunk/CSP/csp/csplib/data/Quat.i trunk/CSP/csp/csplib/data/Real.i trunk/CSP/csp/csplib/data/Types.i trunk/CSP/csp/csplib/data/Vector3.i trunk/CSP/csp/csplib/util/Conversions.i trunk/CSP/csp/csplib/util/Exception.i trunk/CSP/csp/csplib/util/HashUtility.i trunk/CSP/csp/csplib/util/Log.i trunk/CSP/csp/csplib/util/Noise.i trunk/CSP/csp/csplib/util/Random.i trunk/CSP/csp/csplib/util/Testing.i Log: Remove swig interface files that should have been moved to swig/ subdirecties (rather than copied). Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1715 Diff omitted (42893 bytes). |
|
From: <sv...@ww...> - 2005-12-04 20:16:06
|
Author: mkrose Date: 2005-12-04 12:15:57 -0800 (Sun, 04 Dec 2005) New Revision: 1714 Removed: trunk/CSP/csp/cspsim/CSPSim.i trunk/CSP/csp/cspsim/Config.i trunk/CSP/csp/cspsim/VirtualScene.i Log: Remove swig interface files from cspsim/ that had already been moved to cspsim/swig. Two files in cspsim (CSPSim.i and cspsim.i) were causing problems on windows since the file system is case-insensitive. Only cspsim.i should be there. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1714 Deleted: trunk/CSP/csp/cspsim/CSPSim.i =================================================================== --- trunk/CSP/csp/cspsim/CSPSim.i 2005-12-04 10:19:46 UTC (rev 1713) +++ trunk/CSP/csp/cspsim/CSPSim.i 2005-12-04 20:15:57 UTC (rev 1714) @@ -1,106 +0,0 @@ -// Combat Simulator Project -// Copyright (C) 2002 The Combat Simulator Project -// http://csp.sourceforge.net -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%{ -#include <csp/cspsim/CSPSim.h> -#include <csp/cspsim/Theater.h> -#include <csp/cspsim/Projection.h> -#include <csp/cspsim/Shell.h> -#include <csp/cspsim/DynamicObject.h> -#include <csp/csplib/battlefield/LocalBattlefield.h> -#include <csp/csplib/data/DataManager.h> -#include <csp/csplib/data/Math.h> - -void _createVehicleHelper(CSPSim *self, const char *path, simdata::Vector3 position, - simdata::Vector3 velocity, simdata::Vector3 attitude) { - simdata::Ref<DynamicObject> obj = self->getDataManager().getObject(path); - if (!obj) { - std::cout << "WARNING: Failed to create object '" << path << "'\n"; - return; - } - obj->setGlobalPosition(position); - obj->setVelocity(velocity); - simdata::Quat q_attitude; - attitude *= 3.1416 / 180.0; - q_attitude.makeRotate(attitude.x(), attitude.y(), -attitude.z()); - obj->setAttitude(q_attitude); - self->getBattlefield()->__test__addLocalHumanUnit(obj); - if (!self->getActiveObject()) self->setActiveObject(obj); -} - -%} - -class CSPSim -{ -public: - static CSPSim *theSim; - - CSPSim(); - virtual ~CSPSim(); - virtual void init(); - virtual void run(); - virtual void quit(); - virtual void cleanup(); - - void changeScreen(BaseScreen * newScreen); - SDL_Surface * getSDLScreen() {return m_SDLScreen;}; - simdata::SimDate & getCurrentTime() { return m_CurrentTime; } - simdata::SimTime const & getFrameRate() const{ return m_FrameRate; } - void setActiveObject(simdata::Ref<DynamicObject> object); - simdata::Ref<DynamicObject> const getActiveObject() const; - Battlefield * const getBattlefield() const; - void togglePause(); - void runConsole(PyConsole *console); - void endConsole(); - bool isPaused() { return m_Paused; } - simdata::DataManager & getDataManager() { return m_DataManager; } -}; - - -%exception CSPSim::createVehicle { - try { - $action - } catch (simdata::Exception &e) { - std::string msg = e.getType() + ": " + e.getMessage(); - PyErr_SetString(PyExc_RuntimeError, msg.c_str()); - SWIG_fail; - } catch (...) { - PyErr_SetString(PyExc_RuntimeError, "Caught an (unknown) exception in CSPSim::createVehicle"); - SWIG_fail; - } -} - -%extend CSPSim { - void createVehicle(const char *path, simdata::Vector3 position, - simdata::Vector3 velocity, simdata::Vector3 attitude) { - _createVehicleHelper(self, path, position, velocity, attitude); - } - void createVehicle(const char *path, simdata::LLA lla, - simdata::Vector3 velocity, simdata::Vector3 attitude) { - simdata::Ref<const Projection> map = CSPSim::theSim->getTheater()->getTerrain()->getProjection(); - simdata::Vector3 position = map->convert(lla); - _createVehicleHelper(self, path, position, velocity, attitude); - } - void setShell(PyObject *shell) { self->getShell()->bind(shell); } - std::string const &getTerrainName() { return self->getTheater()->getTerrain()->getName(); } - int getTerrainVersion() { return self->getTheater()->getTerrain()->getVersion(); } -} - -%exception; - Deleted: trunk/CSP/csp/cspsim/Config.i =================================================================== --- trunk/CSP/csp/cspsim/Config.i 2005-12-04 10:19:46 UTC (rev 1713) +++ trunk/CSP/csp/cspsim/Config.i 2005-12-04 20:15:57 UTC (rev 1714) @@ -1,27 +0,0 @@ -// Combat Simulator Project -// Copyright (C) 2002 The Combat Simulator Project -// http://csp.sourceforge.net -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%module Config -%{ -#include <csp/cspsim/Config.h> -%} - -%include <csp/cspsim/Config.h> - - Deleted: trunk/CSP/csp/cspsim/VirtualScene.i =================================================================== --- trunk/CSP/csp/cspsim/VirtualScene.i 2005-12-04 10:19:46 UTC (rev 1713) +++ trunk/CSP/csp/cspsim/VirtualScene.i 2005-12-04 20:15:57 UTC (rev 1714) @@ -1,60 +0,0 @@ -// Combat Simulator Project -// Copyright (C) 2002 The Combat Simulator Project -// http://csp.sourceforge.net -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%{ -#include <csp/cspsim/VirtualScene.h> -%} - - -class VirtualScene -{ -private: - // this is a public ctor but we declare it as private here to prevent - // VirtualScene instances from being created from python. - VirtualScene(int x, int y); - -public: - void addObject(simdata::Ref<DynamicObject> object); - void removeObject(simdata::Ref<DynamicObject> object); - - void spinTheWorld(bool spin); - void resetSpin(); - - void _setLookAt(simdata::Vector3 const & eyePos, simdata::Vector3 const & lookPos, simdata::Vector3 const & upVec); - void getLookAt(simdata::Vector3 & eyePos, simdata::Vector3 & lookPos, simdata::Vector3 & upVec) const; - void setWireframeMode(bool flag); - void setFogMode(bool flag); - void setFogStart(float value); - void setFogEnd(float value); - - float getViewDistance() const { return m_ViewDistance; } - void setViewDistance(float value); - - void setCameraNode(osg::Node * pNode); - - int getTerrainPolygonsRendered(); - - float getViewAngle() const { return m_ViewAngle; } - void setViewAngle(float); - - double getSpin(); - -}; - - |
|
From: <sv...@ww...> - 2005-12-04 10:20:09
|
Author: mkrose Date: 2005-12-04 02:19:46 -0800 (Sun, 04 Dec 2005) New Revision: 1713 Added: trunk/CSP/csp/csplib/csplib.dox trunk/CSP/csp/csplib/csplib.footer Removed: trunk/CSP/csp/csplib/net/SimNet.h Modified: trunk/CSP/csp/csplib/SConscript trunk/CSP/csp/csplib/net/Callbacks.h trunk/CSP/csp/csplib/net/ClientServer.h trunk/CSP/csp/csplib/net/DispatchCache.h trunk/CSP/csp/csplib/net/DispatchHandler.h trunk/CSP/csp/csplib/net/DispatchManager.h trunk/CSP/csp/csplib/net/DispatchTarget.h trunk/CSP/csp/csplib/net/HandlerSet.h trunk/CSP/csp/csplib/net/MessageHandler.h trunk/CSP/csp/csplib/net/MessageQueue.h trunk/CSP/csp/csplib/net/NetBase.h trunk/CSP/csp/csplib/net/NetRandom.h trunk/CSP/csp/csplib/net/NetworkInterface.h trunk/CSP/csp/csplib/net/NetworkMessage.h trunk/CSP/csp/csplib/net/NetworkNode.h trunk/CSP/csp/csplib/net/PacketDecoder.h trunk/CSP/csp/csplib/net/PacketHandler.h trunk/CSP/csp/csplib/net/PacketQueue.h trunk/CSP/csp/csplib/net/PacketSource.h trunk/CSP/csp/csplib/net/PeerInfo.h trunk/CSP/csp/csplib/net/RecordCodec.h trunk/CSP/csp/csplib/net/ReliablePacket.h trunk/CSP/csp/csplib/net/RoutingHandler.h trunk/CSP/csp/csplib/net/Sockets.h trunk/CSP/csp/csplib/net/StopWatch.h trunk/CSP/csp/csplib/net/TaggedRecord.h trunk/CSP/csp/csplib/net/TaggedRecordRegistry.h trunk/CSP/csp/csplib/spatial/QuadTree.h trunk/CSP/csp/csplib/util/SConscript trunk/CSP/csp/csplib/util/Trace.h Log: Port doxygen config and build for csplib. Also minor documentation cleanups. <enter a description here> Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1713 Diff omitted (66975 bytes). |
|
From: <sv...@ww...> - 2005-12-04 10:11:50
|
Author: mkrose Date: 2005-12-04 02:11:38 -0800 (Sun, 04 Dec 2005) New Revision: 1712 Modified: trunk/CSP/csp/cspsim/stores/Projectile.cpp trunk/CSP/csp/cspsim/stores/Projectile.h Log: Fix forward Ref<> declaration. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1712 Modified: trunk/CSP/csp/cspsim/stores/Projectile.cpp =================================================================== --- trunk/CSP/csp/cspsim/stores/Projectile.cpp 2005-12-04 09:45:13 UTC (rev 1711) +++ trunk/CSP/csp/cspsim/stores/Projectile.cpp 2005-12-04 10:11:38 UTC (rev 1712) @@ -33,6 +33,13 @@ CSP_XML_BEGIN(Projectile) CSP_XML_END +// TODO SimObject probably needs a specialized type for Projectiles. +Projectile::Projectile(): DynamicObject(TYPE_AIR_UNIT), m_DetachedModel(false) { +} + +Projectile::~Projectile() { +} + void Projectile::prepareRelease(Ref<DynamicObject> const &/*parent*/, Ref<Store> const &store) { assert(store.valid() && !m_Store); m_Store = store; Modified: trunk/CSP/csp/cspsim/stores/Projectile.h =================================================================== --- trunk/CSP/csp/cspsim/stores/Projectile.h 2005-12-04 09:45:13 UTC (rev 1711) +++ trunk/CSP/csp/cspsim/stores/Projectile.h 2005-12-04 10:11:38 UTC (rev 1712) @@ -40,8 +40,7 @@ public: CSP_DECLARE_OBJECT(Projectile) - // TODO SimObject probably needs a specialized type for Projectiles. - Projectile(): DynamicObject(TYPE_AIR_UNIT), m_DetachedModel(false) { } + Projectile(); /** Called by StoresManagementSystem when releasing a store from a parent object. * The newly created Projectile instance is responsible for loading necessary @@ -53,6 +52,8 @@ virtual void prepareRelease(Ref<DynamicObject> const &parent, Ref<Store> const &store); protected: + virtual ~Projectile(); + virtual void onEnterScene(); virtual void createSceneModel(); |
|
From: <sv...@ww...> - 2005-12-04 09:45:41
|
Author: mkrose Date: 2005-12-04 01:45:13 -0800 (Sun, 04 Dec 2005) New Revision: 1711 Modified: trunk/CSP/csp/cspsim/SConscript Log: Add osgDB and OpenThreads to the scons config and link. They were automatically brought in by other lib dependencies, but this isn't necessarily true on other platforms. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1711 Modified: trunk/CSP/csp/cspsim/SConscript =================================================================== --- trunk/CSP/csp/cspsim/SConscript 2005-12-04 09:08:29 UTC (rev 1710) +++ trunk/CSP/csp/cspsim/SConscript 2005-12-04 09:45:13 UTC (rev 1711) @@ -25,9 +25,11 @@ valid = conf.CheckLib('SDL_image', 'IMG_Load') and valid valid = conf.CheckOSGVersion('osg', '0.9.6') and valid valid = conf.CheckOSGVersion('osgUtil', '0.9.6') and valid + valid = conf.CheckOSGVersion('osgDB', '0.9.6') and valid valid = conf.CheckOSGVersion('osgText', '0.9.6') and valid valid = conf.CheckOSGVersion('osgParticle', '0.9.6') and valid valid = conf.CheckLib('osgFX') and valid # doesn't have a GetVersion function + valid = conf.CheckLib('OpenThreads') and valid # doesn't have a GetVersion function valid = conf.CheckCommandVersion('sdl', 'sdl-config --version', '1.2.5') and valid if not valid: print 'Missing dependencies; see http://csp.sf.net/wiki/Current_build_dependencies for more information.' |
|
From: <sv...@ww...> - 2005-12-04 09:08:36
|
Author: mkrose Date: 2005-12-04 01:08:29 -0800 (Sun, 04 Dec 2005) New Revision: 1710 Added: trunk/CSP/csp/cspsim/DataRecorder.cpp trunk/CSP/csp/cspsim/DynamicModel.cpp Modified: trunk/CSP/csp/cspsim/DataRecorder.h trunk/CSP/csp/cspsim/DynamicModel.h trunk/CSP/csp/cspsim/SConscript Log: Move implementation for DynamicModel and DataRecorder out of the headers. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1710 Diff omitted (17110 bytes). |
|
From: <sv...@ww...> - 2005-12-04 09:01:32
|
Author: mkrose Date: 2005-12-04 01:01:21 -0800 (Sun, 04 Dec 2005) New Revision: 1709 Modified: trunk/CSP/csp/csplib/numeric/NumericalMethod.cpp trunk/CSP/csp/csplib/numeric/NumericalMethod.h trunk/CSP/csp/csplib/numeric/Vector.h trunk/CSP/csp/csplib/numeric/VectorField.h trunk/CSP/csp/cspsim/AircraftPhysicsModel.cpp trunk/CSP/csp/cspsim/AircraftPhysicsModel.h trunk/CSP/csp/cspsim/DynamicalSystem.cpp trunk/CSP/csp/cspsim/DynamicalSystem.h trunk/CSP/csp/cspsim/PhysicsModel.cpp trunk/CSP/csp/cspsim/PhysicsModel.h Log: Move rk solver and related classes to csp::numeric namespace. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1709 Diff omitted (18198 bytes). |
|
From: <sv...@ww...> - 2005-12-04 03:51:34
|
Author: mkrose
Date: 2005-12-03 19:51:25 -0800 (Sat, 03 Dec 2005)
New Revision: 1708
Added:
trunk/CSP/csp/cspsim/SceneModel.cpp
trunk/CSP/csp/cspsim/SceneModel.h
Modified:
trunk/CSP/csp/cspsim/AircraftObject.cpp
trunk/CSP/csp/cspsim/DynamicModel.h
trunk/CSP/csp/cspsim/DynamicObject.cpp
trunk/CSP/csp/cspsim/ObjectModel.cpp
trunk/CSP/csp/cspsim/ObjectModel.h
trunk/CSP/csp/cspsim/SConscript
trunk/CSP/csp/cspsim/Station.cpp
trunk/CSP/csp/cspsim/stores/Projectile.cpp
trunk/CSP/csp/cspsim/theater/Feature.cpp
trunk/CSP/csp/cspsim/theater/FeatureObjectModel.h
Log:
Split SceneModel and SceneModelChild out of ObjectModel.h. They are now in
SceneModel.{h,cpp}, with appropriate fixups to other sources using these
classes. Replaced a couple includes with forward declarations that hopefully
won't break on windows.
Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1708
Diff omitted (37614 bytes).
|
|
From: <sv...@ww...> - 2005-12-04 02:50:38
|
Author: mkrose Date: 2005-12-03 18:50:30 -0800 (Sat, 03 Dec 2005) New Revision: 1707 Modified: trunk/CSP/csp/cspsim/systems/AircraftInputSystem.cpp trunk/CSP/csp/cspsim/systems/AircraftInputSystem.h trunk/CSP/csp/cspsim/systems/AircraftSimpleFCS.cpp trunk/CSP/csp/cspsim/systems/AircraftSimpleFCS.h Log: Move private inner class definitions out of headers. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1707 Diff omitted (18757 bytes). |
|
From: <sv...@ww...> - 2005-12-04 02:26:36
|
Author: mkrose Date: 2005-12-03 18:26:28 -0800 (Sat, 03 Dec 2005) New Revision: 1706 Added: trunk/CSP/csp/tools/fcs/ trunk/CSP/csp/tools/fcs/GenerateNetwork.py trunk/CSP/csp/tools/fcs/NodeConstructor.py trunk/CSP/csp/tools/fcs/Normalize.py trunk/CSP/csp/tools/fcs/__init__.py trunk/CSP/csp/tools/recorder/ trunk/CSP/csp/tools/recorder/__init__.py trunk/CSP/csp/tools/recorder/decode.py Log: Port data recorder and fcs xml generator tools. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1706 Diff omitted (18405 bytes). |
|
From: <sv...@ww...> - 2005-12-03 18:08:19
|
Author: mkrose Date: 2005-12-03 10:08:13 -0800 (Sat, 03 Dec 2005) New Revision: 1705 Added: trunk/CSP/csp/tools/svn/ trunk/CSP/csp/tools/svn/__init__.py trunk/CSP/csp/tools/svn/subcmd.py trunk/CSP/csp/tools/svn/sublib.py Removed: trunk/CSP/csp/tools/subcmd.py trunk/CSP/csp/tools/sublib.py Modified: trunk/CSP/csp/tools/subset Log: Move subset helper modules to a separate directory. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1705 Diff omitted (77931 bytes). |
|
From: <sv...@ww...> - 2005-12-03 18:04:36
|
Author: mkrose Date: 2005-12-03 10:04:29 -0800 (Sat, 03 Dec 2005) New Revision: 1704 Modified: trunk/CSP/csp/tools/build.py trunk/CSP/csp/tools/pyrun trunk/CSP/csp/tools/trace trunk/CSP/csp/tools/undiff Log: Fixup import paths and shebangs. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1704 Modified: trunk/CSP/csp/tools/build.py =================================================================== --- trunk/CSP/csp/tools/build.py 2005-12-03 18:03:36 UTC (rev 1703) +++ trunk/CSP/csp/tools/build.py 2005-12-03 18:04:29 UTC (rev 1704) @@ -1,5 +1,3 @@ -#!/usr/bin/python -# # Copyright 2004 Mark Rose <mk...@us...> # # This program is free software; you can redistribute it and/or modify Modified: trunk/CSP/csp/tools/pyrun =================================================================== --- trunk/CSP/csp/tools/pyrun 2005-12-03 18:03:36 UTC (rev 1703) +++ trunk/CSP/csp/tools/pyrun 2005-12-03 18:04:29 UTC (rev 1704) @@ -1,5 +1,5 @@ -#!/usr/bin/python -# +#!/usr/bin/env python + # Copyright 2004 Mark Rose <mk...@us...> # # This program is free software; you can redistribute it and/or modify @@ -37,13 +37,13 @@ import zipfile from modulefinder import ModuleFinder -from CSP.base import app +from csp.base import app ENTRY_MODULE = '__pyrun__' -DEFAULT_STUB = ("python2.3 -c \"" +DEFAULT_STUB = ("python -c \"" "import sys;" "sys.path.insert(0, '$0');" "sys.argv[0]='$0';" Modified: trunk/CSP/csp/tools/trace =================================================================== --- trunk/CSP/csp/tools/trace 2005-12-03 18:03:36 UTC (rev 1703) +++ trunk/CSP/csp/tools/trace 2005-12-03 18:04:29 UTC (rev 1704) @@ -1,5 +1,5 @@ -#!/usr/bin/python -# +#!/usr/bin/env python + # Copyright 2004 Mark Rose <mk...@us...> # # This program is free software; you can redistribute it and/or modify @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -#!/usr/bin/python """ Decode SimData stack traces under GNU/Linux. @@ -48,7 +47,7 @@ import re import os.path -from CSP.base import app +from csp.base import app re_trace = re.compile(r'([0-9A-Fa-f]{8})\s+([0-9A-Fa-f]{8})\s+([0-9A-Fa-f]{8})\s+(\S+)\s*(\S*)') Modified: trunk/CSP/csp/tools/undiff =================================================================== --- trunk/CSP/csp/tools/undiff 2005-12-03 18:03:36 UTC (rev 1703) +++ trunk/CSP/csp/tools/undiff 2005-12-03 18:04:29 UTC (rev 1704) @@ -36,7 +36,7 @@ import sys import os -from CSP.base import app +from csp.base import app app.addOption('--output1', metavar='PATH', default='', help='output path for original file') |
