From f7d79bd4e21c9a6210c2256fe0f6e560127236c1 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Thu, 15 Oct 2020 14:12:39 -0400
Subject: cleanup build

---
 src/objects/effect.cc |  7 ++++---
 src/objects/object.cc | 13 ++++++++-----
 src/objects/pass.cc   |  1 -
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/objects')

diff --git a/src/objects/effect.cc b/src/objects/effect.cc
index 1ab5a96..6fbf71b 100644
--- a/src/objects/effect.cc
+++ b/src/objects/effect.cc
@@ -4,14 +4,12 @@
 #include "../log.h"
 
 #include "effect.h"
-#include "fmt/core.h"
 #include "object.h"
 
 #include "objects/pass.h"
 
 #include <jsoncpp/json/reader.h>
 
-#include <fmt/format.h>
 #include <glm/fwd.hpp>
 
 using namespace Mauri;
@@ -47,7 +45,10 @@ Effect::Effect(Parser &p, json &root)
 
 void Effect::load(Engine *engine, Object *object, bool last)
 {
-    buffer_id = fmt::format("_{}_{}", object->id, id);
+    std::stringstream _buffer_id;
+    _buffer_id << "_" << object->id << "_" << id;
+
+    buffer_id = _buffer_id.str();
 
     for (auto &fbo : fbos)
     {
diff --git a/src/objects/object.cc b/src/objects/object.cc
index 1ed2053..8613b2a 100644
--- a/src/objects/object.cc
+++ b/src/objects/object.cc
@@ -6,13 +6,10 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
-#include <fmt/core.h>
-
 #include "../gl.h"
 #include "../json.h"
 #include "../log.h"
 
-#include "fmt/format.h"
 #include "objects/effect.h"
 #include "objects/model.h"
 #include "objects/object.h"
@@ -117,8 +114,14 @@ void Object::load(Engine *engine)
         origin[1] = size[1] / 2.f;
     }
 
-    buffer_a = fmt::format("_rt_imageLayerComposite_{}_a", id);
-    buffer_b = fmt::format("_rt_imageLayerComposite_{}_b", id);
+
+    std::stringstream _buffer_a, _buffer_b;
+
+    _buffer_a << "_rt_imageLayerComposite_" << id << "_a";
+    _buffer_b << "_rt_imageLayerComposite_" << id << "_b";
+
+    buffer_a = _buffer_a.str();
+    buffer_b = _buffer_b.str();
 
     engine->create_framebuffer(buffer_a, size[0], size[1], 1.f);
     engine->create_framebuffer(buffer_b, size[0], size[1], 1.f);
diff --git a/src/objects/pass.cc b/src/objects/pass.cc
index 689dda4..04eb8e3 100644
--- a/src/objects/pass.cc
+++ b/src/objects/pass.cc
@@ -1,5 +1,4 @@
 #include <cstdio>
-#include <fmt/core.h>
 #include <glm/fwd.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <jsoncpp/json/value.h>
-- 
cgit v1.2.3-101-g0448