3 files changed, 6 insertions, 8 deletions

diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index 044c012..30ae0d7 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -22,11 +22,9 @@ uniform mat4 projView;
 vec3 TransformTextureCoord(vec4 TextureAtlasCoords, vec2 UvCoords, float Layer) {
     float x = TextureAtlasCoords.x;
     float y = TextureAtlasCoords.y;
-    float w = TextureAtlasCoords.z;
+//     float w = TextureAtlasCoords.z;
     float h = TextureAtlasCoords.w;
-    vec2 A = vec2(x, 1 - y - h);
-    vec2 B = vec2(x + w, 1 - y);
-	vec2 transformed = A + UvCoords * (B - A);
+	vec2 transformed = vec2(x, 1 - y - h) + UvCoords * TextureAtlasCoords.zw;
     return vec3(transformed.x, transformed.y, Layer);
 }
 
@@ -42,7 +40,7 @@ void main()
 	texturePos.w = frameHeight;
 	texturePos.y = texturePos.y + currentFrame * frameHeight;
 
-    vs_out.UvPosition = vec2(UvCoordinates.x,UvCoordinates.y);
+    vs_out.UvPosition = UvCoordinates;
     vs_out.Texture = TransformTextureCoord(texturePos,UvCoordinates,TextureLayer);
     vs_out.Color = color;
     vs_out.Light = light;
diff --git a/src/Block.cpp b/src/Block.cpp
index b81a762..85870f6 100644
--- a/src/Block.cpp
+++ b/src/Block.cpp
@@ -11,12 +11,12 @@ static std::map<BlockId, size_t> staticBlockInfo;
 BlockInfo WTFBlock{ true, "", "" };
 
 void RegisterStaticBlockInfo(BlockId blockId, BlockInfo blockInfo) {
-	//NOTE: It can be made thread-safe using incrementer
+	//NOTE: It can be made thread-safe by using atomic incrementer
 	staticBlockInfo[blockId] = blocks.size();
 	blocks.push_back(blockInfo);
 }
 
-BlockInfo* GetBlockInfo(BlockId blockId, Vector blockPos) {
+BlockInfo* GetBlockInfo(BlockId blockId) {
 	auto it = staticBlockInfo.find(blockId);
 	if (it != staticBlockInfo.end())
 		return &blocks.data()[it->second];
diff --git a/src/Block.hpp b/src/Block.hpp
index a9fd881..0fd0e89 100644
--- a/src/Block.hpp
+++ b/src/Block.hpp
@@ -49,4 +49,4 @@ struct BlockInfo {
 
 void RegisterStaticBlockInfo(BlockId blockId, BlockInfo blockInfo);
 
-BlockInfo* GetBlockInfo(BlockId blockId, Vector blockPos = Vector(0,0,0));
+BlockInfo* GetBlockInfo(BlockId blockId);