John McCardle
5a003a9aa5
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.
56 lines
2 KiB
C++
56 lines
2 KiB
C++
#pragma once
|
|
#include "Common.h"
|
|
#include "Python.h"
|
|
|
|
class PyTexture;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
std::shared_ptr<PyTexture> data;
|
|
} PyTextureObject;
|
|
|
|
class PyTexture : public std::enable_shared_from_this<PyTexture>
|
|
{
|
|
private:
|
|
sf::Texture texture;
|
|
std::string source;
|
|
int sheet_width, sheet_height;
|
|
public:
|
|
int sprite_width, sprite_height; // just use them read only, OK?
|
|
PyTexture(std::string filename, int sprite_w, int sprite_h);
|
|
sf::Sprite sprite(int index, sf::Vector2f pos = sf::Vector2f(0, 0), sf::Vector2f s = sf::Vector2f(1.0, 1.0));
|
|
int getSpriteCount() const { return sheet_width * sheet_height; }
|
|
|
|
PyObject* pyObject();
|
|
static PyObject* repr(PyObject*);
|
|
static Py_hash_t hash(PyObject*);
|
|
static int init(PyTextureObject*, PyObject*, PyObject*);
|
|
static PyObject* pynew(PyTypeObject* type, PyObject* args=NULL, PyObject* kwds=NULL);
|
|
|
|
// Getters for properties
|
|
static PyObject* get_sprite_width(PyTextureObject* self, void* closure);
|
|
static PyObject* get_sprite_height(PyTextureObject* self, void* closure);
|
|
static PyObject* get_sheet_width(PyTextureObject* self, void* closure);
|
|
static PyObject* get_sheet_height(PyTextureObject* self, void* closure);
|
|
static PyObject* get_sprite_count(PyTextureObject* self, void* closure);
|
|
static PyObject* get_source(PyTextureObject* self, void* closure);
|
|
|
|
static PyGetSetDef getsetters[];
|
|
};
|
|
|
|
namespace mcrfpydef {
|
|
static PyTypeObject PyTextureType = {
|
|
.ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
|
|
.tp_name = "mcrfpy.Texture",
|
|
.tp_basicsize = sizeof(PyTextureObject),
|
|
.tp_itemsize = 0,
|
|
.tp_repr = PyTexture::repr,
|
|
.tp_hash = PyTexture::hash,
|
|
.tp_flags = Py_TPFLAGS_DEFAULT,
|
|
.tp_doc = PyDoc_STR("SFML Texture Object"),
|
|
.tp_getset = PyTexture::getsetters,
|
|
//.tp_base = &PyBaseObject_Type,
|
|
.tp_init = (initproc)PyTexture::init,
|
|
.tp_new = PyType_GenericNew, //PyTexture::pynew,
|
|
};
|
|
}
|