Fix Entity property setters and PyVector implementation

Fixed the 'new style getargs format' error in Entity property setters by:
- Implementing PyObject_to_sfVector2f/2i using PyVector::from_arg
- Adding proper error checking in Entity::set_position
- Implementing PyVector get_member/set_member for x/y properties
- Fixing PyVector::from_arg to handle non-tuple arguments correctly

Now Entity.pos and Entity.sprite_number setters work correctly with
proper type validation.

src/PyVector.cpp

@@ -106,13 +106,37 @@ PyObject* PyVector::pynew(PyTypeObject* type, PyObject* args, PyObject* kwds)
 
 PyObject* PyVector::get_member(PyObject* obj, void* closure)
 {
-    // TODO
-    return Py_None;
+    PyVectorObject* self = (PyVectorObject*)obj;
+    if (reinterpret_cast<long>(closure) == 0) {
+        // x
+        return PyFloat_FromDouble(self->data.x);
+    } else {
+        // y
+        return PyFloat_FromDouble(self->data.y);
+    }
 }
 
 int PyVector::set_member(PyObject* obj, PyObject* value, void* closure)
 {
-    // TODO
+    PyVectorObject* self = (PyVectorObject*)obj;
+    float val;
+    
+    if (PyFloat_Check(value)) {
+        val = PyFloat_AsDouble(value);
+    } else if (PyLong_Check(value)) {
+        val = PyLong_AsDouble(value);
+    } else {
+        PyErr_SetString(PyExc_TypeError, "Vector members must be numeric");
+        return -1;
+    }
+    
+    if (reinterpret_cast<long>(closure) == 0) {
+        // x
+        self->data.x = val;
+    } else {
+        // y
+        self->data.y = val;
+    }
     return 0;
 }
 
@@ -120,11 +144,31 @@ PyVectorObject* PyVector::from_arg(PyObject* args)
 {
     auto type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Vector");
     if (PyObject_IsInstance(args, (PyObject*)type)) return (PyVectorObject*)args;
+    
     auto obj = (PyVectorObject*)type->tp_alloc(type, 0);
+    
+    // Handle different input types
+    if (PyTuple_Check(args)) {
+        // It's already a tuple, pass it directly to init
         int err = init(obj, args, NULL);
         if (err) {
             Py_DECREF(obj);
             return NULL;
         }
+    } else {
+        // Wrap single argument in a tuple for init
+        PyObject* tuple = PyTuple_Pack(1, args);
+        if (!tuple) {
+            Py_DECREF(obj);
+            return NULL;
+        }
+        int err = init(obj, tuple, NULL);
+        Py_DECREF(tuple);
+        if (err) {
+            Py_DECREF(obj);
+            return NULL;
+        }
+    }
+    
     return obj;
 }

src/UIEntity.cpp

@@ -2,6 +2,8 @@
 #include "UIGrid.h"
 #include "McRFPy_API.h"
 #include "PyObjectUtils.h"
+#include "PyVector.h"
+
 
 UIEntity::UIEntity() {} // this will not work lol. TODO remove default constructor by finding the shared pointer inits that use it
 
@@ -104,28 +106,40 @@ PyObject* UIEntity::get_spritenumber(PyUIEntityObject* self, void* closure) {
     return PyLong_FromDouble(self->data->sprite.getSpriteIndex());
 }
 
