simspark-cvs

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/geometryserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/oxygen/geometryserver

Modified Files:
	stdmeshimporter.cpp 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: stdmeshimporter.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/geometryserver/stdmeshimporter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stdmeshimporter.cpp	5 Dec 2005 21:16:49 -0000	1.1
--- stdmeshimporter.cpp	15 Mar 2007 07:26:27 -0000	1.2
***************
*** 309,314 ****
      float tmp,nx,start_nx,start_ny;
  
!     float l = ccLength * 0.5;
!     float a = g2PI / n;
      float sa = gSin(a);
      float ca = gCos(a);
--- 309,314 ----
      float tmp,nx,start_nx,start_ny;
  
!     float l = ccLength * 0.5f;
!     float a = static_cast<float>(g2PI / n);
      float sa = gSin(a);
      float ca = gCos(a);