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

More removals

Browse Source
This commit is contained in:
CobaltXII
2019-01-03 19:42:24 -05:00
parent 0465bf9a0d
commit a2a5111c7e
2 changed files with 0 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/inc/image.hpp
View File

@@ -210,13 +210,4 @@ std::vector<std::string> all_tex =
"wool_colored_white",
"wool_colored_yellow"
};
// A list of all the files in gui/ (excluding file extensions).
std::vector<std::string> all_gui =
{
"ascii",
"buttons"
};

98
src/inc/texture.hpp
View File

@@ -119,102 +119,4 @@ GLuint load_block_texture_array()
// Return the reference to the texture array.
return texture_array;
}
// A texture that has been loaded on to the CPU and the GPU.
struct complete_texture
{
// The reference to the OpenGL texture.
GLuint storage;
// The dimensions of the texture.
int x_res;
int y_res;
// The channel count of the texture.
int channels;
// The pixels of the texture.
unsigned char* pixels;
};
// Load the interface textures into a std::map mapping the interface texture's
// name to it's complete_texture*.
std::map<std::string, complete_texture*> interface_textures;
void load_interface_textures()
{
for (int i = 0; i < all_gui.size(); i++)
{
// Load the texture.
std::string path = "../gui/" + all_gui[i] + ".png";
GLuint gui_texture;
glGenTextures(1, &gui_texture);
glBindTexture(GL_TEXTURE_2D, gui_texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
int gui_x_res;
int gui_y_res;
int gui_channels;
unsigned char* gui_data = stbi_load(path.c_str(), &gui_x_res, &gui_y_res, &gui_channels, 0);
if (!gui_data)
{
std::cout << "Could not load \"" << path << "\" using stbi_load." << std::endl;
exit(18);
}
if (gui_channels != 4 && gui_channels != 3)
{
std::cout << "Channel count of \"" << path << "\" (" << gui_channels << ") does not match any of the expected channel counts (3 or 4)." << std::endl;
exit(19);
}
if (gui_channels == 4)
{
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, gui_x_res, gui_y_res, 0, GL_RGBA, GL_UNSIGNED_BYTE, gui_data);
}
else
{
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, gui_x_res, gui_y_res, 0, GL_RGB, GL_UNSIGNED_BYTE, gui_data);
}
glBindTexture(GL_TEXTURE_2D, 0);
// Generate a complete_texture* to store in interface_textures.
complete_texture* gui_complete = new complete_texture();
gui_complete->storage = gui_texture;
gui_complete->x_res = gui_x_res;
gui_complete->y_res = gui_y_res;
gui_complete->channels = gui_channels;
gui_complete->pixels = gui_data;
// Add the complete_texture entry to interface_textures.
interface_textures.emplace(all_gui[i], gui_complete);
}
}