-PyObject* sfVector2f_to_PyObject(sf::Vector2f vector) {
-    return Py_BuildValue("(ff)", vector.x, vector.y);
+PyObject* sfVector2f_to_PyObject(sf::Vector2f vec) {
+    auto type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Vector");
+    auto obj = (PyVectorObject*)type->tp_alloc(type, 0);
+    if (obj) {
+        obj->data = vec;
+    }
+    return (PyObject*)obj;
 }
 
-PyObject* sfVector2i_to_PyObject(sf::Vector2i vector) {
-    return Py_BuildValue("(ii)", vector.x, vector.y);
+PyObject* sfVector2i_to_PyObject(sf::Vector2i vec) {
+    auto type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Vector");
+    auto obj = (PyVectorObject*)type->tp_alloc(type, 0);
+    if (obj) {
+        obj->data = sf::Vector2f(static_cast<float>(vec.x), static_cast<float>(vec.y));
+    }
+    return (PyObject*)obj;
 }
 
 sf::Vector2f PyObject_to_sfVector2f(PyObject* obj) {
-    float x, y;
-    if (!PyArg_ParseTuple(obj, "ff", &x, &y)) {
-        return sf::Vector2f(); // TODO / reconsider this default: Return default vector on parse error
+    PyVectorObject* vec = PyVector::from_arg(obj);
+    if (!vec) {
+        // PyVector::from_arg already set the error
+        return sf::Vector2f(0, 0);
     }
-    return sf::Vector2f(x, y);
+    return vec->data;
 }
 
 sf::Vector2i PyObject_to_sfVector2i(PyObject* obj) {
-    int x, y;
-    if (!PyArg_ParseTuple(obj, "ii", &x, &y)) {
-        return sf::Vector2i(); // TODO / reconsider this default: Return default vector on parse error
+    PyVectorObject* vec = PyVector::from_arg(obj);
+    if (!vec) {
+        // PyVector::from_arg already set the error
+        return sf::Vector2i(0, 0);
     }
-    return sf::Vector2i(x, y);
+    return sf::Vector2i(static_cast<int>(vec->data.x), static_cast<int>(vec->data.y));
 }
 
 // TODO - deprecate / remove this helper
@@ -161,9 +175,17 @@ PyObject* UIEntity::get_position(PyUIEntityObject* self, void* closure) {
 
 int UIEntity::set_position(PyUIEntityObject* self, PyObject* value, void* closure) {
     if (reinterpret_cast<long>(closure) == 0) {
-        self->data->position = PyObject_to_sfVector2f(value);
+        sf::Vector2f vec = PyObject_to_sfVector2f(value);
+        if (PyErr_Occurred()) {
+            return -1;  // Error already set by PyObject_to_sfVector2f
+        }
+        self->data->position = vec;
     } else {
-        self->data->collision_pos = PyObject_to_sfVector2i(value);
+        sf::Vector2i vec = PyObject_to_sfVector2i(value);
+        if (PyErr_Occurred()) {
+            return -1;  // Error already set by PyObject_to_sfVector2i
+        }
+        self->data->collision_pos = vec;
     }
     return 0;
 }

tests/entity_property_setters_test.py

@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+"""
+Test for Entity property setters - fixing "new style getargs format" error
+
+Verifies that Entity position and sprite_number setters work correctly.
+"""
+
+def test_entity_setters(timer_name):
+    """Test that Entity property setters work correctly"""
+    import mcrfpy
+    
+    print("Testing Entity property setters...")
+    
+    # Create test scene and grid
+    mcrfpy.createScene("entity_test")
+    ui = mcrfpy.sceneUI("entity_test")
+    
+    # Create grid with texture
+    texture = mcrfpy.Texture("assets/kenney_ice.png", 16, 16)
+    grid = mcrfpy.Grid(10, 10, texture, (10, 10), (400, 400))
+    ui.append(grid)
+    
+    # Create entity
+    initial_pos = mcrfpy.Vector(2.5, 3.5)
+    entity = mcrfpy.Entity(initial_pos, texture, 5, grid)
+    grid.entities.append(entity)
+    
+    print(f"✓ Created entity at position {entity.pos}")
+    
+    # Test position setter with Vector
+    new_pos = mcrfpy.Vector(4.0, 5.0)
+    try:
+        entity.pos = new_pos
+        assert entity.pos.x == 4.0, f"Expected x=4.0, got {entity.pos.x}"
+        assert entity.pos.y == 5.0, f"Expected y=5.0, got {entity.pos.y}"
+        print(f"✓ Position setter works with Vector: {entity.pos}")
+    except Exception as e:
+        print(f"✗ Position setter failed: {e}")
+        raise
+    
+    # Test position setter with tuple (should also work via PyVector::from_arg)
+    try:
+        entity.pos = (7.5, 8.5)
+        assert entity.pos.x == 7.5, f"Expected x=7.5, got {entity.pos.x}"
+        assert entity.pos.y == 8.5, f"Expected y=8.5, got {entity.pos.y}"
+        print(f"✓ Position setter works with tuple: {entity.pos}")
+    except Exception as e:
+        print(f"✗ Position setter with tuple failed: {e}")
+        raise
+    
+    # Test draw_pos setter (collision position)
+    try:
+        entity.draw_pos = mcrfpy.Vector(3, 4)
+        assert entity.draw_pos.x == 3, f"Expected x=3, got {entity.draw_pos.x}"
+        assert entity.draw_pos.y == 4, f"Expected y=4, got {entity.draw_pos.y}"
+        print(f"✓ Draw position setter works: {entity.draw_pos}")
+    except Exception as e:
+        print(f"✗ Draw position setter failed: {e}")
+        raise
+    
+    # Test sprite_number setter
+    try:
+        entity.sprite_number = 10
+        assert entity.sprite_number == 10, f"Expected sprite_number=10, got {entity.sprite_number}"
+        print(f"✓ Sprite number setter works: {entity.sprite_number}")
+    except Exception as e:
+        print(f"✗ Sprite number setter failed: {e}")
+        raise
+    
+    # Test invalid position setter (should raise TypeError)
+    try:
+        entity.pos = "invalid"
+        print("✗ Position setter should have raised TypeError for string")
+        assert False, "Should have raised TypeError"
+    except TypeError as e:
+        print(f"✓ Position setter correctly rejects invalid type: {e}")
+    except Exception as e:
+        print(f"✗ Unexpected error: {e}")
+        raise
+    
+    # Test invalid sprite number (should raise TypeError)
+    try:
+        entity.sprite_number = "invalid"
+        print("✗ Sprite number setter should have raised TypeError for string")
+        assert False, "Should have raised TypeError"
+    except TypeError as e:
+        print(f"✓ Sprite number setter correctly rejects invalid type: {e}")
+    except Exception as e:
+        print(f"✗ Unexpected error: {e}")
+        raise
+    
+    # Cleanup timer
+    mcrfpy.delTimer("test_timer")
+    
+    print("\n✅ Entity property setters test PASSED - All setters work correctly")
+
+# Execute the test after a short delay to ensure window is ready
+import mcrfpy
+mcrfpy.setTimer("test_timer", test_entity_setters, 100)

tests/entity_setter_simple_test.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+"""
+Simple test for Entity property setters
+"""
+
+def test_entity_setters(timer_name):
+    """Test Entity property setters"""
+    import mcrfpy
+    import sys
+    
+    print("Testing Entity property setters...")
+    
+    # Create test scene and grid
+    mcrfpy.createScene("test")
+    ui = mcrfpy.sceneUI("test")
+    
+    # Create grid with texture
+    texture = mcrfpy.Texture("assets/kenney_ice.png", 16, 16)
+    grid = mcrfpy.Grid(10, 10, texture, (10, 10), (400, 400))
+    ui.append(grid)
+    
+    # Create entity
+    entity = mcrfpy.Entity((2.5, 3.5), texture, 5, grid)
+    grid.entities.append(entity)
+    
+    # Test 1: Initial position
+    print(f"Initial position: {entity.pos}")
+    print(f"Initial position x={entity.pos.x}, y={entity.pos.y}")
+    
+    # Test 2: Set position with Vector
+    entity.pos = mcrfpy.Vector(4.0, 5.0)
+    print(f"After Vector setter: pos={entity.pos}, x={entity.pos.x}, y={entity.pos.y}")
+    
+    # Test 3: Set position with tuple
+    entity.pos = (7.5, 8.5)
+    print(f"After tuple setter: pos={entity.pos}, x={entity.pos.x}, y={entity.pos.y}")
+    
+    # Test 4: sprite_number
+    print(f"Initial sprite_number: {entity.sprite_number}")
+    entity.sprite_number = 10
+    print(f"After setter: sprite_number={entity.sprite_number}")
+    
+    # Test 5: Invalid types
+    try:
+        entity.pos = "invalid"
+        print("ERROR: Should have raised TypeError")
+    except TypeError as e:
+        print(f"✓ Correctly rejected invalid position: {e}")
+    
+    try:
+        entity.sprite_number = "invalid"
+        print("ERROR: Should have raised TypeError")
+    except TypeError as e:
+        print(f"✓ Correctly rejected invalid sprite_number: {e}")
+    
+    print("\n✅ Entity property setters test completed")
+    sys.exit(0)
+
+# Execute the test after a short delay
+import mcrfpy
+mcrfpy.setTimer("test", test_entity_setters, 100)