From c8103aa14f24a362d69f1a1ad180cc646daf24ce Mon Sep 17 00:00:00 2001 From: steveway Date: Fri, 26 Sep 2014 14:15:25 +0200 Subject: [PATCH 1/3] A few simple changes to get it to run in Python3 --- glitched.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/glitched.py b/glitched.py index 959bbbb..01b0793 100755 --- a/glitched.py +++ b/glitched.py @@ -207,7 +207,7 @@ def draw_valuepattern(buf, target, drop_frame=False): global valuepattern if not drop_frame: for x, y in enumerate(buf): - valuepattern.set_at((127, 127-x/2), (y, y, y)) + valuepattern.set_at((127, int(127-x/2)), (y, y, y)) target.fill((133, 153, 0)) # Solarized Green target.blit(valuepattern, (0, 0), (0, 0, 128, 128), pygame.BLEND_ADD) valuepattern.scroll(-1, 0) @@ -301,7 +301,7 @@ def draw_graph(buf, stack, t, drop_frame=False): if RENDER_STACK: draw_stack(stack, graph, drop_frame) - for b in [buf[i:i+256] for i in xrange(0, len(buf), 256)]: + for b in [buf[i:i+256] for i in range(0, len(buf), 256)]: if RENDER_VALUEPATTERN: draw_valuepattern(b, graph, drop_frame) if RENDER_YPATTERN: @@ -322,7 +322,7 @@ def draw_graph(buf, stack, t, drop_frame=False): while running: starttime = time() if (channel.get_queue() == None and not PAUSED): # no excess output - buf = [m._compute_(j) for j in xrange(i, i+BUFSIZE)] + buf = [m._compute_(j) for j in range(i, i+BUFSIZE)] sound = pygame.sndarray.make_sound(numpy.array(buf, numpy.uint8)) channel.queue(sound) i += BUFSIZE @@ -388,24 +388,24 @@ def draw_graph(buf, stack, t, drop_frame=False): m.tokens = m._tokenize_(m.lines[1:], [n-1 for n in mutedlines]) m._reset_() - if event.key in TEXT_KEYMAP.keys() or \ - event.key in OPCODE_KEYMAP.keys() or \ + if event.key in list(TEXT_KEYMAP.keys()) or \ + event.key in list(OPCODE_KEYMAP.keys()) or \ event.key == pygame.K_PAGEUP or \ event.key == pygame.K_PAGEDOWN: column = curpos[0] row = curpos[1] - line = m.lines[row] - char = line[column] + line = m.lines[int(row)] + char = line[int(column)] if (row == 0) and ( - event.key in TEXT_KEYMAP.keys() or \ + event.key in list(TEXT_KEYMAP.keys()) or \ event.key == pygame.K_PAGEUP or \ event.key == pygame.K_PAGEDOWN ): KEYMAP = TEXT_KEYMAP KEYORDER = TEXT_ORDER elif (row > 0) and ( - event.key in OPCODE_KEYMAP.keys() or \ + event.key in list(OPCODE_KEYMAP.keys()) or \ event.key == pygame.K_PAGEUP or \ event.key == pygame.K_PAGEDOWN ): @@ -426,7 +426,7 @@ def draw_graph(buf, stack, t, drop_frame=False): index = (KEYORDER.find(char) + 1) % len(KEYORDER) newchar = KEYORDER[index] - m.lines[row] = line[:column] + newchar + line[column+1:] + m.lines[int(row)] = line[:int(column)] + newchar + line[int(column)+1:] m.tokens = m._tokenize_(m.lines[1:], mutedlines) m._reset_() stderr.write('Now playing: ' + str(m) + '\n') @@ -436,6 +436,8 @@ def draw_graph(buf, stack, t, drop_frame=False): elif event.type == pygame.MOUSEBUTTONDOWN: x, y = event.pos + x-=8 + y-=8 if x < GRAPH_WIDTH*GRID: RENDER_WAVE = not RENDER_WAVE RENDER_YPATTERN = not RENDER_YPATTERN From 43d1b81d0d10818ca4c7d079252916c1b696b573 Mon Sep 17 00:00:00 2001 From: steveway Date: Fri, 26 Sep 2014 14:16:41 +0200 Subject: [PATCH 2/3] A few simple changes to get it to run in Python3 --- glitch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glitch.py b/glitch.py index 2905634..a442902 100755 --- a/glitch.py +++ b/glitch.py @@ -115,7 +115,7 @@ def _compute_(self, t, count=1): b = stack[-1] stack.rotate(1) try: - stack.append((b / a) & MAXINT) + stack.append(int(b / a) & MAXINT) except ZeroDivisionError: stack.append(0) From 02bf2e89c84fe7516d99962618a5147d832c4f12 Mon Sep 17 00:00:00 2001 From: steveway Date: Fri, 26 Sep 2014 14:30:19 +0200 Subject: [PATCH 3/3] Fixed the Cursor on Python 3 --- glitched.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/glitched.py b/glitched.py index 01b0793..35009b9 100755 --- a/glitched.py +++ b/glitched.py @@ -436,16 +436,14 @@ def draw_graph(buf, stack, t, drop_frame=False): elif event.type == pygame.MOUSEBUTTONDOWN: x, y = event.pos - x-=8 - y-=8 if x < GRAPH_WIDTH*GRID: RENDER_WAVE = not RENDER_WAVE RENDER_YPATTERN = not RENDER_YPATTERN RENDER_VALUEPATTERN = not RENDER_VALUEPATTERN RENDER_STACK = not RENDER_STACK else: - curpos[0] = x/GRID - 16 - curpos[1] = y/GRID + curpos[0] = int(x/GRID - 16) + curpos[1] = int(y/GRID) draw_controls() draw_iterator(i)