csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/environment - New directory

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

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/environment
In directory sc8-pr-cvs1:/tmp/cvs-serv18334/environment

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/environment added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Data/Input - New directory

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

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

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/Input added to the repository

[Csp-commits] APPLICATIONS/SimData Makefile,1.3,1.4

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

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

Modified Files:
	Makefile 
Log Message:
mostly changes to exception declarations

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	10 Feb 2003 05:11:40 -0000	1.3
--- Makefile	19 Feb 2003 11:14:31 -0000	1.4
***************
*** 2,6 ****
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -DUSE_NAMESPACE_SIMDATA -O2
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -DUSE_NAMESPACE_SIMDATA -noexcept
--- 2,6 ----
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -DUSE_NAMESPACE_SIMDATA -O2 # -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -DUSE_NAMESPACE_SIMDATA -noexcept

[Csp-commits] APPLICATIONS/SimData/Source cSimData.py,1.3,NONE

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

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

Removed Files:
	cSimData.py 
Log Message:
mostly changes to exception declarations

--- cSimData.py DELETED ---

[Csp-commits] APPLICATIONS/SimData/Include/SimData BaseType.h,1.4,1.5 DataArchive.h,1.5,1.6 Date.h,1.3,1.4 Exception.h,1.4,1.5 ObjectInterface.h,1.4,1.5 Path.h,1.4,1.5 TypeAdapter.h,1.4,1.5

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

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

Modified Files:
	BaseType.h DataArchive.h Date.h Exception.h ObjectInterface.h 
	Path.h TypeAdapter.h 
Log Message:
mostly changes to exception declarations

Index: BaseType.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/BaseType.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BaseType.h	2 Feb 2003 15:36:08 -0000	1.4
--- BaseType.h	19 Feb 2003 11:14:31 -0000	1.5
***************
*** 36,40 ****
  
  
! EXCEPTION(ParseException)
  
  
--- 36,40 ----
  
  
! SIMDATA_EXCEPTION(ParseException)
  
  

Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataArchive.h	3 Feb 2003 19:10:39 -0000	1.5
--- DataArchive.h	19 Feb 2003 11:14:33 -0000	1.6
***************
*** 46,71 ****
  
  // exceptions:
! class BadMagic: public Exception { 
! 	public: BadMagic(const char* msg): 
! 		Exception("BadMagic", msg) {}
! };
! class BadByteOrder: public Exception {
! 	public: BadByteOrder(const char* msg): 
! 		Exception("BadByteOrder", msg) {}
! };
! class CorruptArchive: public Exception {
! 	public: CorruptArchive(const char* msg): 
! 		Exception("CorruptArchive", msg) {}
! };
! class IndexError: public Exception {
! 	public: IndexError(const char* msg): 
! 		Exception("IndexError", msg) {}
! };
! class ObjectMismatch: public Exception {
! 	public: ObjectMismatch(const char* msg): 
! 		Exception("ObjectMismatch", msg) {}
! };
! 
! EXCEPTION(IOError)
  
  	// was nested in DataArchive
--- 46,55 ----
  
  // exceptions:
! SIMDATA_EXCEPTION(BadMagic)
! SIMDATA_EXCEPTION(BadByteOrder)
! SIMDATA_EXCEPTION(CorruptArchive)
! SIMDATA_EXCEPTION(IndexError)
! SIMDATA_EXCEPTION(ObjectMismatch)
! SIMDATA_EXCEPTION(IOError)
  
  	// was nested in DataArchive

Index: Date.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Date.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Date.h	2 Feb 2003 15:36:09 -0000	1.3
--- Date.h	19 Feb 2003 11:14:33 -0000	1.4
***************
*** 59,62 ****
--- 59,63 ----
  
  #include <SimData/Pack.h>
+ #include <SimData/Exception.h>
  
  
***************
*** 126,130 ****
   * detected.
   */
! class InvalidDate {};
  
  /**
--- 127,131 ----
   * detected.
   */
! SIMDATA_EXCEPTION(InvalidDate);
  
  /**

Index: Exception.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Exception.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Exception.h	2 Feb 2003 15:36:09 -0000	1.4
--- Exception.h	19 Feb 2003 11:14:33 -0000	1.5
***************
*** 57,61 ****
  };
  
! #define EXCEPTION(a)	\
  class a: public Exception { \
  public: \
--- 57,61 ----
  };
  
! #define SIMDATA_EXCEPTION(a)	\
  class a: public Exception { \
  public: \
***************
*** 69,73 ****
   * @author Mark Rose <mr...@st...>
   */
! class PythonException {};
  
  
--- 69,74 ----
   * @author Mark Rose <mr...@st...>
   */
! SIMDATA_EXCEPTION(PythonException);
! //class PythonException {};
  
  

Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ObjectInterface.h	30 Jan 2003 22:41:03 -0000	1.4
--- ObjectInterface.h	19 Feb 2003 11:14:33 -0000	1.5
***************
*** 44,48 ****
  
  
! EXCEPTION(InterfaceError)
  
  
--- 44,48 ----
  
  
! SIMDATA_EXCEPTION(InterfaceError)
  
  

Index: Path.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Path.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Path.h	3 Feb 2003 19:10:52 -0000	1.4
--- Path.h	19 Feb 2003 11:14:33 -0000	1.5
***************
*** 52,56 ****
  
  
! EXCEPTION(ObjectTypeMismatch)
  
  
--- 52,56 ----
  
  
! SIMDATA_EXCEPTION(ObjectTypeMismatch)
  
  

Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TypeAdapter.h	2 Feb 2003 15:36:09 -0000	1.4
--- TypeAdapter.h	19 Feb 2003 11:14:33 -0000	1.5
***************
*** 55,59 ****
  
  
! EXCEPTION(TypeMismatch)
  
  	
--- 55,59 ----
  
  
! SIMDATA_EXCEPTION(TypeMismatch)
  
  	

[Csp-commits] APPLICATIONS/CSPSim/Include Platform.h,1.2,1.3

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

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

Modified Files:
	Platform.h 
Log Message:
moved hard-coded data paths to ini file

Index: Platform.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Platform.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Platform.h	26 Jan 2003 23:34:13 -0000	1.2
--- Platform.h	16 Feb 2003 09:48:59 -0000	1.3
***************
*** 27,39 ****
  #define __PLATFORM_H__
  
  #ifdef _WIN32
!   #define NATIVE_WIN32
!   #define DIR_SEPARATOR '\\'
! #else
!   #define DIR_SEPARATOR '/'
  #endif
  
