X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=33ad2b15059b82bcb8c9bf8dfeb5f5dbea8dd800;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=f6980894139a931b963d065ad532ba84ca9acef9;hpb=fdfd147f1233eef6ea8b176290221b5a4ec38868;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index f698089413..33ad2b1505 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-column.hh"
 #include "collision.hh"
-#include "dimension-cache.hh"
+
 #include "engraver.hh"
 #include "axis-group-interface.hh"
 
@@ -17,65 +17,70 @@
   a collision object.  */
 class Collision_engraver : public Engraver {
   Item * col_p_;
-  Link_array<Note_column> note_column_l_arr_;
+  Link_array<Grob> note_column_l_arr_;
 
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void create_grobs ();
+  virtual void stop_translation_timestep ();
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Collision_engraver();
+  TRANSLATOR_DECLARATIONS(Collision_engraver);
 };
 
 
 void
-Collision_engraver::process_acknowledged ()
+Collision_engraver::create_grobs ()
 {
   if (col_p_ || note_column_l_arr_.size () < 2)
     return ;
   if (!col_p_) 
     {
-      col_p_ = new Item (get_property ("basicCollisionProperties"));
-      Axis_group_interface (col_p_).set_interface ();
-      Axis_group_interface (col_p_).set_axes (X_AXIS, Y_AXIS);
+      col_p_ = new Item (get_property ("NoteCollision"));
+      Axis_group_interface::set_interface (col_p_);
+      Axis_group_interface::set_axes (col_p_, X_AXIS, Y_AXIS);
 
-      announce_element (Score_element_info (col_p_,0));
+      announce_grob (col_p_,0);
     }
   
   for (int i=0; i< note_column_l_arr_.size (); i++)
-    Collision (col_p_).add_column (note_column_l_arr_[i]);
+    Collision::add_column (col_p_,note_column_l_arr_[i]);
 }
 
 void
-Collision_engraver::acknowledge_element (Score_element_info i)
+Collision_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_column * c = dynamic_cast<Note_column *> (i.elem_l_))
+  if (Note_column::has_interface (i.grob_l_))
     {
       /*should check Y axis? */
-      if (c->rest_b () || c->parent_l(X_AXIS))
+      if (Note_column::rest_b (i.grob_l_) || i.grob_l_->get_parent (X_AXIS))
 	return ;
 
-      note_column_l_arr_.push (c);
+      note_column_l_arr_.push (i.grob_l_);
     }
 }
 
 void
-Collision_engraver::do_pre_move_processing()
+Collision_engraver::stop_translation_timestep ()
 {
   if (col_p_) 
     {
-      typeset_element (col_p_);
+      typeset_grob (col_p_);
       col_p_ =0;
     }
   note_column_l_arr_.clear ();
 }
 
-Collision_engraver::Collision_engraver()
+Collision_engraver::Collision_engraver ()
 {
   col_p_ =0;
 }
 
 
 
-ADD_THIS_TRANSLATOR(Collision_engraver);
+
+ENTER_DESCRIPTION(Collision_engraver,
+/* descr */       "",
+/* creats*/       "NoteCollision",
+/* acks  */       "note-column-interface",
+/* reads */       "",
+/* write */       "");