benkyd/minceraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed block_texture_name_to_layer to block_name_to_layer

Browse Source
This commit is contained in:
CobaltXII
2018-12-28 21:56:58 -05:00
parent 5a82512a20
commit b8ee372bfe
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/inc/texture.hpp
View File

@@ -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<std::string, float> block_texture_name_to_layer;
std::map<std::string, float> 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.

12
src/main.cpp
View File

@@ -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?