diff options
author | David Thompson <dthompson2@worcester.edu> | 2015-08-26 09:12:02 -0400 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2015-08-26 09:12:02 -0400 |
commit | f8b48b550d5f167483a545f207ae053d8fa9d5dd (patch) | |
tree | c1577bdd721598dbe48d7b6ca3a21ad202a99471 /sly/game.scm | |
parent | a0b33ff9274b0fb682e36a42e3aa70ce5581df7c (diff) |
render: Reimplement OpenGL state machine manager.
The implementation is a bit cleaner, and it's a stepping stone towards
render combinators.
* sly/render/context.scm: Delete.
* sly/render.scm: New file.
* Makefile.am (SOURCES): Add it. Remove context.scm.
* sly/game.scm (run-game-loop): Use new <graphics> type.
* sly/render/model.scm (draw-model): Likewise.
* sly/render/scene.scm (draw-scene): Likewise.
* examples/2048/2048.scm: Remove (sly render context) import.
Diffstat (limited to 'sly/game.scm')
-rw-r--r-- | sly/game.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sly/game.scm b/sly/game.scm index b836c22..7e4a79c 100644 --- a/sly/game.scm +++ b/sly/game.scm @@ -34,7 +34,7 @@ #:use-module (sly signal) #:use-module (sly math vector) #:use-module (sly window) - #:use-module (sly render context) + #:use-module (sly render) #:use-module (sly render scene) #:export (draw-hook after-game-loop-error-hook @@ -63,9 +63,9 @@ for the given STACK and error KEY with additional arguments ARGS." (newline cep))) (define* (run-game-loop scene #:key - (frame-rate 60) - (tick-rate 60) - (max-ticks-per-frame 4)) + (frame-rate 60) + (tick-rate 60) + (max-ticks-per-frame 4)) "Run the game loop. SCENE is a signal which contains the current scene to render. FRAME-RATE specifies the optimal number of frames to draw SCENE per second. TICK-RATE specifies the optimal game logic @@ -76,7 +76,7 @@ due to poor performance, the game will start to slow down instead of becoming completely unresponsive and possibly crashing." (let ((tick-interval (interval tick-rate)) (frame-interval (interval frame-rate)) - (context (make-render-context))) + (gfx (make-graphics))) (define (draw dt alpha) "Render a frame." @@ -84,8 +84,8 @@ becoming completely unresponsive and possibly crashing." (gl-viewport 0 0 (vx size) (vy size))) (gl-clear (clear-buffer-mask color-buffer depth-buffer)) (run-hook draw-hook dt alpha) - (with-render-context context - (draw-scene (signal-ref scene) context)) + (with-graphics gfx + (draw-scene (signal-ref scene) gfx)) (SDL:gl-swap-buffers)) (define (update lag) |