mirror of
https://github.com/kuhyx/engineer-thesis-WUT.git
synced 2026-07-04 12:03:05 +02:00
chore: run breakout
This commit is contained in:
parent
81fe93bfa5
commit
10f2b747b8
2
.vscode/tasks.json
vendored
2
.vscode/tasks.json
vendored
@ -22,6 +22,7 @@
|
||||
"-lm",
|
||||
"-ldl",
|
||||
"-pipe",
|
||||
"-Wno-volatile",
|
||||
"-O0"
|
||||
],
|
||||
"options": {
|
||||
@ -58,6 +59,7 @@
|
||||
"-lm",
|
||||
"-ldl",
|
||||
"-pipe",
|
||||
"-Wno-volatile",
|
||||
"-O0"
|
||||
],
|
||||
"options": {
|
||||
|
||||
BIN
breakout/breakout
Normal file → Executable file
BIN
breakout/breakout
Normal file → Executable file
Binary file not shown.
@ -8,8 +8,7 @@
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <fstream>
|
||||
|
||||
#include "../dependencies/include/stb_image.h"
|
||||
#include "./stb_image.h"
|
||||
|
||||
// Instantiate static variables
|
||||
std::map<std::string, Texture2D> ResourceManager::Textures;
|
||||
@ -79,7 +78,7 @@ Shader ResourceManager::loadShaderFromFile(const char *vShaderFile, const char *
|
||||
geometryCode = gShaderStream.str();
|
||||
}
|
||||
}
|
||||
catch (std::exception e)
|
||||
catch (std::exception const&)
|
||||
{
|
||||
std::cout << "ERROR::SHADER: Failed to read shader files" << std::endl;
|
||||
}
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
** Creative Commons, either version 4 of the License, or (at your
|
||||
** option) any later version.
|
||||
******************************************************************/
|
||||
#ifndef BREAKOUT_RESOURCE_MANAGER_HPP_
|
||||
#define BREAKOUT_RESOURCE_MANAGER_HPP_
|
||||
|
||||
#include <map>
|
||||
@ -49,5 +48,3 @@ private:
|
||||
// loads a single texture from file
|
||||
static Texture2D loadTextureFromFile(const char *file, bool alpha);
|
||||
};
|
||||
|
||||
#endif // BREAKOUT_RESOURCE_MANAGER_HPP_
|
||||
Loading…
Reference in New Issue
Block a user