Author: ArcRiley
Date: 2008-02-17 00:06:24 -0500 (Sun, 17 Feb 2008)
New Revision: 915
Modified:
trunk/pysoy/src/colors/Color.pxi
trunk/pysoy/src/colors/a.pxi
trunk/pysoy/src/colors/b.pxi
trunk/pysoy/src/colors/c.pxi
trunk/pysoy/src/colors/d.pxi
trunk/pysoy/src/colors/f.pxi
trunk/pysoy/src/colors/g.pxi
trunk/pysoy/src/colors/h.pxi
trunk/pysoy/src/colors/i.pxi
trunk/pysoy/src/colors/k.pxi
trunk/pysoy/src/colors/l.pxi
trunk/pysoy/src/colors/m.pxi
trunk/pysoy/src/colors/n.pxi
trunk/pysoy/src/colors/o.pxi
trunk/pysoy/src/colors/p.pxi
trunk/pysoy/src/colors/r.pxi
trunk/pysoy/src/colors/s.pxi
trunk/pysoy/src/colors/t.pxi
trunk/pysoy/src/colors/v.pxi
trunk/pysoy/src/colors/w.pxi
trunk/pysoy/src/colors/y.pxi
Log:
Added >1.0 support to Color
Modified: trunk/pysoy/src/colors/Color.pxi
===================================================================
--- trunk/pysoy/src/colors/Color.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/Color.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -22,11 +22,13 @@
This is the base Color class.
'''
- def __init__(self, hex=None, floats=None) :
- if hex :
- self.hex = hex
- elif floats :
- self.floats = floats
+ def __cinit__(self, value) :
+ if type(value) == str or type(value) == unicode :
+ self.hex = value
+ elif type(value) == tuple or type(value) == list :
+ self.floats = value
+ else :
+ raise ValueError('color value must be string, tuple, or list')
cdef void _getRGBA(self, float* ret) :
@@ -38,8 +40,22 @@
property hex :
def __get__(self) :
- return '#%.2x%.2x%.2x%.2x' % (self._a*255, self._r*255,
- self._g*255, self._b*255)
+ cdef float _top
+ _top = self._r
+ if self._g > _top :
+ _top = self._g
+ if self._b > _top :
+ _top = self._b
+ if self._a > _top :
+ _top = self._a
+ if _top > 1.0 :
+ return '#%.2x%.2x%.2x%.2x * %.2f' % (self._a*255/_top,self._r*255/_top,
+ self._g*255/_top,self._b*255/_top,
+ _top)
+ else :
+ return '#%.2x%.2x%.2x%.2x' % (self._a*255,self._r*255,
+ self._g*255,self._b*255)
+
def __set__(self, value) :
if (type(value) != str) and (type(value) != unicode) :
raise('Must supply hex value as string')
Modified: trunk/pysoy/src/colors/a.pxi
===================================================================
--- trunk/pysoy/src/colors/a.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/a.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,9 +17,9 @@
#
# $Id$
-aliceBlue = Color ( hex='#f0f8ff' )
-antiqueWhite = Color ( hex='#faebd7' )
-aqua = Color ( hex='#00ffff' )
-aquamarine = Color ( hex='#7fffd4' )
-aventurine = Color ( hex='#67e4a0' )
-azure = Color ( hex='#f0ffff' )
+aliceBlue = Color ( '#f0f8ff' )
+antiqueWhite = Color ( '#faebd7' )
+aqua = Color ( '#00ffff' )
+aquamarine = Color ( '#7fffd4' )
+aventurine = Color ( '#67e4a0' )
+azure = Color ( '#f0ffff' )
Modified: trunk/pysoy/src/colors/b.pxi
===================================================================
--- trunk/pysoy/src/colors/b.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/b.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,12 +17,12 @@
#
# $Id: B.pxi 703 2008-01-01 22:37:47Z ArcRiley $
-basalt = Color ( hex='#333333' )
-beige = Color ( hex='#f5f5dc' )
-bisque = Color ( hex='#ffe4c4' )
-black = Color ( hex='#000000' )
-blanchedAlmond = Color ( hex='#ffebcd' )
-blue = Color ( hex='#0000ff' )
-blueViolet = Color ( hex='#8a2be2' )
-brown = Color ( hex='#a52a2a' )
-burlyWood = Color ( hex='#deb887' )
+basalt = Color ( '#333333' )
+beige = Color ( '#f5f5dc' )
+bisque = Color ( '#ffe4c4' )
+black = Color ( '#000000' )
+blanchedAlmond = Color ( '#ffebcd' )
+blue = Color ( '#0000ff' )
+blueViolet = Color ( '#8a2be2' )
+brown = Color ( '#a52a2a' )
+burlyWood = Color ( '#deb887' )
Modified: trunk/pysoy/src/colors/c.pxi
===================================================================
--- trunk/pysoy/src/colors/c.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/c.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,15 +17,15 @@
#
# $Id$
-cadetBlue = Color ( hex='#5f9ea0' )
-chartreuse = Color ( hex='#7fff00' )
-chocolate = Color ( hex='#d2691e' )
-chrome = Color ( hex='#e8f1d4' )
-clear = Color ( hex='#00000000' )
-coral = Color ( hex='#ff7f50' )
-cornflowerBlue = Color ( hex='#6495ed' )
-cornsilk = Color ( hex='#fff8dc' )
-crimson = Color ( hex='#dc143c' )
-cyan = Color ( hex='#00ffff' )
-copper = Color ( hex='#B87333' )
-copperSulfate = Color ( hex='#187df9' )
+cadetBlue = Color ( '#5f9ea0' )
+chartreuse = Color ( '#7fff00' )
+chocolate = Color ( '#d2691e' )
+chrome = Color ( '#e8f1d4' )
+clear = Color ( '#00000000' )
+coral = Color ( '#ff7f50' )
+cornflowerBlue = Color ( '#6495ed' )
+cornsilk = Color ( '#fff8dc' )
+crimson = Color ( '#dc143c' )
+cyan = Color ( '#00ffff' )
+copper = Color ( '#B87333' )
+copperSulfate = Color ( '#187df9' )
Modified: trunk/pysoy/src/colors/d.pxi
===================================================================
--- trunk/pysoy/src/colors/d.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/d.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,28 +17,28 @@
#
# $Id$
-darkViolet = Color ( hex='#9400D3' )
-deepSkyBlue = Color ( hex='#00BFFF' )
-darkMagenta = Color ( hex='#8B008B' )
-darkorange = Color ( hex='#FF8C00' )
-darkGray = Color ( hex='#A9A9A9' )
-darkSeaGreen = Color ( hex='#8FBC8F' )
-darkOliveGreen = Color ( hex='#556B2F' )
-darkSlateGrey = Color ( hex='#2F4F4F' )
-darkSalmon = Color ( hex='#E9967A' )
-dimGrey = Color ( hex='#696969' )
-dimGray = Color ( hex='#696969' )
-deepPink = Color ( hex='#FF1493' )
-darkKhaki = Color ( hex='#BDB76B' )
-darkGoldenRod = Color ( hex='#B8860B' )
-darkGreen = Color ( hex='#006400' )
-darkSlateGray = Color ( hex='#2F4F4F' )
-dodgerBlue = Color ( hex='#1E90FF' )
-darkBlue = Color ( hex='#00008B' )
-darkSlateBlue = Color ( hex='#483D8B' )
-darkGrey = Color ( hex='#A9A9A9' )
-darkRed = Color ( hex='#8B0000' )
-darkTurquoise = Color ( hex='#00CED1' )
-darkOrchid = Color ( hex='#9932CC' )
-darkCyan = Color ( hex='#008B8B' )
-darkWood = Color ( hex='#855E42' )
+darkViolet = Color ( '#9400D3' )
+deepSkyBlue = Color ( '#00BFFF' )
+darkMagenta = Color ( '#8B008B' )
+darkorange = Color ( '#FF8C00' )
+darkGray = Color ( '#A9A9A9' )
+darkSeaGreen = Color ( '#8FBC8F' )
+darkOliveGreen = Color ( '#556B2F' )
+darkSlateGrey = Color ( '#2F4F4F' )
+darkSalmon = Color ( '#E9967A' )
+dimGrey = Color ( '#696969' )
+dimGray = Color ( '#696969' )
+deepPink = Color ( '#FF1493' )
+darkKhaki = Color ( '#BDB76B' )
+darkGoldenRod = Color ( '#B8860B' )
+darkGreen = Color ( '#006400' )
+darkSlateGray = Color ( '#2F4F4F' )
+dodgerBlue = Color ( '#1E90FF' )
+darkBlue = Color ( '#00008B' )
+darkSlateBlue = Color ( '#483D8B' )
+darkGrey = Color ( '#A9A9A9' )
+darkRed = Color ( '#8B0000' )
+darkTurquoise = Color ( '#00CED1' )
+darkOrchid = Color ( '#9932CC' )
+darkCyan = Color ( '#008B8B' )
+darkWood = Color ( '#855E42' )
Modified: trunk/pysoy/src/colors/f.pxi
===================================================================
--- trunk/pysoy/src/colors/f.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/f.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,7 +17,7 @@
#
# $Id$
-fireBrick = Color ( hex='#B22222' )
-fuchsia = Color ( hex='#FF00FF' )
-floralWhite = Color ( hex='#FFFAF0' )
-forestGreen = Color ( hex='#228B22' )
+fireBrick = Color ( '#B22222' )
+fuchsia = Color ( '#FF00FF' )
+floralWhite = Color ( '#FFFAF0' )
+forestGreen = Color ( '#228B22' )
Modified: trunk/pysoy/src/colors/g.pxi
===================================================================
--- trunk/pysoy/src/colors/g.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/g.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,11 +17,11 @@
#
# $Id$
-gray = Color ( hex='#808080' )
-gold = Color ( hex='#FFD700' )
-gainsboro = Color ( hex='#DCDCDC' )
-goldenRod = Color ( hex='#DAA520' )
-green = Color ( hex='#008000' )
-ghostWhite = Color ( hex='#F8F8FF' )
-grey = Color ( hex='#808080' )
-greenYellow = Color ( hex='#ADFF2F' )
+gray = Color ( '#808080' )
+gold = Color ( '#FFD700' )
+gainsboro = Color ( '#DCDCDC' )
+goldenRod = Color ( '#DAA520' )
+green = Color ( '#008000' )
+ghostWhite = Color ( '#F8F8FF' )
+grey = Color ( '#808080' )
+greenYellow = Color ( '#ADFF2F' )
Modified: trunk/pysoy/src/colors/h.pxi
===================================================================
--- trunk/pysoy/src/colors/h.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/h.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,5 +17,5 @@
#
# $Id$
-hotPink = Color ( hex='#FF69B4' )
-honeyDew = Color ( hex='#F0FFF0' )
+hotPink = Color ( '#FF69B4' )
+honeyDew = Color ( '#F0FFF0' )
Modified: trunk/pysoy/src/colors/i.pxi
===================================================================
--- trunk/pysoy/src/colors/i.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/i.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,6 +17,6 @@
#
# $Id$
-indigo = Color ( hex='#4B0082' )
-ivory = Color ( hex='#FFFFF0' )
-indianRed = Color ( hex='#CD5C5C' )
+indigo = Color ( '#4B0082' )
+ivory = Color ( '#FFFFF0' )
+indianRed = Color ( '#CD5C5C' )
Modified: trunk/pysoy/src/colors/k.pxi
===================================================================
--- trunk/pysoy/src/colors/k.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/k.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,4 +17,4 @@
#
# $Id$
-khaki = Color ( hex='#F0E68C' )
+khaki = Color ( '#F0E68C' )
Modified: trunk/pysoy/src/colors/l.pxi
===================================================================
--- trunk/pysoy/src/colors/l.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/l.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,25 +17,25 @@
#
# $Id$
-lightCoral = Color ( hex='#F08080' )
-lightYellow = Color ( hex='#FFFFE0' )
-lavender = Color ( hex='#E6E6FA' )
-lightPink = Color ( hex='#FFB6C1' )
-lightBlue = Color ( hex='#ADD8E6' )
-lavenderBlush = Color ( hex='#FFF0F5' )
-lightGray = Color ( hex='#D3D3D3' )
-lightSlateGray = Color ( hex='#778899' )
-lightSeaGreen = Color ( hex='#20B2AA' )
-lime = Color ( hex='#00FF00' )
-lightGrey = Color ( hex='#D3D3D3' )
-lightSlateGrey = Color ( hex='#778899' )
-lemonChiffon = Color ( hex='#FFFACD' )
-lightCyan = Color ( hex='#E0FFFF' )
-lightGreen = Color ( hex='#90EE90' )
-limeGreen = Color ( hex='#32CD32' )
-lightSteelBlue = Color ( hex='#B0C4DE' )
-lawnGreen = Color ( hex='#7CFC00' )
-linen = Color ( hex='#FAF0E6' )
-lightSkyBlue = Color ( hex='#87CEFA' )
-lightGoldenRodYellow = Color ( hex='#FAFAD2' )
-lightSalmon = Color ( hex='#FFA07A' )
+lightCoral = Color ( '#F08080' )
+lightYellow = Color ( '#FFFFE0' )
+lavender = Color ( '#E6E6FA' )
+lightPink = Color ( '#FFB6C1' )
+lightBlue = Color ( '#ADD8E6' )
+lavenderBlush = Color ( '#FFF0F5' )
+lightGray = Color ( '#D3D3D3' )
+lightSlateGray = Color ( '#778899' )
+lightSeaGreen = Color ( '#20B2AA' )
+lime = Color ( '#00FF00' )
+lightGrey = Color ( '#D3D3D3' )
+lightSlateGrey = Color ( '#778899' )
+lemonChiffon = Color ( '#FFFACD' )
+lightCyan = Color ( '#E0FFFF' )
+lightGreen = Color ( '#90EE90' )
+limeGreen = Color ( '#32CD32' )
+lightSteelBlue = Color ( '#B0C4DE' )
+lawnGreen = Color ( '#7CFC00' )
+linen = Color ( '#FAF0E6' )
+lightSkyBlue = Color ( '#87CEFA' )
+lightGoldenRodYellow = Color ( '#FAFAD2' )
+lightSalmon = Color ( '#FFA07A' )
Modified: trunk/pysoy/src/colors/m.pxi
===================================================================
--- trunk/pysoy/src/colors/m.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/m.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,18 +17,18 @@
#
# $Id$
-mediumAquaMarine = Color ( hex='#66CDAA' )
-midnightBlue = Color ( hex='#191970' )
-magenta = Color ( hex='#FF00FF' )
-mistyRose = Color ( hex='#FFE4E1' )
-mediumSpringGreen = Color ( hex='#00FA9A' )
-mediumSlateBlue = Color ( hex='#7B68EE' )
-mediumOrchid = Color ( hex='#BA55D3' )
-maroon = Color ( hex='#800000' )
-mediumTurquoise = Color ( hex='#48D1CC' )
-mediumSeaGreen = Color ( hex='#3CB371' )
-mediumVioletRed = Color ( hex='#C71585' )
-mintCream = Color ( hex='#F5FFFA' )
-moccasin = Color ( hex='#FFE4B5' )
-mediumBlue = Color ( hex='#0000CD' )
-mediumPurple = Color ( hex='#9370D8' )
+mediumAquaMarine = Color ( '#66CDAA' )
+midnightBlue = Color ( '#191970' )
+magenta = Color ( '#FF00FF' )
+mistyRose = Color ( '#FFE4E1' )
+mediumSpringGreen = Color ( '#00FA9A' )
+mediumSlateBlue = Color ( '#7B68EE' )
+mediumOrchid = Color ( '#BA55D3' )
+maroon = Color ( '#800000' )
+mediumTurquoise = Color ( '#48D1CC' )
+mediumSeaGreen = Color ( '#3CB371' )
+mediumVioletRed = Color ( '#C71585' )
+mintCream = Color ( '#F5FFFA' )
+moccasin = Color ( '#FFE4B5' )
+mediumBlue = Color ( '#0000CD' )
+mediumPurple = Color ( '#9370D8' )
Modified: trunk/pysoy/src/colors/n.pxi
===================================================================
--- trunk/pysoy/src/colors/n.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/n.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,5 +17,5 @@
#
# $Id$
-navy = Color ( hex='#000080' )
-navajoWhite = Color ( hex='#FFDEAD' )
+navy = Color ( '#000080' )
+navajoWhite = Color ( '#FFDEAD' )
Modified: trunk/pysoy/src/colors/o.pxi
===================================================================
--- trunk/pysoy/src/colors/o.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/o.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,9 +17,9 @@
#
# $Id$
-oldLace = Color ( hex='#FDF5E6' )
-orangeRed = Color ( hex='#FF4500' )
-orchid = Color ( hex='#DA70D6' )
-olive = Color ( hex='#808000' )
-orange = Color ( hex='#FFA500' )
-oliveDrab = Color ( hex='#6B8E23' )
+oldLace = Color ( '#FDF5E6' )
+orangeRed = Color ( '#FF4500' )
+orchid = Color ( '#DA70D6' )
+olive = Color ( '#808000' )
+orange = Color ( '#FFA500' )
+oliveDrab = Color ( '#6B8E23' )
Modified: trunk/pysoy/src/colors/p.pxi
===================================================================
--- trunk/pysoy/src/colors/p.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/p.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,15 +17,15 @@
#
# $Id$
-peru = Color ( hex='#CD853F' )
-paleGreen = Color ( hex='#98FB98' )
-paleVioletRed = Color ( hex='#D87093' )
-powderBlue = Color ( hex='#B0E0E6' )
-peachPuff = Color ( hex='#FFDAB9' )
-pearl = Color ( hex='#FAFFC7' )
-papayaWhip = Color ( hex='#FFEFD5' )
-pink = Color ( hex='#FFC0CB' )
-purple = Color ( hex='#800080' )
-plum = Color ( hex='#DDA0DD' )
-paleTurquoise = Color ( hex='#AFEEEE' )
-paleGoldenRod = Color ( hex='#EEE8AA' )
+peru = Color ( '#CD853F' )
+paleGreen = Color ( '#98FB98' )
+paleVioletRed = Color ( '#D87093' )
+powderBlue = Color ( '#B0E0E6' )
+peachPuff = Color ( '#FFDAB9' )
+pearl = Color ( '#FAFFC7' )
+papayaWhip = Color ( '#FFEFD5' )
+pink = Color ( '#FFC0CB' )
+purple = Color ( '#800080' )
+plum = Color ( '#DDA0DD' )
+paleTurquoise = Color ( '#AFEEEE' )
+paleGoldenRod = Color ( '#EEE8AA' )
Modified: trunk/pysoy/src/colors/r.pxi
===================================================================
--- trunk/pysoy/src/colors/r.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/r.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,6 +17,6 @@
#
# $Id$
-red = Color ( hex='#FF0000' )
-royalBlue = Color ( hex='#4169E1' )
-rosyBrown = Color ( hex='#BC8F8F' )
+red = Color ( '#FF0000' )
+royalBlue = Color ( '#4169E1' )
+rosyBrown = Color ( '#BC8F8F' )
Modified: trunk/pysoy/src/colors/s.pxi
===================================================================
--- trunk/pysoy/src/colors/s.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/s.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,18 +17,18 @@
#
# $Id$
-springGreen = Color ( hex='#00FF7F' )
-skyBlue = Color ( hex='#87CEEB' )
-salmon = Color ( hex='#FA8072' )
-slateGrey = Color ( hex='#708090' )
-silver = Color ( hex='#C0C0C0' )
-saddleBrown = Color ( hex='#8B4513' )
-sienna = Color ( hex='#A0522D' )
-seaShell = Color ( hex='#FFF5EE' )
-slateGray = Color ( hex='#708090' )
-seaGreen = Color ( hex='#2E8B57' )
-snow = Color ( hex='#FFFAFA' )
-slateBlue = Color ( hex='#6A5ACD' )
-steelBlue = Color ( hex='#4682B4' )
-sandyBrown = Color ( hex='#F4A460' )
-stainlessSteel = Color ( hex='#E0DFDB' )
+springGreen = Color ( '#00FF7F' )
+skyBlue = Color ( '#87CEEB' )
+salmon = Color ( '#FA8072' )
+slateGrey = Color ( '#708090' )
+silver = Color ( '#C0C0C0' )
+saddleBrown = Color ( '#8B4513' )
+sienna = Color ( '#A0522D' )
+seaShell = Color ( '#FFF5EE' )
+slateGray = Color ( '#708090' )
+seaGreen = Color ( '#2E8B57' )
+snow = Color ( '#FFFAFA' )
+slateBlue = Color ( '#6A5ACD' )
+steelBlue = Color ( '#4682B4' )
+sandyBrown = Color ( '#F4A460' )
+stainlessSteel = Color ( '#E0DFDB' )
Modified: trunk/pysoy/src/colors/t.pxi
===================================================================
--- trunk/pysoy/src/colors/t.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/t.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,8 +17,8 @@
#
# $Id$
-tan = Color ( hex='#D2B48C' )
-tomato = Color ( hex='#FF6347' )
-teal = Color ( hex='#008080' )
-thistle = Color ( hex='#D8BFD8' )
-turquoise = Color ( hex='#40E0D0' )
+tan = Color ( '#D2B48C' )
+tomato = Color ( '#FF6347' )
+teal = Color ( '#008080' )
+thistle = Color ( '#D8BFD8' )
+turquoise = Color ( '#40E0D0' )
Modified: trunk/pysoy/src/colors/v.pxi
===================================================================
--- trunk/pysoy/src/colors/v.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/v.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,5 +17,5 @@
#
# $Id$
-violet = Color ( hex='#ee82ee' )
-veryLightBlueGreen = Color ( hex='#2bafed' )
+violet = Color ( '#ee82ee' )
+veryLightBlueGreen = Color ( '#2bafed' )
Modified: trunk/pysoy/src/colors/w.pxi
===================================================================
--- trunk/pysoy/src/colors/w.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/w.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,6 +17,6 @@
#
# $Id$
-wheat = Color ( hex='#f5deb3' )
-white = Color ( hex='#ffffff' )
-whiteSmoke = Color ( hex='#f5f5f5' )
+wheat = Color ( '#f5deb3' )
+white = Color ( '#ffffff' )
+whiteSmoke = Color ( '#f5f5f5' )
Modified: trunk/pysoy/src/colors/y.pxi
===================================================================
--- trunk/pysoy/src/colors/y.pxi 2008-02-17 02:27:56 UTC (rev 914)
+++ trunk/pysoy/src/colors/y.pxi 2008-02-17 05:06:24 UTC (rev 915)
@@ -17,5 +17,5 @@
#
# $Id$
-yellow = Color ( hex='#ffff00' )
-yellowGreen = Color ( hex='#9acd32' )
+yellow = Color ( '#ffff00' )
+yellowGreen = Color ( '#9acd32' )
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
