Author: ArcRiley
Date: 2008-03-22 06:16:13 -0400 (Sat, 22 Mar 2008)
New Revision: 1205
Modified:
trunk/pysoy/src/colors/Color.pxi
trunk/pysoy/src/colors/_getValues.pxi
trunk/pysoy/src/colors/soy.colors.pyx
Log:
Ticket #951 :
* fixed a few typos
* TestColor segfaults - reason unknown
Modified: trunk/pysoy/src/colors/Color.pxi
===================================================================
--- trunk/pysoy/src/colors/Color.pxi 2008-03-22 09:48:24 UTC (rev 1204)
+++ trunk/pysoy/src/colors/Color.pxi 2008-03-22 10:16:13 UTC (rev 1205)
@@ -30,8 +30,6 @@
'''
def __cinit__(self, value) :
if type(value) == str or type(value) == unicode :
- if (type(value) != str) and (type(value) != unicode) :
- raise('Must supply hex value as string')
if value[0] == '#' :
val = value[1:]
else :
@@ -60,8 +58,6 @@
self._rgba[2] = float(int(val[6:8],16)) / 255.0
self._rgba[3] = float(int(val[0:2],16)) / 255.0
elif type(value) == tuple or type(value) == list :
- if type(value)!=tuple and type(value)!=list :
- raise TypeError('Color.floats must be either a tuple or list')
if len(value) == 1 :
value = (value[0], value[0], value[0], 1.0)
if len(value) == 2 :
@@ -94,7 +90,7 @@
_rgba[0][3] / _rgba[1][3])
- def __mul__(self, value) :
+ def __mul__(valueL, valueR) :
cdef object _error
cdef gl.GLfloat _rgba[2][4]
#
@@ -112,7 +108,7 @@
_rgba[0][3] * _rgba[1][3])
- def __add__(self, value) :
+ def __add__(valueL, valueR) :
cdef object _error
cdef gl.GLfloat _rgba[2][4]
#
@@ -187,7 +183,7 @@
return (False, True)[_r&_g&_b&_a]
- def __sub__(self, value) :
+ def __sub__(valueL, valueR) :
cdef object _error
cdef gl.GLfloat _rgba[2][4]
#
@@ -248,24 +244,24 @@
#
if _top < 0 :
if _top < 1.0 :
- chans = (self._rgba[3]*255/_bottom, self._r*255/_bottom,
+ chans = (self._rgba[3]*255/_bottom, self._rgba[0]*255/_bottom,
self._rgba[1]*255/_bottom, self._rgba[2]*255/_bottom)
[self._rgba[3]==1.0:]
multi = _bottom
else :
- chans = (self._rgba[3]*255*_bottom, self._r*255*_bottom,
+ chans = (self._rgba[3]*255*_bottom, self._rgba[0]*255*_bottom,
self._rgba[1]*255*_bottom, self._rgba[2]*255*_bottom)
[self._rgba[3]==1.0:]
multi = _bottom
elif _bottom < 0 :
# This is not correct
- chans = (self._rgba[3]*255-_bottom, self._r*255-_bottom,
+ chans = (self._rgba[3]*255-_bottom, self._rgba[0]*255-_bottom,
self._rgba[1]*255-_bottom, self._rgba[2]*255-_bottom)
[self._rgba[3]==1.0:]
multi = 1.0
elif _top > 1.0 :
- chans = (self._rgba[3]*255/_top, self._r*255/_top,
+ chans = (self._rgba[3]*255/_top, self._rgba[0]*255/_top,
self._rgba[1]*255/_top, self._rgba[2]*255/_top)
[self._rgba[3]==1.0:]
multi = _top
else :
- chans = (self._rgba[3]*255, self._r*255,
+ chans = (self._rgba[3]*255, self._rgba[0]*255,
self._rgba[1]*255, self._rgba[2]*255) [self._rgba[3]==1.0:]
multi = 1.0
#
@@ -297,3 +293,4 @@
def __get__(self) :
return (self._rgba[0], self._rgba[1],
self._rgba[2], self._rgba[3])[:(self._rgba[3]!=1.0)+3]
+
Modified: trunk/pysoy/src/colors/_getValues.pxi
===================================================================
--- trunk/pysoy/src/colors/_getValues.pxi 2008-03-22 09:48:24 UTC (rev
1204)
+++ trunk/pysoy/src/colors/_getValues.pxi 2008-03-22 10:16:13 UTC (rev
1205)
@@ -50,5 +50,5 @@
#
# this value is a color, just copy it over
for _i from 0 <= _i < 4 :
- _rgba[_d][_i] = (<Color> value[_d])._rgba[_i]
+ _rgba[_d][_i] = (<Color> values[_d])._rgba[_i]
return None
Modified: trunk/pysoy/src/colors/soy.colors.pyx
===================================================================
--- trunk/pysoy/src/colors/soy.colors.pyx 2008-03-22 09:48:24 UTC (rev
1204)
+++ trunk/pysoy/src/colors/soy.colors.pyx 2008-03-22 10:16:13 UTC (rev
1205)
@@ -23,6 +23,8 @@
'by '+'$Author$'[9:-2]
__version__ = 'Trunk (r'+'$Rev$'[6:-2]+')'
+cimport stdio
+
include "_getValues.pxi"
include "Color.pxi"
include "a.pxi"
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
