John McCardle
42fcd3417e
- Remove color, color_overlay, tilesprite, tile_overlay, uisprite from UIGridPoint - these are now accessed through named layers - Keep only walkable and transparent as protected GridPoint properties - Update isProtectedLayerName() to only protect walkable/transparent - Fix default layer z-index to -1 (below entities) instead of 0 - Remove dead rendering code from GridChunk (layers handle rendering) - Update cos_level.py demo to use explicit layer definitions - Update UITestScene.cpp to use layer API instead of GridPoint properties Part of #150 - Grid layer system migration 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
97 lines
3.3 KiB
C++
97 lines
3.3 KiB
C++
#pragma once
|
|
#include "Common.h"
|
|
#include "Python.h"
|
|
#include "structmember.h"
|
|
#include "IndexTexture.h"
|
|
#include "Resources.h"
|
|
#include <list>
|
|
|
|
#include "PyCallable.h"
|
|
#include "PyTexture.h"
|
|
#include "PyColor.h"
|
|
#include "PyVector.h"
|
|
#include "PyFont.h"
|
|
|
|
static PyObject* sfColor_to_PyObject(sf::Color color);
|
|
static sf::Color PyObject_to_sfColor(PyObject* obj);
|
|
|
|
class UIGrid;
|
|
class UIEntity;
|
|
class UIGridPoint;
|
|
class UIGridPointState;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
UIGridPoint* data;
|
|
std::shared_ptr<UIGrid> grid;
|
|
} PyUIGridPointObject;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
UIGridPointState* data;
|
|
std::shared_ptr<UIGrid> grid;
|
|
std::shared_ptr<UIEntity> entity;
|
|
} PyUIGridPointStateObject;
|
|
|
|
// UIGridPoint - grid cell data for pathfinding and layer access
|
|
// #150 - Layer-related properties (color, tilesprite, etc.) removed; now handled by layers
|
|
class UIGridPoint
|
|
{
|
|
public:
|
|
bool walkable, transparent; // Pathfinding/FOV properties
|
|
int grid_x, grid_y; // Position in parent grid
|
|
UIGrid* parent_grid; // Parent grid reference for TCOD sync
|
|
UIGridPoint();
|
|
|
|
// Built-in property accessors (walkable, transparent only)
|
|
static PyGetSetDef getsetters[];
|
|
static int set_bool_member(PyUIGridPointObject* self, PyObject* value, void* closure);
|
|
static PyObject* get_bool_member(PyUIGridPointObject* self, void* closure);
|
|
static PyObject* repr(PyUIGridPointObject* self);
|
|
|
|
// #150 - Dynamic property access for named layers
|
|
static PyObject* getattro(PyUIGridPointObject* self, PyObject* name);
|
|
static int setattro(PyUIGridPointObject* self, PyObject* name, PyObject* value);
|
|
};
|
|
|
|
// UIGridPointState - entity-specific info for each cell
|
|
class UIGridPointState
|
|
{
|
|
public:
|
|
bool visible, discovered;
|
|
|
|
static PyObject* get_bool_member(PyUIGridPointStateObject* self, void* closure);
|
|
static int set_bool_member(PyUIGridPointStateObject* self, PyObject* value, void* closure);
|
|
static PyGetSetDef getsetters[];
|
|
static PyObject* repr(PyUIGridPointStateObject* self);
|
|
};
|
|
|
|
namespace mcrfpydef {
|
|
static PyTypeObject PyUIGridPointType = {
|
|
.ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
|
|
.tp_name = "mcrfpy.GridPoint",
|
|
.tp_basicsize = sizeof(PyUIGridPointObject),
|
|
.tp_itemsize = 0,
|
|
.tp_repr = (reprfunc)UIGridPoint::repr,
|
|
// #150 - Dynamic attribute access for named layers
|
|
.tp_getattro = (getattrofunc)UIGridPoint::getattro,
|
|
.tp_setattro = (setattrofunc)UIGridPoint::setattro,
|
|
.tp_flags = Py_TPFLAGS_DEFAULT,
|
|
.tp_doc = "UIGridPoint object",
|
|
.tp_getset = UIGridPoint::getsetters,
|
|
//.tp_init = (initproc)PyUIGridPoint_init, // TODO Define the init function
|
|
.tp_new = NULL, // Prevent instantiation from Python - Issue #12
|
|
};
|
|
|
|
static PyTypeObject PyUIGridPointStateType = {
|
|
.ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
|
|
.tp_name = "mcrfpy.GridPointState",
|
|
.tp_basicsize = sizeof(PyUIGridPointStateObject),
|
|
.tp_itemsize = 0,
|
|
.tp_repr = (reprfunc)UIGridPointState::repr,
|
|
.tp_flags = Py_TPFLAGS_DEFAULT,
|
|
.tp_doc = "UIGridPointState object", // TODO: Add PyUIGridPointState tp_init
|
|
.tp_getset = UIGridPointState::getsetters,
|
|
.tp_new = NULL, // Prevent instantiation from Python - Issue #12
|
|
};
|
|
}
|