uohlhv/danmaku2ass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Experimental 3D rotation handling

Browse source
This commit is contained in:
Star Brilliant 2014-06-08 19:13:25 +08:00
parent 6adac57087
commit e1efa02113
1 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

82
danmaku2ass.py
View file

@ -284,15 +284,17 @@ def WriteCommentBilibiliPositioned(f, c, width, height, styleid):
delay = int(comment_args.get(10, 0)) delay = int(comment_args.get(10, 0))
fontface = comment_args.get(12) fontface = comment_args.get(12)
isborder = comment_args.get(11, 'true') isborder = comment_args.get(11, 'true')
styles = [] from_rotarg = ConvertFlashRotation(rotate_y, rotate_z, from_x, from_y, width, height)
if (from_x, from_y) == (to_x, to_y): to_rotarg = ConvertFlashRotation(rotate_y, rotate_z, to_x, to_y, width, height)
styles.append('\\pos(%s, %s)' % (from_x, from_y)) styles = ['\\org(%s, %s)' % (width//2, height//2)]
if from_rotarg[0:2] == to_rotarg[0:2]:
styles.append('\\pos(%s, %s)' % (from_rotarg[0:2]))
else: else:
styles.append('\\move(%s, %s, %s, %s, %s, %s)' % (from_x, from_y, to_x, to_y, delay, delay+duration)) styles.append('\\move(%s, %s, %s, %s, %s, %s)' % (from_rotarg[0:2]+to_rotarg[0:2]+(delay, delay+duration)))
styles.append('\\frx%s\\fry%s\\frz%s\\fax%s\\fay%s' % ConvertFlashRotation(rotate_y, rotate_z, (from_x-ZoomFactor[1])/(width-ZoomFactor[1]*2), (from_y-ZoomFactor[2])/(height-ZoomFactor[2]*2))) styles.append('\\frx%s\\fry%s\\frz%s\\fscx%s\\fscy%s' % (from_rotarg[2:7]))
if (from_x, from_y) != (to_x, to_y): if (from_x, from_y) != (to_x, to_y):
styles.append('\\t(%s, %s, ' % (delay, delay+duration)) styles.append('\\t(%s, %s, ' % (delay, delay+duration))
styles.append('\\frx%s\\fry%s\\frz%s\\fax%s\\fay%s' % ConvertFlashRotation(rotate_y, rotate_z, (to_x-ZoomFactor[1])/(width-ZoomFactor[1]*2), (to_y-ZoomFactor[2])/(height-ZoomFactor[2]*2))) styles.append('\\frx%s\\fry%s\\frz%s\\fscx%s\\fscy%s' % (to_rotarg[2:7]))
styles.append(')') styles.append(')')
if fontface: if fontface:
styles.append('\\fn%s' % ASSEscape(fontface)) styles.append('\\fn%s' % ASSEscape(fontface))
@ -329,16 +331,22 @@ def WriteCommentAcfunPositioned(f, c, width, height, styleid):
def GetTransformStyles(x=None, y=None, scale_x=None, scale_y=None, rotate_z=None, rotate_y=None, color=None, alpha=None): def GetTransformStyles(x=None, y=None, scale_x=None, scale_y=None, rotate_z=None, rotate_y=None, color=None, alpha=None):
styles = [] styles = []
if x is not None and y is not None: out_x, out_y = x, y
styles.append('\\pos(%s, %s)' % (x, y))
if scale_x is not None:
styles.append('\\fscx%s' % scale_x)
if scale_y is not None:
styles.append('\\fscy%s' % scale_y)
if rotate_z is not None and rotate_y is not None: if rotate_z is not None and rotate_y is not None:
assert x is not None assert x is not None
assert y is not None assert y is not None
styles.append('\\frx%s\\fry%s\\frz%s\\fax%s\\fay%s' % ConvertFlashRotation(rotate_y, rotate_z, (x-ZoomFactor[1])/(width-ZoomFactor[1]*2), (y-ZoomFactor[2])/(height-ZoomFactor[2]*2))) rotarg = ConvertFlashRotation(rotate_y, rotate_z, x, y, width, height)
out_x, out_y = rotarg[0:2]
if scale_x is None:
scale_x = 1
if scale_y is None:
scale_y = 1
styles.append('\\frx%s\\fry%s\\frz%s\\fscx%s\\fscy%s' % (rotarg[2:5]+(round(rotarg[5]*scale_x), round(rotarg[6]*scale_y))))
else:
if scale_x is not None:
styles.append('\\fscx%s' % round(scale_x*100))
if scale_y is not None:
styles.append('\\fscy%s' % round(scale_y*100))
if color is not None: if color is not None:
styles.append('\\c&H%02X%02X%02X&' % (color & 0xff, (color >> 8) & 0xff, (color >> 16) & 0xff)) styles.append('\\c&H%02X%02X%02X&' % (color & 0xff, (color >> 8) & 0xff, (color >> 16) & 0xff))
if color == 0x000000: if color == 0x000000:
@ -346,7 +354,7 @@ def WriteCommentAcfunPositioned(f, c, width, height, styleid):
if alpha is not None: if alpha is not None:
alpha = 255-round(alpha*255) alpha = 255-round(alpha*255)
styles.append('\\alpha&H%02X' % alpha) styles.append('\\alpha&H%02X' % alpha)
return styles return out_x, out_y, styles
def FlushCommentLine(f, text, styles, start_time, end_time, styleid): def FlushCommentLine(f, text, styles, start_time, end_time, styleid):
if end_time > start_time: if end_time > start_time:
@ -355,7 +363,7 @@ def WriteCommentAcfunPositioned(f, c, width, height, styleid):
try: try:
comment_args = c[3] comment_args = c[3]
text = ASSEscape(str(comment_args['n']).replace('\r', '\n').replace('\r', '\n')) text = ASSEscape(str(comment_args['n']).replace('\r', '\n').replace('\r', '\n'))
common_styles = [] common_styles = ['\org(%s, %s)' % (width//2, height//2)]
anchor = {0: 7, 1: 8, 2: 9, 3: 4, 4: 5, 5: 6, 6: 1, 7: 2, 8: 3}.get(comment_args.get('c', 0), 7) anchor = {0: 7, 1: 8, 2: 9, 3: 4, 4: 5, 5: 6, 6: 1, 7: 2, 8: 3}.get(comment_args.get('c', 0), 7)
if anchor != 7: if anchor != 7:
common_styles.append('\\an%s' % anchor) common_styles.append('\\an%s' % anchor)
@ -375,8 +383,8 @@ def WriteCommentAcfunPositioned(f, c, width, height, styleid):
to_pos = dict(comment_args.get('p', {'x': 0, 'y': 0})) to_pos = dict(comment_args.get('p', {'x': 0, 'y': 0}))
to_x = round(GetPosition(int(to_pos.get('x', 0)), False)) to_x = round(GetPosition(int(to_pos.get('x', 0)), False))
to_y = round(GetPosition(int(to_pos.get('y', 0)), True)) to_y = round(GetPosition(int(to_pos.get('y', 0)), True))
to_scale_x = round(float(comment_args.get('e', 1.0))*100) to_scale_x = float(comment_args.get('e', 1.0))
to_scale_y = round(float(comment_args.get('f', 1.0))*100) to_scale_y = float(comment_args.get('f', 1.0))
to_rotate_z = float(comment_args.get('r', 0.0)) to_rotate_z = float(comment_args.get('r', 0.0))
to_rotate_y = float(comment_args.get('k', 0.0)) to_rotate_y = float(comment_args.get('k', 0.0))
to_color = c[5] to_color = c[5]
@ -384,48 +392,45 @@ def WriteCommentAcfunPositioned(f, c, width, height, styleid):
from_time = float(comment_args.get('t', 0.0)) from_time = float(comment_args.get('t', 0.0))
action_time = float(comment_args.get('l', 3.0)) action_time = float(comment_args.get('l', 3.0))
actions = list(comment_args.get('z', [])) actions = list(comment_args.get('z', []))
transform_styles = GetTransformStyles(to_x, to_y, to_scale_x, to_scale_y, to_rotate_z, to_rotate_y, to_color, to_alpha) to_out_x, to_out_y, transform_styles = GetTransformStyles(to_x, to_y, to_scale_x, to_scale_y, to_rotate_z, to_rotate_y, to_color, to_alpha)
FlushCommentLine(f, text, common_styles+transform_styles, c[0]+from_time, c[0]+from_time+action_time, styleid) FlushCommentLine(f, text, common_styles+['\\pos(%s, %s)' % (to_out_x, to_out_y)]+transform_styles, c[0]+from_time, c[0]+from_time+action_time, styleid)
action_styles = transform_styles
for action in actions: for action in actions:
action = dict(action) action = dict(action)
from_x, from_y = to_x, to_y from_x, from_y = to_x, to_y
from_out_x, from_out_y = to_out_x, to_out_y
from_scale_x, from_scale_y = to_scale_x, to_scale_y from_scale_x, from_scale_y = to_scale_x, to_scale_y
from_rotate_z, from_rotate_y = to_rotate_z, to_rotate_y from_rotate_z, from_rotate_y = to_rotate_z, to_rotate_y
from_color, from_alpha = to_color, to_alpha from_color, from_alpha = to_color, to_alpha
transform_styles, action_styles = action_styles, []
from_time += action_time from_time += action_time
action_time = float(action.get('l', 0.0)) action_time = float(action.get('l', 0.0))
action_styles = []
if 'x' in action: if 'x' in action:
to_x = round(GetPosition(int(action['x']), False)) to_x = round(GetPosition(int(action['x']), False))
if 'y' in action: if 'y' in action:
to_y = round(GetPosition(int(action['y']), True)) to_y = round(GetPosition(int(action['y']), True))
if 'f' in action: if 'f' in action:
to_scale_x = round(float(action['f'])*100) to_scale_x = float(action['f'])
action_styles.append('\\fscx%s' % to_scale_x)
if 'g' in action: if 'g' in action:
to_scale_y = round(float(action['g'])*100) to_scale_y = float(action['g'])
action_styles.append('\\fscy%s' % to_scale_y)
if 'c' in action: if 'c' in action:
to_color = int(action['c']) to_color = int(action['c'])
action_styles.append('\\c&H%02X%02X%02X&' % (to_color & 0xff, (to_color >> 8) & 0xff, (to_color >> 16) & 0xff))
if 't' in action: if 't' in action:
to_alpha = float(action['t']) to_alpha = float(action['t'])
action_styles.append('\\alpha&H%02X' % (255-round(to_alpha*255)))
if 'd' in action: if 'd' in action:
to_rotate_z = float(action['d']) to_rotate_z = float(action['d'])
if 'e' in action: if 'e' in action:
to_rotate_y = float(action['e']) to_rotate_y = float(action['e'])
if ('x' in action) or ('y' in action): to_out_x, to_out_y, action_styles = GetTransformStyles(to_x, to_y, from_scale_x, from_scale_y, to_rotate_z, to_rotate_y, from_color, from_alpha)
transform_styles = GetTransformStyles(None, None, from_scale_x, from_scale_y, None, None, from_color, from_alpha) if (from_out_x, from_out_y) == (to_out_x, to_out_y):
transform_styles.append('\\move(%s, %s, %s, %s)' % (from_x, from_y, to_x, to_y)) pos_style = '\\pos(%s, %s)' % (to_out_x, to_out_y)
action_styles.append('\\frx%s\\fry%s\\frz%s\\fax%s\\fay%s' % ConvertFlashRotation(to_rotate_y, to_rotate_z, (to_x-ZoomFactor[1])/(width-ZoomFactor[1]*2), (to_y-ZoomFactor[2])/(width-ZoomFactor[2]*2)))
elif ('d' in action) or ('e' in action):
action_styles.append('\\frx%s\\fry%s\\frz%s\\fax%s\\fay%s' % ConvertFlashRotation(to_rotate_y, to_rotate_z, (to_x-ZoomFactor[1])/(width-ZoomFactor[1]*2), (to_y-ZoomFactor[2])/(width-ZoomFactor[2]*2)))
else: else:
transform_styles = GetTransformStyles(from_x, from_y, from_scale_x, from_scale_y, from_rotate_z, from_rotate_y, from_color, from_alpha) pos_style = '\\move(%s, %s, %s, %s)' % (from_out_x, from_out_y, to_out_x, to_out_y)
styles = common_styles+transform_styles
styles.append(pos_style)
if action_styles: if action_styles:
transform_styles.append('\\t(%s)' % (''.join(action_styles))) styles.append('\\t(%s)' % (''.join(action_styles)))
FlushCommentLine(f, text, common_styles+transform_styles, c[0]+from_time, c[0]+from_time+action_time, styleid) FlushCommentLine(f, text, styles, c[0]+from_time, c[0]+from_time+action_time, styleid)
except (IndexError, ValueError) as e: except (IndexError, ValueError) as e:
logging.warning(_('Invalid comment: %r') % c[3]) logging.warning(_('Invalid comment: %r') % c[3])
@ -521,11 +526,10 @@ def ConvertFlashRotation(rotY, rotZ, X, Y, width, height):
outY = math.atan2(-math.sin(rotY)*math.cos(rotZ), math.cos(rotY))*180/math.pi outY = math.atan2(-math.sin(rotY)*math.cos(rotZ), math.cos(rotY))*180/math.pi
outZ = math.atan2(-math.cos(rotY)*math.sin(rotZ), math.cos(rotZ))*180/math.pi outZ = math.atan2(-math.cos(rotY)*math.sin(rotZ), math.cos(rotZ))*180/math.pi
outX = math.asin(math.sin(rotY)*math.sin(rotZ))*180/math.pi outX = math.asin(math.sin(rotY)*math.sin(rotZ))*180/math.pi
rotX *= pi/180.0 rotY *= math.pi/180.0
rotY *= pi/180.0 rotZ *= math.pi/180.0
rotZ *= pi/180.0
trX = (X*math.cos(rotZ)+Y*math.sin(rotZ))/math.cos(rotY)+math.tan(rotY*math.pi/180.0)+(1-math.cos(rotZ)/math.cos(rotY))*width/2-math.sin(rotZ)/math.cos(rotY)*height/2 trX = (X*math.cos(rotZ)+Y*math.sin(rotZ))/math.cos(rotY)+math.tan(rotY*math.pi/180.0)+(1-math.cos(rotZ)/math.cos(rotY))*width/2-math.sin(rotZ)/math.cos(rotY)*height/2
trY = Y*math.cos(rotZ)-X*math.sin(rotZ)+math.sin(rotZ)*width/2+(1-cos(rotZ))*height/2 trY = Y*math.cos(rotZ)-X*math.sin(rotZ)+math.sin(rotZ)*width/2+(1-math.cos(rotZ))*height/2
return (round(trX), round(trY), WrapAngle(round(outX)), WrapAngle(round(outY)), WrapAngle(round(outZ)), 100, 100) return (round(trX), round(trY), WrapAngle(round(outX)), WrapAngle(round(outY)), WrapAngle(round(outZ)), 100, 100)