merge conficts fixed

1 files changed, 32 insertions, 0 deletions

diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
new file mode 100644
index 0000000..481ef7c
--- /dev/null
+++ b/src/crepe/api/Texture.cpp
@@ -0,0 +1,32 @@
+#include <SDL2/SDL_render.h>
+
+#include "util/log.h"
+
+#include "Asset.h"
+#include "SDLContext.h"
+#include "Texture.h"
+
+using namespace crepe::api;
+using namespace std;
+
+Texture::Texture(unique_ptr<Asset> res) {
+	dbg_trace();
+	this->load(std::move(res));
+}
+
+Texture::Texture(const char * src) {
+	dbg_trace();
+	this->load(make_unique<Asset>(src));
+}
+
+Texture::~Texture() {
+	dbg_trace();
+	if (this->texture != nullptr) {
+		SDL_DestroyTexture(this->texture);
+	}
+}
+
+void Texture::load(unique_ptr<Asset> res) {
+	SDLContext & ctx = SDLContext::get_instance();
+	this->texture = ctx.texture_from_path(res->canonical());
+}