From 98326627f55791d8d2308be3547901c53141d6aa Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 17 Aug 2026 17:27:03 +0300 Subject: [PATCH] revert "fix vcm texture sides" This reverts commit 38bebac37ee2a290315c3148576e98c825efa46d. --- src/coders/vcm.cpp | 12 ++++++------ src/graphics/commons/Model.cpp | 24 ++++++++++++------------ src/graphics/ui/elements/ModelViewer.cpp | 10 +++++----- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/coders/vcm.cpp b/src/coders/vcm.cpp index 3083e1d36..308fb8462 100644 --- a/src/coders/vcm.cpp +++ b/src/coders/vcm.cpp @@ -55,12 +55,12 @@ model::Model VcmModel::squashed() const { } static const std::unordered_map side_indices { - {"east", 0}, - {"west", 1}, - {"bottom", 2}, - {"top", 3}, - {"south", 4}, - {"north", 5}, + {"north", 0}, + {"south", 1}, + {"top", 2}, + {"bottom", 3}, + {"west", 4}, + {"east", 5}, }; static bool to_boolean(const xml::Attribute& attr) { diff --git a/src/graphics/commons/Model.cpp b/src/graphics/commons/Model.cpp index 8c2194775..2de10ad30 100644 --- a/src/graphics/commons/Model.cpp +++ b/src/graphics/commons/Model.cpp @@ -136,18 +136,18 @@ void Mesh::addBox( const bool enabledSides[6], const glm::mat4& transform ) { - if (enabledSides[0]) // east - addPlane(pos-X*size, Z*size, Y*size, -X, uvs[0], transform); - if (enabledSides[1]) // west - addPlane(pos+X*size, -Z*size, Y*size, X, uvs[1] * glm::vec2(-1, 1), transform); - if (enabledSides[2]) // bottom - addPlane(pos-Y*size, X*size, Z*size, -Y, uvs[2], transform); - if (enabledSides[3]) // top - addPlane(pos+Y*size, X*size, -Z*size, Y, uvs[3] * glm::vec2(-1, 1), transform); - if (enabledSides[4]) // south - addPlane(pos-Z*size, -X*size, Y*size, -Z, uvs[4], transform); - if (enabledSides[5]) // north - addPlane(pos+Z*size, X*size, Y*size, Z, uvs[5] * glm::vec2(-1, 1), transform); + if (enabledSides[0]) // north + addPlane(pos+Z*size, X*size, Y*size, Z, uvs[0], transform); + if (enabledSides[1]) // south + addPlane(pos-Z*size, -X*size, Y*size, -Z, uvs[1], transform); + if (enabledSides[2]) // top + addPlane(pos+Y*size, X*size, -Z*size, Y, uvs[2] * glm::vec2(-1), transform); + if (enabledSides[3]) // bottom + addPlane(pos-Y*size, X*size, Z*size, -Y, uvs[3] * glm::vec2(-1, 1), transform); + if (enabledSides[4]) // west + addPlane(pos+X*size, -Z*size, Y*size, X, uvs[4], transform); + if (enabledSides[5]) // east + addPlane(pos-X*size, Z*size, Y*size, -X, uvs[5] * glm::vec2(-1, 1), transform); } void Mesh::scale(const glm::vec3& size) { diff --git a/src/graphics/ui/elements/ModelViewer.cpp b/src/graphics/ui/elements/ModelViewer.cpp index 748eabae5..bfeed086d 100644 --- a/src/graphics/ui/elements/ModelViewer.cpp +++ b/src/graphics/ui/elements/ModelViewer.cpp @@ -83,12 +83,12 @@ static util::TextureRegion determine_texture_region( const Assets& assets, const std::string& texture ) { static std::array faces { - "blocks:dbg_east", - "blocks:dbg_west", - "blocks:dbg_bottom", - "blocks:dbg_top", - "blocks:dbg_south", "blocks:dbg_north", + "blocks:dbg_south", + "blocks:dbg_top", + "blocks:dbg_bottom", + "blocks:dbg_west", + "blocks:dbg_east", }; if (texture.length() < 2 || texture.at(0) != '$') {