Merge branch '193-add-the-new-json-for-modern-c-lib' into 'master'

Resolve "Add the new "JSON for Modern C++" lib" Closes aerys#193 See merge request aerys/smartshape-engine!188
CitrusForks · Apr 2, 2020 · 3515f5b · 3515f5b
2 parents 2190f20 + d7c5876
commit 3515f5b
Show file tree

Hide file tree

Showing 16 changed files with 23,231 additions and 8,400 deletions.
diff --git a/cmake/project.cmake b/cmake/project.cmake
@@ -134,7 +134,7 @@ function (minko_add_executable target_name sources)
         "${MINKO_HOME}/framework/include"
         "${MINKO_HOME}/framework/lib/glm"
         "${MINKO_HOME}/framework/lib/sparsehash/src"
-        "${MINKO_HOME}/framework/lib/jsoncpp/src"
+        "${MINKO_HOME}/framework/lib/jsonmoderncpp"
     )
 
     if (WIN32)

diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
@@ -18,11 +18,8 @@ file (GLOB_RECURSE FRAMEWORK_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/asset/*"
 )
 
-file (GLOB_RECURSE JSON_CPP_SRC
-    "${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp/src/*.hpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp/src/*.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp/src/*.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp/src/*.c"
+file (GLOB_RECURSE JSON_MODERN_CPP
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/jsonmoderncpp/include/nlohmann/*.hpp"
 )
 
 file (GLOB_RECURSE GLM_SRC
@@ -63,7 +60,7 @@ endif ()
 
 list (APPEND
     COMMON_SOURCES
-    ${JSON_CPP_SRC}
+    ${JSON_MODERN_CPP}
     ${GLM_SRC}
     ${FRAMEWORK_SRC}
     ${GLEW_SRC}
@@ -87,7 +84,7 @@ target_include_directories (minko-framework
     PUBLIC
     "include"
     "src"
-    "lib/jsoncpp/src"
+    "lib/jsonmoderncpp/include"
     "lib/glm"
     "lib/sparsehash/src"
 )

diff --git a/framework/enable.cmake b/framework/enable.cmake
@@ -16,7 +16,7 @@ function (minko_enable_framework target)
         "${MINKO_HOME}/framework/include"
         "${MINKO_HOME}/framework/lib/glm"
         "${MINKO_HOME}/framework/lib/sparsehash/src"
-        "${MINKO_HOME}/framework/lib/jsoncpp/src"
+        "${MINKO_HOME}/framework/lib/jsonmoderncpp/include"
     )
     if (WIN32)
         list (

diff --git a/framework/include/minko/file/EffectParser.hpp b/framework/include/minko/file/EffectParser.hpp
@@ -61,7 +61,7 @@ namespace minko
             typedef std::unordered_map<LoaderPtr, Signal<LoaderPtr>::Slot>  LoaderCompleteSlotMap;
             typedef std::unordered_map<LoaderPtr, LoaderErrorSlot>          LoaderErrorSlotMap;
 
-            typedef minko::file::JSON::Value                                JSONValue;
+            typedef minko::file::JSON::json                              JSONValue;
 
             enum class GLSLBlockType
             {
@@ -420,6 +420,12 @@ namespace minko
             ShaderPtr
             parseShader(const JSONValue& node, const Scope& scope, render::Shader::Type type);
 
+            std::vector<unsigned char>
+            replaceBreakLine(std::vector<unsigned char> &data);
+
+            std::string
+            undoBreakLine(const std::string &node);
+
             void
             parseGLSL(const std::string&        glsl,
                       OptionsPtr                options,

diff --git a/framework/include/minko/file/JSON.hpp b/framework/include/minko/file/JSON.hpp
@@ -19,15 +19,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SO
 
 #pragma once
 
-#include "json/json.h"
+#include "nlohmann/json.hpp"
 
 namespace minko
 {
     namespace file
     {
         namespace JSON
         {
-            using namespace Json;
+            using namespace nlohmann;
         }
     }
 }
diff --git a/framework/lib/jsoncpp/LICENSE b/framework/lib/jsoncpp/LICENSE