mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-10 05:21:49 +00:00
fixes
This commit is contained in:
parent
5c36f59b4f
commit
b4bf0dd0f7
2 changed files with 2 additions and 0 deletions
|
|
@ -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);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue