fixes
This commit is contained in:
@@ -75,6 +75,7 @@ void Assets::extend(const Assets& assets) {
|
|||||||
for (auto entry : assets.atlases) {
|
for (auto entry : assets.atlases) {
|
||||||
atlases[entry.first] = entry.second;
|
atlases[entry.first] = entry.second;
|
||||||
}
|
}
|
||||||
|
animations.clear();
|
||||||
for (auto entry : assets.animations) {
|
for (auto entry : assets.animations) {
|
||||||
animations.emplace_back(entry);
|
animations.emplace_back(entry);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ void TextureAnimator::update(float delta) {
|
|||||||
GL_COLOR_BUFFER_BIT, GL_NEAREST);
|
GL_COLOR_BUFFER_BIT, GL_NEAREST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
frameBuffer->unbind();
|
||||||
for (auto& elem : changedTextures) {
|
for (auto& elem : changedTextures) {
|
||||||
glBindTexture(GL_TEXTURE_2D, elem);
|
glBindTexture(GL_TEXTURE_2D, elem);
|
||||||
glGenerateMipmap(GL_TEXTURE_2D);
|
glGenerateMipmap(GL_TEXTURE_2D);
|
||||||
|
|||||||
Reference in New Issue
Block a user