[Crystal-cvs] SF.net SVN: crystal: [25773] CS/branches/release/V1.0

[<re...@us...>]

Revision: 25773
          http://svn.sourceforge.net/crystal/?rev=25773&view=rev
Author:   res2002
Date:     2006-10-30 14:13:26 -0800 (Mon, 30 Oct 2006)

Log Message:
-----------
res merged r25771 into 1.0 (VC warning fixes).

Modified Paths:
--------------
    CS/branches/release/V1.0/docs/history.txt
    CS/branches/release/V1.0/docs/history10.txt
    CS/branches/release/V1.0/plugins/bugplug/shadow.h
    CS/branches/release/V1.0/plugins/mesh/spr2d/object/spr2d.h
    CS/branches/release/V1.0/plugins/physics/odedynam/odedynam.cpp

Modified: CS/branches/release/V1.0/docs/history.txt
===================================================================
--- CS/branches/release/V1.0/docs/history.txt	2006-10-30 22:12:24 UTC (rev 25772)
+++ CS/branches/release/V1.0/docs/history.txt	2006-10-30 22:13:26 UTC (rev 25773)
@@ -6,6 +6,7 @@
 individual changes for each given day, however, are in normal (ascending)
 chronological order.
 
+30-Oct-2006
 	- caedes added some %ignore directives in cspace.i to avoid wrapping
 	  deprecated members from cspath.
 	- caedes removed the exclusion of gmeshskel2.h from master headers,
@@ -19,6 +20,7 @@
 	  position object" SV which is not provided by the standard render 
 	  steps. Fixes occuring floating point exceptions and also probably
 	  makes lighting actually work right.
+	- res fixed some VC warnings.
 29-Oct-2006
 	- Eric Sunshine fixed a quoting problem in configure.ac which caused
 	  X11 check to barf for old-style installations.

Modified: CS/branches/release/V1.0/docs/history10.txt
===================================================================
--- CS/branches/release/V1.0/docs/history10.txt	2006-10-30 22:12:24 UTC (rev 25772)
+++ CS/branches/release/V1.0/docs/history10.txt	2006-10-30 22:13:26 UTC (rev 25773)
@@ -19,6 +19,7 @@
 	- res merged r25755 into 1.0 (fix checks for empty libs).
 	- res merged r25767 into 1.0 (make vproc_std work with standard
 	  rendersteps).
+	- res merged r25771 into 1.0 (VC warning fixes).
 29-Oct-2006
 	- Eric Sunshine merged r25691, r25744, r25745 into 1.0 (X11R7 detection
 	  fixes).

Modified: CS/branches/release/V1.0/plugins/bugplug/shadow.h
===================================================================
--- CS/branches/release/V1.0/plugins/bugplug/shadow.h	2006-10-30 22:12:24 UTC (rev 25772)
+++ CS/branches/release/V1.0/plugins/bugplug/shadow.h	2006-10-30 22:13:26 UTC (rev 25773)
@@ -30,6 +30,7 @@
 struct iMeshWrapper;
 struct iCamera;
 
+#include "csutil/win32/msvc_deprecated_warn_off.h"
 
 /**
  * BugPlug is the hiding place for many dark creatures. While Spider only
@@ -166,4 +167,6 @@
   virtual void PositionChild (iMeshObject* /*child*/, csTicks /*current_time*/) { }
 };
 
+#include "csutil/win32/msvc_deprecated_warn_on.h"
+
 #endif // __CS_SHADOW_H__

Modified: CS/branches/release/V1.0/plugins/mesh/spr2d/object/spr2d.h
===================================================================
--- CS/branches/release/V1.0/plugins/mesh/spr2d/object/spr2d.h	2006-10-30 22:12:24 UTC (rev 25772)
+++ CS/branches/release/V1.0/plugins/mesh/spr2d/object/spr2d.h	2006-10-30 22:13:26 UTC (rev 25773)
@@ -53,6 +53,8 @@
 
 class csSprite2DMeshObjectFactory;
 
+#include "csutil/win32/msvc_deprecated_warn_off.h"
+
 /**
  * Sprite 2D version of mesh object.
  */
@@ -280,6 +282,8 @@
   /** @} */
 };
 
+#include "csutil/win32/msvc_deprecated_warn_on.h"
+
 /**
  * Factory for 2D sprites. This factory also implements iSprite2DFactoryState.
  */

Modified: CS/branches/release/V1.0/plugins/physics/odedynam/odedynam.cpp
===================================================================
--- CS/branches/release/V1.0/plugins/physics/odedynam/odedynam.cpp	2006-10-30 22:12:24 UTC (rev 25772)
+++ CS/branches/release/V1.0/plugins/physics/odedynam/odedynam.cpp	2006-10-30 22:13:26 UTC (rev 25773)
@@ -2429,9 +2429,9 @@
   fmax = csVector3 (0);
   fudge_factor = csVector3 (1);
   bounce = csVector3 (0);
-  cfm = csVector3 (9.9999997e-006);
+  cfm = csVector3 (9.9999997e-006f);
   stop_erp = csVector3 (0.2f);
-  stop_cfm = csVector3 (9.9999997e-006);
+  stop_cfm = csVector3 (9.9999997e-006f);
   suspension_erp = csVector3 (0.0f);
   suspension_cfm = csVector3 (0.0f);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.