Updated to the new time API (sfTime)

include/SFML/System/Clock.h

@@ -29,6 +29,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.h>
+#include <SFML/System/Time.h>
 #include <SFML/System/Types.h>
 
 
@@ -62,25 +63,28 @@ CSFML_API void sfClock_Destroy(sfClock* clock);
 /// \brief Get the time elapsed in a clock
 ///
 /// This function returns the time elapsed since the last call
-/// to sfClock_Reset (or the construction of the object if
-/// sfClock_Reset has not been called).
+/// to sfClock_Restart (or the construction of the object if
+/// sfClock_Restart has not been called).
 ///
 /// \param clock Clock object
 ///
-/// \return Time elapsed, in milliseconds
+/// \return Time elapsed
 ///
 ////////////////////////////////////////////////////////////
-CSFML_API sfUint32 sfClock_GetTime(const sfClock* clock);
+CSFML_API sfTime sfClock_GetElapsedTime(const sfClock* clock);
 
 ////////////////////////////////////////////////////////////
 /// \brief Restart a clock
 ///
 /// This function puts the time counter back to zero.
+/// It also returns the time elapsed since the clock was started.
 ///
 /// \param clock Clock object
 ///
+/// \return Time elapsed
+///
 ////////////////////////////////////////////////////////////
-CSFML_API void sfClock_Reset(sfClock* clock);
+CSFML_API sfTime sfClock_Restart(sfClock* clock);
 
 
 #endif // SFML_CLOCK_H

include/SFML/System/Sleep.h

@@ -29,6 +29,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.h>
+#include <SFML/System/Time.h>
 
 
 ////////////////////////////////////////////////////////////
@@ -37,10 +38,10 @@
 /// sfSleep is the best way to block a program or one of its
 /// threads, as it doesn't consume any CPU power.
 ///
-/// \param duration Time to sleep, in milliseconds
+/// \param duration Time to sleep
 ///
 ////////////////////////////////////////////////////////////
-CSFML_API void sfSleep(sfUint32 duration);
+CSFML_API void sfSleep(sfTime duration);
 
 
 #endif // SFML_SLEEP_H

include/SFML/System/Time.h

@@ -0,0 +1,110 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_TIME_H
+#define SFML_TIME_H
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.h>
+
+
+////////////////////////////////////////////////////////////
+/// \brief Represents a time value
+///
+////////////////////////////////////////////////////////////
+typedef struct
+{
+    sfInt64 Microseconds;
+} sfTime;
+
+////////////////////////////////////////////////////////////
+/// \brief Predefined "zero" time value 
+///
+////////////////////////////////////////////////////////////
+CSFML_API sfTime sfTimeZero;
+
+////////////////////////////////////////////////////////////
+/// \brief Return a time value as a number of seconds
+///
+/// \param time Time value
+///
+/// \return Time in seconds
+///
+////////////////////////////////////////////////////////////
+CSFML_API float sfTime_AsSeconds(sfTime time);
+
+////////////////////////////////////////////////////////////
+/// \brief Return a time value as a number of milliseconds
+///
+/// \param time Time value
+///
+/// \return Time in milliseconds
+///
+////////////////////////////////////////////////////////////
+CSFML_API sfInt32 sfTime_AsMilliseconds(sfTime time);
+
+////////////////////////////////////////////////////////////
+/// \brief Return a time value as a number of microseconds
+///
+/// \param time Time value
+///
+/// \return Time in microseconds
+///
+////////////////////////////////////////////////////////////
+CSFML_API sfInt64 sfTime_AsMicroseconds(sfTime time);
+
+////////////////////////////////////////////////////////////
+/// \brief Construct a time value from a number of seconds
+///
+/// \param amount Number of seconds
+///
+/// \return Time value constructed from the amount of seconds
+///
+////////////////////////////////////////////////////////////
+CSFML_API sfTime sfSeconds(float amount);
+
+////////////////////////////////////////////////////////////
+/// \brief Construct a time value from a number of milliseconds
+///
+/// \param amount Number of milliseconds
+///
+/// \return Time value constructed from the amount of milliseconds
+///
+////////////////////////////////////////////////////////////
+CSFML_API sfTime sfMilliseconds(sfInt32 amount);
+
+////////////////////////////////////////////////////////////
+/// \brief Construct a time value from a number of microseconds
+///
+/// \param amount Number of microseconds
+///
+/// \return Time value constructed from the amount of microseconds
+///
+////////////////////////////////////////////////////////////
+CSFML_API sfTime sfMicroseconds(sfInt64 amount);
+
+
+#endif // SFML_TIME_H