Mercurial > MadButterfly
changeset 1197:8c5492b096f1
Fix bug of changing tween type
| author | Thinker K.F. Li <thinker@codemud.net> |
|---|---|
| date | Sun, 02 Jan 2011 21:09:35 +0800 |
| parents | 42f8cee2118b |
| children | 164076156e04 |
| files | pyink/MBScene.py pyink/frameline.py |
| diffstat | 2 files changed, 11 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/pyink/MBScene.py Sun Jan 02 20:51:51 2011 +0800 +++ b/pyink/MBScene.py Sun Jan 02 21:09:35 2011 +0800 @@ -479,6 +479,7 @@ pass pass + # TODO: this function should be removed. def update_scenes_of_dom(self): doc = self._root rdoc = self._doc @@ -1095,17 +1096,16 @@ if self.last_line == None: return frameline = self.last_line - idx = self.last_frame - i = 0 - found = -1 - for start_idx, stop_idx, tween_type in frameline.get_frame_blocks(): - if start_idx <= idx and stop_idx >= idx: - n = self.tweenTypeSelector.get_active() - new_tween_type = MBScene._frameline_tween_types[n] - self.last_line.set_tween_type(start_idx, new_tween_type) - self.update_scenes_of_dom() - break - pass + start, end, old_tween_type = frameline.get_frame_block(self.last_frame) + + type_idx = self.tweenTypeSelector.get_active() + tween_type = MBScene._frameline_tween_types[type_idx] + type_name = self._tween_type_names[type_idx] + + frameline.tween(start, tween_type) + + scene_node = frameline.get_frame_data(start) + scene_node.setAttribute('type', type_name) pass def addTweenTypeSelector(self,hbox):
--- a/pyink/frameline.py Sun Jan 02 20:51:51 2011 +0800 +++ b/pyink/frameline.py Sun Jan 02 21:09:35 2011 +0800 @@ -655,11 +655,6 @@ pass pass - ## Set the frame @idx as the right of a tween - def set_right_tween(self,idx): - pos = self._find_keyframe(idx) - self._keys[pos].right_tween = TRue - def remove_frame(self, idx): pos = self._find_keyframe_floor(idx) if pos != -1: