Mercurial > MadButterfly

comparison pyink/MBScene.py @ 1157:3a891dccabd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove the locate tween. It is a special case for the scale tween
author wycc
date Mon, 27 Dec 2010 23:01:48 +0800
parents 5db4d769387c
children e731a0eaa35f
comparison
equal deleted inserted replaced
1156:ad9c44a08645 1157:3a891dccabd8
154 pass 154 pass
155 pass 155 pass
156 156
157 class MBScene(): 157 class MBScene():
158 _frameline_tween_types = (frameline.TWEEN_TYPE_NONE, 158 _frameline_tween_types = (frameline.TWEEN_TYPE_NONE,
159 frameline.TWEEN_TYPE_MOVE,
160 frameline.TWEEN_TYPE_SHAPE) 159 frameline.TWEEN_TYPE_SHAPE)
161 _tween_obj_tween_types = (TweenObject.TWEEN_TYPE_NORMAL, 160 _tween_obj_tween_types = (TweenObject.TWEEN_TYPE_NORMAL,
162 TweenObject.TWEEN_TYPE_RELOCATE,
163 TweenObject.TWEEN_TYPE_SCALE) 161 TweenObject.TWEEN_TYPE_SCALE)
164 _tween_type_names = ('normal', 'relocate', 'scale') 162 _tween_type_names = ('normal', 'scale')
165 163
166 def __init__(self, desktop, win, root=None): 164 def __init__(self, desktop, win, root=None):
167 self.desktop = desktop 165 self.desktop = desktop
168 self.window = win 166 self.window = win
169 self.layers = [] 167 self.layers = []
936 label = gtk.Label('Tween Type') 934 label = gtk.Label('Tween Type')
937 tweenbox.pack_start(label) 935 tweenbox.pack_start(label)
938 936
939 self.tweenTypeSelector = gtk.combo_box_new_text() 937 self.tweenTypeSelector = gtk.combo_box_new_text()
940 self.tweenTypeSelector.append_text('normal') 938 self.tweenTypeSelector.append_text('normal')
941 self.tweenTypeSelector.append_text('relocate') 939 #self.tweenTypeSelector.append_text('relocate')
942 self.tweenTypeSelector.append_text('scale') 940 self.tweenTypeSelector.append_text('scale')
943 self.tweenTypeSelector.set_active(0) 941 self.tweenTypeSelector.set_active(0)
944 tweenbox.pack_start(self.tweenTypeSelector, expand=False,fill=False) 942 tweenbox.pack_start(self.tweenTypeSelector, expand=False,fill=False)
945 hbox.pack_start(tweenbox,expand=False,fill=False) 943 hbox.pack_start(tweenbox,expand=False,fill=False)
946 self.tweenTypeSelector.connect('changed', self.onTweenTypeChange) 944 self.tweenTypeSelector.connect('changed', self.onTweenTypeChange)