GAME: syntax for defining game entry point with game-loop attributes

diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index c57924eda74fbc9cf4abe591ec9e905a4004011d..e0fa560935f35b551040fbb2c1cafe3d96a45011 100644 (file)
--- a/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@ -243,9 +243,8 @@ M: object close-window
 
 HOOK: beep ui-backend ( -- )
 
-: parse-main-window ( class -- attributes quot )
-    "{" expect dup all-slots parse-tuple-literal-slots
-    parse-definition ;
+: parse-main-window-attributes ( class -- attributes )
+    "{" expect dup all-slots parse-tuple-literal-slots ;
 
 : define-main-window ( word attributes quot -- )
     [
@@ -253,4 +252,7 @@ HOOK: beep ui-backend ( -- )
     ] [ 2drop current-vocab (>>main) ] 3bi ;
 
 SYNTAX: MAIN-WINDOW:
-    CREATE world-attributes parse-main-window define-main-window ;
+    CREATE
+    world-attributes parse-main-window-attributes
+    parse-definition
+    define-main-window ;

diff --git a/extra/game/worlds/worlds.factor b/extra/game/worlds/worlds.factor
index cba57c89e9b9102b64c10dbee7b25a395643cfb9..f614943f0408d2b1f6e4c026656ce954c9af918e 100644 (file)
--- a/extra/game/worlds/worlds.factor
+++ b/extra/game/worlds/worlds.factor
@@ -1,5 +1,6 @@
-USING: accessors game.input game.loop kernel math ui.gadgets
-ui.gadgets.worlds ui.gestures threads ;
+USING: accessors combinators fry game.input game.loop generic kernel math
+parser sequences ui ui.gadgets ui.gadgets.worlds ui.gestures threads
+words ;
 IN: game.worlds
 
 TUPLE: game-world < world
@@ -24,3 +25,26 @@ M: game-world end-world
 TUPLE: game-attributes < world-attributes
     { tick-interval-micros fixnum read-only } ;
 
+: verify-game-attributes ( attributes -- )
+    world-class>> { f world } member?
+    [ "GAME: must be given a custom world-class" throw ] when ;
+
+: define-game-tick-interval-micros ( attributes -- )
+    [ world-class>> \ tick-interval-micros create-method ]
+    [ tick-interval-micros>> '[ drop _ ] ] bi
+    define ;
+
+: define-game-methods ( attributes -- )
+    {
+        [ verify-game-attributes ]
+        [ define-game-tick-interval-micros ]
+    } cleave ;
+
+: define-game ( word attributes -- )
+    [ [ ] define-main-window ]
+    [ nip define-game-methods ] 2bi ;
+
+SYNTAX: GAME:
+    CREATE
+    game-attributes parse-main-window-attributes
+    define-game ;

diff --git a/extra/gpu/demos/bunny/bunny.factor b/extra/gpu/demos/bunny/bunny.factor
index b1a2f81a1e070828bd62b09fc189acc892902dc3..067e9344531b5a6365fd1bb502da3903de65c808 100644 (file)
--- a/extra/gpu/demos/bunny/bunny.factor
+++ b/extra/gpu/demos/bunny/bunny.factor
@@ -7,7 +7,7 @@ io io.encodings.ascii io.files io.files.temp kernel locals math
 math.matrices math.vectors.simd math.parser math.vectors
 method-chains namespaces sequences splitting threads ui ui.gadgets
 ui.gadgets.worlds ui.pixel-formats specialized-arrays
-specialized-vectors ;
+specialized-vectors literals ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float
 SPECIALIZED-VECTOR: uint
@@ -293,24 +293,19 @@ M: bunny-world draw-world*
 AFTER: bunny-world resize-world
     [ sobel>> framebuffer>> ] [ dim>> ] bi resize-framebuffer ;
 
-M: bunny-world pref-dim* drop { 1024 768 } ;
-M: bunny-world tick-interval-micros drop 1000000 60 /i ;
 M: bunny-world wasd-movement-speed drop 1/160. ;
 M: bunny-world wasd-near-plane drop 1/32. ;
 M: bunny-world wasd-far-plane drop 256.0 ;
 
-: bunny-window ( -- )
-    [
-        f T{ world-attributes
-            { world-class bunny-world }
-            { title "Bunny" }
-            { pixel-format-attributes {
-                windowed
-                double-buffered
-                T{ depth-bits { value 24 } }
-            } }
-            { grab-input? t }
-        } open-window
-    ] with-ui ;
-
-MAIN: bunny-window
+GAME: bunny-game {
+        { world-class bunny-world }
+        { title "Bunny" }
+        { pixel-format-attributes {
+            windowed
+            double-buffered
+            T{ depth-bits { value 24 } }
+        } }
+        { grab-input? t }
+        { pref-dim { 1024 768 } }
+        { tick-interval-micros $[ 1,000,000 60 /i ] }
+    }

diff --git a/extra/gpu/demos/raytrace/raytrace.factor b/extra/gpu/demos/raytrace/raytrace.factor
index dd31244a454711b435ba3eb922bbde57bf3a1484..8883609bce38faf5525bea2f470696a307b44e09 100644 (file)
--- a/extra/gpu/demos/raytrace/raytrace.factor
+++ b/extra/gpu/demos/raytrace/raytrace.factor
@@ -92,21 +92,16 @@ M: raytrace-world draw-world*
         { "vertex-array"   [ vertex-array>>              ] }
     } <render-set> render ;
 
-M: raytrace-world pref-dim* drop { 1024 768 } ;
-M: raytrace-world tick-interval-micros drop 1000000 60 /i ;
 M: raytrace-world wasd-movement-speed drop 1/4. ;
 
-: raytrace-window ( -- )
-    [
-        f T{ world-attributes
-            { world-class raytrace-world }
-            { title "Raytracing" }
-            { pixel-format-attributes {
-                windowed
-                double-buffered
-            } }
-            { grab-input? t }
-        } open-window
-    ] with-ui ;
-
-MAIN: raytrace-window
+GAME: raytrace-game {
+        { world-class raytrace-world }
+        { title "Raytracing" }
+        { pixel-format-attributes {
+            windowed
+            double-buffered
+        } }
+        { grab-input? t }
+        { pref-dim { 1024 768 } }
+        { tick-interval-micros $[ 1,000,000 60 /i ] }
+    }

diff --git a/extra/terrain/terrain.factor b/extra/terrain/terrain.factor
index 655fee501128fdd31c2282e12f0d3ca8949e494c..adbeb9c441fa2fb7f062ea2d9f390a819fd7084b 100644 (file)
--- a/extra/terrain/terrain.factor
+++ b/extra/terrain/terrain.factor
@@ -55,9 +55,6 @@ TUPLE: terrain-world < game-world
         float-4{ 0.0 0.0 0.0 1.0 } >>velocity
         VELOCITY-MODIFIER-NORMAL >>velocity-modifier ;
 
-M: terrain-world tick-interval-micros
-    drop 1000000 60 /i ;
-
 : frustum ( dim -- -x x -y y near far )
     dup first2 min v/n
     NEAR-PLANE FOV / v*n first2 [ [ neg ] keep ] bi@
@@ -290,20 +287,15 @@ M: terrain-world draw-world*
         ] with-gl-program ]
     } cleave gl-error ;
 
-M: terrain-world pref-dim* drop { 1024 768 } ;
-
-: terrain-window ( -- )
-    [
-        f T{ world-attributes
-            { world-class terrain-world }
-            { title "Terrain" }
-            { pixel-format-attributes {
-                windowed
-                double-buffered
-                T{ depth-bits { value 24 } }
-            } }
-            { grab-input? t }
-        } open-window
-    ] with-ui ;
-
-MAIN: terrain-window
+GAME: terrain-game {
+        { world-class terrain-world }
+        { title "Terrain" }
+        { pixel-format-attributes {
+            windowed
+            double-buffered
+            T{ depth-bits { value 24 } }
+        } }
+        { grab-input? t }
+        { pref-dim { 1024 768 } }
+        { tick-interval-micros $[ 1,000,000 60 /i ] }
+    }