From aa5c396ade101f569a6d99891889cb512bd11ea0 Mon Sep 17 00:00:00 2001
From: Richard Smith <mercurial@fantastic.me.uk>
Date: Sun, 26 May 2019 00:15:55 +0100
Subject: [PATCH] switch richlib to use raylib.static rather than dynamic, and
 fix colors to always be lists of 4

---
 raylib/richlib/__init__.py | 70 +++++++++++++++++++++++++++++---------
 test_richlib.py            | 10 +++---
 2 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/raylib/richlib/__init__.py b/raylib/richlib/__init__.py
index 3d7f4b4..c5175eb 100755
--- a/raylib/richlib/__init__.py
+++ b/raylib/richlib/__init__.py
@@ -2,7 +2,8 @@
 """
 __version__ = '0.1'
 
-from ..dynamic import ffi, raylib as rl
+from ..static import ffi, rl
+#from ..dynamic import ffi, raylib as rl
 from ..colors import *
 
 import sys
@@ -44,16 +45,58 @@ class Vector(list):
     def z(self, value):
         self[2] = value
 
+    @property
+    def w(self):
+        return self[3]
 
-def make_color(c):
-    if isinstance(c, str):
-        return globals()[c.upper()]
-    else:
-        return c
+    @w.setter
+    def w(self, value):
+        self[3] = value
+
+class Color(list):
+    def __init__(self, s):
+        if isinstance(s, str):
+            super().__init__(globals()[s.upper()])
+        else:
+            super().__init__(s)
+        if len(self) == 3:
+            self.append(255)
+
+    @property
+    def r(self):
+        return self[0]
+
+    @r.setter
+    def r(self, value):
+        self[0] = value
+
+    @property
+    def g(self):
+        return self[1]
+
+    @g.setter
+    def g(self, value):
+        self[1] = value
+
+    @property
+    def b(self):
+        return self[2]
+
+    @b.setter
+    def b(self, value):
+        self[2] = value
+
+    @property
+    def a(self):
+        return self[3]
+
+    @a.setter
+    def a(self, value):
+        self[3] = value
 
 
 def clear(color=BLACK):
-    rl.ClearBackground(color)
+    rl.ClearBackground(Color(color))
 
 
 class Shape:
@@ -63,10 +106,7 @@ class Shape:
 
     @color.setter
     def color(self, value):
-        if isinstance(value, str):
-            self._color = globals()[value.upper()]
-        else:
-            self._color = value
+        self._color = Color(value)
 
     @property
     def pos(self):
@@ -82,10 +122,7 @@ class Shape:
 
     @wire_color.setter
     def wire_color(self, value):
-        if isinstance(value, str):
-            self._wire_color = globals()[value.upper()]
-        else:
-            self._wire_color = value
+        self._wire_color =  Color(value)
 
     @property
     def x(self):
@@ -117,7 +154,7 @@ class Box(Shape):
         self.pos = position
         self.size = size
         self.color = color
-        self.wire_color = wire_color  # make_color(wire_color)
+        self.wire_color = wire_color
         self.wires = wires
 
     # def __getattr__(self, item):
@@ -150,6 +187,7 @@ class Box(Shape):
         )
 
     def draw(self):
+        #print("draw color ",self.color)
         rl.DrawCubeV(self.pos, self.size, self.color)
         if self.wires:
             rl.DrawCubeWiresV(
diff --git a/test_richlib.py b/test_richlib.py
index 801054b..c1f0f30 100644
--- a/test_richlib.py
+++ b/test_richlib.py
@@ -5,8 +5,8 @@ HEIGHT=640
 #CAMERA=CAMERA_FIRST_PERSON
 DATA_DIR="examples/models/resources/models/"
 
-player = Box((0, 10, 20), (10, 20, 10), GREEN)
-enemy_box = Box((-40, 10, 0), (20, 20, 20), (70,70,70))
+player = Box((0, 10, 20), (10, 20, 10), 'green')
+enemy_box = Box((-40, 10, 0), (20, 20, 20), (150,0,0))
 enemy_sphere = Sphere((40, 15, 0), 15, 'gray')
 castle = Actor("castle", collision_radius=15)
 castle.z=-50
@@ -28,13 +28,13 @@ def update():
         player.pos.z -= 2
 
     if player.check_collision(enemy_box) or player.check_collision(enemy_sphere) or player.check_collision(castle):
-        player.color = RED
+        player.color = 'red'
     else:
-        player.color = GREEN
+        player.color = 'green'
 
 
 def draw3d():
-    rl.ClearBackground(WHITE)
+    clear('white')
     enemy_box.draw()
     enemy_sphere.draw()
     player.draw()