use jLog as a submodule (#142)

* use jLog as a submodule * with submodules in workflow checkouts * update android
JerboaBurrow · Jan 1, 2024 · c748a94 · c748a94
1 parent 143c671
commit c748a94
Show file tree

Hide file tree

Showing 21 changed files with 66 additions and 260 deletions.
diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml
@@ -16,6 +16,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: 'true'
 
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev
@@ -55,6 +57,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: 'true'
 
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev
@@ -161,6 +165,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: 'true'
 
     - name: Install dependencies
       run: |

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -14,6 +14,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: 'true'
 
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "include/jLog"]
+	path = include/jLog
+	url = https://github.com/JerboaBurrow/jLog.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -133,6 +133,7 @@ target_link_libraries(Miniaudio vorbisfile ogg ${CMAKE_DL_LIBS})
 include_directories(include include/vendored ${OPENGL_INCLUDE_DIRS} ${GLEW_INCLUDE} ${ZLIB_DEPS_DIR})
 
 include_directories(src)
+include_directories(include/jLog)
 
 file(GLOB SRC 
     "src/*.cpp"
@@ -173,7 +174,9 @@ endif()
 
 add_library(FreeType ALIAS freetype)
 
-add_subdirectory(tools/)
+if (NOT ANDROID)
+    add_subdirectory(tools/)
+endif ()
 
 IF (BUILD_DEMOS)
 

diff --git a/demo/android/perlinWorld/app/src/main/cpp/hopAndroid.cpp b/demo/android/perlinWorld/app/src/main/cpp/hopAndroid.cpp
@@ -29,7 +29,7 @@
 
 #include <Util/util.h>
 
-#include <log.h>
+#include <jLog/jLog.h>
 
 using Hop::Object::Component::cTransform;
 using Hop::Object::Component::cPhysics;
@@ -59,8 +59,8 @@ using Hop::World::AbstractWorld;
 using Hop::World::TileWorld;
 using Hop::World::MarchingWorld;
 
-using Hop::Logging::INFO;
-using Hop::Logging::WARN;
+using jLog::INFO;
+using jLog::WARN;
 
 static Boundary * boundary = nullptr;
 static PerlinSource * perlin = nullptr;
@@ -69,7 +69,7 @@ static MarchingWorld * world = nullptr;
 
 static EntityComponentSystem * manager = nullptr;
 
-static Hop::Logging::Log * hopLog = nullptr;
+static jLog::Log * hopLog = nullptr;
 
 static sPhysics * physics = nullptr;
 static sCollision * collisions = nullptr;
@@ -133,7 +133,7 @@ extern "C"
             textRenderer = new Hop::System::Rendering::TextRenderer(glm::ortho(0.0,double(resX),0.0,double(resY)));
             font = new Hop::System::Rendering::Type(48);
 
-            hopLog = new Hop::Logging::Log;
+            hopLog = new jLog::Log;
 
             manager = new EntityComponentSystem;
 

diff --git a/demo/desktop/perlinWorld/sfml/sfmlPerlinWorld.cpp b/demo/desktop/perlinWorld/sfml/sfmlPerlinWorld.cpp
@@ -37,7 +37,7 @@ using namespace std::chrono;
 #include <Console/console.h>
 
 #include <Util/util.h>
-#include <log.h>
+#include <jLog/jLog.h>
 
 #include <Debug/collisionMeshDebug.h>
 
@@ -83,8 +83,8 @@ using Hop::World::AbstractWorld;
 using Hop::World::TileWorld;
 using Hop::World::MarchingWorld;
 
-using Hop::Logging::INFO;
-using Hop::Logging::WARN;
+using jLog::INFO;
+using jLog::WARN;
 
 using Hop::Util::fixedLengthNumber;
 
@@ -116,7 +116,7 @@ int main(int argc, char ** argv)
 
   EntityComponentSystem manager;
 
-  Hop::Logging::Log log;
+  jLog::Log log;
 
   Hop::Console console(log);
 

diff --git a/demo/desktop/perlinWorld/standalone/perlinWorld.cpp b/demo/desktop/perlinWorld/standalone/perlinWorld.cpp
@@ -31,7 +31,7 @@ using namespace std::chrono;
 #include <Console/console.h>
 
 #include <Util/util.h>
-#include <log.h>
+#include <jLog/jLog.h>
 
 const int resX = 1000;
 const int resY = 1000;
@@ -72,8 +72,8 @@ using Hop::World::AbstractWorld;
 using Hop::World::TileWorld;
 using Hop::World::MarchingWorld;
 
-using Hop::Logging::INFO;
-using Hop::Logging::WARN;
+using jLog::INFO;
+using jLog::WARN;
 
 using Hop::Util::fixedLengthNumber;
 
@@ -88,7 +88,7 @@ int main(int argc, char ** argv)
 
     EntityComponentSystem manager;
 
-    Hop::Logging::Log log;
+    jLog::Log log;
 
     Hop::Console console(log);
 

diff --git a/demo/desktop/softBodyTetris/sfml/main.cpp b/demo/desktop/softBodyTetris/sfml/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char ** argv)
 
   EntityComponentSystem manager;
 
-  Hop::Logging::Log log;
+  jLog::Log log;
 
   Hop::Console console(log);
 

diff --git a/demo/desktop/softBodyTetris/sfml/main.h b/demo/desktop/softBodyTetris/sfml/main.h
@@ -40,7 +40,7 @@ using namespace std::chrono;
 #include <Console/console.h>
 
 #include <Util/util.h>
