csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/CSPSim/Include CSPSim.h,1.16.2.3,1.16.2.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv12060/Include

Modified Files:
      Tag: systems
	CSPSim.h 
Log Message:


Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -C2 -d -r1.16.2.3 -r1.16.2.4
*** CSPSim.h	11 Oct 2003 17:42:01 -0000	1.16.2.3
--- CSPSim.h	11 Oct 2003 17:57:37 -0000	1.16.2.4
***************
*** 44,47 ****
--- 44,50 ----
  
  
+ // Uncomment this line if you are using OSG version 0.9.4 or older.
+ //#define CSP_OSG_094
+ 
  struct SDL_Surface;
  

[Csp-commits] APPLICATIONS/CSPSim/Source VirtualScene.cpp,1.14.2.1,1.14.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv12060/Source

Modified Files:
      Tag: systems
	VirtualScene.cpp 
Log Message:


Index: VirtualScene.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/VirtualScene.cpp,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** VirtualScene.cpp	29 Sep 2003 06:46:11 -0000	1.14.2.1
--- VirtualScene.cpp	11 Oct 2003 17:57:37 -0000	1.14.2.2
***************
*** 61,66 ****
  #endif
  
- //#define CSP_OSG_094
- 
  extern int g_ScreenWidth;
  extern int g_ScreenHeight;
--- 61,64 ----

[Csp-commits] APPLICATIONS/CSPSim/Include BaseScreen.h,1.4,1.4.2.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv10727/Include

Modified Files:
      Tag: systems
	BaseScreen.h 
Log Message:


Index: BaseScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/BaseScreen.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** BaseScreen.h	18 Apr 2003 12:06:47 -0000	1.4
--- BaseScreen.h	11 Oct 2003 17:48:12 -0000	1.4.2.1
***************
*** 54,61 ****
  	virtual void onRender() = 0;
  
! 	virtual VirtualHID *getInterface();
  
  protected:
! 	VirtualHID *m_Interface;
  };
  
--- 54,61 ----
  	virtual void onRender() = 0;
  
! 	virtual simdata::Ref<VirtualHID> getInterface();
  
  protected:
! 	simdata::Ref<VirtualHID> m_Interface;
  };
  

[Csp-commits] APPLICATIONS/CSPSim/Include MapEvent.h,1.1.2.1,1.1.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv10510/Include

Modified Files:
      Tag: systems
	MapEvent.h 
Log Message:


Index: MapEvent.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Attic/MapEvent.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** MapEvent.h	29 Sep 2003 06:46:11 -0000	1.1.2.1
--- MapEvent.h	11 Oct 2003 17:47:53 -0000	1.1.2.2
***************
*** 23,28 ****
   **/
  
! #ifndef __INPUTEVENT_H__
! #define __INPUTEVENT_H__
  
  #include <string>
--- 23,28 ----
   **/
  
! #ifndef __MAPEVENT_H__
! #define __MAPEVENT_H__
  
  #include <string>
***************
*** 86,89 ****
  
  
! #endif // __INPUTEVENT_H__
  
--- 86,89 ----
  
  
! #endif // __MAPEVENT_H__
  

[Csp-commits] APPLICATIONS/CSPSim/Source BaseScreen.cpp,1.3,1.3.2.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv10467/Source

Modified Files:
      Tag: systems
	BaseScreen.cpp 
Log Message:


Index: BaseScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/BaseScreen.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** BaseScreen.cpp	2 Feb 2003 20:53:28 -0000	1.3
--- BaseScreen.cpp	11 Oct 2003 17:47:36 -0000	1.3.2.1
***************
*** 25,29 ****
  #include <BaseScreen.h>
  
! BaseScreen::BaseScreen(): m_Interface(0) 
  {
  }
--- 25,29 ----
  #include <BaseScreen.h>
  
! BaseScreen::BaseScreen()
  {
  }
***************
*** 33,37 ****
  }
  
! VirtualHID *BaseScreen::getInterface()
  {
  	return m_Interface;
--- 33,37 ----
  }
  
! simdata::Ref<VirtualHID> BaseScreen::getInterface()
  {
  	return m_Interface;

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.cpp,1.36.2.2,1.36.2.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv10426/Source

Modified Files:
      Tag: systems
	CSPSim.cpp 
Log Message:


Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -C2 -d -r1.36.2.2 -r1.36.2.3
*** CSPSim.cpp	29 Sep 2003 06:46:11 -0000	1.36.2.2
--- CSPSim.cpp	11 Oct 2003 17:47:15 -0000	1.36.2.3
***************
*** 125,129 ****
  	m_MainMenuScreen = NULL;
  
- 	m_Interface = NULL;
  	m_Battlefield = NULL;
  	m_Scene = NULL;
--- 125,128 ----
***************
*** 168,173 ****
  		simdata::hasht classhash = m_ActiveObject->getPath();
  		printf("getting map for %s\n", classhash.str().c_str());
! 		EventMapping *map = m_InterfaceMaps->getMap(classhash);
! 		printf("selecting map @ %p\n", map);
  		m_Interface->setMapping(map);
  	}
--- 167,172 ----
  		simdata::hasht classhash = m_ActiveObject->getPath();
  		printf("getting map for %s\n", classhash.str().c_str());
! 		simdata::Ref<EventMapping> map = m_InterfaceMaps->getMap(classhash);
! 		printf("selecting map @ %p\n", map.get());
  		m_Interface->setMapping(map);
  	}
***************
*** 400,408 ****
  	assert(m_Terrain.valid());
  	assert(m_GameScreen);
