csp-commits

[<de...@us...>]

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

Modified Files:
	SimpleConfig.h LandingGear.h InputInterface.h HID.h Console.h 
Log Message:
no message

Index: SimpleConfig.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimpleConfig.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SimpleConfig.h	19 Feb 2003 22:57:59 -0000	1.6
--- SimpleConfig.h	22 Mar 2003 02:25:18 -0000	1.7
***************
*** 41,49 ****
  #include <iostream>
  #include <fstream>
- //#include <cstdio>
- //#include <cstdlib>
- 
- #include <SimData/hash_map.h>
  
  
  /**
--- 41,46 ----
  #include <iostream>
  #include <fstream>
  
+ #include <SimData/HashUtility.h>
  
  /**
***************
*** 338,349 ****
  		
  private:
- 	class HashString {
- 	public:
- 		size_t operator()(std::string const &str) const {
- 			return HASH<char const *>()(str.c_str());
- 		}
- 	};
  
! 	typedef HASH_MAP<std::string, ConfigElement*, HashString> ConfigDictionary;
  	typedef std::vector<ConfigElement *> ElementList;
  
--- 335,345 ----
  		
  private:
  
! # if defined(_MSC_VER) && (_MSC_VER == 1300)
! 	typedef HASH_MAP<std::string, ConfigElement*, simdata::eqstring> ConfigDictionary;
! #else
! 	typedef HASH_MAP<std::string, ConfigElement*, simdata::hashstring> ConfigDictionary;
! #endif
! 
  	typedef std::vector<ConfigElement *> ElementList;
  

Index: LandingGear.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LandingGear.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LandingGear.h	21 Mar 2003 20:08:35 -0000	1.1
--- LandingGear.h	22 Mar 2003 02:25:18 -0000	1.2
***************
*** 64,68 ****
  	bool getTouchdown() const { return m_Touchdown; }
  	void resetTouchdown() { m_Touchdown = false; }
! 	float getCompression() const { return m_Compression; }
  	float getDamage() const { return m_Damage; }
  	bool getExtended() const { return m_Extended; }
--- 64,68 ----
  	bool getTouchdown() const { return m_Touchdown; }
  	void resetTouchdown() { m_Touchdown = false; }
! 	double getCompression() const { return m_Compression; }
  	float getDamage() const { return m_Damage; }
  	bool getExtended() const { return m_Extended; }
***************
*** 104,108 ****
  	float m_TireShiftX;
  	float m_TireShiftY;
! 	float m_Compression;
  	bool m_ABS;
  	simdata::Vector3 m_Position;
--- 104,108 ----
  	float m_TireShiftX;
  	float m_TireShiftY;
! 	double m_Compression;
  	bool m_ABS;
  	simdata::Vector3 m_Position;
***************
*** 144,153 ****
  
  	virtual void pack(simdata::Packer& p) const {
! 		simdata::Object::pack(p);
  		p.pack(m_Gear);
  	}
  
  	virtual void unpack(simdata::UnPacker& p) {
! 		simdata::Object::unpack(p);
  		p.unpack(m_Gear);
  	}
--- 144,153 ----
  
  	virtual void pack(simdata::Packer& p) const {
! 		Object::pack(p);
  		p.pack(m_Gear);
  	}
  
  	virtual void unpack(simdata::UnPacker& p) {
! 		Object::unpack(p);
  		p.unpack(m_Gear);
  	}

Index: InputInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/InputInterface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InputInterface.h	2 Feb 2003 20:53:27 -0000	1.3
--- InputInterface.h	22 Mar 2003 02:25:18 -0000	1.4
***************
*** 30,34 ****
  #include <SDL/SDL_events.h>
  
! #include <SimData/hash_map.h>
  
  #include "HID.h"
--- 30,34 ----
  #include <SDL/SDL_events.h>
  
! #include <SimData/HashUtility.h>
  
  #include "HID.h"
***************
*** 36,39 ****
--- 36,40 ----
  //class VirtualHID;
  
+ using simdata::eqstr;
  
  class InputInterface {
***************
*** 61,73 ****
  
  protected:
! 	struct eqstr {
! 		bool operator()(const char* s1, const char* s2) const {
! 			return strcmp(s1, s2) == 0;
! 		}
! 	};
! 	
! 	typedef HASH_MAP<const char *, ActionAdapter, HASH<const char *>, eqstr> ActionMap;
! 	typedef HASH_MAP<const char *, MotionAdapter, HASH<const char *>, eqstr> MotionMap;
! 	typedef HASH_MAP<const char *, AxisAdapter, HASH<const char *>, eqstr> AxisMap;
  	
  	ActionMap m_Actions;
--- 62,68 ----
  
  protected:
! 	typedef HASH_MAPS<const char *, ActionAdapter, HASH<const char *>, eqstr>::Type ActionMap;
! 	typedef HASH_MAPS<const char *, MotionAdapter, HASH<const char *>, eqstr>::Type MotionMap;
! 	typedef HASH_MAPS<const char *, AxisAdapter, HASH<const char *>, eqstr>::Type AxisMap;
  	
  	ActionMap m_Actions;

Index: HID.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/HID.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HID.h	19 Feb 2003 11:41:56 -0000	1.4
--- HID.h	22 Mar 2003 02:25:18 -0000	1.5
***************
*** 48,52 ****
  #include <vector>
  
! #include <SimData/HashUtility.h>
  
  #include "EventMapping.h"
--- 48,52 ----
  #include <vector>
  
! //#include <SimData/HashUtility.h>
  
  #include "EventMapping.h"

Index: Console.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Console.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Console.h	21 Mar 2003 20:08:35 -0000	1.1
--- Console.h	22 Mar 2003 02:25:18 -0000	1.2
***************
*** 1,38 ****
! #ifndef OSGCONSOLE_CONSOLE_
  #define OSGCONSOLE_CONSOLE_
! 
! #include <osg/Drawable>
  #include <osg/State>
! 
! #include <osgText/Text>
  #include <osgText/Font>
! 
! #include <streambuf>
! #include <string>
! #include <deque>
! 
! namespace osgConsole
! {
! 
! 	class Console: public osg::Drawable, public std::basic_streambuf<char> {
! 	public:
! 
! 		Console(int x=0, int y=0, int w=1024, int h=768, int border=10);
! 		Console(const Console &copy, const osg::CopyOp &copyop = osg::CopyOp::SHALLOW_COPY);
! 
! 		META_Object(osgConsole, Console);
! 
! 		inline float getLeft() const { return left_; }
! 		inline float getBottom() const { return bottom_; }
! 		inline float getWidth() const { return width_; }
! 		inline float getHeight() const { return height_; }
  		inline void setRect(float l, float t, float w, float h);
! 
! 		inline int getTabSize() const { return tab_size_; }
! 		inline void setTabSize(int s) { tab_size_ = s; buffer_.clear(); dirtyDisplayList(); }
! 
! 		inline bool getCursorEnabled() const { return cursor_enabled_; }
! 		inline void setCursorEnabled(bool e) { cursor_enabled_ = e; dirtyDisplayList(); }
! 
  		inline char getCursorCharacter() const { return cursor_char_; }
  		inline void setCursorCharacter(char c) { cursor_char_ = c; dirtyDisplayList(); }
--- 1,31 ----
! #ifndef OSGCONSOLE_CONSOLE_
  #define OSGCONSOLE_CONSOLE_
! #include <osg/Drawable>
  #include <osg/State>
! #include <osgText/Text>
  #include <osgText/Font>
! 
! #include <streambuf>
! #include <string>
! #include <deque>

! namespace osgConsole
! {
! 
! 	class Console: public osg::Drawable, public std::basic_streambuf<char> {
! 	public:

! 		Console(int x=0, int y=0, int w=1024, int h=768, int border=10);
! 		Console(const Console &copy, const osg::CopyOp &copyop = osg::CopyOp::SHALLOW_COPY);
! 
! 		META_Object(osgConsole, Console);
! 
! 		inline float getLeft() const { return left_; }
! 		inline float getBottom() const { return bottom_; }
! 		inline float getWidth() const { return width_; }
! 		inline float getHeight() const { return height_; }
  		inline void setRect(float l, float t, float w, float h);
! 		inline int getTabSize() const { return tab_size_; }
! 		inline void setTabSize(int s) { tab_size_ = s; buffer_.clear(); dirtyDisplayList(); }

! 		inline bool getCursorEnabled() const { return cursor_enabled_; }
! 		inline void setCursorEnabled(bool e) { cursor_enabled_ = e; dirtyDisplayList(); }

  		inline char getCursorCharacter() const { return cursor_char_; }
  		inline void setCursorCharacter(char c) { cursor_char_ = c; dirtyDisplayList(); }
***************
*** 74,79 ****
  
  	private:
! 		mutable osg::ref_ptr<osgText::Text> text_;
! 
  		struct Buffer_line {
  			std::string line;
--- 67,71 ----
  
  	private:
! 		mutable osg::ref_ptr<osgText::Text> text_;
		mutable osg::ref_ptr<osgText::Text> token_;
  		struct Buffer_line {
  			std::string line;