hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
Showing only changes of commit acc7aacf7b - Show all commits

View File

@ -17,7 +17,7 @@ command_rect = (drawing_rect[2], screen_rect[1], screen_rect[2], screen_rect[3])
cmd1_rect = (command_rect[0], command_rect[1], command_rect[2], 60) cmd1_rect = (command_rect[0], command_rect[1], command_rect[2], 60)
cmd2_rect = (command_rect[0], 60, command_rect[2], 120) cmd2_rect = (command_rect[0], 60, command_rect[2], 120)
cmd3_rect = (command_rect[0], 120, command_rect[2], 180) cmd3_rect = (command_rect[0], 120, command_rect[2], 180)
cmd3_rect = (command_rect[0], 180, command_rect[2], command_rect[3]) cmd4_rect = (command_rect[0], 180, command_rect[2], command_rect[3])
def point_in_rect(rect, x, y): def point_in_rect(rect, x, y):
return (x >= rect[0]) and (x < rect[2]) and (y >= rect[1]) and (y < rect[3]) return (x >= rect[0]) and (x < rect[2]) and (y >= rect[1]) and (y < rect[3])