- 	assert(m_InterfaceMaps);
  	setActiveObject(NULL);
  	delete m_GameScreen;
  	m_GameScreen = NULL;
- 	delete m_InterfaceMaps;
  	m_InterfaceMaps = NULL;
  	m_Terrain->deactivate();
--- 399,405 ----
***************
*** 599,603 ****
  	CSP_LOG(APP, DEBUG, "CSPSim::doInput()...");
  
! 	VirtualHID *screen_interface = m_CurrentScreen->getInterface();
  
  	SDL_Event event;
--- 596,600 ----
  	CSP_LOG(APP, DEBUG, "CSPSim::doInput()...");
  
! 	simdata::Ref<VirtualHID> screen_interface = m_CurrentScreen->getInterface();
  
  	SDL_Event event;
***************
*** 619,633 ****
  		}
  		if (!handled && m_CurrentScreen) {
! 			if (screen_interface) {
  				handled = screen_interface->onEvent(event);
  			}
  		}
! 		if (!handled && m_Interface) {
  			handled = m_Interface->onEvent(event);
  		}
  	}
  	// run input scripts
! 	if (screen_interface) screen_interface->onUpdate(dt);
! 	if (m_Interface) m_Interface->onUpdate(dt);
  }
  
--- 616,634 ----
  		}
  		if (!handled && m_CurrentScreen) {
! 			if (screen_interface.valid()) {
  				handled = screen_interface->onEvent(event);
  			}
  		}
! 		if (!handled && m_Interface.valid()) {
  			handled = m_Interface->onEvent(event);
  		}
  	}
  	// run input scripts
! 	if (screen_interface.valid()) {
! 		screen_interface->onUpdate(dt);
! 	}
! 	if (m_Interface.valid()) {
! 		m_Interface->onUpdate(dt);
! 	}
  }
  
***************
*** 766,767 ****
--- 767,773 ----
  	return m_Theater;
  }
+ 
+ simdata::Ref<EventMapIndex> CSPSim::getInterfaceMaps() const { 
+ 	return m_InterfaceMaps; 
+ }
+ 

[Csp-commits] APPLICATIONS/CSPSim/Source EventMapIndex.cpp,1.7,1.7.2.1 EventMapping.cpp,1.4,1.4.2.1 HID.cpp,1.10.2.1,1.10.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv10333/Source

Modified Files:
      Tag: systems
	EventMapIndex.cpp EventMapping.cpp HID.cpp 
Log Message:


Index: EventMapIndex.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/EventMapIndex.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** EventMapIndex.cpp	23 Jul 2003 01:28:58 -0000	1.7
--- EventMapIndex.cpp	11 Oct 2003 17:46:34 -0000	1.7.2.1
***************
*** 39,50 ****
  
  
- EventMapIndex::~EventMapIndex() {
- 	MapVector::iterator i;
- 	for (i = m_Maps.begin(); i != m_Maps.end(); i++) {
- 		delete *i;
- 	}
- }
  
