csp-commits

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

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

Modified Files:
	Makefile.in Terrain.cpp Terrain.h TerrainTextureFactory.h 
Log Message:
changed lib names, fix for EPSILON and INFINITY redefinition conflicts

Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	9 Dec 2002 01:33:51 -0000	1.2
--- Makefile.in	2 Feb 2003 20:59:22 -0000	1.3
***************
*** 33,38 ****
  # nothing should be edited below this line
  
! CODE_BINARY=demeter_csp.a
! SHARED_LIB=libdemeter_csp.so
  
  CXXFLAGS+=-Wall 
--- 33,38 ----
  # nothing should be edited below this line
  
! CODE_BINARY=libdemeter_csp.a
! SHARED_LIB=demeter_csp.so
  
  CXXFLAGS+=-Wall 

Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Terrain.cpp	5 Dec 2002 03:33:45 -0000	1.1.1.1
--- Terrain.cpp	2 Feb 2003 20:59:22 -0000	1.2
***************
*** 2219,2223 ****
  {
      Ray ray;
!     float distance = INFINITY;
      Vector point;
      point.x = point.y = point.z = -1.0f;
--- 2219,2223 ----
  {
      Ray ray;
!     float distance = DEMETER_INFINITY;
      Vector point;
      point.x = point.y = point.z = -1.0f;
***************
*** 2375,2380 ****
      float       tnear,tfar,t1,t2;
  
!     tnear = -INFINITY;
!     tfar = INFINITY;
  
  // Find intersection with x-aligned planes of box.
--- 2375,2380 ----
      float       tnear,tfar,t1,t2;
  
!     tnear = -DEMETER_INFINITY;
!     tfar = DEMETER_INFINITY;
  
  // Find intersection with x-aligned planes of box.

Index: Terrain.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Terrain.h	5 Dec 2002 03:33:46 -0000	1.1.1.1
--- Terrain.h	2 Feb 2003 20:59:23 -0000	1.2
***************
*** 84,89 ****
  
  #define MAX_VERTICES_PER_FAN 10
! #define EPSILON 0.00001f
! #define INFINITY 999999999.0f
  
  
--- 84,89 ----
  
  #define MAX_VERTICES_PER_FAN 10
! #define DEMETER_EPSILON 0.00001f
! #define DEMETER_INFINITY 999999999.0f
  
  
***************
*** 135,139 ****
                              ~Vector() {}
          float               GetLength();
!         float               Normalize( float tolerance = EPSILON );
  		void				RotateZ(float theta);
          Vector&             operator = ( const Vector& vector );
--- 135,139 ----
                              ~Vector() {}
          float               GetLength();
!         float               Normalize( float tolerance = DEMETER_EPSILON );
  		void				RotateZ(float theta);
          Vector&             operator = ( const Vector& vector );

Index: TerrainTextureFactory.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TerrainTextureFactory.h	7 Dec 2002 07:40:05 -0000	1.2
--- TerrainTextureFactory.h	2 Feb 2003 20:59:23 -0000	1.3
***************
*** 30,34 ****
  
  	TerrainTextureFactory();
! 	~TerrainTextureFactory();
  
  	virtual Texture* GetTexture(int index,float originX,float originY,float width,float height);
--- 30,34 ----
  
  	TerrainTextureFactory();
! 	virtual ~TerrainTextureFactory();
  
  	virtual Texture* GetTexture(int index,float originX,float originY,float width,float height);