memory-related refactor
This commit is contained in:
@@ -98,7 +98,7 @@ glshader compile_shader(GLenum type, const GLchar* source, const std::string& fi
|
||||
return glshader(new GLuint(shader), shader_deleter);
|
||||
}
|
||||
|
||||
Shader* Shader::create(
|
||||
std::unique_ptr<Shader> Shader::create(
|
||||
const std::string& vertexFile,
|
||||
const std::string& fragmentFile,
|
||||
const std::string& vertexCode,
|
||||
@@ -125,5 +125,5 @@ Shader* Shader::create(
|
||||
"shader program linking failed:\n"+std::string(infoLog)
|
||||
);
|
||||
}
|
||||
return new Shader(id);
|
||||
return std::make_unique<Shader>(id);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "../../typedefs.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
@@ -36,7 +37,7 @@ public:
|
||||
/// @param vertexSource vertex shader source code
|
||||
/// @param fragmentSource fragment shader source code
|
||||
/// @return linked shader program containing vertex and fragment shaders
|
||||
static Shader* create(
|
||||
static std::unique_ptr<Shader> create(
|
||||
const std::string& vertexFile,
|
||||
const std::string& fragmentFile,
|
||||
const std::string& vertexSource,
|
||||
|
||||
@@ -51,7 +51,7 @@ std::shared_ptr<Menu> GUI::getMenu() {
|
||||
}
|
||||
|
||||
void GUI::onAssetsLoad(Assets* assets) {
|
||||
assets->store(new UiDocument(
|
||||
assets->store(std::make_unique<UiDocument>(
|
||||
"core:root",
|
||||
uidocscript {},
|
||||
std::dynamic_pointer_cast<gui::UINode>(container),
|
||||
|
||||
Reference in New Issue
Block a user