diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-04 00:59:32 +0100 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-04 00:59:32 +0100 |
| commit | 81b2d1591d348ee7972d174a2ba2dee8dc7cea96 (patch) | |
| tree | 078dc35034b2dfdfdc7d849bad136b210390de87 | |
| parent | d4eae8dfc1fcf68e198205b9bab7574b4c17cc66 (diff) | |
| download | YAGE-81b2d1591d348ee7972d174a2ba2dee8dc7cea96.tar.gz YAGE-81b2d1591d348ee7972d174a2ba2dee8dc7cea96.zip | |
Adding rapidjson
| -rw-r--r-- | .dir-locals.el | 10 | ||||
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | include/YAGE/camera2d.h | 6 | ||||
| -rw-r--r-- | include/YAGE/imageloader.h | 1 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 4 | ||||
| m--------- | lib/rapidjson | 0 | ||||
| m--------- | lib/yajl | 0 | ||||
| -rw-r--r-- | src/sprite.cpp | 3 |
8 files changed, 16 insertions, 14 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index 40c788b1..4bc48695 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -5,10 +5,16 @@ (list (concat "-I" (projectile-project-root) "include"))))) (setq company-clang-arguments (delete-dups (append company-clang-arguments - (list (concat "-I" (projectile-project-root) "googletest/googletest/include"))))) + (list (concat "-I" (projectile-project-root) "lib/googletest/googletest/include"))))) + (setq company-clang-arguments (delete-dups (append + company-clang-arguments + (list (concat "-I" (projectile-project-root) "lib/yajl/include"))))) (setq flycheck-clang-include-path (delete-dups (append flycheck-clang-include-path (list (concat (projectile-project-root) "include"))))) (setq flycheck-clang-include-path (delete-dups (append flycheck-clang-include-path - (list (concat (projectile-project-root) "googletest/googletest/include")))))))))) + (list (concat (projectile-project-root) "lib/googletest/googletest/include"))))) + (setq flycheck-clang-include-path (delete-dups (append + flycheck-clang-include-path + (list (concat (projectile-project-root) "lib/yajl/include")))))))))) diff --git a/.gitmodules b/.gitmodules index a14871fc..4c4e97f3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ path = lib/googletest url = https://github.com/google/googletest branch = master -[submodule "lib/yajl"] - path = lib/yajl - url = git://github.com/lloyd/yajl +[submodule "lib/rapidjson"] + path = lib/rapidjson + url = https://github.com/miloyip/rapidjson branch = master diff --git a/include/YAGE/camera2d.h b/include/YAGE/camera2d.h index a50544a4..a60893ac 100644 --- a/include/YAGE/camera2d.h +++ b/include/YAGE/camera2d.h @@ -6,8 +6,8 @@ * ---------------------------------------------------------------------------- */ -#ifndef CAMERA_2D_H -#define CAMERA_2D_H +#ifndef YAGE_CAMERA2D_H +#define YAGE_CAMERA2D_H #include "glslprogram.h" @@ -29,9 +29,7 @@ private: public: Camera2D(int screen_width = 1280, int screen_height = 720); - // update camera location void update(GlslProgram &program); - // camera movement void move(const glm::vec2 &direction); }; diff --git a/include/YAGE/imageloader.h b/include/YAGE/imageloader.h index ab6a3569..8d5c5cd1 100644 --- a/include/YAGE/imageloader.h +++ b/include/YAGE/imageloader.h @@ -20,7 +20,6 @@ class ImageLoader { public: static Texture loadPng(const std::string &file_path); - static Texture loadSpriteSheet(const std::string &file_path); }; } // namespace yage diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1a413c1e..35eca5a5 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -11,7 +11,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) # Add googletest directly to our build. This defines # the gtest and gtest_main targets. -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest/) # The gtest/gtest_main targets carry header search path # dependencies automatically when using CMake 2.8.11 or @@ -19,3 +19,5 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest) if (CMAKE_VERSION VERSION_LESS 2.8.11) include_directories("${gtest_SOURCE_DIR}/include") endif() + +add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/yajl") diff --git a/lib/rapidjson b/lib/rapidjson new file mode 160000 +Subproject f05edc9296507a9864d99931e203631c2ffd8d4 diff --git a/lib/yajl b/lib/yajl deleted file mode 160000 -Subproject 5e3a7856e643b4d6410ddc3f84bc2f38174f287 diff --git a/src/sprite.cpp b/src/sprite.cpp index ffd8a44b..68e08e5d 100644 --- a/src/sprite.cpp +++ b/src/sprite.cpp @@ -6,9 +6,6 @@ * ---------------------------------------------------------------------------- */ -/** @file - */ - #include <YAGE/sprite.h> #include <YAGE/resourcemanager.h> #include <YAGE/vertex.h> |