mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-16 04:45:06 +00:00
Code Issues Releases Wiki Activity

Build fixes for Linux, some warnings and compatibility fixes for C++17 and up

Browse source
This commit is contained in:
fgenesis 2023-05-25 16:58:08 +02:00
parent 924bc058b4
commit 74ad8f7804
36 changed files with 126 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

16
BBGE/Core.cpp
View file

@ -2070,22 +2070,18 @@ CountedPtr<Texture> Core::addTexture(const std::string &textureName)
return ptex;
}
void Core::addRenderObject(RenderObject *o, size_t layer)
void Core::addRenderObject(RenderObject *o, unsigned layer)
{
if (!o) return;
assert(o->layer == LR_NONE);
assert(layer < renderObjectLayers.size());
o->layer = layer;
if (layer >= renderObjectLayers.size())
{
std::ostringstream os;
os << "attempted to add render object to invalid layer [" << layer << "]";
errorLog(os.str());
}
renderObjectLayers[layer].add(o);
}
void Core::switchRenderObjectLayer(RenderObject *o, int toLayer)
void Core::switchRenderObjectLayer(RenderObject *o, unsigned toLayer)
{
if (!o) return;
assert(o->layer != LR_NONE);
assert(toLayer < renderObjectLayers.size());
renderObjectLayers[o->layer].remove(o);
renderObjectLayers[toLayer].add(o);
o->layer = toLayer;