From b8ee372bfe2fc99c096553d1d00eb4d8187f0f60 Mon Sep 17 00:00:00 2001 From: CobaltXII Date: Fri, 28 Dec 2018 21:56:58 -0500 Subject: [PATCH] Renamed block_texture_name_to_layer to block_name_to_layer --- src/inc/texture.hpp | 4 ++-- src/main.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/inc/texture.hpp b/src/inc/texture.hpp index 828aa73..013c355 100644 --- a/src/inc/texture.hpp +++ b/src/inc/texture.hpp @@ -6,7 +6,7 @@ // Generates a std::map that maps block texture names to layer indices in a 2D // texture array. Returns the OpenGL identifier of that 2D texture array. -std::map block_texture_name_to_layer; +std::map block_name_to_layer; GLuint load_block_texture_array() { @@ -78,7 +78,7 @@ GLuint load_block_texture_array() // Add to map. - block_texture_name_to_layer.emplace(all_tex[i], float(i)); + block_name_to_layer.emplace(all_tex[i], float(i)); } // Generate the texture array. diff --git a/src/main.cpp b/src/main.cpp index 0c321a7..2c9695c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -230,17 +230,17 @@ int main(int argc, char** argv) // What is the layer number of each face? - float layer_top = block_texture_name_to_layer.at("grass_top"); + float layer_top = block_name_to_layer.at("grass_top"); - float layer_bottom = block_texture_name_to_layer.at("dirt"); + float layer_bottom = block_name_to_layer.at("dirt"); - float layer_left = block_texture_name_to_layer.at("grass_side"); + float layer_left = block_name_to_layer.at("grass_side"); - float layer_right = block_texture_name_to_layer.at("grass_side"); + float layer_right = block_name_to_layer.at("grass_side"); - float layer_front = block_texture_name_to_layer.at("grass_side"); + float layer_front = block_name_to_layer.at("grass_side"); - float layer_back = block_texture_name_to_layer.at("grass_side"); + float layer_back = block_name_to_layer.at("grass_side"); // What is the lighting value of each face?