Fix Issue #63: Implement z-order rendering with dirty flag optimization
- Add dirty flags to PyScene and UIFrame to track when sorting is needed - Implement lazy sorting - only sort when z_index changes or elements are added/removed - Make Frame children respect z_index (previously rendered in insertion order only) - Update UIDrawable::set_int to notify when z_index changes - Mark collections dirty on append, remove, setitem, and slice operations - Remove per-frame vector copy in PyScene::render for better performance Performance improvement: Static scenes now use O(1) check instead of O(n log n) sort every frame 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
2a48138011
commit
90c318104b
11 changed files with 154 additions and 83 deletions
|
|
@ -23,17 +23,22 @@ mcrfpy.createScene("entities")
|
|||
# We use: mcrfpy.default_font (which is already loaded by the engine)
|
||||
|
||||
# Title
|
||||
title = mcrfpy.Caption(400, 30, "Entity Example - Roguelike Characters")
|
||||
title.font = mcrfpy.default_font
|
||||
title.font_size = 24
|
||||
title.font_color = (255, 255, 255)
|
||||
title = mcrfpy.Caption((400, 30), "Entity Example - Roguelike Characters", font=mcrfpy.default_font)
|
||||
#title.font = mcrfpy.default_font
|
||||
#title.font_size = 24
|
||||
title.size=24
|
||||
#title.font_color = (255, 255, 255)
|
||||
#title.text_color = (255,255,255)
|
||||
|
||||
# Create a grid background
|
||||
texture = mcrfpy.Texture("assets/kenney_TD_MR_IP.png", 16, 16)
|
||||
|
||||
# Create grid with entities - using 2x scale (32x32 pixel tiles)
|
||||
grid = mcrfpy.Grid(100, 100, 20, 15, texture, 32, 32)
|
||||
grid.texture = texture
|
||||
#grid = mcrfpy.Grid((100, 100), (20, 15), texture, 16, 16) # I can never get the args right for this thing
|
||||
t = mcrfpy.Texture("assets/kenney_TD_MR_IP.png", 16, 16)
|
||||
grid = mcrfpy.Grid(20, 15, t, (10, 10), (1014, 758))
|
||||
grid.zoom = 2.0
|
||||
#grid.texture = texture
|
||||
|
||||
# Define tile types
|
||||
FLOOR = 58 # Stone floor
|
||||
|
|
@ -42,51 +47,50 @@ WALL = 11 # Stone wall
|
|||
# Fill with floor
|
||||
for x in range(20):
|
||||
for y in range(15):
|
||||
grid.set_tile(x, y, FLOOR)
|
||||
grid.at((x, y)).tilesprite = WALL
|
||||
|
||||
# Add walls around edges
|
||||
for x in range(20):
|
||||
grid.set_tile(x, 0, WALL)
|
||||
grid.set_tile(x, 14, WALL)
|
||||
grid.at((x, 0)).tilesprite = WALL
|
||||
grid.at((x, 14)).tilesprite = WALL
|
||||
for y in range(15):
|
||||
grid.set_tile(0, y, WALL)
|
||||
grid.set_tile(19, y, WALL)
|
||||
grid.at((0, y)).tilesprite = WALL
|
||||
grid.at((19, y)).tilesprite = WALL
|
||||
|
||||
# Create entities
|
||||
# Player at center
|
||||
player = mcrfpy.Entity(10, 7)
|
||||
player.texture = texture
|
||||
player.sprite_index = 84 # Player sprite
|
||||
player = mcrfpy.Entity((10, 7), t, 84)
|
||||
#player.texture = texture
|
||||
#player.sprite_index = 84 # Player sprite
|
||||
|
||||
# Enemies
|
||||
rat1 = mcrfpy.Entity(5, 5)
|
||||
rat1.texture = texture
|
||||
rat1.sprite_index = 123 # Rat
|
||||
rat1 = mcrfpy.Entity((5, 5), t, 123)
|
||||
#rat1.texture = texture
|
||||
#rat1.sprite_index = 123 # Rat
|
||||
|
||||
rat2 = mcrfpy.Entity(15, 5)
|
||||
rat2.texture = texture
|
||||
rat2.sprite_index = 123 # Rat
|
||||
rat2 = mcrfpy.Entity((15, 5), t, 123)
|
||||
#rat2.texture = texture
|
||||
#rat2.sprite_index = 123 # Rat
|
||||
|
||||
big_rat = mcrfpy.Entity(7, 10)
|
||||
big_rat.texture = texture
|
||||
big_rat.sprite_index = 130 # Big rat
|
||||
big_rat = mcrfpy.Entity((7, 10), t, 130)
|
||||
#big_rat.texture = texture
|
||||
#big_rat.sprite_index = 130 # Big rat
|
||||
|
||||
cyclops = mcrfpy.Entity(13, 10)
|
||||
cyclops.texture = texture
|
||||
cyclops.sprite_index = 109 # Cyclops
|
||||
cyclops = mcrfpy.Entity((13, 10), t, 109)
|
||||
#cyclops.texture = texture
|
||||
#cyclops.sprite_index = 109 # Cyclops
|
||||
|
||||
# Items
|
||||
chest = mcrfpy.Entity(3, 3)
|
||||
chest.texture = texture
|
||||
chest.sprite_index = 89 # Chest
|
||||
chest = mcrfpy.Entity((3, 3), t, 89)
|
||||
#chest.texture = texture
|
||||
#chest.sprite_index = 89 # Chest
|
||||
|
||||
boulder = mcrfpy.Entity(10, 5)
|
||||
boulder.texture = texture
|
||||
boulder.sprite_index = 66 # Boulder
|
||||
|
||||
key = mcrfpy.Entity(17, 12)
|
||||
key.texture = texture
|
||||
key.sprite_index = 384 # Key
|
||||
boulder = mcrfpy.Entity((10, 5), t, 66)
|
||||
#boulder.texture = texture
|
||||
#boulder.sprite_index = 66 # Boulder
|
||||
key = mcrfpy.Entity((17, 12), t, 384)
|
||||
#key.texture = texture
|
||||
#key.sprite_index = 384 # Key
|
||||
|
||||
# Add all entities to grid
|
||||
grid.entities.append(player)
|
||||
|
|
@ -99,29 +103,29 @@ grid.entities.append(boulder)
|
|||
grid.entities.append(key)
|
||||
|
||||
# Labels
|
||||
entity_label = mcrfpy.Caption(100, 580, "Entities move independently on the grid. Grid scale: 2x (32x32 pixels)")
|
||||
entity_label.font = mcrfpy.default_font
|
||||
entity_label.font_color = (255, 255, 255)
|
||||
entity_label = mcrfpy.Caption((100, 580), "Entities move independently on the grid. Grid scale: 2x (32x32 pixels)")
|
||||
#entity_label.font = mcrfpy.default_font
|
||||
#entity_label.font_color = (255, 255, 255)
|
||||
|
||||
info = mcrfpy.Caption(100, 600, "Player (center), Enemies (rats, cyclops), Items (chest, boulder, key)")
|
||||
info.font = mcrfpy.default_font
|
||||
info.font_size = 14
|
||||
info.font_color = (200, 200, 200)
|
||||
info = mcrfpy.Caption((100, 600), "Player (center), Enemies (rats, cyclops), Items (chest, boulder, key)")
|
||||
#info.font = mcrfpy.default_font
|
||||
#info.font_size = 14
|
||||
#info.font_color = (200, 200, 200)
|
||||
|
||||
# Legend frame
|
||||
legend_frame = mcrfpy.Frame(50, 50, 200, 150)
|
||||
legend_frame.bgcolor = (64, 64, 128)
|
||||
legend_frame.outline = 2
|
||||
#legend_frame.bgcolor = (64, 64, 128)
|
||||
#legend_frame.outline = 2
|
||||
|
||||
legend_title = mcrfpy.Caption(150, 60, "Entity Types")
|
||||
legend_title.font = mcrfpy.default_font
|
||||
legend_title.font_color = (255, 255, 255)
|
||||
legend_title.centered = True
|
||||
legend_title = mcrfpy.Caption((150, 60), "Entity Types")
|
||||
#legend_title.font = mcrfpy.default_font
|
||||
#legend_title.font_color = (255, 255, 255)
|
||||
#legend_title.centered = True
|
||||
|
||||
legend_text = mcrfpy.Caption(60, 90, "Player: @\nRat: r\nBig Rat: R\nCyclops: C\nChest: $\nBoulder: O\nKey: k")
|
||||
legend_text.font = mcrfpy.default_font
|
||||
legend_text.font_size = 12
|
||||
legend_text.font_color = (255, 255, 255)
|
||||
#legend_text = mcrfpy.Caption((60, 90), "Player: @\nRat: r\nBig Rat: R\nCyclops: C\nChest: $\nBoulder: O\nKey: k")
|
||||
#legend_text.font = mcrfpy.default_font
|
||||
#legend_text.font_size = 12
|
||||
#legend_text.font_color = (255, 255, 255)
|
||||
|
||||
# Add all to scene
|
||||
ui = mcrfpy.sceneUI("entities")
|
||||
|
|
@ -131,10 +135,10 @@ ui.append(entity_label)
|
|||
ui.append(info)
|
||||
ui.append(legend_frame)
|
||||
ui.append(legend_title)
|
||||
ui.append(legend_text)
|
||||
#ui.append(legend_text)
|
||||
|
||||
# Switch to scene
|
||||
mcrfpy.setScene("entities")
|
||||
|
||||
# Set timer to capture after rendering starts
|
||||
mcrfpy.setTimer("capture", capture_entity, 100)
|
||||
mcrfpy.setTimer("capture", capture_entity, 100)
|
||||
|
|
|
|||
|
|
@ -33,34 +33,34 @@ def test_Entity():
|
|||
|
||||
# Test entity properties
|
||||
try:
|
||||
print(f"✓ Entity1 pos: {entity1.pos}")
|
||||
print(f"✓ Entity1 draw_pos: {entity1.draw_pos}")
|
||||
print(f"✓ Entity1 sprite_number: {entity1.sprite_number}")
|
||||
print(f" Entity1 pos: {entity1.pos}")
|
||||
print(f" Entity1 draw_pos: {entity1.draw_pos}")
|
||||
print(f" Entity1 sprite_number: {entity1.sprite_number}")
|
||||
|
||||
# Modify properties
|
||||
entity1.pos = mcrfpy.Vector(3, 3)
|
||||
entity1.sprite_number = 5
|
||||
print("✓ Entity properties modified")
|
||||
print(" Entity properties modified")
|
||||
except Exception as e:
|
||||
print(f"✗ Entity property access failed: {e}")
|
||||
print(f"X Entity property access failed: {e}")
|
||||
|
||||
# Test gridstate access
|
||||
try:
|
||||
gridstate = entity2.gridstate
|
||||
print(f"✓ Entity gridstate accessible")
|
||||
print(" Entity gridstate accessible")
|
||||
|
||||
# Test at() method
|
||||
point_state = entity2.at(0, 0)
|
||||
print(f"✓ Entity at() method works")
|
||||
point_state = entity2.at()#.at(0, 0)
|
||||
print(" Entity at() method works")
|
||||
except Exception as e:
|
||||
print(f"✗ Entity gridstate/at() failed: {e}")
|
||||
print(f"X Entity gridstate/at() failed: {e}")
|
||||
|
||||
# Test index() method (Issue #73)
|
||||
print("\nTesting index() method (Issue #73)...")
|
||||
try:
|
||||
# Try to find entity2's index
|
||||
index = entity2.index()
|
||||
print(f"✓ index() method works: entity2 is at index {index}")
|
||||
print(f":) index() method works: entity2 is at index {index}")
|
||||
|
||||
# Verify by checking collection
|
||||
if entities[index] == entity2:
|
||||
|
|
@ -70,7 +70,7 @@ def test_Entity():
|
|||
|
||||
# Remove using index
|
||||
entities.remove(index)
|
||||
print(f"✓ Removed entity using index, now {len(entities)} entities")
|
||||
print(f":) Removed entity using index, now {len(entities)} entities")
|
||||
except AttributeError:
|
||||
print("✗ index() method not implemented (Issue #73)")
|
||||
# Try manual removal as workaround
|
||||
|
|
@ -78,21 +78,21 @@ def test_Entity():
|
|||
for i in range(len(entities)):
|
||||
if entities[i] == entity2:
|
||||
entities.remove(i)
|
||||
print(f"✓ Manual removal workaround succeeded")
|
||||
print(":) Manual removal workaround succeeded")
|
||||
break
|
||||
except:
|
||||
print("✗ Manual removal also failed")
|
||||
except Exception as e:
|
||||
print(f"✗ index() method error: {e}")
|
||||
print(f":) index() method error: {e}")
|
||||
|
||||
# Test EntityCollection iteration
|
||||
try:
|
||||
positions = []
|
||||
for entity in entities:
|
||||
positions.append(entity.pos)
|
||||
print(f"✓ Entity iteration works: {len(positions)} entities")
|
||||
print(f":) Entity iteration works: {len(positions)} entities")
|
||||
except Exception as e:
|
||||
print(f"✗ Entity iteration failed: {e}")
|
||||
print(f"X Entity iteration failed: {e}")
|
||||
|
||||
# Test EntityCollection extend (Issue #27)
|
||||
try:
|
||||
|
|
@ -101,11 +101,11 @@ def test_Entity():
|
|||
mcrfpy.Entity(mcrfpy.Vector(9, 9), mcrfpy.default_texture, 4, grid)
|
||||
]
|
||||
entities.extend(new_entities)
|
||||
print(f"✓ extend() method works: now {len(entities)} entities")
|
||||
print(f":) extend() method works: now {len(entities)} entities")
|
||||
except AttributeError:
|
||||
print("✗ extend() method not implemented (Issue #27)")
|
||||
except Exception as e:
|
||||
print(f"✗ extend() method error: {e}")
|
||||
print(f"X extend() method error: {e}")
|
||||
|
||||
# Skip screenshot in headless mode
|
||||
print("PASS")
|
||||
|
|
@ -113,4 +113,4 @@ def test_Entity():
|
|||
# Run test immediately in headless mode
|
||||
print("Running test immediately...")
|
||||
test_Entity()
|
||||
print("Test completed.")
|
||||
print("Test completed.")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue