From 4c9c8ede6fbc3b5f396f0c67137de79133f30bf1 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:49:54 -0500
Subject: [PATCH] bubble-chamber: use color objects

---
 extra/bubble-chamber/particle/hadron/hadron.factor      | 5 ++---
 extra/bubble-chamber/particle/muon/colors/colors.factor | 2 +-
 extra/bubble-chamber/particle/particle.factor           | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/extra/bubble-chamber/particle/hadron/hadron.factor b/extra/bubble-chamber/particle/hadron/hadron.factor
index 10a5431e57..910df97789 100644
--- a/extra/bubble-chamber/particle/hadron/hadron.factor
+++ b/extra/bubble-chamber/particle/hadron/hadron.factor
@@ -1,9 +1,8 @@
 
 USING: kernel random math math.constants math.points accessors multi-methods
        processing processing.shapes
-       processing.color
        bubble-chamber.common
-       bubble-chamber.particle ;
+       bubble-chamber.particle colors ;
 
 IN: bubble-chamber.particle.hadron
 
@@ -26,7 +25,7 @@ METHOD: collide { hadron }
 
   [ 0.00001 theta-dd-small? ] [ -0.001 0.001 random-theta-dd ] [ ] while
 
-  0 1 0 <rgb> >>myc
+  0 1 0 1 rgba boa >>myc
 
   drop ;
 
diff --git a/extra/bubble-chamber/particle/muon/colors/colors.factor b/extra/bubble-chamber/particle/muon/colors/colors.factor
index e68fff5efd..644bed833b 100644
--- a/extra/bubble-chamber/particle/muon/colors/colors.factor
+++ b/extra/bubble-chamber/particle/muon/colors/colors.factor
@@ -1,7 +1,7 @@
 
 USING: kernel sequences math math.constants math.order accessors
        processing
-       processing.color ;
+       colors ;
 
 IN: bubble-chamber.particle.muon.colors
 
diff --git a/extra/bubble-chamber/particle/particle.factor b/extra/bubble-chamber/particle/particle.factor
index 755a414b71..8b13e9b4b7 100644
--- a/extra/bubble-chamber/particle/particle.factor
+++ b/extra/bubble-chamber/particle/particle.factor
@@ -1,8 +1,8 @@
 
 USING: kernel sequences combinators
        math math.vectors math.functions multi-methods
-       accessors combinators.cleave processing processing.color
-       bubble-chamber.common ;
+       accessors combinators.cleave processing
+       bubble-chamber.common colors ;
 
 IN: bubble-chamber.particle
 
@@ -28,8 +28,8 @@ TUPLE: particle pos vel speed speed-d theta theta-d theta-dd myc mya ;
   0 >>theta-d
   0 >>theta-dd
 
-  0 0 0 1 <rgba> >>myc
-  0 0 0 1 <rgba> >>mya ;
+  0 0 0 1 rgba boa >>myc
+  0 0 0 1 rgba boa >>mya ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!