From 801f648cc99a637234eeed44172aad381dd5e7d1 Mon Sep 17 00:00:00 2001 From: James Carr Date: Mon, 2 Aug 2021 18:44:31 +0100 Subject: [PATCH 1/2] Remove max_size usage with displayio.Group Remove max_glyphs usage with Display_Text Label --- Macropad_Dragon_Drop/code.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Macropad_Dragon_Drop/code.py b/Macropad_Dragon_Drop/code.py index f069921d7..9a178f030 100755 --- a/Macropad_Dragon_Drop/code.py +++ b/Macropad_Dragon_Drop/code.py @@ -68,7 +68,7 @@ def __init__(self, col, start_time): # Create 3 displayio groups -- one each for the title, play and end screens. -TITLE_GROUP = displayio.Group(max_size=1) +TITLE_GROUP = displayio.Group() TITLE_BITMAP, TITLE_PALETTE = adafruit_imageload.load(PATH + 'title.bmp', bitmap=displayio.Bitmap, palette=displayio.Palette) @@ -82,7 +82,7 @@ def __init__(self, col, start_time): PATH + 'sprites.bmp', bitmap=displayio.Bitmap, palette=displayio.Palette) SPRITE_PALETTE.make_transparent(0) -PLAY_GROUP = displayio.Group(max_size=MAX_EGGS + 10) +PLAY_GROUP = displayio.Group() # Bitmap containing five shadow tiles ('no shadow' through 'max shadow') SHADOW_BITMAP, SHADOW_PALETTE = adafruit_imageload.load( PATH + 'shadow.bmp', bitmap=displayio.Bitmap, palette=displayio.Palette) @@ -99,19 +99,19 @@ def __init__(self, col, start_time): fill_color=0, margin_size=1) PLAY_GROUP.append(LIFE_BAR) # Score is last object in PLAY_GROUP, can be indexed as -1 -PLAY_GROUP.append(label.Label(FONT, text='0', max_glyphs=10, color=0xFFFFFF, +PLAY_GROUP.append(label.Label(FONT, text='0', color=0xFFFFFF, anchor_point=(0.5, 0.0), anchored_position=(MACROPAD.display.width // 2, 10))) -END_GROUP = displayio.Group(max_size=1) +END_GROUP = displayio.Group() END_BITMAP, END_PALETTE = adafruit_imageload.load( PATH + 'gameover.bmp', bitmap=displayio.Bitmap, palette=displayio.Palette) END_GROUP.append(displayio.TileGrid(END_BITMAP, pixel_shader=END_PALETTE, width=1, height=1, tile_width=END_BITMAP.width, tile_height=END_BITMAP.height)) -END_GROUP.append(label.Label(FONT, text='0', max_glyphs=10, color=0xFFFFFF, +END_GROUP.append(label.Label(FONT, text='0', color=0xFFFFFF, anchor_point=(0.5, 0.0), anchored_position=(MACROPAD.display.width // 2, 90))) From 8ee5b9d300029c8e49e7b3ad2e75feda25624440 Mon Sep 17 00:00:00 2001 From: James Carr Date: Mon, 2 Aug 2021 18:46:06 +0100 Subject: [PATCH 2/2] Remove unnecessary execute bits from files --- Macropad_Dragon_Drop/code.py | 0 .../dragondrop/cursive-smart.license | 0 Macropad_Dragon_Drop/dragondrop/cursive-smart.pcf | Bin Macropad_Dragon_Drop/dragondrop/gameover.bmp | Bin Macropad_Dragon_Drop/dragondrop/rawr.wav | Bin Macropad_Dragon_Drop/dragondrop/shadow.bmp | Bin Macropad_Dragon_Drop/dragondrop/sizzle.wav | Bin Macropad_Dragon_Drop/dragondrop/splat.wav | Bin Macropad_Dragon_Drop/dragondrop/sprites.bmp | Bin Macropad_Dragon_Drop/dragondrop/title.bmp | Bin 10 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Macropad_Dragon_Drop/code.py mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/cursive-smart.license mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/cursive-smart.pcf mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/gameover.bmp mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/rawr.wav mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/shadow.bmp mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/sizzle.wav mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/splat.wav mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/sprites.bmp mode change 100755 => 100644 Macropad_Dragon_Drop/dragondrop/title.bmp diff --git a/Macropad_Dragon_Drop/code.py b/Macropad_Dragon_Drop/code.py old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/cursive-smart.license b/Macropad_Dragon_Drop/dragondrop/cursive-smart.license old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/cursive-smart.pcf b/Macropad_Dragon_Drop/dragondrop/cursive-smart.pcf old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/gameover.bmp b/Macropad_Dragon_Drop/dragondrop/gameover.bmp old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/rawr.wav b/Macropad_Dragon_Drop/dragondrop/rawr.wav old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/shadow.bmp b/Macropad_Dragon_Drop/dragondrop/shadow.bmp old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/sizzle.wav b/Macropad_Dragon_Drop/dragondrop/sizzle.wav old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/splat.wav b/Macropad_Dragon_Drop/dragondrop/splat.wav old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/sprites.bmp b/Macropad_Dragon_Drop/dragondrop/sprites.bmp old mode 100755 new mode 100644 diff --git a/Macropad_Dragon_Drop/dragondrop/title.bmp b/Macropad_Dragon_Drop/dragondrop/title.bmp old mode 100755 new mode 100644