From 816967182c31c7b20e43b9e208b8aafdd8073214 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Thu, 15 Oct 2020 15:35:03 -0400
Subject: wip

---
 src/assets.cc         |  2 +-
 src/engine.cc         |  4 ++--
 src/objects/effect.cc |  2 +-
 src/objects/object.cc | 12 +++++-------
 src/objects/pass.cc   |  2 +-
 src/shader.cc         |  4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/assets.cc b/src/assets.cc
index 789ba2e..9e233f3 100644
--- a/src/assets.cc
+++ b/src/assets.cc
@@ -114,7 +114,7 @@ bool AssetManager::load_package(const std::string &path)
 
     for (auto i = 0; i < count; i++)
     {
-        pkg_files.emplace_back((PkgFile) {
+        pkg_files.emplace_back(PkgFile {
             pkg->reads(pkg->read<u32>()),
             pkg->read<u32>(),
             pkg->read<u32>()
diff --git a/src/engine.cc b/src/engine.cc
index 98de4aa..2ee3a49 100644
--- a/src/engine.cc
+++ b/src/engine.cc
@@ -72,7 +72,7 @@ Engine::Engine(Scene *scene, Context *context, Parser *parser, bool audio)
     default_object = new RenderObject(DEFAULT);
 
     default_model = mat4x4(1.f);
-    default_model_flipped = glm::scale(default_model, (vec3){1.f, -1.f, 1.f});
+    default_model_flipped = glm::scale(default_model, vec3{1.f, -1.f, 1.f});
 
     scene->load(this);
 
@@ -143,7 +143,7 @@ void Engine::draw()
 {
     for (auto& buffer : framebuffers)
     {
-        buffer->buffer->clear((vec4){0.f, 0.f, 0.f, 0.f});
+        buffer->buffer->clear(vec4{0.f, 0.f, 0.f, 0.f});
     }
 
     if (scene->clear_enabled)
diff --git a/src/objects/effect.cc b/src/objects/effect.cc
index bee93e0..854ec2d 100644
--- a/src/objects/effect.cc
+++ b/src/objects/effect.cc
@@ -37,7 +37,7 @@ Effect::Effect(Parser &p, json &root)
 
     for (auto &fbo : file["fbos"])
     {
-        fbos.emplace_back((EffectBuffer) { fbo["name"], fbo["scale"] });
+        fbos.emplace_back(EffectBuffer { fbo["name"], fbo["scale"] });
     }
 }
 
diff --git a/src/objects/object.cc b/src/objects/object.cc
index 44b1092..600e2a6 100644
--- a/src/objects/object.cc
+++ b/src/objects/object.cc
@@ -56,13 +56,13 @@ void Object::get_model(f32 width, f32 height, bool flip)
 {
     model = mat4x4(1.f);
 
-    model = glm::translate(model, (vec3){-width, -height, 0.f});
+    model = glm::translate(model, vec3{-width, -height, 0.f});
 
     model = glm::translate(model, origin * 2.f);
 
-    model = glm::rotate(model, angles[0], (vec3){1.f, 0.f, 0.f});
-    model = glm::rotate(model, angles[1], (vec3){0.f, 1.f, 0.f});
-    model = glm::rotate(model, angles[2], (vec3){0.f, 0.f, 1.f});
+    model = glm::rotate(model, angles[0], vec3{1.f, 0.f, 0.f});
+    model = glm::rotate(model, angles[1], vec3{0.f, 1.f, 0.f});
+    model = glm::rotate(model, angles[2], vec3{0.f, 0.f, 1.f});
 
     model = glm::scale(model, scale);
 
@@ -70,7 +70,7 @@ void Object::get_model(f32 width, f32 height, bool flip)
 
     if (flip)
     {
-        model = glm::scale(model, (vec3){1.f, -1.f, 1.f});
+        model = glm::scale(model, vec3{1.f, -1.f, 1.f});
     }
 
     model = _ortho * model;
@@ -208,8 +208,6 @@ Object::~Object()
     delete gl_object;
     delete gl_uv_object;
 
-    //delete blend_shader;
-
     for (auto &pass : passes)
     {
         delete pass;
diff --git a/src/objects/pass.cc b/src/objects/pass.cc
index eeaf732..b193234 100644
--- a/src/objects/pass.cc
+++ b/src/objects/pass.cc
@@ -87,7 +87,7 @@ Pass::Pass(Parser &p, json &root, PassStage stage)
 
     for (auto &combo : root["combos"].items())
     {
-        combos.emplace_back((Combo) { combo.key(), combo.value() });
+        combos.emplace_back(Combo { combo.key(), combo.value() });
     }
 }
 
diff --git a/src/shader.cc b/src/shader.cc
index c0df777..245a6de 100644
--- a/src/shader.cc
+++ b/src/shader.cc
@@ -116,7 +116,7 @@ void Shader::build_shader_source(Parser *p, const std::string &isource, std::str
                     auto combo = root["combo"];
 
                     if (!combo.is_null())
-                        combos.emplace_back((Combo) { .name = combo, .value = 1 });
+                        combos.emplace_back(Combo { combo, 1 });
 
                     break;
                 }
@@ -142,7 +142,7 @@ void Shader::build_shader_source(Parser *p, const std::string &isource, std::str
 
             auto root = json::parse(combo);
 
-            combos.emplace_back((Combo) { root["combo"], root["default"] });
+            combos.emplace_back(Combo { root["combo"], root["default"] });
         }
 
         if (!cut_line) res += line + "\n";
-- 
cgit v1.2.3-101-g0448