-#include <log.h>
+#include <jLog/jLog.h>
 
 #include <Debug/collisionMeshDebug.h>
 
@@ -84,8 +84,8 @@ using Hop::World::Boundary;
 using Hop::World::AbstractWorld;
 using Hop::World::TileWorld;
 
-using Hop::Logging::INFO;
-using Hop::Logging::WARN;
+using jLog::INFO;
+using jLog::WARN;
 
 using Hop::Util::fixedLengthNumber;
 

diff --git a/demo/desktop/softBodyTetris/standalone/main.cpp b/demo/desktop/softBodyTetris/standalone/main.cpp
@@ -11,7 +11,7 @@ int main(int argc, char ** argv)
 
     EntityComponentSystem manager;
 
-    Hop::Logging::Log log;
+    jLog::Log log;
 
     Hop::Console console(log);
 

diff --git a/demo/desktop/softBodyTetris/standalone/main.h b/demo/desktop/softBodyTetris/standalone/main.h
@@ -37,7 +37,7 @@ using namespace std::chrono;
 #include <Debug/collisionMeshDebug.h>
 
 #include <Util/util.h>
-#include <log.h>
+#include <jLog/jLog.h>
 
 const int resX = 1000;
 const int resY = 1000;
@@ -77,8 +77,8 @@ using Hop::World::MapSource;
 using Hop::World::Boundary;
 using Hop::World::AbstractWorld;
 using Hop::World::TileWorld;
-using Hop::Logging::INFO;
-using Hop::Logging::WARN;
+using jLog::INFO;
+using jLog::WARN;
 
 using Hop::Util::fixedLengthNumber;
 

diff --git a/include/Console/console.h b/include/Console/console.h
@@ -9,7 +9,7 @@
 #include <Console/LuaTable.h>
 #include <System/Physics/sPhysics.h>
 #include <System/Physics/sCollision.h>
-#include <log.h>
+#include <jLog/jLog.h>
 #include <Object/id.h>
 
 #include <memory>
@@ -24,11 +24,11 @@ namespace Hop
     using Hop::System::Physics::sPhysics;
     using Hop::System::Physics::sCollision;
 
-    using Hop::Logging::INFO;
-    using Hop::Logging::WARN;
-    using Hop::Logging::ERROR;
-    using Hop::Logging::Log;
-    using Hop::Logging::ERRORCODE;
+    using jLog::INFO;
+    using jLog::WARN;
+    using jLog::ERROR;
+    using jLog::Log;
+    using jLog::ERRORCODE;
 
     struct Routine 
     {

diff --git a/include/Shader/shaders.h b/include/Shader/shaders.h
@@ -9,7 +9,7 @@
 #include <fstream>
 #include <exception>
 #include <memory>
-#include <log.h>
+#include <jLog/jLog.h>
 
 namespace Hop::System::Rendering
 {
@@ -72,7 +72,7 @@ namespace Hop::System::Rendering
             return this->vertex == s.vertex && this->fragment == s.fragment;
         }
 
-        bool lint(Hop::Logging::Log & log);
+        bool lint(jLog::Log & log);
 
     private:
 
@@ -91,13 +91,13 @@ namespace Hop::System::Rendering
 
         Shaders(){}
 
-        void defaultShaders(Hop::Logging::Log & log);
+        void defaultShaders(jLog::Log & log);
 
         void makeShader(
             const char * v, 
             const char * f,
             std::string n,
-            Hop::Logging::Log & log
+            jLog::Log & log
         );
 
         void remove(std::string n);

diff --git a/include/System/Rendering/sRender.h b/include/System/Rendering/sRender.h
@@ -1,12 +1,12 @@
-#ifndef SRENDER
-#define SRENDER
+#ifndef SRENDER_H
+#define SRENDER_H
 
 #include <System/system.h>
 #include <System/Rendering/sSpriteRender.h>
 #include <Shader/shaders.h>
 #include <Object/entityComponentSystem.h>
 #include <World/world.h>
-#include <log.h>
+#include <jLog/jLog.h>
 
 namespace Hop::Object
 {
@@ -16,7 +16,7 @@ namespace Hop::Object
 namespace Hop::System::Rendering
 {
     using Hop::Object::EntityComponentSystem;
-    using Hop::Logging::Log;
+    using jLog::Log;
     using Hop::World::AbstractWorld;
 
     class sRender : public System
@@ -55,4 +55,4 @@ namespace Hop::System::Rendering
     };
 }
 
-#endif /* SRENDER */
+#endif /* SRENDER_H */
diff --git a/include/System/Sound/sSound.h b/include/System/Sound/sSound.h
@@ -6,7 +6,7 @@
 #include <miniaudio/miniaudio.h>
 #include <System/Sound/vorbis.h>
 
-#include <log.h>
+#include <jLog/jLog.h>
 #include <sstream>
 
 #include <Object/entityComponentSystem.h>
@@ -83,10 +83,10 @@ namespace Hop::System::Sound
 
                 if (result != MA_SUCCESS)
                 {
-                    Hop::Logging::Log log;
+                    jLog::Log log;
                     std::stringstream ss;
                     ss << "Could not decode audio file: " << filename << ", got error: " << to_string(result);
-                    Hop::Logging::ERROR(ss.str()) >> log;
+                    jLog::ERROR(ss.str()) >> log;
                 }
 
                 if (decoderInUse == DECODER::MA)

diff --git a/include/jLog b/include/jLog