! EventMapping *EventMapIndex::getMap(const simdata::hasht &key) {
  	MapHash::iterator i = m_Index.find(key);
  	if (i == m_Index.end()) return NULL;
--- 39,44 ----
  
  
  
! EventMapping::Ref EventMapIndex::getMap(const simdata::hasht &key) {
  	MapHash::iterator i = m_Index.find(key);
  	if (i == m_Index.end()) return NULL;
***************
*** 52,62 ****
  }
  
! EventMapping *EventMapIndex::getMap(const std::string &id) {
  	return getMap(simdata::hasht(id));
  }
  
  void EventMapIndex::load(std::string const &path) {
! 	EventMapping *m = new EventMapping;
! 	assert(m);
  	CSP_LOG(APP, INFO, "Loading human interface device mapping '" << path << "'");
  	if (m->load(path)) {
--- 46,56 ----
  }
  
! EventMapping::Ref EventMapIndex::getMap(const std::string &id) {
  	return getMap(simdata::hasht(id));
  }
  
  void EventMapIndex::load(std::string const &path) {
! 	EventMapping::Ref m = new EventMapping;
! 	assert(m.valid());
  	CSP_LOG(APP, INFO, "Loading human interface device mapping '" << path << "'");
  	if (m->load(path)) {
***************
*** 67,72 ****
  			m_Index[*idx] = m;
  		}
- 	} else {
- 		delete m;
  	}
  }
--- 61,64 ----

Index: EventMapping.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/EventMapping.cpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** EventMapping.cpp	19 Feb 2003 11:41:58 -0000	1.4
--- EventMapping.cpp	11 Oct 2003 17:46:34 -0000	1.4.2.1
***************
*** 28,32 ****
  # endif
  
! #include "EventMapping.h"
  
  #include <SDL/SDL_events.h>
--- 28,32 ----
  # endif
  
! #include <EventMapping.h>
  
  #include <SDL/SDL_events.h>

Index: HID.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/HID.cpp,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** HID.cpp	16 Sep 2003 06:57:30 -0000	1.10.2.1
--- HID.cpp	11 Oct 2003 17:46:34 -0000	1.10.2.2
***************
*** 30,33 ****
--- 30,34 ----
  #include "InputInterface.h"
  #include <SDL/SDL_events.h>
+ //#include "Event.h"
  
  #include <cassert>
***************
*** 117,121 ****
  VirtualHID::~VirtualHID() {}
  
! void VirtualHID::setMapping(EventMapping const *map) { 
  	m_Map = map; 
  }
--- 118,122 ----
  VirtualHID::~VirtualHID() {}
  
! void VirtualHID::setMapping(simdata::Ref<EventMapping const> map) { 
  	m_Map = map; 
  }

[Csp-commits] APPLICATIONS/CSPSim/Include EventMapIndex.h,1.2,1.2.2.1 EventMapping.h,1.4,1.4.2.1 HID.h,1.7.2.1,1.7.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv10333/Include

Modified Files:
      Tag: systems
	EventMapIndex.h EventMapping.h HID.h 
Log Message:


Index: EventMapIndex.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/EventMapIndex.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** EventMapIndex.h	26 Jan 2003 23:34:13 -0000	1.2
--- EventMapIndex.h	11 Oct 2003 17:46:33 -0000	1.2.2.1
***************
*** 34,49 ****
  
  
! class EventMapIndex 
  {	
  public:
! 	~EventMapIndex();
! 	EventMapping *getMap(const simdata::hasht &key);
! 	EventMapping *getMap(const std::string &id);
  	void load(std::string const &path);
  	void loadAllMaps();
  
  protected:
! 	typedef simdata::HASHT_MAP<EventMapping*>::Type MapHash;
! 	typedef std::vector<EventMapping*> MapVector;
  	MapHash m_Index;
  	MapVector m_Maps;
--- 34,48 ----
  
  
! class EventMapIndex: public simdata::Referenced
  {	
  public:
! 	EventMapping::Ref getMap(const simdata::hasht &key);
! 	EventMapping::Ref getMap(const std::string &id);
  	void load(std::string const &path);
  	void loadAllMaps();
  
  protected:
! 	typedef simdata::HASHT_MAP<EventMapping::Ref>::Type MapHash;
! 	typedef std::vector<EventMapping::Ref> MapVector;
  	MapHash m_Index;
  	MapVector m_Maps;

Index: EventMapping.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/EventMapping.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** EventMapping.h	19 Feb 2003 11:41:56 -0000	1.4
--- EventMapping.h	11 Oct 2003 17:46:33 -0000	1.4.2.1
***************
*** 38,48 ****
  #include <vector>
  
  #include <SimData/HashUtility.h>
  
  
! class EventMapping 
  {
  public:
  	EventMapping();
  
  	struct LinearCorrection {
--- 38,51 ----
  #include <vector>
  
+ #include <SimData/Ref.h>
  #include <SimData/HashUtility.h>
  
  
! class EventMapping: public simdata::Referenced
  {
  public:
  	EventMapping();
+ 
+ 	typedef simdata::Ref<EventMapping> Ref;
  
  	struct LinearCorrection {

Index: HID.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/HID.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** HID.h	16 Sep 2003 06:57:30 -0000	1.7.2.1
--- HID.h	11 Oct 2003 17:46:33 -0000	1.7.2.2
***************
*** 48,51 ****
--- 48,53 ----
  #include <SDL/SDL_keyboard.h>
  
+ #include <SimData/Ref.h>
+ 
  #include <string>
  #include <vector>
***************
*** 65,75 ****
   * and implements an event dispatch routine.
   */
! class HID
  {
- 
  public:
  
  	HID() {}
- 	virtual ~HID() {}
  
  	/**
--- 67,75 ----
   * and implements an event dispatch routine.
   */
! class HID: public simdata::Referenced
  {
  public:
  
  	HID() {}
  
  	/**
***************
*** 128,131 ****
--- 128,134 ----
  	 */
  	static void translate(SDL_Event &event);
+ 
+ protected:
+ 	virtual ~HID() {}
  };
  
***************
*** 148,154 ****
  public:
  	VirtualHID();
- 	virtual ~VirtualHID();
  
! 	virtual void setMapping(EventMapping const *map);
  	virtual void bindObject(InputInterface *object);
  	
--- 151,156 ----
  public:
  	VirtualHID();
  
! 	virtual void setMapping(simdata::Ref<const EventMapping> map);
  	virtual void bindObject(InputInterface *object);
  	
***************
*** 162,165 ****
--- 164,168 ----
  
  protected:
+ 	virtual ~VirtualHID();
  	virtual void setScript(EventMapping::Script const *s, int x = -1, int y = -1);
  	virtual void setVirtualMode(int mode);
***************
*** 168,172 ****
  	int m_VirtualMode;
  	bool m_JoystickModifier;
! 	const EventMapping *m_Map;
  
  	InputInterface *m_Object;
--- 171,175 ----
  	int m_VirtualMode;
  	bool m_JoystickModifier;
! 	simdata::Ref<const EventMapping> m_Map;
  
  	InputInterface *m_Object;

[Csp-commits] APPLICATIONS/CSPSim/Source GameScreen.cpp,1.27,1.27.2.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv9943/Source

Modified Files:
      Tag: systems
	GameScreen.cpp 
Log Message:


Index: GameScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/GameScreen.cpp,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** GameScreen.cpp	16 Aug 2003 10:23:27 -0000	1.27
--- GameScreen.cpp	11 Oct 2003 17:43:33 -0000	1.27.2.1
***************
*** 113,119 ****
  	BIND_ACTION("RESET_SPIN", on_ResetSpin);
  	BIND_MOTION("CAMERA_PAN", on_MouseView);
! 	EventMapIndex *maps = CSPSim::theSim->getInterfaceMaps();
! 	if (maps) {
! 		EventMapping *map = maps->getMap("__gamescreen__");
  		if (map != NULL) {
  			m_Interface->setMapping(map);
--- 113,119 ----
  	BIND_ACTION("RESET_SPIN", on_ResetSpin);
  	BIND_MOTION("CAMERA_PAN", on_MouseView);
! 	simdata::Ref<EventMapIndex> maps = CSPSim::theSim->getInterfaceMaps();
! 	if (maps.valid()) {
! 		EventMapping::Ref map = maps->getMap("__gamescreen__");
  		if (map != NULL) {
  			m_Interface->setMapping(map);
***************
*** 185,189 ****
  	
  GameScreen::~GameScreen() {
- 	if (m_Interface) delete m_Interface;
  }
  
--- 185,188 ----

[Csp-commits] APPLICATIONS/CSPSim/Include CSPSim.h,1.16.2.2,1.16.2.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv9691/Include

Modified Files:
      Tag: systems
	CSPSim.h 
Log Message:


Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -C2 -d -r1.16.2.2 -r1.16.2.3
*** CSPSim.h	11 Oct 2003 17:38:14 -0000	1.16.2.2
--- CSPSim.h	11 Oct 2003 17:42:01 -0000	1.16.2.3
***************
*** 39,44 ****
  
  #include <Producer/RenderSurface>
! // Producer includes windows.h, which leaks a #define min
  #undef min
  
  
--- 39,45 ----
  
  #include <Producer/RenderSurface>
! // Producer includes windows.h, which leaks a #define min and max
  #undef min
+ #undef max
  
  

[Csp-commits] APPLICATIONS/CSPSim/Include CSPSim.h,1.16.2.1,1.16.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv9165/Include

Modified Files:
      Tag: systems
	CSPSim.h 
Log Message:


Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** CSPSim.h	29 Sep 2003 06:46:11 -0000	1.16.2.1
--- CSPSim.h	11 Oct 2003 17:38:14 -0000	1.16.2.2
***************
*** 36,42 ****
  
  #include <osg/ref_ptr>
- #include <Producer/RenderSurface>
  #include <SDL/SDL_joystick.h>
  
  
  struct SDL_Surface;
--- 36,45 ----
  
  #include <osg/ref_ptr>
  #include <SDL/SDL_joystick.h>
  
+ #include <Producer/RenderSurface>
+ // Producer includes windows.h, which leaks a #define min
+ #undef min
+ 
  
  struct SDL_Surface;
***************
*** 89,94 ****
  	VirtualScene const * getScene() const;
  	simdata::Ref<Theater> getTheater() const;
! 
! 	EventMapIndex *getInterfaceMaps() { return m_InterfaceMaps; }
  
  	void togglePause();
--- 92,96 ----
  	VirtualScene const * getScene() const;
  	simdata::Ref<Theater> getTheater() const;
! 	simdata::Ref<EventMapIndex> getInterfaceMaps() const;
  
  	void togglePause();
***************
*** 150,155 ****
  	 * The current input device interface
  	 */
! 	VirtualHID *m_Interface;
! 	EventMapIndex *m_InterfaceMaps;
  	simdata::Ref<DynamicObject> m_ActiveObject;
  
--- 152,157 ----
  	 * The current input device interface
  	 */
! 	simdata::Ref<VirtualHID> m_Interface;
! 	simdata::Ref<EventMapIndex> m_InterfaceMaps;
  	simdata::Ref<DynamicObject> m_ActiveObject;
  
***************
*** 170,174 ****
--- 172,178 ----
  	simdata::Ref<PyShell> m_Shell;
  
+ #ifndef CSP_OSG_094
  	osg::ref_ptr<Producer::RenderSurface> m_RenderSurface;
+ #endif
  
  };

[Csp-commits] APPLICATIONS/CSPSim/Include DynamicObject.h,1.12.2.2,1.12.2.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv32054/Include

Modified Files:
      Tag: systems
	DynamicObject.h 
Log Message:


Index: DynamicObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/DynamicObject.h,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -C2 -d -r1.12.2.2 -r1.12.2.3
*** DynamicObject.h	29 Sep 2003 06:46:11 -0000	1.12.2.2
--- DynamicObject.h	11 Oct 2003 06:44:22 -0000	1.12.2.3
***************
*** 33,37 ****
  #include "TerrainObject.h"
  #include "DataRecorder.h"
! #include "System.h"
  
  
--- 33,37 ----
  #include "TerrainObject.h"
  #include "DataRecorder.h"
! #include "SystemsModel.h"
  
  

[Csp-commits] APPLICATIONS/CSPSim/Include System.h,1.3.2.2,1.3.2.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv31976/Include

Modified Files:
      Tag: systems
	System.h 
Log Message:


Index: System.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/System.h,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** System.h	29 Sep 2003 06:46:11 -0000	1.3.2.2
--- System.h	11 Oct 2003 06:43:15 -0000	1.3.2.3
***************
*** 32,35 ****
--- 32,36 ----
  #include <SynchronousUpdate.h>
  #include <InputInterface.h>
+ 
  #include <SimData/Object.h>
  #include <SimData/InterfaceRegistry.h>
***************
*** 214,353 ****
  	SIMDATA_VISITABLE(SystemVisitor);
  };
- 
- 
- 
- class PhysicsModel;
- class Controller;
- class DataRecorder;
- 
- /** Base class for detailed vehicle models.
-  *
-  *  Systems model classes serve as the root node of System trees.  The
-  *  model defines a data bus shared by all systems it contains,
-  *  and serves as the external interface of the composite system.
-  */
- class SystemsModel: public System {
- 
- 	Bus::Ref m_Bus;
- 
- 	bool m_Bound;
- 
- 	virtual void setModel(SystemsModel *) {}
- 
- 	class FindSystemByNameVisitor: public simdata::FindVisitor<System,SystemVisitor> {
- 		std::string m_Name;
- 	public:
- 		FindSystemByNameVisitor(std::string const &name): 
- 			simdata::FindVisitor<System,SystemVisitor>(), m_Name(name) {}
- 		virtual bool match(System &s) { return s.getName() == m_Name; }
- 	};
- 
- 	class EventVisitor: public SystemVisitor {
- 		bool m_handled;
- 		MapEvent m_event;
- 	public:
- 		typedef simdata::Ref<EventVisitor> Ref;
- 		EventVisitor(MapEvent const &event): m_handled(false), m_event(event) {}
- 		bool handled() const { return m_handled; }
- 		void apply(System &system) {
- 			if (m_handled) return;
- 			m_handled = system.onMapEvent(m_event);
- 			if (!m_handled) traverse(system);
- 		}
- 		void apply(SystemsModel &model) { traverse(model); }
- 	};
- 
- 	class InfoVisitor: public SystemVisitor {
- 		InfoList &m_info;
- 	public:
- 		InfoVisitor(InfoList &info): m_info(info) {}
- 		void apply(System &system) { system.getInfo(m_info); traverse(system); }
- 		void apply(SystemsModel &model) { traverse(model); }
- 	};
- 
- 	simdata::Link<PhysicsModel> m_PhysicsModel;
- 	simdata::Link<Controller> m_Controller;
- 
- protected:
- 	virtual ~SystemsModel() { }
- 
- public:
- 
- 	typedef simdata::Ref<SystemsModel> Ref;
- 
- 	SIMDATA_OBJECT(SystemsModel, 0, 0)
- 
- 	EXTEND_SIMDATA_XML_INTERFACE(SystemsModel, System)
- 		SIMDATA_XML("physics_model", SystemsModel::m_PhysicsModel, false)
- 		SIMDATA_XML("controller", SystemsModel::m_Controller, false)
- 	END_SIMDATA_XML_INTERFACE
- 
- 	/** Initialize from an existing model.
- 	 *  
- 	 *  This method is called when a new model is bound to a vehicle,
- 	 *  allowing relevant state data from the old model to be preserved.
- 	 *
- 	 *  @param other The previous model (may be NULL).
- 	 */
- 	virtual void init(SystemsModel::Ref other) {}
- 
- 	bool canBeAdded() const { return false; }
- 
- 	template<typename T>
- 	void publish(std::string const &name, T const &value) {
- 		assert(!m_Bound);
- 		m_Bus->registerLocalDataChannel(name, value);
- 	}
- 
- 	Bus::Ref getBus() const { 
- 		assert(m_Bus.valid());
- 		return m_Bus; 
- 	}
- 
- 	virtual void postCreate();
- 	virtual void serialize(simdata::Archive &archive);
- 
- 	simdata::Ref<PhysicsModel> getPhysicsModel() const;
- 
- 	simdata::Ref<Controller> getController() const;
- 
- 	void setDataRecorder(DataRecorder*);
- 
- 	virtual void getInfo(InfoList &info);
- 
- 	System::Ref getSystem(std::string const &name, bool required = true) {
- 		simdata::Ref< simdata::FindVisitor<System,SystemVisitor> > visitor;
- 		visitor = accept(new FindSystemByNameVisitor(name));
- 		System::Ref found = visitor->getNode();
- 		if (!found) {
- 			assert(!required);
- 			return 0;
- 		}
- 		return found;
- 	}
- 
- 	void bindSystems() {
- 		assert(!m_Bound);
- 		BindVisitor::Ref binder = new BindVisitor(m_Bus.get());
- 		accept(binder);
- 		m_Bound = true;
- 	}
- 
- 	SystemsModel(): m_Bound(false) {
- 		m_Model = this;
- 		m_Bus = new Bus("MODEL_BUS");
- 	}
- 
- 	virtual bool onMapEvent(MapEvent const &event) {
- 		EventVisitor::Ref visitor = accept(new EventVisitor(event));
- 		return visitor->handled();
- 	}
- 
- 	virtual void registerChannels(Bus *bus) {}
- 	virtual void importChannels(Bus *bus) {}
- 
- 	SIMDATA_VISITABLE(SystemVisitor);
- };
- 
  
  
--- 215,218 ----

[Csp-commits] APPLICATIONS/CSPSim/Source System.cpp,1.1.2.1,1.1.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv31976/Source

Modified Files:
      Tag: systems
	System.cpp 
Log Message:


Index: System.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Attic/System.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** System.cpp	9 Oct 2003 23:50:47 -0000	1.1.2.1
--- System.cpp	11 Oct 2003 06:43:15 -0000	1.1.2.2
***************
*** 27,37 ****
  
  #include <System.h>
! #include <DataRecorder.h>
! #include <PhysicsModel.h>
! #include <Controller.h>
! 
! 
! SIMDATA_REGISTER_INTERFACE(SystemsModel)
! 
  
  void System::setModel(SystemsModel *model) {
--- 27,31 ----
  
  #include <System.h>
! #include <SystemsModel.h>
  
  void System::setModel(SystemsModel *model) {
***************
*** 42,83 ****
  		registerChannels(bus.get());
  	}
- }
- 
- void SystemsModel::setDataRecorder(DataRecorder *recorder) {
- 	if (!recorder) return;
- 	// TODO pass recorder to subsystems
- }
- 
- simdata::Ref<PhysicsModel> SystemsModel::getPhysicsModel() const {
- 	return m_PhysicsModel;
- }
- 
- simdata::Ref<Controller> SystemsModel::getController() const {
- 	return m_Controller;
- }
- 
- void SystemsModel::postCreate() {
- 	System::postCreate();
- 	if (m_PhysicsModel.valid()) {
- 		CSP_LOG(OBJECT, DEBUG, "Adding PhysicsModel (" << m_PhysicsModel->getClassName() << ")");
- 		addChild(m_PhysicsModel.get());
- 	}
- 	if (m_Controller.valid()) {
- 		CSP_LOG(OBJECT, DEBUG, "Adding Controller (" << m_Controller->getClassName() << ")");
- 		addChild(m_Controller.get());
- 	}
- }
- 
- 
- void SystemsModel::serialize(simdata::Archive &archive) {
- 	System::serialize(archive);
- 	archive(m_PhysicsModel);
- 	// XXX temporarily disabled (no controller classes yet)
- 	//archive(m_Controller);
- }
- 
- 
- void SystemsModel::getInfo(InfoList &info) {
- 	accept(new InfoVisitor(info));
  }
  
--- 36,39 ----

[Csp-commits] APPLICATIONS/SimData/Include/SimData InterfaceRegistry.h,1.22.2.1,1.22.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv417/Include/SimData

Modified Files:
      Tag: b0_4_0
	InterfaceRegistry.h 
Log Message:


Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -d -r1.22.2.1 -r1.22.2.2
*** InterfaceRegistry.h	18 Sep 2003 00:27:37 -0000	1.22.2.1
--- InterfaceRegistry.h	10 Oct 2003 05:45:33 -0000	1.22.2.2
***************
*** 133,141 ****
  	 *  @note Do not call this method directly.
  	 *
! 	 *  @param interface The ObjectInterface to add.
  	 *  @param classname The name of the Object subclass corresponding
  	 *                   to the interface being added.
  	 */
! 	void addInterface(ObjectInterfaceBase* interface, 
  	                  std::string const &classname,
  	                  hasht const &classhash);
--- 133,141 ----
  	 *  @note Do not call this method directly.
  	 *
! 	 *  @param objectinterface The ObjectInterface to add.
  	 *  @param classname The name of the Object subclass corresponding
  	 *                   to the interface being added.
  	 */
! 	void addInterface(ObjectInterfaceBase* objectinterface, 
  	                  std::string const &classname,
  	                  hasht const &classhash);

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.75.2.9,1.75.2.10

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv417

Modified Files:
      Tag: b0_4_0
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.75.2.9
retrieving revision 1.75.2.10
diff -C2 -d -r1.75.2.9 -r1.75.2.10
*** CHANGES.current	10 Oct 2003 01:54:26 -0000	1.75.2.9
--- CHANGES.current	10 Oct 2003 05:45:33 -0000	1.75.2.10
***************
*** 6,9 ****
--- 6,12 ----
  	    problems.
  
+ 	    Renamed 'interface' variables in InterfaceRegistry to
+ 	    'objectinterface' to avoid a msvc reserved keyword.
+ 
  2003-09-27: onsight
              Added the VisualStudio2003 directory from the main trunk,

[Csp-commits] APPLICATIONS/SimData/Source InterfaceRegistry.cpp,1.10.2.1,1.10.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv417/Source

Modified Files:
      Tag: b0_4_0
	InterfaceRegistry.cpp 
Log Message:


Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/InterfaceRegistry.cpp,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** InterfaceRegistry.cpp	18 Sep 2003 00:27:38 -0000	1.10.2.1
--- InterfaceRegistry.cpp	10 Oct 2003 05:45:33 -0000	1.10.2.2
***************
*** 68,75 ****
  }
  
! void InterfaceProxy::addInterface(ObjectInterfaceBase* interface, 
                                    std::string const &classname,
  				  hasht const &classhash) { 
! 	std::vector<std::string> names = interface->getVariableNames();
  	std::vector<std::string>::iterator name = names.begin();
  	for (; name != names.end(); ++name) {
--- 68,75 ----
  }
  
! void InterfaceProxy::addInterface(ObjectInterfaceBase* objectinterface, 
                                    std::string const &classname,
  				  hasht const &classhash) { 
! 	std::vector<std::string> names = objectinterface->getVariableNames();
  	std::vector<std::string>::iterator name = names.begin();
  	for (; name != names.end(); ++name) {
***************
*** 83,89 ****
  			throw InterfaceError(ss.str());
  		}
! 		_interfaces[*name] = interface;
  		_variableNames.push_back(*name);
! 		if (interface->variableRequired(*name)) {
  			_requiredNames.push_back(*name);
  		}
--- 83,89 ----
  			throw InterfaceError(ss.str());
  		}
! 		_interfaces[*name] = objectinterface;
  		_variableNames.push_back(*name);
! 		if (objectinterface->variableRequired(*name)) {
  			_requiredNames.push_back(*name);
  		}

[Csp-commits] APPLICATIONS/CSPSim/Source SystemsModel.cpp,NONE,1.1.2.1 Makefile.in,1.20.2.5,1.20.2.6

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv32317/Source

Modified Files:
      Tag: systems
	Makefile.in 
Added Files:
      Tag: systems
	SystemsModel.cpp 
Log Message:


--- NEW FILE: SystemsModel.cpp ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2003 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 SystemsModel.cpp
 *
 * Vehicle systems base classes and infrastructure.
 *
 **/


#include <SystemsModel.h>
#include <DataRecorder.h>


SIMDATA_REGISTER_INTERFACE(SystemsModel)


void SystemsModel::setDataRecorder(DataRecorder *recorder) {
	if (!recorder) return;
	// TODO pass recorder to subsystems
}

simdata::Ref<PhysicsModel> SystemsModel::getPhysicsModel() const {
	return m_PhysicsModel;
}

simdata::Ref<Controller> SystemsModel::getController() const {
	return m_Controller;
}

void SystemsModel::postCreate() {
	System::postCreate();
	if (m_PhysicsModel.valid()) {
		CSP_LOG(OBJECT, DEBUG, "Adding PhysicsModel (" << m_PhysicsModel->getClassName() << ")");
		addChild(m_PhysicsModel.get());
	}
	if (m_Controller.valid()) {
		CSP_LOG(OBJECT, DEBUG, "Adding Controller (" << m_Controller->getClassName() << ")");
		addChild(m_Controller.get());
	}
}


void SystemsModel::serialize(simdata::Archive &archive) {
	System::serialize(archive);
	archive(m_PhysicsModel);
	// XXX temporarily disabled (no controller classes yet)
	//archive(m_Controller);
}


void SystemsModel::getInfo(InfoList &info) {
	accept(new InfoVisitor(info));
}



Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -C2 -d -r1.20.2.5 -r1.20.2.6
*** Makefile.in	9 Oct 2003 23:40:41 -0000	1.20.2.5
--- Makefile.in	10 Oct 2003 05:41:28 -0000	1.20.2.6
***************
*** 70,73 ****
--- 70,74 ----
  	SynchronousUpdate.cpp \
  	System.cpp \
+ 	SystemsModel.cpp \
  	TankObject.cpp \
  	TerrainObject.cpp \

[Csp-commits] APPLICATIONS/CSPSim/Include SystemsModel.h,NONE,1.1.2.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv32317/Include

Added Files:
      Tag: systems
	SystemsModel.h 
Log Message:


--- NEW FILE: SystemsModel.h ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2003 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 SystemsModel.h
 *
 * Vehicle systems base classes and infrastructure.
 *
 **/

#ifndef __SYSTEMSMODEL_H__
#define __SYSTEMSMODEL_H__

#include <System.h>
#include <PhysicsModel.h>
#include <Controller.h>


class DataRecorder;

/** Base class for detailed vehicle models.
 *
 *  Systems model classes serve as the root node of System trees.  The
 *  model defines a data bus shared by all systems it contains,
 *  and serves as the external interface of the composite system.
 */
class SystemsModel: public System {

	Bus::Ref m_Bus;

	bool m_Bound;

	virtual void setModel(SystemsModel *) {}

	class FindSystemByNameVisitor: public simdata::FindVisitor<System,SystemVisitor> {
		std::string m_Name;
	public:
		FindSystemByNameVisitor(std::string const &name): 
			simdata::FindVisitor<System,SystemVisitor>(), m_Name(name) {}
		virtual bool match(System &s) { return s.getName() == m_Name; }
	};

	class EventVisitor: public SystemVisitor {
		bool m_handled;
		MapEvent m_event;
	public:
		typedef simdata::Ref<EventVisitor> Ref;
		EventVisitor(MapEvent const &event): m_handled(false), m_event(event) {}
		bool handled() const { return m_handled; }
		void apply(System &system) {
			if (m_handled) return;
			m_handled = system.onMapEvent(m_event);
			if (!m_handled) traverse(system);
		}
		void apply(SystemsModel &model) { traverse(model); }
	};

	class InfoVisitor: public SystemVisitor {
		InfoList &m_info;
	public:
		InfoVisitor(InfoList &info): m_info(info) {}
		void apply(System &system) { system.getInfo(m_info); traverse(system); }
		void apply(SystemsModel &model) { traverse(model); }
	};

	simdata::Link<PhysicsModel> m_PhysicsModel;
	simdata::Link<Controller> m_Controller;

protected:
	virtual ~SystemsModel() { }

public:

	typedef simdata::Ref<SystemsModel> Ref;

	SIMDATA_OBJECT(SystemsModel, 0, 0)

	EXTEND_SIMDATA_XML_INTERFACE(SystemsModel, System)
		SIMDATA_XML("physics_model", SystemsModel::m_PhysicsModel, false)
		SIMDATA_XML("controller", SystemsModel::m_Controller, false)
	END_SIMDATA_XML_INTERFACE

	/** Initialize from an existing model.
	 *  
	 *  This method is called when a new model is bound to a vehicle,
	 *  allowing relevant state data from the old model to be preserved.
	 *
	 *  @param other The previous model (may be NULL).
	 */
	virtual void init(SystemsModel::Ref other) {}

	bool canBeAdded() const { return false; }

	template<typename T>
	void publish(std::string const &name, T const &value) {
		assert(!m_Bound);
		m_Bus->registerLocalDataChannel(name, value);
	}

	Bus::Ref getBus() const { 
		assert(m_Bus.valid());
		return m_Bus; 
	}

	virtual void postCreate();
	virtual void serialize(simdata::Archive &archive);

	simdata::Ref<PhysicsModel> getPhysicsModel() const;

	simdata::Ref<Controller> getController() const;

	void setDataRecorder(DataRecorder*);

	virtual void getInfo(InfoList &info);

	System::Ref getSystem(std::string const &name, bool required = true) {
		simdata::Ref< simdata::FindVisitor<System,SystemVisitor> > visitor;
		visitor = accept(new FindSystemByNameVisitor(name));
		System::Ref found = visitor->getNode();
		if (!found) {
			assert(!required);
			return 0;
		}
		return found;
	}

	void bindSystems() {
		assert(!m_Bound);
		BindVisitor::Ref binder = new BindVisitor(m_Bus.get());
		accept(binder);
		m_Bound = true;
	}

	SystemsModel(): m_Bound(false) {
		m_Model = this;
		m_Bus = new Bus("MODEL_BUS");
	}

	virtual bool onMapEvent(MapEvent const &event) {
		EventVisitor::Ref visitor = accept(new EventVisitor(event));
		return visitor->handled();
	}

	virtual void registerChannels(Bus *bus) {}
	virtual void importChannels(Bus *bus) {}

	SIMDATA_VISITABLE(SystemVisitor);
};



#endif // __SYSTEMSMODEL_H__

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.69.2.2,1.69.2.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv32317

Modified Files:
      Tag: systems
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.69.2.2
retrieving revision 1.69.2.3
diff -C2 -d -r1.69.2.2 -r1.69.2.3
*** CHANGES.current	29 Sep 2003 06:46:10 -0000	1.69.2.2
--- CHANGES.current	10 Oct 2003 05:41:27 -0000	1.69.2.3
***************
*** 1,4 ****
--- 1,16 ----
  Branch 'systems' (in progress)
  ===========================
+ 2003-10-09: onsight
+             Fixed minor snprintf problem under msvc.
+ 
+             Split the SystemsModel class out of System.h/cpp into 
+ 	    SystemsModel.h/cpp.  This seems to be a better arrangement,
+ 	    and hopefully circumventns a problem with forward 
+ 	    declarations + simdata::Link<> under msvc.
+ 
+ 2003-10-05: onsight
+             Changed HID to inherit from simdata::Referenced.  Minor
+ 	    changes to BaseScreen, GameScreen, and CSPSim to support
+ 	    this change.
  
  2003-09-25: onsight
***************
*** 12,15 ****
--- 24,30 ----
  	      * False horizon coloring
  	      * Skydome (non-TEXDOME) coloring
+ 
+ 	    To use OSG 094, uncomment the #define CSP_OSG_094 line
+ 	    in VirtualScene.cpp
  
  2003-09-17: onsight

[Csp-commits] APPLICATIONS/SimData/Include/SimData Composite.h,1.1.2.6,1.1.2.7

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv4295/Include/SimData

Modified Files:
      Tag: b0_4_0
	Composite.h 
Log Message:


Index: Composite.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/Composite.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** Composite.h	10 Oct 2003 01:50:02 -0000	1.1.2.6
--- Composite.h	10 Oct 2003 01:54:26 -0000	1.1.2.7
***************
*** 534,538 ****
  class FindAllVisitor: public V {
  public:
! 	typedef std::vector< Ref<N> > NodeList;
  
  	/** The search condition.
--- 534,538 ----
  class FindAllVisitor: public V {
  public:
! 	typedef std::vector< simdata::Ref<N> > NodeList;
  
  	/** The search condition.

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.75.2.8,1.75.2.9

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv4295

Modified Files:
      Tag: b0_4_0
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.75.2.8
retrieving revision 1.75.2.9
diff -C2 -d -r1.75.2.8 -r1.75.2.9
*** CHANGES.current	27 Sep 2003 16:28:58 -0000	1.75.2.8
--- CHANGES.current	10 Oct 2003 01:54:26 -0000	1.75.2.9
***************
*** 1,4 ****
--- 1,9 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2003-10-09: onsight
+             Added simdata:: prefix to Ref<N> in class FindVisitor and
+ 	    FindAllVisitor (Composite.h) to fix msvc namespace resolution 
+ 	    problems.
+ 
  2003-09-27: onsight
              Added the VisualStudio2003 directory from the main trunk,

[Csp-commits] APPLICATIONS/SimData/Include/SimData Composite.h,1.1.2.5,1.1.2.6

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv3769/Include/SimData

Modified Files:
      Tag: b0_4_0
	Composite.h 
Log Message:


Index: Composite.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/Composite.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** Composite.h	18 Sep 2003 00:27:37 -0000	1.1.2.5
--- Composite.h	10 Oct 2003 01:50:02 -0000	1.1.2.6
***************
*** 519,526 ****
  	/** Get the node that match the search condition, if any.
  	 */
! 	Ref<N> getNode() const { return _node; }
  private:
  	/// The matching node.
! 	Ref<N> _node;
  };
  
--- 519,526 ----
  	/** Get the node that match the search condition, if any.
  	 */
! 	simdata::Ref<N> getNode() const { return _node; }
  private:
  	/// The matching node.
! 	simdata::Ref<N> _node;
  };
  

[Csp-commits] APPLICATIONS/CSPSim/Source AircraftObject.cpp,1.30,1.31

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv26127/Source

Modified Files:
	AircraftObject.cpp 
Log Message:


Index: AircraftObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftObject.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** AircraftObject.cpp	6 Aug 2003 07:56:56 -0000	1.30
--- AircraftObject.cpp	10 Oct 2003 00:34:12 -0000	1.31
***************
*** 37,40 ****
--- 37,44 ----
  
  
+ #ifdef _WIN32
+ #define snprintf _snprintf
+ #endif
+ 
  SIMDATA_REGISTER_INTERFACE(AircraftObject)
  

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.76,1.77

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv25159

Modified Files:
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** CHANGES.current	17 Sep 2003 07:27:01 -0000	1.76
--- CHANGES.current	10 Oct 2003 00:26:00 -0000	1.77
***************
*** 2,5 ****
--- 2,10 ----
  ===========================
  
+ 2003-10-09: onsight
+             Backported a couple fixes from the b0_4_0 branch:
+ 	      * #include inside simdata namespace in Date.cpp
+ 	      * snprintf replaced with stringstream in Real.cpp
+ 
  2003-09-16: onsight
              Changed Parse.py to handle misinstalled zlib modules