bubble-chamber: use color objects

diff --git a/extra/bubble-chamber/particle/hadron/hadron.factor b/extra/bubble-chamber/particle/hadron/hadron.factor
index 10a5431e57c0347ed70264922c46864557834f25..910df97789bbda55303d2353f77186d0d957dca5 100644 (file)
--- 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 e68fff5efdbff40624d8e02247a015ef7db1d4b3..644bed833b95f0510dfc330925a01ed88c894e0e 100644 (file)
--- 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 755a414b711c03e3e2ba682db8b53ac9d6fb817c..8b13e9b4b7d0e9277da908c3f1ab6170553b9bce 100644 (file)
--- 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 ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!