Intermediate refactor to move everything over to using the textures module rather than everyone using one TexturePack thing.
This commit is contained in:
parent
6c1d851e85
commit
f3e1413022
23 changed files with 129 additions and 64 deletions
|
@ -8,9 +8,8 @@ namespace gui {
|
|||
using namespace guecs;
|
||||
using std::string;
|
||||
|
||||
OverlayUI::OverlayUI(GameLevel level, TexturePack& textures) :
|
||||
$level(level),
|
||||
$textures(textures)
|
||||
OverlayUI::OverlayUI(GameLevel level) :
|
||||
$level(level)
|
||||
{
|
||||
$gui.position(RAY_VIEW_X, RAY_VIEW_Y, RAY_VIEW_WIDTH, RAY_VIEW_HEIGHT);
|
||||
$gui.layout(
|
||||
|
@ -28,7 +27,7 @@ namespace gui {
|
|||
auto region = $gui.entity(name);
|
||||
world.set<lel::Cell>(region, cell);
|
||||
}
|
||||
$gui.init($textures);
|
||||
$gui.init();
|
||||
}
|
||||
|
||||
void OverlayUI::draw(sf::RenderWindow& window) {
|
||||
|
@ -39,7 +38,7 @@ namespace gui {
|
|||
auto ent = $gui.entity(region);
|
||||
Sprite blood{sprite_name};
|
||||
auto& cell = $gui.cell_for(ent);
|
||||
blood.init(cell, $textures);
|
||||
blood.init(cell);
|
||||
$gui.set<guecs::Sprite>(ent, blood);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue