Merge branch 'fluids'

diff --git a/extra/fluids/fluids.factor b/extra/fluids/fluids.factor
index f383534658f99c45dc3aa90bc1a0c35565db6816..f2d02b22a32eb15831f57fa8b40a170ee12f3a9c 100644 (file)
--- 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

diff --git a/extra/fluids/resources.txt b/extra/fluids/resources.txt
new file mode 100644 (file)
index 0000000..f37e692
--- /dev/null
+++ b/extra/fluids/resources.txt
@@ -0,0 +1,2 @@
+particle2.pgm
+colors.ppm