Merge branch 'fluids'

2010-04-20 22:28:43 -07:00 · 2010-04-20 22:28:43 -07:00 · 2be0e94c87
parent 723302053b ebd6594ef5
commit 2be0e94c87
2 changed files with 4 additions and 2 deletions
--- a/extra/fluids/fluids.factor
+++ b/extra/fluids/fluids.factor
@ -78,8 +78,8 @@ M: fluids-world begin-game-world
    dup fluid set
    init-gpu
    initial-particles clone >>particles
-    "resource:extra/fluids/particle2.pgm" make-texture >>texture
-    "resource:extra/fluids/colors.ppm" make-texture >>ramp
+    "vocab:fluids/particle2.pgm" make-texture >>texture
+    "vocab:fluids/colors.ppm" make-texture >>ramp
    drop ;

 M: fluids-world end-game-world
--- a/extra/fluids/resources.txt
+++ b/extra/fluids/resources.txt
@ -0,0 +1,2 @@
+particle2.pgm
+colors.ppm