Push before merge

This commit is contained in:
Ryzerth
2020-09-06 15:39:09 +02:00
parent 7190acfe9e
commit c0825dbeeb
35 changed files with 90 additions and 57 deletions

View File

@@ -9,9 +9,9 @@ namespace icons {
ImTextureID STOP;
ImTextureID MENU;
GLuint loadTexture(char* path) {
GLuint loadTexture(std::string path) {
int w,h,n;
stbi_uc* data = stbi_load(path, &w, &h, &n, NULL);
stbi_uc* data = stbi_load(path.c_str(), &w, &h, &n, NULL);
GLuint texId;
glGenTextures(1, &texId);
glBindTexture(GL_TEXTURE_2D, texId);
@@ -24,9 +24,9 @@ namespace icons {
}
void load() {
LOGO = (ImTextureID)loadTexture("res/icons/sdrpp.png");
PLAY = (ImTextureID)loadTexture("res/icons/play.png");
STOP = (ImTextureID)loadTexture("res/icons/stop.png");
MENU = (ImTextureID)loadTexture("res/icons/menu.png");
LOGO = (ImTextureID)loadTexture(config::getRootDirectory() + "/res/icons/sdrpp.png");
PLAY = (ImTextureID)loadTexture(config::getRootDirectory() + "/res/icons/play.png");
STOP = (ImTextureID)loadTexture(config::getRootDirectory() + "/res/icons/stop.png");
MENU = (ImTextureID)loadTexture(config::getRootDirectory() + "/res/icons/menu.png");
}
}