Reorganize examples

[gacela.git] / examples / fran.scm

diff --git a/examples/fran.scm b/examples/fran.scm
index b85720859560255fe726133c2ceb6098e14c9eb7..964bbbccf21450f0dd68633fd66f7acbec1f366f 100644 (file)
--- a/examples/fran.scm
+++ b/examples/fran.scm
@@ -1,3 +1,6 @@
+#!/usr/bin/env guile
+!#
+
 ;;; Gacela, a GNU Guile extension for fast games development
 ;;; Copyright (C) 2016 by Javier Sancho Fernandez <jsf at jsancho dot org>
 ;;;
@@ -19,17 +22,16 @@
 
 ;;; Reactive positions
 
-(define PI 3.14159265)
-(define (waggle) (cos (* PI (current-time))))
-(define (wiggle) (sin (* PI (current-time))))
-
+(define (tick) (* 3000000 (get-internal-real-time)))
+(define (waggle) (* 200 (+ 1 (cos (* pi (tick))))))
+(define (wiggle) (* 300 (+ 1 (sin (* pi (tick))))))
 
 ;;; First example
 
-(define charlotte (importBitmap "charlotte.bmp"))
-(define leftRightCharlotte (moveXY wiggle 0 charlotte))
-(leftRightCharlotte)
+(define red (import-bitmap "red.bmp"))
+(define left-right-red (move-xy wiggle 0 red))
+(run-scene left-right-red)
 
-(define pat (importBitmap "pat.bmp"))
-(define upDownPat (moveXY 0 waggle pat))
-(upDownPat)
+(define blue (import-bitmap "blue.bmp"))
+(define up-down-blue (move-xy 0 waggle blue))
+(run-scene up-down-blue)