Implemented mul and div operators in Time class (#38)

Author: intjelic

include/Includes/sfml/sfml.pxd

@@ -57,19 +57,20 @@ cdef extern from "SFML/System.hpp" namespace "sf":
         Int32 asMilliseconds() const
         Int64 asMicroseconds() const
         Time operator-()
-        bint operator==(Time&)
-        bint operator!=(Time&)
-        bint operator<(Time&)
-        bint operator>(Time&)
-        bint operator<=(Time&)
-        bint operator>=(Time&)
-        Time operator+(Time&)
-        Time operator-(Time&)
+        bint operator==(Time)
+        bint operator!=(Time)
+        bint operator<(Time)
+        bint operator>(Time)
+        bint operator<=(Time)
+        bint operator>=(Time)
+        Time operator+(Time)
+        Time operator-(Time)
         Time operator*(float)
         Time operator*(Int64)
         Time operator/(float)
         Time operator/(Int64)
-        Time operator%(Time&)
+        float operator/(Time)
+        Time operator%(Time)
 
     cdef void sleep(Time) nogil
 

setup.py

@@ -92,7 +92,7 @@ def remove_if_exist(filename):
 
 system = extension(
     'system',
-    [sources['system'], 'src/sfml/error.cpp', 'src/sfml/NumericObject.cpp'],
+    [sources['system'], 'src/sfml/error.cpp', 'src/sfml/NumericObject.cpp', 'src/sfml/hacks.cpp'],
     ['sfml-system'])
 
 window = extension(

src/sfml/hacks.h

@@ -22,8 +22,21 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //------------------------------------------------------------------------------
 
+#ifndef PYSFML_HACKS_HPP
+#define PYSFML_HACKS_HPP
+
 #include <Python.h>
+#include <SFML/System.hpp>
 
 #if PY_VERSION_HEX >= 0x03000000
     #define PyString_AsString PyBytes_AsString
 #endif
+
+sf::Time Time_div_int(sf::Time left, sf::Int64 right);
+sf::Time Time_div_float(sf::Time left, float right);
+float Time_div_Time(sf::Time left, sf::Time right);
+
+void Time_idiv_int(sf::Time& left, sf::Int64 right);
+void Time_idiv_float(sf::Time& left, float right);
+
+#endif // PYSFML_HACKS_HPP

src/sfml/system.pyx

@@ -50,6 +50,13 @@ cdef extern from "error.hpp":
     void restorePythonErrorBuffer()
     object getLastErrorMessage()
 
+cdef extern from "hacks.h":
+    sf.Time Time_div_int(sf.Time left, Int64)
+    sf.Time Time_div_float(sf.Time left, float)
+    float Time_div_Time(sf.Time, sf.Time)
+    void Time_idiv_int(sf.Time&, Int64)
+    void Time_idiv_float(sf.Time&, float)
+
 __all__ = ['Time', 'sleep', 'Clock', 'seconds', 'milliseconds', 'microseconds',
             'Vector2', 'Vector3']
 
@@ -440,6 +447,38 @@ cdef public class Time[type PyTimeType, object PyTimeObject]:
         p[0] = x.p_this[0] - y.p_this[0]
         return wrap_time(p)
 
+    def __mul__(Time self, other):
+        cdef sf.Time* p = new sf.Time()
+
+        if isinstance(other, (int, long)):
+            p[0] = self.p_this[0] * <Int64>other
+        elif isinstance(other, float):
+            p[0] = self.p_this[0] * <float>other
+        else:
+            return NotImplemented
+
+        return wrap_time(p)
+
+    def __truediv__(Time self, other):
+        cdef sf.Time* p
+
+        if isinstance(other, Time):
+#            return self.p_this[0] / (<Time>other).p_this[0]
+            return Time_div_Time(self.p_this[0], (<Time>other).p_this[0])
+        else:
+            p = new sf.Time()
+            if isinstance(other, (int, long)):
+#                p[0] = self.p_this[0] / <Int64>other
+                p[0] = Time_div_int(self.p_this[0], <Int64>other)
+            elif isinstance(other, float):
+#                p[0] = self.p_this[0] / <float>other
+                p[0] = Time_div_float(self.p_this[0], <float>other)
+            else:
+                del p
+                return NotImplemented
+
+            return wrap_time(p)
+
     def __mod__(Time x, Time y):
         cdef sf.Time* p = new sf.Time()
         p[0] = x.p_this[0] % y.p_this[0]
@@ -453,6 +492,28 @@ cdef public class Time[type PyTimeType, object PyTimeObject]:
         self.p_this[0] -= x.p_this[0]
         return self
 
+    def __imul__(Time self, other):
+        if isinstance(other, (int, long)):
+            self.p_this[0] *= <Int64>other
+        elif isinstance(other, float):
+            self.p_this[0] *= <float>other
+        else:
+            return NotImplemented
+
+        return self
+
+    def __itruediv__(Time self, other):
+        if isinstance(other, (int, long)):
+#            self.p_this[0] /= <Int64>other
+            Time_idiv_int(self.p_this[0], <Int64>other)
+        elif isinstance(other, float):
+#            self.p_this[0] /= <float>other
+            Time_idiv_float(self.p_this[0], <float>other)
+        else:
+            return NotImplemented
+
+        return self
+
     def __imod__(self, Time x):
         self.p_this[0] %= x.p_this[0]
         return self