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
79 lines
2.5 KiB
C++
79 lines
2.5 KiB
C++
#include "PyFont.h"
|
|
#include "McRFPy_API.h"
|
|
|
|
|
|
PyFont::PyFont(std::string filename)
|
|
: source(filename)
|
|
{
|
|
font = sf::Font();
|
|
font.loadFromFile(source);
|
|
}
|
|
|
|
PyObject* PyFont::pyObject()
|
|
{
|
|
auto type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Font");
|
|
//PyObject* obj = PyType_GenericAlloc(&mcrfpydef::PyFontType, 0);
|
|
PyObject* obj = PyFont::pynew(type, Py_None, Py_None);
|
|
try {
|
|
((PyFontObject*)obj)->data = shared_from_this();
|
|
}
|
|
catch (std::bad_weak_ptr& e)
|
|
{
|
|
std::cout << "Bad weak ptr: shared_from_this() failed in PyFont::pyObject(); did you create a PyFont outside of std::make_shared? enjoy your segfault, soon!" << std::endl;
|
|
}
|
|
// TODO - shared_from_this will raise an exception if the object does not have a shared pointer. Constructor should be made private; write a factory function
|
|
return obj;
|
|
}
|
|
|
|
PyObject* PyFont::repr(PyObject* obj)
|
|
{
|
|
PyFontObject* self = (PyFontObject*)obj;
|
|
std::ostringstream ss;
|
|
if (!self->data)
|
|
{
|
|
ss << "<Font [invalid internal object]>";
|
|
std::string repr_str = ss.str();
|
|
return PyUnicode_DecodeUTF8(repr_str.c_str(), repr_str.size(), "replace");
|
|
}
|
|
auto& pfont = *(self->data);
|
|
ss << "<Font (family=" << pfont.font.getInfo().family << ") source=`" << pfont.source << "`>";
|
|
std::string repr_str = ss.str();
|
|
return PyUnicode_DecodeUTF8(repr_str.c_str(), repr_str.size(), "replace");
|
|
}
|
|
|
|
Py_hash_t PyFont::hash(PyObject* obj)
|
|
{
|
|
auto self = (PyFontObject*)obj;
|
|
return reinterpret_cast<Py_hash_t>(self->data.get());
|
|
}
|
|
|
|
int PyFont::init(PyFontObject* self, PyObject* args, PyObject* kwds)
|
|
{
|
|
static const char* keywords[] = { "filename", nullptr };
|
|
char* filename;
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", const_cast<char**>(keywords), &filename))
|
|
return -1;
|
|
self->data = std::make_shared<PyFont>(filename);
|
|
return 0;
|
|
}
|
|
|
|
PyObject* PyFont::pynew(PyTypeObject* type, PyObject* args, PyObject* kwds)
|
|
{
|
|
return (PyObject*)type->tp_alloc(type, 0);
|
|
}
|
|
|
|
PyObject* PyFont::get_family(PyFontObject* self, void* closure)
|
|
{
|
|
return PyUnicode_FromString(self->data->font.getInfo().family.c_str());
|
|
}
|
|
|
|
PyObject* PyFont::get_source(PyFontObject* self, void* closure)
|
|
{
|
|
return PyUnicode_FromString(self->data->source.c_str());
|
|
}
|
|
|
|
PyGetSetDef PyFont::getsetters[] = {
|
|
{"family", (getter)PyFont::get_family, NULL, "Font family name", NULL},
|
|
{"source", (getter)PyFont::get_source, NULL, "Source filename of the font", NULL},
|
|
{NULL} // Sentinel
|
|
};
|