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
101 lines
4.5 KiB
C++
101 lines
4.5 KiB
C++
#pragma once
|
|
#include "Common.h"
|
|
#include "Python.h"
|
|
|
|
#include "UIDrawable.h"
|
|
|
|
class UICollectionIter
|
|
{
|
|
// really more of a namespace: all the members are public and static. But being consistent with other UI objects
|
|
public:
|
|
static int init(PyUICollectionIterObject* self, PyObject* args, PyObject* kwds);
|
|
static PyObject* next(PyUICollectionIterObject* self);
|
|
static PyObject* repr(PyUICollectionIterObject* self);
|
|
};
|
|
|
|
class UICollection
|
|
{
|
|
// really more of a namespace: all the members are public and static. But being consistent with other UI objects
|
|
public:
|
|
static Py_ssize_t len(PyUICollectionObject* self);
|
|
static PyObject* getitem(PyUICollectionObject* self, Py_ssize_t index);
|
|
static int setitem(PyUICollectionObject* self, Py_ssize_t index, PyObject* value);
|
|
static int contains(PyUICollectionObject* self, PyObject* value);
|
|
static PyObject* concat(PyUICollectionObject* self, PyObject* other);
|
|
static PyObject* inplace_concat(PyUICollectionObject* self, PyObject* other);
|
|
static PySequenceMethods sqmethods;
|
|
static PyMappingMethods mpmethods;
|
|
static PyObject* subscript(PyUICollectionObject* self, PyObject* key);
|
|
static int ass_subscript(PyUICollectionObject* self, PyObject* key, PyObject* value);
|
|
static PyObject* append(PyUICollectionObject* self, PyObject* o);
|
|
static PyObject* extend(PyUICollectionObject* self, PyObject* iterable);
|
|
static PyObject* remove(PyUICollectionObject* self, PyObject* o);
|
|
static PyObject* index_method(PyUICollectionObject* self, PyObject* value);
|
|
static PyObject* count(PyUICollectionObject* self, PyObject* value);
|
|
static PyMethodDef methods[];
|
|
static PyObject* repr(PyUICollectionObject* self);
|
|
static int init(PyUICollectionObject* self, PyObject* args, PyObject* kwds);
|
|
static PyObject* iter(PyUICollectionObject* self);
|
|
};
|
|
|
|
namespace mcrfpydef {
|
|
static PyTypeObject PyUICollectionIterType = {
|
|
.ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
|
|
.tp_name = "mcrfpy.UICollectionIter",
|
|
.tp_basicsize = sizeof(PyUICollectionIterObject),
|
|
.tp_itemsize = 0,
|
|
//TODO - as static method, not inline lambda def, please
|
|
.tp_dealloc = (destructor)[](PyObject* self)
|
|
{
|
|
PyUICollectionIterObject* obj = (PyUICollectionIterObject*)self;
|
|
obj->data.reset();
|
|
Py_TYPE(self)->tp_free(self);
|
|
},
|
|
.tp_repr = (reprfunc)UICollectionIter::repr,
|
|
.tp_flags = Py_TPFLAGS_DEFAULT,
|
|
.tp_doc = PyDoc_STR("Iterator for a collection of UI objects"),
|
|
.tp_iter = PyObject_SelfIter,
|
|
.tp_iternext = (iternextfunc)UICollectionIter::next,
|
|
//.tp_getset = PyUICollection_getset,
|
|
.tp_init = (initproc)UICollectionIter::init, // just raise an exception
|
|
.tp_alloc = PyType_GenericAlloc,
|
|
//TODO - as static method, not inline lambda def, please
|
|
.tp_new = [](PyTypeObject* type, PyObject* args, PyObject* kwds) -> PyObject*
|
|
{
|
|
PyErr_SetString(PyExc_TypeError, "UICollection cannot be instantiated: a C++ data source is required.");
|
|
return NULL;
|
|
}
|
|
};
|
|
|
|
static PyTypeObject PyUICollectionType = {
|
|
.ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
|
|
.tp_name = "mcrfpy.UICollection",
|
|
.tp_basicsize = sizeof(PyUICollectionObject),
|
|
.tp_itemsize = 0,
|
|
//TODO - as static method, not inline lambda def, please
|
|
.tp_dealloc = (destructor)[](PyObject* self)
|
|
{
|
|
PyUICollectionObject* obj = (PyUICollectionObject*)self;
|
|
obj->data.reset();
|
|
Py_TYPE(self)->tp_free(self);
|
|
},
|
|
.tp_repr = (reprfunc)UICollection::repr,
|
|
.tp_as_sequence = &UICollection::sqmethods,
|
|
.tp_as_mapping = &UICollection::mpmethods,
|
|
.tp_flags = Py_TPFLAGS_DEFAULT,
|
|
.tp_doc = PyDoc_STR("Iterable, indexable collection of UI objects"),
|
|
.tp_iter = (getiterfunc)UICollection::iter,
|
|
.tp_methods = UICollection::methods, // append, remove
|
|
//.tp_getset = PyUICollection_getset,
|
|
.tp_init = (initproc)UICollection::init, // just raise an exception
|
|
//TODO - as static method, not inline lambda def, please
|
|
.tp_new = [](PyTypeObject* type, PyObject* args, PyObject* kwds) -> PyObject*
|
|
{
|
|
// Does PyUICollectionType need __new__ if it's not supposed to be instantiable by the user?
|
|
// Should I just raise an exception? Or is the uninitialized shared_ptr enough of a blocker?
|
|
PyErr_SetString(PyExc_TypeError, "UICollection cannot be instantiated: a C++ data source is required.");
|
|
return NULL;
|
|
}
|
|
};
|
|
|
|
}
|