- #include <string>
- 
  /**
   * Platform independent file path manipulation routines.
--- 27,36 ----
  #define __PLATFORM_H__
  
+ #include <string>
+ 
  #ifdef _WIN32
! 	  #define NATIVE_WIN32
  #endif
  
  /**
   * Platform independent file path manipulation routines.
***************
*** 42,45 ****
--- 39,45 ----
   */
  namespace ospath {
+ 
+ 	extern const char DIR_SEPARATOR;
+ 	extern const char PATH_SEPARATOR;
  	
  	/**
***************
*** 120,123 ****
--- 120,127 ----
  	std::string filter(const std::string &path);
  
+ 	/**
+ 	 * Add a path to a list of paths using the platform path separator.
+ 	 */
+ 	std::string const &ospath::addpath(std::string &pathlist, const std::string &path);
  };
  

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.cpp,1.3,1.4 LogoScreen.cpp,1.3,1.4 Platform.cpp,1.2,1.3 TerrainObject.cpp,1.3,1.4 VirtualBattlefield.cpp,1.3,1.4 main.cpp,1.3,1.4

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

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

Modified Files:
	CSPSim.cpp LogoScreen.cpp Platform.cpp TerrainObject.cpp 
	VirtualBattlefield.cpp main.cpp 
Log Message:
moved hard-coded data paths to ini file

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CSPSim.cpp	2 Feb 2003 20:53:28 -0000	1.3
--- CSPSim.cpp	16 Feb 2003 09:48:59 -0000	1.4
***************
*** 172,178 ****
  	CSP_LOG(CSP_APP, CSP_INFO, "Starting CSPSim...");
  
! 	std::string archive_file;
! 	// TODO get the path prefix from config....
! 	archive_file = ospath::filter("../Data/Sim.dar");
  	
  	// open the primary data archive
--- 172,177 ----
  	CSP_LOG(CSP_APP, CSP_INFO, "Starting CSPSim...");
  
! 	std::string data_path = g_Config.getPath("Paths", "DataPath", ".", true);
! 	std::string archive_file = ospath::join(data_path, "Sim.dar");
  	
  	// open the primary data archive
***************
*** 575,581 ****
  	Con_rect.w = Con_rect.h = 300;
  
! 	m_ConsoleFont = DT_LoadFont("../Data/Fonts/ConsoleFont.bmp", 0);
  
! 	m_pConsole = CON_Init("../Data/Fonts/ConsoleFont.bmp", m_SDLScreen, 100, Con_rect);
  	CON_Alpha(m_pConsole, 50);
  
--- 574,582 ----
  	Con_rect.w = Con_rect.h = 300;
  
! 	std::string font_path = g_Config.getPath("Paths", "FontPath", ".", true);
! 	std::string console_font = ospath::join(font_path, "ConsoleFont.bmp");
  
! 	m_ConsoleFont = DT_LoadFont(console_font.c_str(), 0);
! 	m_pConsole = CON_Init(console_font.c_str(), m_SDLScreen, 100, Con_rect);
  	CON_Alpha(m_pConsole, 50);
  

Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LogoScreen.cpp	2 Feb 2003 20:53:28 -0000	1.3
--- LogoScreen.cpp	16 Feb 2003 09:48:59 -0000	1.4
***************
*** 54,65 ****
  void LogoScreen::OnInit()
  {
!     std::string path = ospath::filter("../Data/Images/CSPLogo.bmp");
!     m_image = SDL_LoadBMP(path.c_str());
!     if (m_image == NULL)
!     {
  		std::cout << "Unable to load bitmap " << path << std::endl;
!     }
! 
! 
  }
  
--- 54,64 ----
  void LogoScreen::OnInit()
  {
! 	std::string image_path = g_Config.getPath("Paths", "ImagePath", ".", true);
! 	std::string path = ospath.join(image_path, "CSPLogo.bmp");
! 	m_image = SDL_LoadBMP(path.c_str());
! 	if (m_image == NULL)
! 	{
  		std::cout << "Unable to load bitmap " << path << std::endl;
! 	}
  }
  

Index: Platform.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Platform.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Platform.cpp	26 Jan 2003 23:33:38 -0000	1.2
--- Platform.cpp	16 Feb 2003 09:48:59 -0000	1.3
***************
*** 53,56 ****
--- 53,65 ----
  #endif
  
+ #ifdef _WIN32
+ 	const char ospath::DIR_SEPARATOR = '\\';
+ 	const char ospath::PATH_SEPARATOR = ';';
+ #else
+ 	const char ospath::DIR_SEPARATOR = '/';
+ 	const char ospath::PATH_SEPARATOR = ':';
+ #endif
+ 
+ 
  std::string ospath::basename(const std::string &path)
  {
***************
*** 147,150 ****
--- 156,165 ----
  	free(str);
  	return result;
+ }
+ 
+ std::string const &ospath::addpath(std::string &pathlist, const std::string &path) {
+ 	if (pathlist.size() > 0) pathlist = pathlist + PATH_SEPARATOR;
+ 	pathlist = pathlist + path;
+ 	return pathlist;
  }
  	

Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/TerrainObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TerrainObject.cpp	2 Feb 2003 20:53:28 -0000	1.3
--- TerrainObject.cpp	16 Feb 2003 09:48:59 -0000	1.4
***************
*** 144,151 ****
  void TerrainObject::load() {
  	if (m_Loaded) return;
  	if (m_Lattice)
  	{
  		// create lattice
! 		Demeter::Settings::GetInstance()->SetMediaPath("../Data/Terrain");
  		createTerrainLattice();
  		m_TerrainNode = createTerrainLatticeNode(m_pTerrainLattice);
--- 144,152 ----
  void TerrainObject::load() {
  	if (m_Loaded) return;
+ 	std::string terrain_path = g_Config.getPath("Paths", "TerrainPath", ".", true);
  	if (m_Lattice)
  	{
  		// create lattice
! 		Demeter::Settings::GetInstance()->SetMediaPath(terrain_path.c_str());
  		createTerrainLattice();
  		m_TerrainNode = createTerrainLatticeNode(m_pTerrainLattice);
***************
*** 157,161 ****
  	{
  		// create single terrain node
! 		Demeter::Settings::GetInstance()->SetMediaPath("../Data/Terrain");
  		createTerrain();
  		m_TerrainNode = createTerrainNode(m_pTerrain);
--- 158,162 ----
  	{
  		// create single terrain node
! 		Demeter::Settings::GetInstance()->SetMediaPath(terrain_path.c_str());
  		createTerrain();
  		m_TerrainNode = createTerrainNode(m_pTerrain);
***************
*** 391,396 ****
  void TerrainObject::updateDemeterSettings()
  {
! 	std::string mediaPath = ospath::filter("../Data/Terrain/");
! 	Demeter::Settings::GetInstance()->SetMediaPath(mediaPath.c_str());
  	Demeter::Settings::GetInstance()->SetVerbose(false);
  	Demeter::Settings::GetInstance()->SetScreenWidth(g_ScreenWidth);
--- 392,397 ----
  void TerrainObject::updateDemeterSettings()
  {
! 	std::string terrain_path = g_Config.getPath("Paths", "TerrainPath", ".", true);
! 	Demeter::Settings::GetInstance()->SetMediaPath(terrain_path.c_str());
  	Demeter::Settings::GetInstance()->SetVerbose(false);
  	Demeter::Settings::GetInstance()->SetScreenWidth(g_ScreenWidth);

Index: VirtualBattlefield.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/VirtualBattlefield.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VirtualBattlefield.cpp	2 Feb 2003 20:53:29 -0000	1.3
--- VirtualBattlefield.cpp	16 Feb 2003 09:48:59 -0000	1.4
***************
*** 36,39 ****
--- 36,40 ----
  #include "LogStream.h"
  #include "VirtualBattlefield.h"
+ #include "Platform.h"
  
  #include <SimData/Types.h>
***************
*** 255,259 ****
  #endif
  
! 	osgDB::setDataFilePathList("../Data" + sep + "../Data/Images" + sep + "../Data/Models" + sep + "../Data/Fonts");
  
  	// we don't need this on Linux since libs are usually
--- 256,267 ----
  #endif
  
! 	std::string image_path = g_Config.getPath("Paths", "ImagePath", ".", true);
! 	std::string model_path = g_Config.getPath("Paths", "ModelPath", ".", true);
! 	std::string font_path = g_Config.getPath("Paths", "FontPath", ".", true);
! 	std::string search_path;
! 	ospath::addpath(search_path, image_path);
! 	ospath::addpath(search_path, model_path);
! 	ospath::addpath(search_path, font_path);
! 	osgDB::setDataFilePathList(searchpath);
  
  	// we don't need this on Linux since libs are usually

Index: main.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.cpp	2 Feb 2003 20:53:30 -0000	1.3
--- main.cpp	16 Feb 2003 09:48:59 -0000	1.4
***************
*** 5,9 ****
  int main(int argc, char *argv[])
  {
! 	if (!openConfig("../Data/CSPSim.ini")) return 0;
  
  	CSPSim app;
--- 5,9 ----
  int main(int argc, char *argv[])
  {
! 	if (!openConfig("CSPSim.ini")) return 0;
  
  	CSPSim app;

[Csp-commits] THIRDPARTYLIBS/demeter Terrain.cpp,1.2,1.3 TerrainTextureFactory.cpp,1.2,1.3 TerrainTextureFactory.h,1.3,1.4

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

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv32395

Modified Files:
	Terrain.cpp TerrainTextureFactory.cpp TerrainTextureFactory.h 
Log Message:
big speedup in terrain loading by computing less accurate normals.
turned on bounds checking to prevent some segfaults.

Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Terrain.cpp	2 Feb 2003 20:59:22 -0000	1.2
--- Terrain.cpp	15 Feb 2003 20:56:18 -0000	1.3
***************
*** 56,59 ****
--- 56,60 ----
  //#endif
  
+ #define _PROTECT_ACCESS_
  
  #include "Terrain.h"
***************
*** 914,917 ****
--- 915,922 ----
          DimensionPowerOf2(imageWidth,imageHeight,elevWidth,elevHeight);
          pImageData = new float[elevWidth * elevHeight];
+ 	if (pImageData == 0) {
+ 	     cout << "TERRAIN: out of memory allocating new terrain elevation map\n";
+ 	     exit(1);
+ 	}
          if (imageWidth != elevWidth || imageHeight != elevHeight)
          {
***************
*** 965,969 ****
      m_HeightVertices = elevHeight + 1;
      m_NumberOfVertices = m_WidthVertices * m_HeightVertices;
!     m_pVertices = new Vector[m_WidthVertices * m_HeightVertices];
      int i,j;
      float x,y;
--- 970,974 ----
      m_HeightVertices = elevHeight + 1;
      m_NumberOfVertices = m_WidthVertices * m_HeightVertices;
!     m_pVertices = new Vector[m_WidthVertices * m_HeightVertices]; 
      int i,j;
      float x,y;
***************
*** 1007,1010 ****
--- 1012,1016 ----
  	{
  		m_pNormals = new Vector[m_NumberOfVertices];
+ 		assert(m_pNormals);
  		const float delta = (M_PI * 2.0f) / 8.0f;
  		for (i = 0; i < m_NumberOfVertices; i++)
***************
*** 1016,1022 ****
  			vertexX = indexX * m_VertexSpacing;
  			vertexY = indexY * m_VertexSpacing;
  			Vector avgNormal;
  			avgNormal.x = avgNormal.y = avgNormal.z = 0.0f;
! 			for (float theta = -0.5f * delta; theta < (M_PI * 2.0f); theta++)
  			{
  				Vector v;
--- 1022,1041 ----
  			vertexX = indexX * m_VertexSpacing;
  			vertexY = indexY * m_VertexSpacing;
+ 			/*
+ 			// This average over 8 nearby normals is extremely slow compared
+ 			// to all the other terrain loading code.  First, the offset vector
+ 			// calculation is ineffecient, since v is recomputed 8 times at
+ 			// every vertex to get exactly the same set of vectors each time.
+ 			// Next, GetNormal() is slow, so doing such an average is costly.
+ 			// For now I've stripped out this computation, and substituted a
+ 			// single normal evaluation at a slight (fixed) offset from each
+ 			// vertex.  This seems to produe comparable results.  If better
+ 			// normal matching needs to be done at the boundaries of terrain
+ 			// tiles, this should be done in a separate computation that only
+ 			// operates on vertices near the edges of the terrain tiles.
+ 			// -MR
  			Vector avgNormal;
  			avgNormal.x = avgNormal.y = avgNormal.z = 0.0f;
! 			for (float theta = -0.5f * delta; theta < (M_PI * 2.0f); theta+=delta)
  			{
  				Vector v;
***************
*** 1027,1031 ****
  				v.x += vertexX;
  				v.y += vertexY;
! 				float nx,ny,nz;
  				GetNormal(v.x,v.y,nx,ny,nz);
  				avgNormal.x += nx;
--- 1046,1050 ----
  				v.x += vertexX;
  				v.y += vertexY;
! 				float nx, ny, nz;
  				GetNormal(v.x,v.y,nx,ny,nz);
  				avgNormal.x += nx;
***************
*** 1036,1039 ****
--- 1055,1064 ----
  			m_pNormals[i].y = avgNormal.y / 8.0f;
  			m_pNormals[i].z = avgNormal.z / 8.0f;
+ 			*/
+ 			float nx, ny, nz;
+ 			GetNormal(vertexX+0.2,vertexY+0.8,nx,ny,nz);
+ 			m_pNormals[i].x = nx;
+ 			m_pNormals[i].y = ny;
+ 			m_pNormals[i].z = nz;
  		}
  	}
***************
*** 2959,2964 ****
      v2.z = p3.z - p1.z;
  
!     v1.Normalize();
!     v2.Normalize();
  // Find surface normal based on cross product.
      normal.x = v1.y * v2.z - v2.y * v1.z;
--- 2984,2990 ----
      v2.z = p3.z - p1.z;
  
!     // why?
!     //v1.Normalize();
!     //v2.Normalize();
  // Find surface normal based on cross product.
      normal.x = v1.y * v2.z - v2.y * v1.z;

Index: TerrainTextureFactory.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TerrainTextureFactory.cpp	8 Feb 2003 15:56:45 -0000	1.2
--- TerrainTextureFactory.cpp	15 Feb 2003 20:56:19 -0000	1.3
***************
*** 132,135 ****
--- 132,136 ----
  	m_BaseTextures[1] = pTextureImage;
  
+ 	//LoadImage("Snow1.tga", width, height, &pTextureImage, false);
  	LoadImage("Grass1.bmp",  width, height, &pTextureImage, false);
  	m_BaseTextures[2] = pTextureImage;

Index: TerrainTextureFactory.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TerrainTextureFactory.h	2 Feb 2003 20:59:23 -0000	1.3
--- TerrainTextureFactory.h	15 Feb 2003 20:56:19 -0000	1.4
***************
*** 14,21 ****
     #if __GNUC__ >= 3
       #include <ext/hash_map>  
     #else
       #include <hash_map>  
     #endif
-    using std::hash_map;
   #endif
  #endif
--- 14,22 ----
     #if __GNUC__ >= 3
       #include <ext/hash_map>  
+      using __gnu_cxx::hash_map;
     #else
       #include <hash_map>  
+      using std::hash_map;
     #endif
   #endif
  #endif

[Csp-commits] APPLICATIONS/CSPSim/Source AircraftObject.cpp,1.3,1.4

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

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

Modified Files:
	AircraftObject.cpp 
Log Message:
initializing control input parameters

Index: AircraftObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AircraftObject.cpp	2 Feb 2003 20:53:28 -0000	1.3
--- AircraftObject.cpp	15 Feb 2003 20:54:00 -0000	1.4
***************
*** 56,59 ****
--- 56,61 ----
  	//m_iObjectType = AIRPLANE_OBJECT_TYPE;
  	//m_iObjectID = g_pBattlefield->getNewObjectID();
+ 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::AircraftObject() ...");
  	m_sObjectName = "AIRCRAFT";
  
***************
*** 79,82 ****
--- 81,91 ----
  	m_ThrottleInput = 0.0;
  
+ 	m_dThrottleInput = 0;
+ 	m_dAileronInput = 0;
+ 	m_dElevatorInput = 0;
+ 
+     m_decayAileron = 0;
+     m_decayElevator = 0;
+ 
  	m_ComplexPhysics = false;
  	m_PhysicsInitialized = false;
***************
*** 98,101 ****
--- 107,111 ----
  	BIND_ACTION("DEC_ELEVATOR", DecElevator);
  	BIND_ACTION("STOP_DEC_ELEVATOR", noDecElevator);
+     CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::AircraftObject()");
  }
  
***************
*** 166,169 ****
--- 176,183 ----
  void AircraftObject::updateControls(double dt)
  {
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::updateControls ...");
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_dThrottleInput = " << m_dThrottleInput);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_dAileronInput = " << m_dAileronInput);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_dElevatorInput = " << m_dElevatorInput);
  	m_ThrottleInput += m_dThrottleInput * dt * 0.2;
  	m_AileronInput += m_dAileronInput * dt * 0.4;
***************
*** 180,187 ****
--- 194,205 ----
  	CLIP(m_AileronInput, -1.0, 1.0);
  	CLIP(m_ElevatorInput, -1.0, 1.0);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_decayElevator = " << m_decayElevator);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::m_ElevatorInput = " << m_ElevatorInput);
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::updateControls");
  }
  
  void AircraftObject::doFCS(double dt)
  {
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::doFCS ...");
  	// FIXME: very temporary fcs mappings
  	m_Rudder = m_RudderInput * m_RudderMax * 0.017;
***************
*** 189,192 ****
--- 207,211 ----
  	m_Elevator = m_ElevatorInput * m_ElevatorMax * 0.017;
  	m_Throttle = (1.0 - m_ThrottleInput) * 0.5;
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, " ... AircraftObject::doFCS");
  }
  
***************
*** 208,230 ****
--- 227,259 ----
  void AircraftObject::setElevator(double x)
  { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::setElevator ...");
  	m_ElevatorInput = x; 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "m_ElevatorInput = " << m_ElevatorInput << " ...AircraftObject::setElevator");
  }
  
  void AircraftObject::IncElevator() { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::IncElevator ...");
  	m_dElevatorInput = 1.0; 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::IncElevator");
  }	
  
  void AircraftObject::noIncElevator() { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::noIncElevator ...");
  	if (m_dElevatorInput > 0.0) m_dElevatorInput = 0.0; 
  	m_decayElevator = 30;
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::noIncElevator");
  }
  
  void AircraftObject::DecElevator() { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::DecElevator ...");
  	m_dElevatorInput = -1.0; 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::DecElevator");
  }
  
  void AircraftObject::noDecElevator() { 
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "AircraftObject::noDecElevator ...");
  	if (m_dElevatorInput < 0.0) m_dElevatorInput = 0.0; 
  	m_decayElevator = 30;
+ 	CSP_LOG(CSP_APP, CSP_DEBUG, "... AircraftObject::noDecElevator");
  }
  
***************
*** 375,379 ****
--- 404,436 ----
  }
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  #if 0
+ /*
  void AircraftObject::initialize()
  {
***************
*** 384,388 ****
  void AircraftObject::initializeHud()
  {
!   m_phud = osgNew Hud(m_InitialDirection);
    m_phud->BuildHud("../Data/Scripts/HudM2k.csp");
    m_rpSwitch->addChild(m_phud);
--- 441,445 ----
  void AircraftObject::initializeHud()
  {
!   m_phud = new Hud(m_InitialDirection);
    m_phud->BuildHud("../Data/Scripts/HudM2k.csp");
    m_rpSwitch->addChild(m_phud);
***************
*** 549,553 ****
  }
  
! 
  #endif
  
--- 606,610 ----
  }
  
! */
  #endif
  

[Csp-commits] APPLICATIONS/SimData TODO,1.2,1.3

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

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

Modified Files:
	TODO 
Log Message:
updated todo

Index: TODO
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TODO	28 Jan 2003 23:26:05 -0000	1.2
--- TODO	10 Feb 2003 05:16:19 -0000	1.3
***************
*** 35,39 ****
      * Improve the build on Linux.
  
!     * Creae a build for Windows.
  
      * Install target to put SimData.py and _cSimData.so in
--- 35,39 ----
      * Improve the build on Linux.
  
!     * Create a build for Windows. (in progress)
  
      * Install target to put SimData.py and _cSimData.so in
***************
*** 53,67 ****
      * Consider eliminating pack/unpack object methods, instead using the 
        interface proxy classes to serialize objects. This may be much less 
!       error-prone.
  
      > This is now partially implemented.  I'm holding off on completing
        this feature for the time being.
        
!     * Store path hash in loaded simdata::Object instances
  
      * Change getClassName() to return just the classname, without version 
!       number
        
!     * Add getClassVersion() method to simdata::Object. Return "major:minor".
  
  
--- 53,68 ----
      * Consider eliminating pack/unpack object methods, instead using the 
        interface proxy classes to serialize objects. This may be much less 
!       error-prone. (but perhaps too inflexible?)
  
      > This is now partially implemented.  I'm holding off on completing
        this feature for the time being.
        
!     * Store path hash in loaded simdata::Object instances (done)
  
      * Change getClassName() to return just the classname, without version 
!       number (done)
        
!     * Add getClassVersion() method to simdata::Object. Return 
!       "major:minor". (done)
  
  

[Csp-commits] APPLICATIONS/SimData/Include/SimData GeoPos.h,NONE,1.1 GeoPos.i,NONE,1.1 Version.h,NONE,1.1 Export.h,1.2,1.3 GlibCsp.h,1.2,1.3 InterfaceRegistry.h,1.7,1.8 Types.h,1.2,1.3 Types.i,1.2,1.3

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

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

Modified Files:
	Export.h GlibCsp.h InterfaceRegistry.h Types.h Types.i 
Added Files:
	GeoPos.h GeoPos.i Version.h 
Log Message:
added geopos and version, removed csimdata_wrap.cpp, improved interface_registry singleton

--- NEW FILE: GeoPos.h ---
/* SimDataCSP: Data Infrastructure for Simulations
 * Copyright (C) 2002 Mark Rose <tm...@st...>
 * 
 * This file is part of SimDataCSP.
 * 
 * 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.
 */


#ifndef __GEOPOS_H__
#define __GEOPOS_H__

#include <string>
#include <SimData/Vector3.h>


NAMESPACE_SIMDATA


/**
 * Reference ellipsoid parameters.
 *
 */
struct ReferenceEllipsoid {
	ReferenceEllipsoid(double semi_major, double semi_minor) {
		A          = semi_major;
		B          = semi_minor;
		R          = 6371010.0;
		f          = (A-B)/A;
		e          = sqrt(2*f-f*f);
		A_B        = A/B;
		B_A        = B/A;
		B2_A2      = (B*B)/(A*A);
		A2_B2      = 1.0 / B2_A2;
		e2	   = e*e;
		e1         = (A-B)/(A+B);
		ep         = sqrt(A*A-B*B)/B;
		ep2        = ep*ep;
		// utm2ll constants
		m_0        = 1.0 - 0.25 * e2 - 0.046875*e2*e2 - 0.01953125*e2*e2*e2;
		m_1        = -(0.375*e2 + 0.09375*e2*e2 + 0.0439453125*e2*e2*e2);
		m_2        = 0.05859375*e2*e2 + 0.0439453125*e2*e2*e2;
		m_3        = -0.01139322916667*e2*e2*e2;
		// ll2utm constants
		m_f        = 1.0/(A*(1.0 - e2*(0.25 + e2*(0.046875 + e2*0.01953125))));
		m_a        = e1 * (1.5 - 0.84375*e1*e1);
		m_b        = e1 * e1 * (1.3125 - 1.71875*e1*e1);
		m_c        = 1.5729166666667*e1*e1*e1;
	}
	double A;    // equatorial radius
	double B;    // polar radius
	double R;    // volumetric mean radius
	double f;    // flattening
	double e;    // eccentricity
	double A_B;
	double B_A;
	double B2_A2;
	double A2_B2;
	double e2;
	double e1;
	double ep;
	double ep2;
	
	double m_0;
	double m_1;
	double m_2;
	double m_3;
	
	double m_f;
	double m_a;
	double m_b;
	double m_c;
};


// some standard reference ellipsoids
namespace GeoRef {
	extern const ReferenceEllipsoid Airy1830;
	extern const ReferenceEllipsoid AustralianNational;
	extern const ReferenceEllipsoid WGS84;
	extern const ReferenceEllipsoid GRS80;
	extern const ReferenceEllipsoid WGS72;
	extern const ReferenceEllipsoid Clarke1866;
	extern const ReferenceEllipsoid NAD27;
}



/**
 * GeoPos position class.
 *
 * Extends a cartesian 3-vector to Earth-Centered, Earth-Fixed (ECEF) 
 * coordinates.  Helper methods are provided for lazy conversion to
 * and from Geodetic and UTM coordinates using a standard reference
 * ellipsoid.
 *
 * Due to subclassing of Vector3, modifications of the ECEF vector do
 * not automatically set the dirty flags used for lazy evaluations of
 * other coordinate representations.  After calculations that modify
 * the underlying ECEF vector, you *must* call setDirty() manually to
 * ensure that subsequent conversions to Geodetic and UTM coordinates
 * function properly.
 * 
 */
class GeoPos: public Vector3 {
public:

	/**
	 * Default constructor.
	 *
	 * The WGS84 reference ellipsoid will be set implicity, and the
	 * position will be set to (0, 0, 0) --- the center of the Earth.
	 */
	GeoPos(): Vector3(), _ref(&GeoRef::WGS84) {
		_stale_lla = true;
		_stale_utm = true;
	}
	
	/**
	 * Copy constructor from a standard vector.  
	 *
	 * The WGS84 reference ellipsoid will be set implicity.
	 */
	GeoPos(Vector3 const &v): _ref(&GeoRef::WGS84) { *this = v; }

	/**
	 * Copy constructor
	 *
	 * The new GeoPos will use the same reference ellipsoid as the source.
	 */
	GeoPos(GeoPos const &g): _ref(&GeoRef::WGS84) { *this = g; }

	/**
	 * Copy operator.
	 *
	 * The reference ellipsoid will not be modified.
	 */
	const GeoPos &operator=(Vector3 const &v);
	
	/**
	 * Copy operator.
	 *
	 * The reference ellipsoid is also copied.
	 */
	const GeoPos &operator=(GeoPos const &g);

	/**
	 * Destructor.
	 */
	virtual ~GeoPos() {}

	/**
	 * Get the absolute distance between two points in ECEF coordinates.
	 *
	 * This is the normal cartesian distance between two points;  the 
	 * curvature of the ellipsoid is not involved.
	 */
	double getSlantRange(GeoPos const &) const;

	/**
	 * Get the distance between to points along the surface of the 
	 * reference ellipsoid.
	 *
	 * Both points are projected to altitude = 0, and the distance
	 * calculated along a geodesic path of the reference ellipsoid.
	 * 
	 * @return distance the geodesic distance
	 * @return bearing the bearing to the specified point (in radians relative to true north)
	 */
	void getSurfaceDistance(GeoPos const &, double &distance, double &bearing) const;

	/**
	 * Get the distance between two points along the surface of the
	 * reference ellipsoid, including altitude.
	 *
	 * This method is very similar to getSurfaceDistance, but includes the altitude
	 * difference between the two points in an approximate way that can be used both
	 * at close range and globally.
	 * 
	 * @return distance a combined geodesic and altitude distance 
	 * @return bearing the bearing to the specified point (in radians relative to true north)
	 */
	void getShellDistance(GeoPos const &, double &distance, double &bearing) const;

	/**
	 * Get a local cartesian coordinate frame.
	 *
	 * @return localX a unit vector, tangent to the reference ellipsoid, pointing east
	 * @return localY a unit vector, tangent to the reference ellipsoid, pointing north
	 * @return localZ a nuti vector, normal to the reference ellipsoid
	 */
	void getLocalFrame(Vector3 &localX, Vector3 &localY, Vector3 &localZ) const;
	
	/**
	 * Get the current latitude, longitude, and altitude relative to the reference ellipsoid.
	 *
	 * @return lat latitude in radians
	 * @return lon longitude in radians
	 * @return alt altitude relative to the reference ellipse (in meters)
	 */
	void getLLA(double &lat, double &lon, double &alt) const;
	
	/**
	 * Set the position using latitude, longitude, and altitude.
	 * 
	 * @param lat latitude in radians
	 * @param lon longitude in radians
	 * @param alt altitude in meters
	 */
	void setLLA(double lat, double lon, double alt = 0.0);

	/**
	 * Get the current latitude.
	 * 
	 * @return latitude in radians
	 */
	double getLongitude() const { if (_stale_lla) _updateLLA(); return _lon; }

	/** 
	 * Get the current longitude.
	 * 
	 * @return longitude in radians
	 */
	double getLatitude() const { if (_stale_lla) _updateLLA(); return _lat; }

	/**
	 * Get the current altitude.
	 *
	 * @return altitude relative to the reference ellipse (in meters)
	 */
	double getAltitude() const { if (_stale_lla) _updateLLA(); return _alt; }

	/**
	 * Internal method to update latitude, longitude, and altitude.
	 *
	 * You do not need to call this directly.
	 */
	void _updateLLA() const;

	/**
	 * Get the current position in UTM coordinates.
	 *
	 * @return northing UTM northing
	 * @return easting UTM easting
	 * @return zone UTM zone
	 * @return designator UTM zone letter
	 */
	void getUTM(double &northing, double &easting, char &zone, char &designator) const;

	/**
	 * Set the current position from UTM coordinates.
	 *
	 * @param northing UTM northing
	 * @param easting UTM easting
	 * @param zone UTM zone
	 * @param designator UTM zone letter
	 * @alt altitude above the reference ellipse (in meters)
	 */
	void setUTM(double northing, double easting, char zone, char designator, double alt = 0.0);
	
	/**
	 * Set the current position from UTM coordinates.
	 *
	 * @param northing UTM northing
	 * @param easting UTM easting
	 * @param zone UTM zone (e.g. "10T")
	 * @alt altitude above the reference ellipse (in meters)
	 */
	void setUTM(double northing, double easting, const char *zone, double alt = 0.0);
	
	/**
	 * Get the UTM northing coordinate for the current position.
	 */
	double getNorthing() const { if (_stale_utm) _updateUTM(); return _northing; }

	/**
	 * Get the UTM easting coordinate for the current position.
	 */
	double getEasting() const { if (_stale_utm) _updateUTM(); return _easting; }

	/** 
	 * Get the UTM zone number for the current position.
	 */
	int getZoneNumber() const { if (_stale_utm) _updateUTM(); return _zone; }

	/**
	 * Get the UTM zone letter for the current position.
	 */
	char getZoneLetter() const { if (_stale_utm) _updateUTM(); return _designator; }

	/**
	 * Internal method to update UTM northing, easting, and zone.
	 *
	 * You do not need to call this directly.
	 */
	void _updateUTM() const;

	/**
	 * Internal class method to get the UTM zone letter for a given latitude.
	 *
	 * @param lat latitude in radians
	 */
	static char _getUTMDesignator(double lat);

	/**
	 * Set the reference ellipsoid used for LLA and UTM conversions.
	 *
	 * The default ellipsoid is WGS-84.  The reference ellipsoid can be
	 * specified independently for each GeoPos instance, but mixing results
	 * from different ellipsoids is not recommended.
	 */
	void setReferenceEllipsoid(ReferenceEllipsoid const & = GeoRef::WGS84);

	/**
	 * Get the current reference ellipsoid.
	 */
	ReferenceEllipsoid const &getReferenceEllipsoid() const { return *_ref; }

	/**
	 * Set flags to indicate that the underlying ECEF vector has changed.
	 *
	 * Call this method after any computations that modify the ECEF vector to
	 * ensure that LLA and UTM coordinates will be updated correctly.
	 */
	void setDirty() { _stale_lla = _stale_utm = true; }

	/**
	 * String representation.
	 */
	virtual std::string asString() { return Vector3::asString(); }
	
	/**
	 * Set the current position from XML character data.
	 *
	 * ECEF coordinate format (x, y, z):
	 * 	x.x x.x x.x
	 *
	 * LLA coordinate format (lat, lon, alt): 
	 * 	G x.x x.x x.x
	 *
	 * LLA coordinate format 2 (lat, lon, alt):
	 * 	G x'x"x.x x'x"x.x x.x
	 *
	 * UTM coordinate format (northing, easting, zone, alt):
	 * 	G x.x x.x zone x.x
	 * where 'zone' is an integer followed by a UTM latitude designator,
	 * such as "10T"
	 *
	 * Note that the letters preceeding all formats other than ECEF are required.
	 *
	 * TODO:
	 *     * use different prefix letters for LLA and UTM
	 *     * allow the source reference ellipsoid to be specified
	 */
	void parseXML(const char *);

	/**
	 * Serialize to a data archive
	 */
	virtual void pack(Packer&) const; 
	
	/**
	 * Deserialize from a data archive
	 */
	virtual void unpack(UnPacker&);

protected:

	// geodetic latitude
	mutable double _lat;
	// longitude
	mutable double _lon;
	// altitude above reference ellipse
	mutable double _alt;
	// lla needs update
	mutable bool _stale_lla;
	// utm needs update
	mutable bool _stale_utm;
	// utm northing
	mutable double _northing;
	// utm easting
	mutable double _easting;
	// utm zone
	mutable char _zone;
	// utm designator
	mutable char _designator;
	// reference ellipsoid
	ReferenceEllipsoid const *_ref;
	
	/**
	 * Compute ECEF from LLA
	 */
	void iterateECEF(double p, double z, double x, double y, int iter=0) const;
};



NAMESPACE_END


#endif //__GEOPOS_H__


--- NEW FILE: GeoPos.i ---
%module GeoPos
%{
#include "SimData/Vector3.h"
#include "SimData/GeoPos.h"
%}

%include "std_string.i"

NAMESPACE_SIMDATA
%rename(__repr__) GeoPos::asString() const;
%ignore GeoPos::parseXML(const char*);
%ignore GeoPos::operator=(Vector3 const &);
%ignore GeoPos::operator=(GeoPos const &);
NAMESPACE_END

%include "SimData/GeoPos.h"


--- NEW FILE: Version.h ---
#include <SimData/ns-simdata.h>

NAMESPACE_SIMDATA

const char *getVersion();

NAMESPACE_END


Index: Export.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Export.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Export.h	2 Feb 2003 15:36:09 -0000	1.2
--- Export.h	10 Feb 2003 05:11:40 -0000	1.3
***************
*** 12,14 ****
  #endif
  
! #endif __EXPORT_H__
--- 12,15 ----
  #endif
  
! #endif // __EXPORT_H__
! 

Index: GlibCsp.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/GlibCsp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GlibCsp.h	28 Jan 2003 23:26:06 -0000	1.2
--- GlibCsp.h	10 Feb 2003 05:11:41 -0000	1.3
***************
*** 38,41 ****
--- 38,43 ----
  
  #define G_PI		3.14159265358979323846	/* pi */
+ #define D2R (G_PI/180.0)
+ #define R2D (180.0/G_PI)
  
  // this needs to be generated by the configure script:

Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InterfaceRegistry.h	2 Feb 2003 15:36:09 -0000	1.7
--- InterfaceRegistry.h	10 Feb 2003 05:11:41 -0000	1.8
***************
*** 123,126 ****
--- 123,138 ----
  
  
+ template <class C>
+ class Singleton {
+ public:
+ 	static C& getInstance() {
+ 		static C __instance;
+ 		return __instance;
+ 	}
+ private:
+ 	Singleton() {}
+ 	~Singleton() {}
+ };
+ 
  /**
   * class InterfaceRegistry - Singleton class to store and access all ObjectInterfaces
***************
*** 140,147 ****
  	typedef std::vector<InterfaceProxy *> interface_list;
  
- 	InterfaceRegistry();
- 	
- 	virtual ~InterfaceRegistry(); 
- 	
  	InterfaceProxy *getInterface(const char *name);
  	
--- 152,155 ----
***************
*** 154,174 ****
  	std::vector<std::string> getInterfaceNames() const;
  
! 	std::vector<InterfaceProxy *> const &getInterfaces() const;
  	
  	void addInterface(const char *name, hasht id, InterfaceProxy *proxy) throw(InterfaceError);
  
  private:
  	typedef HASH_MAP<const char *, InterfaceProxy *, HASH<const char *>, eqstr> proxy_map;
  	typedef HASH_MAP<hasht, InterfaceProxy *, hasht_hash, hasht_eq> proxy_id_map;
! 	proxy_map *map;
! 	proxy_id_map *id_map;
! 	interface_list list;
  };
  
  
  /**
   * The master interface registry.
   */
  extern InterfaceRegistry g_InterfaceRegistry;
  
  
--- 162,195 ----
  	std::vector<std::string> getInterfaceNames() const;
  
! 	std::vector<InterfaceProxy *> getInterfaces() const;
  	
  	void addInterface(const char *name, hasht id, InterfaceProxy *proxy) throw(InterfaceError);
  
+ 	static InterfaceRegistry &getInterfaceRegistry() {
+ 		return Singleton<InterfaceRegistry>::getInstance();
+ 	}
+ 
+ 
  private:
+ 	friend class Singleton<InterfaceRegistry>;
+ 	InterfaceRegistry();
+ 	virtual ~InterfaceRegistry(); 
+ 	void __cleanup();
  	typedef HASH_MAP<const char *, InterfaceProxy *, HASH<const char *>, eqstr> proxy_map;
  	typedef HASH_MAP<hasht, InterfaceProxy *, hasht_hash, hasht_eq> proxy_id_map;
! 	proxy_map *__map;
! 	proxy_id_map *__id_map;
! 	interface_list *__list;
  };
  
  
+ // #define g_InterfaceRegistry Singleton<InterfaceRegistry>::getInstance()
+ 
  /**
   * The master interface registry.
   */
+ /*
  extern InterfaceRegistry g_InterfaceRegistry;
+ */
  
  

Index: Types.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Types.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Types.h	28 Jan 2003 23:26:06 -0000	1.2
--- Types.h	10 Feb 2003 05:11:41 -0000	1.3
***************
*** 23,26 ****
--- 23,27 ----
  
  #include <SimData/Date.h>
+ #include <SimData/GeoPos.h>
  #include <SimData/Vector3.h>
  #include <SimData/Matrix3.h>

Index: Types.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Types.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Types.i	28 Jan 2003 23:26:06 -0000	1.2
--- Types.i	10 Feb 2003 05:11:41 -0000	1.3
***************
*** 17,20 ****
--- 17,21 ----
  
  %include "SimData/Vector3.i"
+ %include "SimData/GeoPos.i"
  %include "SimData/External.i"
  %include "SimData/Spread.i"

[Csp-commits] APPLICATIONS/SimData Makefile,1.2,1.3

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

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

Modified Files:
	Makefile 
Log Message:
added geopos and version, removed csimdata_wrap.cpp, improved interface_registry singleton

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	28 Jan 2003 23:26:04 -0000	1.2
--- Makefile	10 Feb 2003 05:11:40 -0000	1.3
***************
*** 2,6 ****
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -I/usr/local/include/python2.2 -fPIC -DSWIG_GLOBAL -DUSE_NAMESPACE_SIMDATA # -O2
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -DUSE_NAMESPACE_SIMDATA -noexcept
--- 2,6 ----
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -DUSE_NAMESPACE_SIMDATA -O2
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -DUSE_NAMESPACE_SIMDATA -noexcept

[Csp-commits] APPLICATIONS/SimData/Tools/DataCompiler Compile.py,1.2,1.3 Parse.py,1.2,1.3

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

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

Modified Files:
	Compile.py Parse.py 
Log Message:
added geopos and version, removed csimdata_wrap.cpp, improved interface_registry singleton

Index: Compile.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Tools/DataCompiler/Compile.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Compile.py	28 Jan 2003 23:26:09 -0000	1.2
--- Compile.py	10 Feb 2003 05:11:44 -0000	1.3
***************
*** 24,28 ****
  
  if __name__ == "__main__":
! 	sys.path.append("../../Source");
  	try:
  		import SimData
--- 24,30 ----
  
  if __name__ == "__main__":
! 	if hasattr(sys, "setdlopenflags"):
! 		sys.setdlopenflags(0x101)
! 	#sys.path.append("../../Source");
  	try:
  		import SimData
***************
*** 46,50 ****
  		try:
  			import CSP
- 			print "import successful"
  			break
  		except:
--- 48,51 ----

Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Tools/DataCompiler/Parse.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Parse.py	28 Jan 2003 23:26:09 -0000	1.2
--- Parse.py	10 Feb 2003 05:11:44 -0000	1.3
***************
*** 91,94 ****
--- 91,95 ----
  		self._paths = []
  		self._externals = []
+ 		self._c = ""
  
  	def getElement(self):
***************
*** 102,106 ****
  
  	def cdata(self, c):
! 		pass
  
  	def endChild(self):
--- 103,108 ----
  
  	def cdata(self, c):
!  		self._c = self._c + c
! #		pass
  
  	def endChild(self):
***************
*** 169,179 ****
  	def __init__(self, id, base, name, attrs):
  		ElementHandler.__init__(self, id, base, name, attrs)
! 		self._c = ""
  
  	def validateChild(self, name, attrs):
  		return 0
  
! 	def cdata(self, c):
!  		self._c = self._c + c
  
  
--- 171,181 ----
  	def __init__(self, id, base, name, attrs):
  		ElementHandler.__init__(self, id, base, name, attrs)
! #		self._c = ""
  
  	def validateChild(self, name, attrs):
  		return 0
  
! #	def cdata(self, c):
! # 		self._c = self._c + c
  
  
***************
*** 612,615 ****
--- 614,618 ----
  		self._element = self._object
  		self.checkAssigned()
+ 		self._element.parseXML(self._c)
  		self._element.convertXML()
  

[Csp-commits] APPLICATIONS/CSPSim/Data/Fonts - New directory

[<wol...@us...>]

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

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/Fonts added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Data/Images - New directory

[<wol...@us...>]

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

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/Images added to the repository

[Csp-commits] THIRDPARTYLIBS/demeter DemeterDrawable.cpp,1.1.1.1,1.2

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

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv19084

Modified Files:
	DemeterDrawable.cpp 
Log Message:
no message

Index: DemeterDrawable.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterDrawable.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DemeterDrawable.cpp	5 Dec 2002 03:33:40 -0000	1.1.1.1
--- DemeterDrawable.cpp	8 Feb 2003 15:57:47 -0000	1.2
***************
*** 23,35 ****
  #include <vector>
  #include <string>
- 
- #include <string>
- 
- #include <iostream>
- //#include <ostream>
- //#include <istream>
  #include <iomanip>
  #include <fstream>
- //#include <streambuf>
  #include <sstream>
  
--- 23,28 ----

[Csp-commits] THIRDPARTYLIBS/demeter DemeterDrawable.h,1.1.1.1,1.2

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

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv19008

Modified Files:
	DemeterDrawable.h 
Log Message:
no message

Index: DemeterDrawable.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterDrawable.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DemeterDrawable.h	5 Dec 2002 03:33:40 -0000	1.1.1.1
--- DemeterDrawable.h	8 Feb 2003 15:57:37 -0000	1.2
***************
*** 99,103 ****
          
              virtual bool          computeBound() const;
! 				mutable osg::ref_ptr<TerrainLattice>    m_RefTerrainLattice;
  			DemeterLatticeDrawableLoadListener * m_pLatticeLoadListener;
  
--- 99,103 ----
          
              virtual bool          computeBound() const;
! 			mutable osg::ref_ptr<TerrainLattice>    m_RefTerrainLattice;
  			DemeterLatticeDrawableLoadListener * m_pLatticeLoadListener;
  

[Csp-commits] THIRDPARTYLIBS/demeter Terrain.h,1.2,1.3

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

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv18933

Modified Files:
	Terrain.h 
Log Message:
no message

Index: Terrain.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Terrain.h	2 Feb 2003 20:59:23 -0000	1.2
--- Terrain.h	8 Feb 2003 15:57:28 -0000	1.3
***************
*** 102,106 ****
  
      /// An abstract factory that allows applications to provide and manage their own terrain textures, rather than letting Demeter manage textures. This is most useful for procedural texture algorithms.
!     class TextureFactory
      {
      public:
--- 102,106 ----
  
      /// An abstract factory that allows applications to provide and manage their own terrain textures, rather than letting Demeter manage textures. This is most useful for procedural texture algorithms.
!     class TERRAIN_API TextureFactory
      {
      public:
***************
*** 225,228 ****
--- 225,231 ----
      };
   
+ 
+ 	//class   vpDetailTexture:public vector<DetailTexture*>{};
+ 
      class TERRAIN_API TextureCell
      {
***************
*** 245,251 ****
      private:
          Texture*                m_pTexture;
!         vector<DetailTexture*>  m_DetailTextures;
      };
   
      class TERRAIN_API TextureSet
      {
--- 248,257 ----
      private:
          Texture*                m_pTexture;
! 		vector<TERRAIN_API DetailTexture*>  m_DetailTextures;
! 		//vpDetailTexture         m_DetailTextures;
! 
      };
   
+ 	
      class TERRAIN_API TextureSet
      {

[Csp-commits] THIRDPARTYLIBS/demeter TerrainTextureFactory.cpp,1.1.1.1,1.2

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

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv18656

Modified Files:
	TerrainTextureFactory.cpp 
Log Message:
no message

Index: TerrainTextureFactory.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TerrainTextureFactory.cpp	5 Dec 2002 03:33:47 -0000	1.1.1.1
--- TerrainTextureFactory.cpp	8 Feb 2003 15:56:45 -0000	1.2
***************
*** 8,16 ****
  
  #include <iostream>
- //#include <ostream>
- //#include <istream>
  #include <iomanip>
  #include <fstream>
- //#include <streambuf>
  #include <sstream>
  
--- 8,13 ----

[Csp-commits] APPLICATIONS/SimData/Source Random.cpp,1.2,1.3

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

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

Modified Files:
	Random.cpp 
Log Message:
no message

Index: Random.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Random.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Random.cpp	28 Jan 2003 23:26:07 -0000	1.2
--- Random.cpp	6 Feb 2003 21:22:57 -0000	1.3
***************
*** 24,28 ****
  NAMESPACE_SIMDATA
  
- 
  Random g_Random;
  
--- 24,27 ----

[Csp-commits] APPLICATIONS/SimData/Include/SimData Random.h,1.3,1.4

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

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

Modified Files:
	Random.h 
Log Message:
no message

Index: Random.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Random.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Random.h	3 Feb 2003 19:11:04 -0000	1.3
--- Random.h	6 Feb 2003 21:22:39 -0000	1.4
***************
*** 32,39 ****
  #include <math.h>
  
- #ifdef _WIN32
  #include <SimData/Export.h>
- #endif
- 
  #include <SimData/ns-simdata.h>
  
--- 32,36 ----

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL CSPSimDLL.dsp,1.1,1.2

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

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

Added Files:
	CSPSimDLL.dsp 
Log Message:
no message

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli CSPSimAppli.dsp,1.1,1.2

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

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

Added Files:
	CSPSimAppli.dsp 
Log Message:
no message

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio CSPSim.dsw,1.1,1.2

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

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

Added Files:
	CSPSim.dsw 
Log Message:
no message

[Csp-commits] APPLICATIONS/CSPSim/Source SmokeEffects.cpp,1.1,1.2

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

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

Modified Files:
	SmokeEffects.cpp 
Log Message:
# if defined(_MSC_VER) && (_MSC_VER <= 1200)
#include <assert.h>
# endif

Index: SmokeEffects.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SmokeEffects.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SmokeEffects.cpp	2 Feb 2003 21:17:25 -0000	1.1
--- SmokeEffects.cpp	3 Feb 2003 19:22:46 -0000	1.2
***************
*** 47,50 ****
--- 47,54 ----
   */
  
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #include <assert.h>
+ # endif
+ 
  #include "SmokeEffects.h"