Mercurial > hg > amuse

comparison implementations/viewpointable/viewpointable.lisp @ 196:3b36cf79b525

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix amuse-viewpointing-implementation:make-viewpointable-composition. Ignore-this: db82c168f04fbcfa001d3db346231bfe Change to make-standard-viewpointable-composition. darcs-hash:20090723103119-16a00-40780dad850b7e64fe8acb717192c5959d0ff9df.gz
author j.forth <j.forth@gold.ac.uk>
date Thu, 23 Jul 2009 11:31:19 +0100
parents 0190c6ad759e
children
comparison
equal deleted inserted replaced
195:f0e742e8de06 196:3b36cf79b525
9 :accessor %viewpointable-event-source-event) 9 :accessor %viewpointable-event-source-event)
10 (source-composition :initarg :source-composition 10 (source-composition :initarg :source-composition
11 :accessor %viewpointable-event-source-composition))) 11 :accessor %viewpointable-event-source-composition)))
12 12
13 (defclass viewpointable-composition (monody) ()) 13 (defclass viewpointable-composition (monody) ())
14
15 (defclass standard-viewpointable-composition (standard-monody) ())
14 16
15 (defmethod timepoint ((event viewpointable-event)) 17 (defmethod timepoint ((event viewpointable-event))
16 (timepoint (%viewpointable-event-source-event event))) 18 (timepoint (%viewpointable-event-source-event event)))
17 19
18 (defmethod duration ((event viewpointable-event)) 20 (defmethod duration ((event viewpointable-event))
53 (declare (ignore composition)) 55 (declare (ignore composition))
54 (amuse-segmentation:boundary-strength segmenter 56 (amuse-segmentation:boundary-strength segmenter
55 (%viewpointable-event-source-event event) 57 (%viewpointable-event-source-event event)
56 (%viewpointable-event-source-composition event))) 58 (%viewpointable-event-source-composition event)))
57 59
58 (defun make-viewpointable-composition (composition) 60 (defun make-standard-viewpointable-composition (composition)
59 (let ((new-comp (make-instance 'viewpointable-composition 61 (let ((new-comp (make-instance 'standard-viewpointable-composition
60 :time (timepoint composition) 62 :time (timepoint composition)
61 :interval (duration composition))) 63 :interval (duration composition)))
62 (event-list) (i 0)) 64 (event-list) (i 0))
63 (sequence:dosequence (event composition) 65 (sequence:dosequence (event composition)
64 (push (make-instance 'viewpointable-event :source-event event 66 (push (make-instance 'viewpointable-event :source-event event