updated grafics
This commit is contained in:
@@ -181,7 +181,6 @@ def make_picture(board0, board1, next_board0, next_board1, output, score0=0, sco
|
|||||||
if x>=b1.x and x<b1.x+b1.width and y>=b1.y and y<b1.y+b1.height:
|
if x>=b1.x and x<b1.x+b1.width and y>=b1.y and y<b1.y+b1.height:
|
||||||
xd = x-b1.x
|
xd = x-b1.x
|
||||||
yd = y-b1.y
|
yd = y-b1.y
|
||||||
# pixels[x, y] = colors[board[yd>>5][xd>>5]].multiply(sprite_pixels[yd&0b0000000000011111, xd&0b0000000000011111])
|
|
||||||
xs = xd&0x1F
|
xs = xd&0x1F
|
||||||
ys = yd&0x1F
|
ys = yd&0x1F
|
||||||
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
|
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
|
||||||
@@ -204,13 +203,18 @@ def make_picture(board0, board1, next_board0, next_board1, output, score0=0, sco
|
|||||||
yd = y-nb1.y
|
yd = y-nb1.y
|
||||||
xs = xd&0x1F
|
xs = xd&0x1F
|
||||||
ys = yd&0x1F
|
ys = yd&0x1F
|
||||||
if (xs == 31) or (ys==31):
|
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
|
||||||
if (xs == 0) or (ys == 0):
|
|
||||||
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].shiftr(1)
|
|
||||||
else:
|
|
||||||
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].shiftr(2)
|
|
||||||
elif (not xs) or (not ys):
|
|
||||||
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].get()
|
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].get()
|
||||||
|
elif (xs > 5 and xs < 26) and (ys > 5 and ys < 26): # mid boarder
|
||||||
|
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFB0)
|
||||||
|
elif xs+ys<31: # top left edge
|
||||||
|
if xs>ys:
|
||||||
|
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].get()
|
||||||
|
else:
|
||||||
|
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFEF)
|
||||||
|
else:
|
||||||
|
if xs>ys:
|
||||||
|
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFD7)
|
||||||
else:
|
else:
|
||||||
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFC0)
|
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFC0)
|
||||||
### Score
|
### Score
|
||||||
@@ -237,13 +241,18 @@ def make_picture(board0, board1, next_board0, next_board1, output, score0=0, sco
|
|||||||
yd = y-b2.y
|
yd = y-b2.y
|
||||||
xs = xd&0x1F
|
xs = xd&0x1F
|
||||||
ys = yd&0x1F
|
ys = yd&0x1F
|
||||||
if (xs == 31) or (ys==31):
|
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
|
||||||
if (xs == 0) or (ys == 0):
|
|
||||||
pixels[x, y] = colors[board1[yd>>5][xd>>5]].shiftr(1)
|
|
||||||
else:
|
|
||||||
pixels[x, y] = colors[board1[yd>>5][xd>>5]].shiftr(2)
|
|
||||||
elif (not xs) or (not ys):
|
|
||||||
pixels[x, y] = colors[board1[yd>>5][xd>>5]].get()
|
pixels[x, y] = colors[board1[yd>>5][xd>>5]].get()
|
||||||
|
elif (xs > 5 and xs < 26) and (ys > 5 and ys < 26): # mid boarder
|
||||||
|
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFB0)
|
||||||
|
elif xs+ys<31: # top left edge
|
||||||
|
if xs>ys:
|
||||||
|
pixels[x, y] = colors[board1[yd>>5][xd>>5]].get()
|
||||||
|
else:
|
||||||
|
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFEF)
|
||||||
|
else:
|
||||||
|
if xs>ys:
|
||||||
|
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFD7)
|
||||||
else:
|
else:
|
||||||
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFC0)
|
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFC0)
|
||||||
### Next Piece
|
### Next Piece
|
||||||
@@ -252,13 +261,18 @@ def make_picture(board0, board1, next_board0, next_board1, output, score0=0, sco
|
|||||||
yd = y-nb2.y
|
yd = y-nb2.y
|
||||||
xs = xd&0x1F
|
xs = xd&0x1F
|
||||||
ys = yd&0x1F
|
ys = yd&0x1F
|
||||||
if (xs == 31) or (ys==31):
|
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
|
||||||
if (xs == 0) or (ys == 0):
|
|
||||||
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].shiftr(1)
|
|
||||||
else:
|
|
||||||
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].shiftr(2)
|
|
||||||
elif (not xs) or (not ys):
|
|
||||||
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].get()
|
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].get()
|
||||||
|
elif (xs > 5 and xs < 26) and (ys > 5 and ys < 26): # mid boarder
|
||||||
|
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFB0)
|
||||||
|
elif xs+ys<31: # top left edge
|
||||||
|
if xs>ys:
|
||||||
|
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].get()
|
||||||
|
else:
|
||||||
|
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFEF)
|
||||||
|
else:
|
||||||
|
if xs>ys:
|
||||||
|
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFD7)
|
||||||
else:
|
else:
|
||||||
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFC0)
|
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFC0)
|
||||||
### Score
|
### Score
|
||||||
|
|||||||
+1
-1
Submodule tet-cpu-plan updated: bff840b94f...9d3abbb8e2
Reference in New Issue
Block a user