diff options
| author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2019-01-27 14:57:47 +0100 |
|---|---|---|
| committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2019-01-27 15:06:37 +0100 |
| commit | b57a26a7112d19fdee27c99028092463e550119c (patch) | |
| tree | 132863eab01c9f22727bc9057da4d1bf3eb4015d /src/AssetManager.cpp | |
| parent | Basic animated textures support (diff) | |
| download | AltCraft-b57a26a7112d19fdee27c99028092463e550119c.tar AltCraft-b57a26a7112d19fdee27c99028092463e550119c.tar.gz AltCraft-b57a26a7112d19fdee27c99028092463e550119c.tar.bz2 AltCraft-b57a26a7112d19fdee27c99028092463e550119c.tar.lz AltCraft-b57a26a7112d19fdee27c99028092463e550119c.tar.xz AltCraft-b57a26a7112d19fdee27c99028092463e550119c.tar.zst AltCraft-b57a26a7112d19fdee27c99028092463e550119c.zip | |
Diffstat (limited to 'src/AssetManager.cpp')
| -rw-r--r-- | src/AssetManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/AssetManager.cpp b/src/AssetManager.cpp index 9fd49bb..71800d7 100644 --- a/src/AssetManager.cpp +++ b/src/AssetManager.cpp @@ -508,7 +508,6 @@ void ParseBlockModels() { AssetTexture *assetTexture = AssetManager::GetAsset<AssetTexture>(textureName); texture = atlas->GetTexture(assetTexture->id); textureFrames = assetTexture->frames; - texture.h /= textureFrames; if (!(face.second.uv == BlockModel::ElementData::FaceData::Uv{ 0,16,0,16 }) && !(face.second.uv == BlockModel::ElementData::FaceData::Uv{ 0,0,0,0 }) && !(face.second.uv == BlockModel::ElementData::FaceData::Uv{ 0,0,16,16 })) { @@ -533,6 +532,7 @@ void ParseBlockModels() { } parsedFace.texture = glm::vec4{ texture.x,texture.y,texture.w,texture.h }; parsedFace.layer = texture.layer; + parsedFace.frames = textureFrames; if (face.second.tintIndex) parsedFace.color = glm::vec3(0.275, 0.63, 0.1); else |