diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2020-10-15 14:49:37 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2020-10-15 14:49:37 -0400 |
| commit | 26ceced8a3ba2a3a0d5ae8a63018741252fe354c (patch) | |
| tree | d6e535de554ee6b3c871fc63c144a3959a6a2afb | |
| parent | f7d79bd4e21c9a6210c2256fe0f6e560127236c1 (diff) | |
| download | mauri-26ceced8a3ba2a3a0d5ae8a63018741252fe354c.tar.gz mauri-26ceced8a3ba2a3a0d5ae8a63018741252fe354c.tar.bz2 mauri-26ceced8a3ba2a3a0d5ae8a63018741252fe354c.zip | |
add json subproject
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | src/assets.h | 1 | ||||
| -rw-r--r-- | src/mauri.cc | 4 | ||||
| -rw-r--r-- | src/objects/effect.cc | 2 | ||||
| -rw-r--r-- | src/objects/material.cc | 2 | ||||
| -rw-r--r-- | src/objects/model.cc | 2 | ||||
| -rw-r--r-- | src/objects/object.cc | 1 | ||||
| -rw-r--r-- | src/objects/object.h | 1 | ||||
| -rw-r--r-- | src/objects/pass.cc | 1 | ||||
| -rw-r--r-- | src/objects/pass.h | 1 | ||||
| m--------- | subprojects/json | 0 |
11 files changed, 5 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules index 00fb228..ee69460 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "subprojects/glfw"] path = subprojects/glfw url = https://github.com/glfw/glfw.git +[submodule "subprojects/json"] + path = subprojects/json + url = https://github.com/nlohmann/json.git diff --git a/src/assets.h b/src/assets.h index 2f7677f..72fd58b 100644 --- a/src/assets.h +++ b/src/assets.h @@ -5,7 +5,6 @@ #include <iostream> #include <sstream> #include <vector> -#include <jsoncpp/json/json.h> #include "util.h" diff --git a/src/mauri.cc b/src/mauri.cc index 83b7655..3ff975a 100644 --- a/src/mauri.cc +++ b/src/mauri.cc @@ -33,8 +33,8 @@ s32 main(s32 argc, char *argv[]) //Context *context = new ContextX11(2560, 1440, "mauri", true); //Context *context = new ContextGLFW(720, 1280, "mauri", false); - //Context *context = new ContextGLFW(1280, 720, "mauri", false); - Context *context = new ContextX11(1920, 1080, "mauri", false); + Context *context = new ContextGLFW(1280, 720, "mauri", false); + //Context *context = new ContextX11(1920, 1080, "mauri", false); //Context *context = new ContextNull(1920, 1080, "mauri", false); if (argc == 2) diff --git a/src/objects/effect.cc b/src/objects/effect.cc index 6fbf71b..bee93e0 100644 --- a/src/objects/effect.cc +++ b/src/objects/effect.cc @@ -8,8 +8,6 @@ #include "objects/pass.h" -#include <jsoncpp/json/reader.h> - #include <glm/fwd.hpp> using namespace Mauri; diff --git a/src/objects/material.cc b/src/objects/material.cc index b91a26a..6efa2d0 100644 --- a/src/objects/material.cc +++ b/src/objects/material.cc @@ -1,5 +1,3 @@ -#include <jsoncpp/json/json.h> - #include "assets.h" #include "engine.h" #include "json.h" diff --git a/src/objects/model.cc b/src/objects/model.cc index 1ec7424..68aa04b 100644 --- a/src/objects/model.cc +++ b/src/objects/model.cc @@ -1,5 +1,3 @@ -#include <jsoncpp/json/json.h> - #include "assets.h" #include "json.h" #include "log.h" diff --git a/src/objects/object.cc b/src/objects/object.cc index 8613b2a..44b1092 100644 --- a/src/objects/object.cc +++ b/src/objects/object.cc @@ -1,6 +1,5 @@ #include <glm/fwd.hpp> #include <glm/trigonometric.hpp> -#include <jsoncpp/json/json.h> #include <glm/ext/matrix_transform.hpp> #include <glm/glm.hpp> diff --git a/src/objects/object.h b/src/objects/object.h index 24796e5..00cfe86 100644 --- a/src/objects/object.h +++ b/src/objects/object.h @@ -2,7 +2,6 @@ #define _OBJECT_H #include <glm/glm.hpp> -#include <jsoncpp/json/json.h> #include "../engine.h" diff --git a/src/objects/pass.cc b/src/objects/pass.cc index 04eb8e3..eeaf732 100644 --- a/src/objects/pass.cc +++ b/src/objects/pass.cc @@ -1,7 +1,6 @@ #include <cstdio> #include <glm/fwd.hpp> #include <glm/gtc/type_ptr.hpp> -#include <jsoncpp/json/value.h> #include <stdint.h> #include <thread> #include <type_traits> diff --git a/src/objects/pass.h b/src/objects/pass.h index 3e722b8..c5318fb 100644 --- a/src/objects/pass.h +++ b/src/objects/pass.h @@ -2,7 +2,6 @@ #define _PASS_H #include <glm/glm.hpp> -#include <jsoncpp/json/json.h> #include "json.h" #include "context.h" diff --git a/subprojects/json b/subprojects/json new file mode 160000 +Subproject fd7a9f600712b2724463e9f7f703878ade676d6 |