remove a lot of stuff
This commit is contained in:
parent
c186d8c7f3
commit
8efa25878f
527
src/UI.cpp
527
src/UI.cpp
|
|
@ -1,527 +0,0 @@
|
||||||
//#include "UI.h"
|
|
||||||
//#include "Resources.h"
|
|
||||||
//#include "GameEngine.h"
|
|
||||||
//
|
|
||||||
///* //callability fields & methods
|
|
||||||
// PyObject* click_callable;
|
|
||||||
// virtual UIDrawable* click_at(sf::Vector2f point);
|
|
||||||
// void click_register(PyObject*);
|
|
||||||
// void click_unregister();
|
|
||||||
//*/
|
|
||||||
//
|
|
||||||
//UIDrawable::UIDrawable() { click_callable = NULL; }
|
|
||||||
//
|
|
||||||
//UIDrawable* UIFrame::click_at(sf::Vector2f point)
|
|
||||||
//{
|
|
||||||
// for (auto e: *children)
|
|
||||||
// {
|
|
||||||
// auto p = e->click_at(point + box.getPosition());
|
|
||||||
// if (p)
|
|
||||||
// return p;
|
|
||||||
// }
|
|
||||||
// if (click_callable)
|
|
||||||
// {
|
|
||||||
// float x = box.getPosition().x, y = box.getPosition().y, w = box.getSize().x, h = box.getSize().y;
|
|
||||||
// if (point.x > x && point.y > y && point.x < x+w && point.y < y+h) return this;
|
|
||||||
// }
|
|
||||||
// return NULL;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UIDrawable* UICaption::click_at(sf::Vector2f point)
|
|
||||||
//{
|
|
||||||
// if (click_callable)
|
|
||||||
// {
|
|
||||||
// if (text.getGlobalBounds().contains(point)) return this;
|
|
||||||
// }
|
|
||||||
// return NULL;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UIDrawable* UISprite::click_at(sf::Vector2f point)
|
|
||||||
//{
|
|
||||||
// if (click_callable)
|
|
||||||
// {
|
|
||||||
// if(sprite.getGlobalBounds().contains(point)) return this;
|
|
||||||
// }
|
|
||||||
// return NULL;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UIDrawable* UIGrid::click_at(sf::Vector2f point)
|
|
||||||
//{
|
|
||||||
// if (click_callable)
|
|
||||||
// {
|
|
||||||
// if(box.getGlobalBounds().contains(point)) return this;
|
|
||||||
// }
|
|
||||||
// return NULL;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UIDrawable::click_register(PyObject* callable)
|
|
||||||
//{
|
|
||||||
// /*
|
|
||||||
// if (click_callable)
|
|
||||||
// {
|
|
||||||
// // decrement reference before overwriting
|
|
||||||
// Py_DECREF(click_callable);
|
|
||||||
// }
|
|
||||||
// click_callable = callable;
|
|
||||||
// Py_INCREF(click_callable);
|
|
||||||
// */
|
|
||||||
// click_callable = std::make_unique<PyClickCallable>(callable);
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UIDrawable::click_unregister()
|
|
||||||
//{
|
|
||||||
// /*
|
|
||||||
// if (click_callable == NULL) return;
|
|
||||||
// Py_DECREF(click_callable);
|
|
||||||
// click_callable = NULL;
|
|
||||||
// */
|
|
||||||
// click_callable.reset();
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UIDrawable::render()
|
|
||||||
//{
|
|
||||||
// //std::cout << "Rendering base UIDrawable\n";
|
|
||||||
// render(sf::Vector2f());
|
|
||||||
//}
|
|
||||||
//UIFrame::UIFrame():
|
|
||||||
//x(0), y(0), w(0), h(0),
|
|
||||||
//outline(0)
|
|
||||||
//{
|
|
||||||
// children = std::make_shared<std::vector<std::shared_ptr<UIDrawable>>>();
|
|
||||||
// box.setPosition(0, 0);
|
|
||||||
// box.setSize(sf::Vector2f(0, 0));
|
|
||||||
// /*
|
|
||||||
// pyOutlineColor = NULL;
|
|
||||||
// pyFillColor = NULL;
|
|
||||||
// _outlineColor = NULL;
|
|
||||||
// _fillColor = NULL;
|
|
||||||
// */
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UIFrame::UIFrame(float _x, float _y, float _w, float _h):
|
|
||||||
//x(_x), y(_y), w(_w), h(_h),
|
|
||||||
//outline(0)
|
|
||||||
//{
|
|
||||||
// box.setPosition(_x, _y);
|
|
||||||
// box.setSize(sf::Vector2f(_w, _h));
|
|
||||||
// children = std::make_shared<std::vector<std::shared_ptr<UIDrawable>>>();
|
|
||||||
// /*
|
|
||||||
// pyOutlineColor = NULL;
|
|
||||||
// pyFillColor = NULL;
|
|
||||||
// _outlineColor = NULL;
|
|
||||||
// _fillColor = NULL;
|
|
||||||
// */
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UIFrame::~UIFrame()
|
|
||||||
//{
|
|
||||||
// children.reset();
|
|
||||||
// /*
|
|
||||||
// if (pyOutlineColor) Py_DECREF(pyOutlineColor);
|
|
||||||
// else if (_outlineColor) delete _outlineColor;
|
|
||||||
// if (pyFillColor) Py_DECREF(pyFillColor);
|
|
||||||
// else if (_fillColor) delete _fillColor;
|
|
||||||
// */
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
///*
|
|
||||||
// sf::Color& fillColor(); // getter
|
|
||||||
// void fillColor(sf::Color c); // C++ setter
|
|
||||||
// void fillColor(PyObject* pyColor); // Python setter
|
|
||||||
//
|
|
||||||
// sf::Color& outlineColor(); // getter
|
|
||||||
// void outlineColor(sf::Color c); // C++ setter
|
|
||||||
// void outlineColor(PyObject* pyColor); // Python setter
|
|
||||||
//*/
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//PyObjectsEnum UIFrame::derived_type()
|
|
||||||
//{
|
|
||||||
// return PyObjectsEnum::UIFRAME;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UIFrame::render(sf::Vector2f offset)
|
|
||||||
//{
|
|
||||||
// //std::cout << "Rendering UIFrame w/ offset " << offset.x << ", " << offset.y << "\n";
|
|
||||||
// //std::cout << "position = " << x << ", " << y << "\n";
|
|
||||||
// box.move(offset);
|
|
||||||
// Resources::game->getWindow().draw(box);
|
|
||||||
// box.move(-offset);
|
|
||||||
// //sf::RectangleShape box = sf::RectangleShape(sf::Vector2f(w,h));
|
|
||||||
// //sf::Vector2f pos = sf::Vector2f(x, y);
|
|
||||||
// //box.setPosition(offset + pos);
|
|
||||||
// //if (_fillColor) { box.setFillColor(fillColor()); }
|
|
||||||
// //if (_outlineColor) { box.setOutlineColor(outlineColor()); }
|
|
||||||
// //box.setOutlineThickness(outline);
|
|
||||||
// //Resources::game->getWindow().draw(box);
|
|
||||||
// for (auto drawable : *children) {
|
|
||||||
// drawable->render(offset + box.getPosition());
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UICaption::render(sf::Vector2f offset)
|
|
||||||
//{
|
|
||||||
// //std::cout << "Rendering Caption with offset\n";
|
|
||||||
// text.move(offset);
|
|
||||||
// Resources::game->getWindow().draw(text);
|
|
||||||
// text.move(-offset);
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UISprite::UISprite() {}
|
|
||||||
///*
|
|
||||||
// // * tearing down the old IndexTexture way of life
|
|
||||||
//UISprite::UISprite(IndexTexture* _itex, int _sprite_index, float x = 0.0, float y = 0.0, float s = 1.0)
|
|
||||||
//: itex(_itex), sprite_index(_sprite_index)
|
|
||||||
//{
|
|
||||||
// sprite.setTexture(_itex->texture);
|
|
||||||
// sprite.setTextureRect(_itex->spriteCoordinates(_sprite_index));
|
|
||||||
// sprite.setPosition(sf::Vector2f(x, y));
|
|
||||||
// sprite.setScale(sf::Vector2f(s, s));
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UISprite::UISprite(IndexTexture* _itex, int _sprite_index, sf::Vector2f pos, float s = 1.0)
|
|
||||||
//: itex(_itex), sprite_index(_sprite_index)
|
|
||||||
//{
|
|
||||||
// sprite.setTexture(_itex->texture);
|
|
||||||
// sprite.setTextureRect(_itex->spriteCoordinates(_sprite_index));
|
|
||||||
// sprite.setPosition(pos);
|
|
||||||
// sprite.setScale(sf::Vector2f(s, s));
|
|
||||||
//}
|
|
||||||
//*/
|
|
||||||
//
|
|
||||||
//UISprite::UISprite(std::shared_ptr<PyTexture> _ptex, int _sprite_index, sf::Vector2f _pos, float _scale)
|
|
||||||
//: ptex(_ptex), sprite_index(_sprite_index)
|
|
||||||
//{
|
|
||||||
// sprite = ptex->sprite(sprite_index, _pos, sf::Vector2f(_scale, _scale));
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UISprite::update()
|
|
||||||
//{
|
|
||||||
// //auto& tex = Resources::game->textures[texture_index];
|
|
||||||
// //sprite.setTexture(tex.texture);
|
|
||||||
// //sprite.setScale(sf::Vector2f(scale, scale));
|
|
||||||
// //sprite.setPosition(sf::Vector2f(x, y));
|
|
||||||
// //std::cout << "Drawable position: " << x << ", " << y << " -> " << s.getPosition().x << ", " << s.getPosition().y << std::endl;
|
|
||||||
// //sprite.setTextureRect(tex.spriteCoordinates(sprite_index));
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UISprite::render(sf::Vector2f offset)
|
|
||||||
//{
|
|
||||||
// sprite.move(offset);
|
|
||||||
// Resources::game->getWindow().draw(sprite);
|
|
||||||
// sprite.move(-offset);
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
// 7DRL hack; needed to draw entities to UIGrid. TODO, apply this technique to all UIDrawables
|
|
||||||
//void UISprite::render(sf::Vector2f offset, sf::RenderTexture& target)
|
|
||||||
//{
|
|
||||||
// sprite.move(offset);
|
|
||||||
// target.draw(sprite);
|
|
||||||
// sprite.move(-offset);
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
///*
|
|
||||||
//void UISprite::setPosition(float x, float y)
|
|
||||||
//{
|
|
||||||
// setPosition(sf::Vector2f(x, y));
|
|
||||||
//}
|
|
||||||
//*/
|
|
||||||
//
|
|
||||||
//void UISprite::setPosition(sf::Vector2f pos)
|
|
||||||
//{
|
|
||||||
// sprite.setPosition(pos);
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UISprite::setScale(sf::Vector2f s)
|
|
||||||
//{
|
|
||||||
// sprite.setScale(s);
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UISprite::setTexture(std::shared_ptr<PyTexture> _ptex, int _sprite_index)
|
|
||||||
//{
|
|
||||||
// ptex = _ptex;
|
|
||||||
// if (_sprite_index != -1) // if you are changing textures, there's a good chance you need a new index too
|
|
||||||
// sprite_index = _sprite_index;
|
|
||||||
// sprite = ptex->sprite(sprite_index, sprite.getPosition(), sprite.getScale());
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UISprite::setSpriteIndex(int _sprite_index)
|
|
||||||
//{
|
|
||||||
// sprite_index = _sprite_index;
|
|
||||||
// sprite = ptex->sprite(sprite_index, sprite.getPosition(), sprite.getScale());
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//sf::Vector2f UISprite::getScale()
|
|
||||||
//{
|
|
||||||
// return sprite.getScale();
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//sf::Vector2f UISprite::getPosition()
|
|
||||||
//{
|
|
||||||
// return sprite.getPosition();
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//std::shared_ptr<PyTexture> UISprite::getTexture()
|
|
||||||
//{
|
|
||||||
// return ptex;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//int UISprite::getSpriteIndex()
|
|
||||||
//{
|
|
||||||
// return sprite_index;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//PyObjectsEnum UICaption::derived_type()
|
|
||||||
//{
|
|
||||||
// return PyObjectsEnum::UICAPTION;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//PyObjectsEnum UISprite::derived_type()
|
|
||||||
//{
|
|
||||||
// return PyObjectsEnum::UISPRITE;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
// UIGrid support classes' methods
|
|
||||||
//
|
|
||||||
//UIGridPoint::UIGridPoint()
|
|
||||||
//:color(1.0f, 1.0f, 1.0f), color_overlay(0.0f, 0.0f, 0.0f), walkable(false), transparent(false),
|
|
||||||
// tilesprite(-1), tile_overlay(-1), uisprite(-1)
|
|
||||||
//{
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UIEntity::UIEntity() {} // this will not work lol. TODO remove default constructor by finding the shared pointer inits that use it
|
|
||||||
//
|
|
||||||
//UIEntity::UIEntity(UIGrid& grid)
|
|
||||||
//: gridstate(grid.grid_x * grid.grid_y)
|
|
||||||
//{
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
// UIGrid methods
|
|
||||||
//
|
|
||||||
//UIGrid::UIGrid()
|
|
||||||
//{
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
///*
|
|
||||||
//UIGrid::UIGrid(int gx, int gy, std::shared_ptr<PyTexture> _ptex, float _x, float _y, float _w, float _h)
|
|
||||||
//: grid_x(gx), grid_y(gy),
|
|
||||||
// zoom(1.0f), center_x((gx/2) * _ptex->sheet_width), center_y((gy/2) * _ptex->sheet_height),
|
|
||||||
// itex(_itex), points(gx * gy)
|
|
||||||
//{
|
|
||||||
// // set up blank list of entities
|
|
||||||
// entities = std::make_shared<std::list<std::shared_ptr<UIEntity>>>();
|
|
||||||
//
|
|
||||||
// box.setSize(sf::Vector2f(_w, _h));
|
|
||||||
// box.setPosition(sf::Vector2f(_x, _y));
|
|
||||||
//
|
|
||||||
// box.setFillColor(sf::Color(0,0,0,0));
|
|
||||||
// renderTexture.create(_w, _h);
|
|
||||||
// sprite.setTexture(_itex->texture);
|
|
||||||
// output.setTextureRect(
|
|
||||||
// sf::IntRect(0, 0,
|
|
||||||
// box.getSize().x, box.getSize().y));
|
|
||||||
// output.setPosition(box.getPosition());
|
|
||||||
// // textures are upside-down inside renderTexture
|
|
||||||
// output.setTexture(renderTexture.getTexture());
|
|
||||||
//}
|
|
||||||
//*/
|
|
||||||
//
|
|
||||||
//UIGrid::UIGrid(int gx, int gy, std::shared_ptr<PyTexture> _ptex, sf::Vector2f _xy, sf::Vector2f _wh)
|
|
||||||
//: grid_x(gx), grid_y(gy),
|
|
||||||
// zoom(1.0f), center_x((gx/2) * _ptex->sprite_width), center_y((gy/2) * _ptex->sprite_height),
|
|
||||||
// ptex(_ptex), points(gx * gy)
|
|
||||||
//{
|
|
||||||
// // set up blank list of entities
|
|
||||||
// entities = std::make_shared<std::list<std::shared_ptr<UIEntity>>>();
|
|
||||||
//
|
|
||||||
// box.setSize(_wh);
|
|
||||||
// box.setPosition(_xy);
|
|
||||||
//
|
|
||||||
// box.setFillColor(sf::Color(0,0,0,0));
|
|
||||||
// //renderTexture.create(_wh.x, _wh.y);
|
|
||||||
// // create renderTexture with maximum theoretical size; sprite can resize to show whatever amount needs to be rendered
|
|
||||||
// renderTexture.create(1920, 1080); // TODO - renderTexture should be window size; above 1080p this will cause rendering errors
|
|
||||||
//
|
|
||||||
// //sprite.setTexture(_itex->texture);
|
|
||||||
// sprite = ptex->sprite(0);
|
|
||||||
//
|
|
||||||
// output.setTextureRect(
|
|
||||||
// sf::IntRect(0, 0,
|
|
||||||
// box.getSize().x, box.getSize().y));
|
|
||||||
// output.setPosition(box.getPosition());
|
|
||||||
// // textures are upside-down inside renderTexture
|
|
||||||
// output.setTexture(renderTexture.getTexture());
|
|
||||||
//
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//void UIGrid::update()
|
|
||||||
//{
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
///*
|
|
||||||
//void UIGrid::setSprite(int ti)
|
|
||||||
//{
|
|
||||||
// //int tx = ti % itex->grid_width, ty = ti / itex->grid_width;
|
|
||||||
// // sprite.setTextureRect(sf::IntRect(tx * itex->grid_size, ty * itex->grid_size, itex->grid_size, itex->grid_size));
|
|
||||||
// sprite = ptex->sprite(ti);
|
|
||||||
//}
|
|
||||||
//*/
|
|
||||||
//
|
|
||||||
//void UIGrid::render(sf::Vector2f)
|
|
||||||
//{
|
|
||||||
// output.setPosition(box.getPosition()); // output sprite can move; update position when drawing
|
|
||||||
// // output size can change; update size when drawing
|
|
||||||
// output.setTextureRect(
|
|
||||||
// sf::IntRect(0, 0,
|
|
||||||
// box.getSize().x, box.getSize().y));
|
|
||||||
// renderTexture.clear(sf::Color(8, 8, 8, 255)); // TODO - UIGrid needs a "background color" field
|
|
||||||
// // sprites that are visible according to zoom, center_x, center_y, and box width
|
|
||||||
// float center_x_sq = center_x / ptex->sprite_width;
|
|
||||||
// float center_y_sq = center_y / ptex->sprite_height;
|
|
||||||
//
|
|
||||||
// float width_sq = box.getSize().x / (ptex->sprite_width * zoom);
|
|
||||||
// float height_sq = box.getSize().y / (ptex->sprite_height * zoom);
|
|
||||||
// float left_edge = center_x_sq - (width_sq / 2.0);
|
|
||||||
// float top_edge = center_y_sq - (height_sq / 2.0);
|
|
||||||
//
|
|
||||||
// int left_spritepixels = center_x - (box.getSize().x / 2.0 / zoom);
|
|
||||||
// int top_spritepixels = center_y - (box.getSize().y / 2.0 / zoom);
|
|
||||||
//
|
|
||||||
// //sprite.setScale(sf::Vector2f(zoom, zoom));
|
|
||||||
// sf::RectangleShape r; // for colors and overlays
|
|
||||||
// r.setSize(sf::Vector2f(ptex->sprite_width * zoom, ptex->sprite_height * zoom));
|
|
||||||
// r.setOutlineThickness(0);
|
|
||||||
//
|
|
||||||
// int x_limit = left_edge + width_sq + 2;
|
|
||||||
// if (x_limit > grid_x) x_limit = grid_x;
|
|
||||||
//
|
|
||||||
// int y_limit = top_edge + height_sq + 2;
|
|
||||||
// if (y_limit > grid_y) y_limit = grid_y;
|
|
||||||
//
|
|
||||||
// // base layer - bottom color, tile sprite ("ground")
|
|
||||||
// for (int x = (left_edge - 1 >= 0 ? left_edge - 1 : 0);
|
|
||||||
// x < x_limit; //x < view_width;
|
|
||||||
// x+=1)
|
|
||||||
// {
|
|
||||||
// //for (float y = (top_edge >= 0 ? top_edge : 0);
|
|
||||||
// for (int y = (top_edge - 1 >= 0 ? top_edge - 1 : 0);
|
|
||||||
// y < y_limit; //y < view_height;
|
|
||||||
// y+=1)
|
|
||||||
// {
|
|
||||||
// auto pixel_pos = sf::Vector2f(
|
|
||||||
// (x*ptex->sprite_width - left_spritepixels) * zoom,
|
|
||||||
// (y*ptex->sprite_height - top_spritepixels) * zoom );
|
|
||||||
//
|
|
||||||
// auto gridpoint = at(std::floor(x), std::floor(y));
|
|
||||||
//
|
|
||||||
// //sprite.setPosition(pixel_pos);
|
|
||||||
//
|
|
||||||
// r.setPosition(pixel_pos);
|
|
||||||
// r.setFillColor(gridpoint.color);
|
|
||||||
// renderTexture.draw(r);
|
|
||||||
//
|
|
||||||
// // tilesprite
|
|
||||||
// // if discovered but not visible, set opacity to 90%
|
|
||||||
// // if not discovered... just don't draw it?
|
|
||||||
// if (gridpoint.tilesprite != -1) {
|
|
||||||
// sprite = ptex->sprite(gridpoint.tilesprite, pixel_pos, sf::Vector2f(zoom, zoom)); //setSprite(gridpoint.tilesprite);;
|
|
||||||
// renderTexture.draw(sprite);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // middle layer - entities
|
|
||||||
// // disabling entity rendering until I can render their UISprite inside the rendertexture (not directly to window)
|
|
||||||
// for (auto e : *entities) {
|
|
||||||
// // TODO skip out-of-bounds entities (grid square not visible at all, check for partially on visible grid squares / floating point grid position)
|
|
||||||
// //auto drawent = e->cGrid->indexsprite.drawable();
|
|
||||||
// auto& drawent = e->sprite;
|
|
||||||
// //drawent.setScale(zoom, zoom);
|
|
||||||
// drawent.setScale(sf::Vector2f(zoom, zoom));
|
|
||||||
// auto pixel_pos = sf::Vector2f(
|
|
||||||
// (e->position.x*ptex->sprite_width - left_spritepixels) * zoom,
|
|
||||||
// (e->position.y*ptex->sprite_height - top_spritepixels) * zoom );
|
|
||||||
// //drawent.setPosition(pixel_pos);
|
|
||||||
// //renderTexture.draw(drawent);
|
|
||||||
// drawent.render(pixel_pos, renderTexture);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// // top layer - opacity for discovered / visible status (debug, basically)
|
|
||||||
// /* // Disabled until I attach a "perspective"
|
|
||||||
// for (int x = (left_edge - 1 >= 0 ? left_edge - 1 : 0);
|
|
||||||
// x < x_limit; //x < view_width;
|
|
||||||
// x+=1)
|
|
||||||
// {
|
|
||||||
// //for (float y = (top_edge >= 0 ? top_edge : 0);
|
|
||||||
// for (int y = (top_edge - 1 >= 0 ? top_edge - 1 : 0);
|
|
||||||
// y < y_limit; //y < view_height;
|
|
||||||
// y+=1)
|
|
||||||
// {
|
|
||||||
//
|
|
||||||
// auto pixel_pos = sf::Vector2f(
|
|
||||||
// (x*itex->grid_size - left_spritepixels) * zoom,
|
|
||||||
// (y*itex->grid_size - top_spritepixels) * zoom );
|
|
||||||
//
|
|
||||||
// auto gridpoint = at(std::floor(x), std::floor(y));
|
|
||||||
//
|
|
||||||
// sprite.setPosition(pixel_pos);
|
|
||||||
//
|
|
||||||
// r.setPosition(pixel_pos);
|
|
||||||
//
|
|
||||||
// // visible & discovered layers for testing purposes
|
|
||||||
// if (!gridpoint.discovered) {
|
|
||||||
// r.setFillColor(sf::Color(16, 16, 20, 192)); // 255 opacity for actual blackout
|
|
||||||
// renderTexture.draw(r);
|
|
||||||
// } else if (!gridpoint.visible) {
|
|
||||||
// r.setFillColor(sf::Color(32, 32, 40, 128));
|
|
||||||
// renderTexture.draw(r);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // overlay
|
|
||||||
//
|
|
||||||
// // uisprite
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// */
|
|
||||||
//
|
|
||||||
// // grid lines for testing & validation
|
|
||||||
// /*
|
|
||||||
// sf::Vertex line[] =
|
|
||||||
// {
|
|
||||||
// sf::Vertex(sf::Vector2f(0, 0), sf::Color::Red),
|
|
||||||
// sf::Vertex(box.getSize(), sf::Color::Red),
|
|
||||||
//
|
|
||||||
// };
|
|
||||||
//
|
|
||||||
// renderTexture.draw(line, 2, sf::Lines);
|
|
||||||
// sf::Vertex lineb[] =
|
|
||||||
// {
|
|
||||||
// sf::Vertex(sf::Vector2f(0, box.getSize().y), sf::Color::Blue),
|
|
||||||
// sf::Vertex(sf::Vector2f(box.getSize().x, 0), sf::Color::Blue),
|
|
||||||
//
|
|
||||||
// };
|
|
||||||
//
|
|
||||||
// renderTexture.draw(lineb, 2, sf::Lines);
|
|
||||||
// */
|
|
||||||
//
|
|
||||||
// // render to window
|
|
||||||
// renderTexture.display();
|
|
||||||
// Resources::game->getWindow().draw(output);
|
|
||||||
//
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//UIGridPoint& UIGrid::at(int x, int y)
|
|
||||||
//{
|
|
||||||
// return points[y * grid_x + x];
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//PyObjectsEnum UIGrid::derived_type()
|
|
||||||
//{
|
|
||||||
// return PyObjectsEnum::UIGRID;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//std::shared_ptr<PyTexture> UIGrid::getTexture()
|
|
||||||
//{
|
|
||||||
// return ptex;
|
|
||||||
//}
|
|
||||||
261
src/UICaption.h
261
src/UICaption.h
|
|
@ -33,270 +33,11 @@ public:
|
||||||
static PyGetSetDef getsetters[];
|
static PyGetSetDef getsetters[];
|
||||||
static PyObject* repr(PyUICaptionObject* self);
|
static PyObject* repr(PyUICaptionObject* self);
|
||||||
static int init(PyUICaptionObject* self, PyObject* args, PyObject* kwds);
|
static int init(PyUICaptionObject* self, PyObject* args, PyObject* kwds);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace mcrfpydef {
|
namespace mcrfpydef {
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static PyObject* PyUICaption_get_float_member(PyUICaptionObject* self, void* closure)
|
|
||||||
{
|
|
||||||
auto member_ptr = reinterpret_cast<long>(closure);
|
|
||||||
if (member_ptr == 0)
|
|
||||||
return PyFloat_FromDouble(self->data->text.getPosition().x);
|
|
||||||
else if (member_ptr == 1)
|
|
||||||
return PyFloat_FromDouble(self->data->text.getPosition().y);
|
|
||||||
else if (member_ptr == 4)
|
|
||||||
return PyFloat_FromDouble(self->data->text.getOutlineThickness());
|
|
||||||
else if (member_ptr == 5)
|
|
||||||
return PyLong_FromLong(self->data->text.getCharacterSize());
|
|
||||||
else
|
|
||||||
{
|
|
||||||
PyErr_SetString(PyExc_AttributeError, "Invalid attribute");
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static int PyUICaption_set_float_member(PyUICaptionObject* self, PyObject* value, void* closure)
|
|
||||||
{
|
|
||||||
float val;
|
|
||||||
auto member_ptr = reinterpret_cast<long>(closure);
|
|
||||||
if (PyFloat_Check(value))
|
|
||||||
{
|
|
||||||
val = PyFloat_AsDouble(value);
|
|
||||||
}
|
|
||||||
else if (PyLong_Check(value))
|
|
||||||
{
|
|
||||||
val = PyLong_AsLong(value);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
PyErr_SetString(PyExc_TypeError, "Value must be an integer.");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
if (member_ptr == 0) //x
|
|
||||||
self->data->text.setPosition(val, self->data->text.getPosition().y);
|
|
||||||
else if (member_ptr == 1) //y
|
|
||||||
self->data->text.setPosition(self->data->text.getPosition().x, val);
|
|
||||||
else if (member_ptr == 4) //outline
|
|
||||||
self->data->text.setOutlineThickness(val);
|
|
||||||
else if (member_ptr == 5) // character size
|
|
||||||
self->data->text.setCharacterSize(val);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static PyObject* PyUICaption_get_vec_member(PyUICaptionObject* self, void* closure)
|
|
||||||
{
|
|
||||||
return PyVector(self->data->text.getPosition()).pyObject();
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
static int PyUICaption_set_vec_member(PyUICaptionObject* self, PyObject* value, void* closure)
|
|
||||||
{
|
|
||||||
self->data->text.setPosition(PyVector::fromPy(value));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static PyObject* PyUICaption_get_color_member(PyUICaptionObject* self, void* closure)
|
|
||||||
{
|
|
||||||
// validate closure (should be impossible to be wrong, but it's thorough)
|
|
||||||
auto member_ptr = reinterpret_cast<long>(closure);
|
|
||||||
if (member_ptr != 0 && member_ptr != 1)
|
|
||||||
{
|
|
||||||
PyErr_SetString(PyExc_AttributeError, "Invalid attribute");
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: manually calling tp_alloc to create a PyColorObject seems like an antipattern
|
|
||||||
// fetch correct member data
|
|
||||||
sf::Color color;
|
|
||||||
|
|
||||||
if (member_ptr == 0)
|
|
||||||
{
|
|
||||||
color = self->data->text.getFillColor();
|
|
||||||
}
|
|
||||||
else if (member_ptr == 1)
|
|
||||||
{
|
|
||||||
color = self->data->text.getOutlineColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
return PyColor(color).pyObject();
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static int PyUICaption_set_color_member(PyUICaptionObject* self, PyObject* value, void* closure)
|
|
||||||
{
|
|
||||||
auto member_ptr = reinterpret_cast<long>(closure);
|
|
||||||
//TODO: this logic of (PyColor instance OR tuple -> sf::color) should be encapsulated for reuse
|
|
||||||
int r, g, b, a;
|
|
||||||
if (PyObject_IsInstance(value, (PyObject*)&PyColorType))
|
|
||||||
{
|
|
||||||
// get value from mcrfpy.Color instance
|
|
||||||
auto c = ((PyColorObject*)value)->data;
|
|
||||||
r = c.r; g = c.g; b = c.b; a = c.a;
|
|
||||||
std::cout << "got " << int(r) << ", " << int(g) << ", " << int(b) << ", " << int(a) << std::endl;
|
|
||||||
}
|
|
||||||
else if (!PyTuple_Check(value) || PyTuple_Size(value) < 3 || PyTuple_Size(value) > 4)
|
|
||||||
{
|
|
||||||
// reject non-Color, non-tuple value
|
|
||||||
PyErr_SetString(PyExc_TypeError, "Value must be a tuple of 3 or 4 integers or an mcrfpy.Color object.");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
else // get value from tuples
|
|
||||||
{
|
|
||||||
r = PyLong_AsLong(PyTuple_GetItem(value, 0));
|
|
||||||
g = PyLong_AsLong(PyTuple_GetItem(value, 1));
|
|
||||||
b = PyLong_AsLong(PyTuple_GetItem(value, 2));
|
|
||||||
a = 255;
|
|
||||||
|
|
||||||
if (PyTuple_Size(value) == 4)
|
|
||||||
{
|
|
||||||
a = PyLong_AsLong(PyTuple_GetItem(value, 3));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255 || a < 0 || a > 255)
|
|
||||||
{
|
|
||||||
PyErr_SetString(PyExc_ValueError, "Color values must be between 0 and 255.");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (member_ptr == 0)
|
|
||||||
{
|
|
||||||
self->data->text.setFillColor(sf::Color(r, g, b, a));
|
|
||||||
}
|
|
||||||
else if (member_ptr == 1)
|
|
||||||
{
|
|
||||||
self->data->text.setOutlineColor(sf::Color(r, g, b, a));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
PyErr_SetString(PyExc_AttributeError, "Invalid attribute");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static PyObject* PyUICaption_get_text(PyUICaptionObject* self, void* closure)
|
|
||||||
{
|
|
||||||
Resources::caption_buffer = self->data->text.getString();
|
|
||||||
return PyUnicode_FromString(Resources::caption_buffer.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
static int PyUICaption_set_text(PyUICaptionObject* self, PyObject* value, void* closure)
|
|
||||||
{
|
|
||||||
PyObject* s = PyObject_Str(value);
|
|
||||||
PyObject * temp_bytes = PyUnicode_AsEncodedString(s, "UTF-8", "strict"); // Owned reference
|
|
||||||
if (temp_bytes != NULL) {
|
|
||||||
Resources::caption_buffer = PyBytes_AS_STRING(temp_bytes); // Borrowed pointer
|
|
||||||
Py_DECREF(temp_bytes);
|
|
||||||
}
|
|
||||||
self->data->text.setString(Resources::caption_buffer);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
//TODO: add this static array to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static PyGetSetDef PyUICaption_getsetters[] = {
|
|
||||||
{"x", (getter)PyUICaption_get_float_member, (setter)PyUICaption_set_float_member, "X coordinate of top-left corner", (void*)0},
|
|
||||||
{"y", (getter)PyUICaption_get_float_member, (setter)PyUICaption_set_float_member, "Y coordinate of top-left corner", (void*)1},
|
|
||||||
{"pos", (getter)PyUICaption_get_vec_member, (setter)PyUICaption_set_vec_member, "(x, y) vector", (void*)0},
|
|
||||||
//{"w", (getter)PyUIFrame_get_float_member, (setter)PyUIFrame_set_float_member, "width of the rectangle", (void*)2},
|
|
||||||
//{"h", (getter)PyUIFrame_get_float_member, (setter)PyUIFrame_set_float_member, "height of the rectangle", (void*)3},
|
|
||||||
{"outline", (getter)PyUICaption_get_float_member, (setter)PyUICaption_set_float_member, "Thickness of the border", (void*)4},
|
|
||||||
{"fill_color", (getter)PyUICaption_get_color_member, (setter)PyUICaption_set_color_member, "Fill color of the text", (void*)0},
|
|
||||||
{"outline_color", (getter)PyUICaption_get_color_member, (setter)PyUICaption_set_color_member, "Outline color of the text", (void*)1},
|
|
||||||
//{"children", (getter)PyUIFrame_get_children, NULL, "UICollection of objects on top of this one", NULL},
|
|
||||||
{"text", (getter)PyUICaption_get_text, (setter)PyUICaption_set_text, "The text displayed", NULL},
|
|
||||||
{"size", (getter)PyUICaption_get_float_member, (setter)PyUICaption_set_float_member, "Text size (integer) in points", (void*)5},
|
|
||||||
{"click", (getter)UIDrawable::get_click, (setter)UIDrawable::set_click, "Object called with (x, y, button) when clicked", (void*)PyObjectsEnum::UICAPTION},
|
|
||||||
{NULL}
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static PyObject* PyUICaption_repr(PyUICaptionObject* self)
|
|
||||||
{
|
|
||||||
std::ostringstream ss;
|
|
||||||
if (!self->data) ss << "<Frame (invalid internal object)>";
|
|
||||||
else {
|
|
||||||
auto text = self->data->text;
|
|
||||||
auto fc = text.getFillColor();
|
|
||||||
auto oc = text.getOutlineColor();
|
|
||||||
ss << "<Caption (x=" << text.getPosition().x << ", y=" << text.getPosition().y << ", " <<
|
|
||||||
"text='" << (std::string)text.getString() << "', " <<
|
|
||||||
"outline=" << text.getOutlineThickness() << ", " <<
|
|
||||||
"fill_color=(" << (int)fc.r << ", " << (int)fc.g << ", " << (int)fc.b << ", " << (int)fc.a <<"), " <<
|
|
||||||
"outlinecolor=(" << (int)oc.r << ", " << (int)oc.g << ", " << (int)oc.b << ", " << (int)oc.a <<"), " <<
|
|
||||||
")>";
|
|
||||||
}
|
|
||||||
std::string repr_str = ss.str();
|
|
||||||
return PyUnicode_DecodeUTF8(repr_str.c_str(), repr_str.size(), "replace");
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
//TODO: add this method to class scope; move implementation to .cpp file
|
|
||||||
/*
|
|
||||||
static int PyUICaption_init(PyUICaptionObject* self, PyObject* args, PyObject* kwds)
|
|
||||||
{
|
|
||||||
//std::cout << "Init called\n";
|
|
||||||
static const char* keywords[] = { "x", "y", "text", "font", "fill_color", "outline_color", nullptr };
|
|
||||||
float x = 0.0f, y = 0.0f;
|
|
||||||
char* text;
|
|
||||||
PyObject* font, fill_color, outline_color;
|
|
||||||
|
|
||||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|ffzOOO",
|
|
||||||
const_cast<char**>(keywords), &x, &y, &text, &font, &fill_color, &outline_color))
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// check types for font, fill_color, outline_color
|
|
||||||
|
|
||||||
std::cout << PyUnicode_AsUTF8(PyObject_Repr(font)) << std::endl;
|
|
||||||
if (font != NULL && !PyObject_IsInstance(font, (PyObject*)&PyFontType)){
|
|
||||||
PyErr_SetString(PyExc_TypeError, "font must be a mcrfpy.Font instance");
|
|
||||||
return -1;
|
|
||||||
} else if (font != NULL)
|
|
||||||
{
|
|
||||||
auto font_obj = (PyFontObject*)font;
|
|
||||||
self->data->text.setFont(font_obj->data->font);
|
|
||||||
self->font = font;
|
|
||||||
Py_INCREF(font);
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
// default font
|
|
||||||
//self->data->text.setFont(Resources::game->getFont());
|
|
||||||
}
|
|
||||||
|
|
||||||
self->data->text.setPosition(sf::Vector2f(x, y));
|
|
||||||
self->data->text.setString((std::string)text);
|
|
||||||
self->data->text.setFillColor(sf::Color(0,0,0,255));
|
|
||||||
self->data->text.setOutlineColor(sf::Color(128,128,128,255));
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
static PyTypeObject PyUICaptionType = {
|
static PyTypeObject PyUICaptionType = {
|
||||||
//PyVarObject_HEAD_INIT(NULL, 0)
|
|
||||||
.tp_name = "mcrfpy.Caption",
|
.tp_name = "mcrfpy.Caption",
|
||||||
.tp_basicsize = sizeof(PyUICaptionObject),
|
.tp_basicsize = sizeof(PyUICaptionObject),
|
||||||
.tp_itemsize = 0,
|
.tp_itemsize = 0,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue