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

PEP8

Browse Source
This commit is contained in:
Star Brilliant 2014-06-15 15:35:27 +08:00
parent f9576e81de
commit 61e4682a05
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
danmaku2ass.py
View File

@ -467,10 +467,10 @@ def WriteCommentSH5VPositioned(f, c, width, height, styleid):
to_rotate_y = -int(c[15]) to_rotate_y = -int(c[15])
to_color = c[5] to_color = c[5]
to_alpha = float(c[12]) to_alpha = float(c[12])
#Note: Alpha transition hasn't been worked out yet. # Note: Alpha transition hasn't been worked out yet.
to_size = int(c[6])*math.sqrt(width*height/307200) to_size = int(c[6])*math.sqrt(width*height/307200)
#Note: Because sH5V's data is the absolute size of font,temporarily solve by it at present.[*math.sqrt(width/640*height/480)] # Note: Because sH5V's data is the absolute size of font,temporarily solve by it at present.[*math.sqrt(width/640*height/480)]
#But it seems to be working fine... # But it seems to be working fine...
from_time = float(c[0]) from_time = float(c[0])
action_time = float(c[11])/1000 action_time = float(c[11])/1000
transform_styles = GetTransformStyles(to_x, to_y, to_size, to_rotate_z, to_rotate_y, to_color, to_alpha) transform_styles = GetTransformStyles(to_x, to_y, to_size, to_rotate_z, to_rotate_y, to_color, to_alpha)
@ -512,7 +512,7 @@ def GetZoomFactor(SourceSize, TargetSize):
# Result: (transX, transY, rotX, rotY, rotZ, scaleX, scaleY) # Result: (transX, transY, rotX, rotY, rotZ, scaleX, scaleY)
def ConvertFlashRotation(rotY, rotZ, X, Y, width, height): def ConvertFlashRotation(rotY, rotZ, X, Y, width, height):
def WrapAngle(deg): def WrapAngle(deg):
return 180-((180-deg)%360) return 180-((180-deg) % 360)
rotY = WrapAngle(rotY) rotY = WrapAngle(rotY)
rotZ = WrapAngle(rotZ) rotZ = WrapAngle(rotZ)
if rotY in (90, -90): if rotY in (90, -90):
@ -536,7 +536,7 @@ def ConvertFlashRotation(rotY, rotZ, X, Y, width, height):
try: try:
scaleXY = FOV/(FOV+trZ) scaleXY = FOV/(FOV+trZ)
except ZeroDivisionError: except ZeroDivisionError:
logging.error('Rotation makes object behind the camera: trZ == %.0f' % trZ); logging.error('Rotation makes object behind the camera: trZ == %.0f' % trZ)
scaleXY = 1 scaleXY = 1
trX = (trX-width/2)*scaleXY+width/2 trX = (trX-width/2)*scaleXY+width/2
trY = (trY-height/2)*scaleXY+height/2 trY = (trY-height/2)*scaleXY+height/2
@ -544,7 +544,7 @@ def ConvertFlashRotation(rotY, rotZ, X, Y, width, height):
scaleXY = -scaleXY scaleXY = -scaleXY
outX += 180 outX += 180
outY += 180 outY += 180
logging.error('Rotation makes object behind the camera: trZ == %.0f < %.0f' % (trZ, FOV)); logging.error('Rotation makes object behind the camera: trZ == %.0f < %.0f' % (trZ, FOV))
return (trX, trY, WrapAngle(outX), WrapAngle(outY), WrapAngle(outZ), scaleXY*100, scaleXY*100) return (trX, trY, WrapAngle(outX), WrapAngle(outY), WrapAngle(outZ), scaleXY*100, scaleXY*100)
@ -713,7 +713,7 @@ def ConvertColor(RGB, width=1280, height=576):
if width < 1280 and height < 576: if width < 1280 and height < 576:
return '%02X%02X%02X' % (B, G, R) return '%02X%02X%02X' % (B, G, R)
else: # VobSub always uses BT.601 colorspace, convert to BT.709 else: # VobSub always uses BT.601 colorspace, convert to BT.709
ClipByte = lambda x: 255 if x > 255 else 0 if x < 0 else round(x); ClipByte = lambda x: 255 if x > 255 else 0 if x < 0 else round(x)
return '%02X%02X%02X' % ( return '%02X%02X%02X' % (
ClipByte(R*0.00956384088080656+G*0.03217254540203729+B*0.95826361371715607), ClipByte(R*0.00956384088080656+G*0.03217254540203729+B*0.95826361371715607),
ClipByte(R*-0.10493933142075390+G*1.17231478191855154+B*-0.06737545049779757), ClipByte(R*-0.10493933142075390+G*1.17231478191855154+B*-0.06737545049779757),