From 109d40a75d9135db707363b1747923d5b79eb18d Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson@member.fsf.org>
Date: Sun, 15 Sep 2013 21:17:47 -0400
Subject: Rename scene draw and update procedures.

They were inconsistent with the rest of the API.
---
 2d/game-loop.scm    |  4 ++--
 2d/game.scm         |  4 ++--
 2d/private/game.scm | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to '2d')

diff --git a/2d/game-loop.scm b/2d/game-loop.scm
index 6d32bcb..1a9b518 100644
--- a/2d/game-loop.scm
+++ b/2d/game-loop.scm
@@ -144,7 +144,7 @@
   (set-gl-matrix-mode (matrix-mode modelview))
   (gl-load-identity)
   (gl-clear (clear-buffer-mask color-buffer depth-buffer))
-  (scene-draw current-scene)
+  (draw-scene current-scene)
   (SDL:gl-swap-buffers)
   (accumulate-fps! dt))
 
@@ -156,7 +156,7 @@ is the unused accumulator time."
       (begin
         (handle-events)
         (update-agenda)
-        (scene-update current-scene)
+        (update-scene current-scene)
         (update (- accumulator tick-interval)))
       accumulator))
 
diff --git a/2d/game.scm b/2d/game.scm
index 77a5cb1..3bd314e 100644
--- a/2d/game.scm
+++ b/2d/game.scm
@@ -68,8 +68,8 @@ creates a new scene."
            scene-draw-proc
            scene-state
            scene-trigger
-           scene-update
-           scene-draw
+           update-scene
+           draw-scene
            push-scene
            replace-scene
            pop-scene)
diff --git a/2d/private/game.scm b/2d/private/game.scm
index 63f0bd1..88a971f 100644
--- a/2d/private/game.scm
+++ b/2d/private/game.scm
@@ -46,12 +46,12 @@
          (scene-state scene)
          args))
 
-(define (scene-draw scene)
-  "Draw scene."
+(define (draw-scene scene)
+  "Draw SCENE."
   ((scene-draw-proc scene) (scene-state scene)))
 
-(define (scene-update scene)
-  "Update scene."
+(define (update-scene scene)
+  "Update SCENE."
   ((scene-update-proc scene) (scene-state scene)))
 
 (export <scene>
@@ -63,8 +63,8 @@
         scene-draw-proc
         scene-state
         scene-trigger
-        scene-update
-        scene-draw)
+        update-scene
+        draw-scene)
 
 ;;;
 ;;; Games
-- 
cgit v1.2.3