the low-hanging fruit of pre-existing issues and standardizing the
Python interfaces
Special thanks to Claude Code, ~100k output tokens for this merge
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
commit 99f301e3a0
Author: John McCardle <mccardle.john@gmail.com>
Date: Sat Jul 5 16:25:32 2025 -0400
Add position tuple support and pos property to UI elements
closes #83, closes #84
- Issue #83: Add position tuple support to constructors
- Frame and Sprite now accept both (x, y) and ((x, y)) forms
- Also accept Vector objects as position arguments
- Caption and Entity already supported tuple/Vector forms
- Uses PyVector::from_arg for flexible position parsing
- Issue #84: Add pos property to Frame and Sprite
- Added pos getter that returns a Vector
- Added pos setter that accepts Vector or tuple
- Provides consistency with Caption and Entity which already had pos properties
- All UI elements now have a uniform way to get/set positions as Vectors
Both features improve API consistency and make it easier to work with positions.
commit 2f2b488fb5
Author: John McCardle <mccardle.john@gmail.com>
Date: Sat Jul 5 16:18:10 2025 -0400
Standardize sprite_index property and add scale_x/scale_y to UISprite
closes #81, closes #82
- Issue #81: Standardized property name to sprite_index across UISprite and UIEntity
- Added sprite_index as the primary property name
- Kept sprite_number as a deprecated alias for backward compatibility
- Updated repr() methods to use sprite_index
- Updated animation system to recognize both names
- Issue #82: Added scale_x and scale_y properties to UISprite
- Enables non-uniform scaling of sprites
- scale property still works for uniform scaling
- Both properties work with the animation system
All existing code using sprite_number continues to work due to backward compatibility.
commit 5a003a9aa5
Author: John McCardle <mccardle.john@gmail.com>
Date: Sat Jul 5 16:09:52 2025 -0400
Fix multiple low priority issues
closes #12, closes #80, closes #95, closes #96, closes #99
- Issue #12: Set tp_new to NULL for GridPoint and GridPointState to prevent instantiation from Python
- Issue #80: Renamed Caption.size to Caption.font_size for semantic clarity
- Issue #95: Fixed UICollection repr to show actual derived types instead of generic UIDrawable
- Issue #96: Added extend() method to UICollection for API consistency with UIEntityCollection
- Issue #99: Exposed read-only properties for Texture (sprite_width, sprite_height, sheet_width, sheet_height, sprite_count, source) and Font (family, source)
All issues have corresponding tests that verify the fixes work correctly.
commit e5affaf317
Author: John McCardle <mccardle.john@gmail.com>
Date: Sat Jul 5 15:50:09 2025 -0400
Fix critical issues: script loading, entity types, and color properties
- Issue #37: Fix Windows scripts subdirectory not checked
- Updated executeScript() to use executable_path() from platform.h
- Scripts now load correctly when working directory differs from executable
- Issue #76: Fix UIEntityCollection returns wrong type
- Updated UIEntityCollectionIter::next() to check for stored Python object
- Derived Entity classes now preserve their type when retrieved from collections
- Issue #9: Recreate RenderTexture when resized (already fixed)
- Confirmed RenderTexture recreation already implemented in set_size() and set_float_member()
- Uses 1.5x padding and 4096 max size limit
- Issue #79: Fix Color r, g, b, a properties return None
- Implemented get_member() and set_member() in PyColor.cpp
- Color component properties now work correctly with proper validation
- Additional fix: Grid.at() method signature
- Changed from METH_O to METH_VARARGS to accept two arguments
All fixes include comprehensive tests to verify functionality.
closes #37, closes #76, closes #9, closes #79
88 lines
No EOL
3 KiB
Python
88 lines
No EOL
3 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Test for Issue #76: UIEntityCollection::getitem returns wrong type for derived classes
|
|
|
|
This test checks if derived Entity classes maintain their type when retrieved from collections.
|
|
"""
|
|
|
|
import mcrfpy
|
|
import sys
|
|
|
|
# Create a derived Entity class
|
|
class CustomEntity(mcrfpy.Entity):
|
|
def __init__(self, x, y):
|
|
super().__init__(x, y)
|
|
self.custom_attribute = "I am custom!"
|
|
|
|
def custom_method(self):
|
|
return "Custom method called"
|
|
|
|
def run_test(runtime):
|
|
"""Test that derived entity classes maintain their type in collections"""
|
|
try:
|
|
# Create a grid
|
|
grid = mcrfpy.Grid(10, 10)
|
|
|
|
# Create instances of base and derived entities
|
|
base_entity = mcrfpy.Entity(1, 1)
|
|
custom_entity = CustomEntity(2, 2)
|
|
|
|
# Add them to the grid's entity collection
|
|
grid.entities.append(base_entity)
|
|
grid.entities.append(custom_entity)
|
|
|
|
# Retrieve them back
|
|
retrieved_base = grid.entities[0]
|
|
retrieved_custom = grid.entities[1]
|
|
|
|
print(f"Base entity type: {type(retrieved_base)}")
|
|
print(f"Custom entity type: {type(retrieved_custom)}")
|
|
|
|
# Test 1: Check if base entity is correct type
|
|
if type(retrieved_base).__name__ == "Entity":
|
|
print("✓ Test 1 PASSED: Base entity maintains correct type")
|
|
else:
|
|
print("✗ Test 1 FAILED: Base entity has wrong type")
|
|
|
|
# Test 2: Check if custom entity maintains its derived type
|
|
if type(retrieved_custom).__name__ == "CustomEntity":
|
|
print("✓ Test 2 PASSED: Derived entity maintains correct type")
|
|
|
|
# Test 3: Check if custom attributes are preserved
|
|
try:
|
|
attr = retrieved_custom.custom_attribute
|
|
method_result = retrieved_custom.custom_method()
|
|
print(f"✓ Test 3 PASSED: Custom attributes preserved - {attr}, {method_result}")
|
|
except AttributeError as e:
|
|
print(f"✗ Test 3 FAILED: Custom attributes lost - {e}")
|
|
else:
|
|
print("✗ Test 2 FAILED: Derived entity type lost!")
|
|
print("This is the bug described in Issue #76!")
|
|
|
|
# Try to access custom attributes anyway
|
|
try:
|
|
attr = retrieved_custom.custom_attribute
|
|
print(f" - Has custom_attribute: {attr} (but wrong type)")
|
|
except AttributeError:
|
|
print(" - Lost custom_attribute")
|
|
|
|
# Test 4: Check iteration
|
|
print("\nTesting iteration:")
|
|
for i, entity in enumerate(grid.entities):
|
|
print(f" Entity {i}: {type(entity).__name__}")
|
|
|
|
print("\nTest complete")
|
|
|
|
except Exception as e:
|
|
print(f"Test error: {e}")
|
|
import traceback
|
|
traceback.print_exc()
|
|
|
|
sys.exit(0)
|
|
|
|
# Set up the test scene
|
|
mcrfpy.createScene("test")
|
|
mcrfpy.setScene("test")
|
|
|
|
# Schedule test to run after game loop starts
|
|
mcrfpy.setTimer("test", run_test, 100) |