Merge branch 'refactor-with-def'

1 files changed, 14 insertions, 6 deletions

diff --git a/src/interactive/frameset.lisp b/src/interactive/frameset.lisp
index c866d04..65762c7 100644
--- a/src/interactive/frameset.lisp
+++ b/src/interactive/frameset.lisp
@@ -2,12 +2,20 @@
 
 (in-package #:wheelwork)
 
-(defclass/std frameset (unit interactive)
-  ((frames :with :doc "an array of renderable frames")
-   (sequence :with :doc "an array of indices into frames")
-   (runningp  :std t)
-   (wait-time :std (/ 1000.0 2) :with :doc "milliseconds between frames")
-   (count index next-time :with :std 0 :a)))
+;; TODO: be more specific about vector types 
+(def:class frameset (unit interactive)
+  ((frames "Vector of renderable frames.") 
+   :prefix :type vector)
+  ((sequence "Vector of indicies into the frame controlling order of display")
+   :prefix :type vector)
+  ((runningp "Whether this set is animating by cycling through frames")
+   :type boolean :initform t)
+  ((wait-time "Milliseconds between frames")
+   :prefix :initform (/ 1000.0 2))
+  ((count "")
+   (index "")
+   (next-time "")
+   :prefix :initform 0))
 
 (defmethod (setf fps) (newval (fs frameset))
   (setf (frameset-wait-time fs) (/ 1000.0 newval)))