Added an initial tween construction language

3 files changed, 62 insertions, 2 deletions

diff --git a/animise.asd b/animise.asd
index fe9fc38..401e39c 100644
--- a/animise.asd
+++ b/animise.asd
@@ -9,4 +9,5 @@
   :depends-on (#:lettuce #:trivia)
   :components ((:file "package")
                (:file "easing")
-               (:file "animise")))
+               (:file "animise")
+               (:file "tweening")))
diff --git a/package.lisp b/package.lisp
index 5ae2c76..683a828 100644
--- a/package.lisp
+++ b/package.lisp
@@ -15,7 +15,7 @@
    #:duration
    #:run-tween
 
-   ;; TWEEN FUNCTIONS
+   ;; TWEEN FUNCTIONS & Macros
    #:tween-finished-p
    #:in-sequence
    #:end-time
@@ -23,6 +23,10 @@
    #:as-group
    #:pause
    #:animate
+   #:animating
+   #:sequencing
+   #:pausing
+   #:grouping 
 
 
    ;; EASING FUNCTIONS
diff --git a/tweening.lisp b/tweening.lisp
new file mode 100644
index 0000000..12ddc5e
--- /dev/null
+++ b/tweening.lisp
@@ -0,0 +1,55 @@
+(in-package :animise)
+
+(defmacro when-bound (symbol)
+  `(when (boundp (quote ,symbol)) ,symbol))
+
+(defvar *duration*)
+(defvar *target*)
+(defvar *start-time*)
+
+(defmacro sequencing ((&key loop-mode start starting with-target targeting target) &body forms)
+  (let ((this-seq (gensym))
+        (dyn-vars (append (when (or with-target target targeting)
+                             `((*target* ,(or with-target target targeting))))
+                           (when (or start starting)
+                             `((*start-time* ,(or start starting)))))))
+    `(let ,dyn-vars
+       (let ((,this-seq (in-sequence ,@forms)))
+         (setf (loop-mode ,this-seq) ',loop-mode)
+         ,this-seq))))
+
+
+(defun pausing (&key for duration start)
+  (pause (or for duration (when-bound *duration*) 0)
+         (or start (when-bound *start-time*) 0)))
+
+(defmacro grouping ((&key duration for with-duration) &body forms)
+  (let ((dyn-vars (append (when (or duration for with-duration)
+                            `((*duration* ,(or duration for with-duration)))))))
+    `(let ,dyn-vars
+       (as-group ,@forms))))
+
+
+(defun keyword->ease-fn (name)
+  (case name
+    ((:bounce-out :bouncing-out) #'bounce-out)
+    ((:cubing-in :cubically-in :cubic-in) #'cubic-in)
+    ((:cubing-in-out :cubically-in-out :cubic-in-out) #'cubic-in-out)
+    ((:cubing-out :cubically-out :cubic-out) #'cubic-out)
+    ((:elastic-out :elastically-out) #'elastic-out)
+    ((:linear :linearly) #'linear)
+    ((:quading-in :quad-in :quadratically-in) #'quad-in)
+    ((:quading-in-out :quad-in-out :quadratically-in-out) #'quad-in-out)
+    ((:quading-out :quad-out :quadratically-out) #'quad-out)
+    ((:sine-in :sinusoidal-in :sinusoidally-in) #'sinusoidal-in)
+    ((:sine-in-out :sinusoidally-in-out :sinusoidal-in-out) #'sinusoidal-in-out)
+    ((:sine-out :sinusoidal-out :sinusoidally-out) #'sinusoidal-out)))
+
+(defun animating (ease &key the  modifying of to for start starting)
+  (animate (or of (when-bound *target*))
+           (or the modifying)
+           to
+           :start (or start starting (when-bound *start-time*) 0)
+           :ease (if (functionp ease) ease (keyword->ease-fn ease))
+           :duration (or for (when-bound *duration*) 0)))
+