Merge pull request #56 from CapsCollective/feature/raylib-removal

Removed core dependency on raylib, migrated game example render and input to internal modules

Author: Raelr

.github/workflows/tests.yml

@@ -25,9 +25,6 @@ jobs:
     - name: install glfw dependencies
       run: sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
 
-    - name: install raylib dependencies
-      run: sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
-
     - name: perform setup
       run: ./scripts/setup.sh
 

.github/workflows/ubuntu.yml

@@ -25,9 +25,6 @@ jobs:
     - name: install glfw dependencies
       run: sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
 
-    - name: install raylib dependencies
-      run: sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
-
     - name: perform setup
       run: ./scripts/setup.sh
 

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "vendor/glm"]
 	path = vendor/glm
 	url = https://github.com/g-truc/glm.git
-[submodule "vendor/raylib-cpp"]
-	path = vendor/raylib-cpp
-	url = https://github.com/robloach/raylib-cpp
 [submodule "vendor/utest.h"]
 	path = vendor/utest.h
 	url = https://github.com/sheredom/utest.h

Makefile

@@ -71,7 +71,7 @@ $(renderLib): buildFlags $(utilsLib) $(windowLib)
 $(testApp): buildFlags $(utilsLib) $(coreLib)
 	"$(MAKE)" -C $(testsDir) CXXFLAGS="$(CXXFLAGS)"
 
-$(exampleGameApp): buildFlags $(coreLib)
+$(exampleGameApp): buildFlags $(renderLib) $(coreLib)
 	"$(MAKE)" -C $(examplesDir)/game CXXFLAGS="$(CXXFLAGS)"
 
 $(exampleRenderApp): buildFlags $(renderLib)

engine/core/Makefile

@@ -20,31 +20,16 @@ ifeq ($(platform), windows)
 else ifeq ($(platform), macos)
     libGenDir := src
 endif
-raylibIncludeDir := $(vendorDir)/include/raylib
-raylibLib := $(vendorDir)/raylib-cpp/vendor/raylib/$(libGenDir)/libraylib.a
 
 # Build the static library
-$(coreLib): $(raylibLib) $(raylibIncludeDir) $(coreObjects)
+$(coreLib): $(coreObjects)
 	$(MKDIR) $(call platformpth, $(libDir))
-	$(RM) $(call platformpth, $(coreLib))
-	$(call COMBINE_LIBS, $(vendorDir)/raylib-cpp/vendor/raylib/$(libGenDir)/libraylib.a, $(coreObjects), $(libDir), core)
+	ar -crs $(coreLib) $(coreObjects)
 
 # Add all rules from dependency files
 -include $(coreDepends)
 
 # Compile object files to the bin directory
 $(coreBinDir)/%.o: $(coreSrcDir)/%.cpp
 	$(MKDIR) $(call platformpth, $(@D))
-	$(CXX) -MMD -MP -c $(compileFlags) -I $(raylibIncludeDir) -I $(engineDir) $< -o $@ $(CXXFLAGS)
-
-# TODO move this into setup file
-# Copy the relevant header files into includes
-$(raylibIncludeDir):
-	$(MKDIR) $(call platformpth, $(raylibIncludeDir)/raylib)
-	$(call COPY,$(vendorDir)/raylib-cpp/vendor/raylib/src,$(raylibIncludeDir)/raylib,raylib.h,**)
-	$(call COPY,$(vendorDir)/raylib-cpp/vendor/raylib/src,$(raylibIncludeDir)/raylib,raymath.h,**)
-	$(call COPY,$(vendorDir)/raylib-cpp/include,$(raylibIncludeDir)/raylib,*.hpp)
-
-# Build the raylib static library file
-$(raylibLib):
-	"$(MAKE)" -C $(vendorDir)/raylib-cpp/vendor/raylib/src PLATFORM=PLATFORM_DESKTOP
+	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)

engine/core/render/ResourceSystem.cpp renamed to engine/core/ResourceSystem.cpp

@@ -8,7 +8,6 @@
 
 #include "ResourceSystem.h"
 
-#include <raylib/raylib-cpp.hpp>
 #include <vector>
 
 namespace Siege
@@ -20,15 +19,15 @@ static std::map<String, Texture> textures = std::map<String, Texture>();
 void ResourceSystem::RegisterModel(const String& path)
 {
     String fullPath = baseDir + path;
-    if (models.find(fullPath) != models.end()) return;
-    models[fullPath] = LoadModel(fullPath);
+    //    if (models.find(fullPath) != models.end()) return;
+    //    models[fullPath] = LoadModel(fullPath);
 }
 
 void ResourceSystem::RegisterTexture(const String& path)
 {
     String fullPath = baseDir + path;
-    if (textures.find(fullPath) != textures.end()) return;
-    textures[fullPath] = LoadTexture(fullPath);
+    //    if (textures.find(fullPath) != textures.end()) return;
+    //    textures[fullPath] = LoadTexture(fullPath);
 }
 
 void* ResourceSystem::GetModel(const String& path)
@@ -50,23 +49,23 @@ void ResourceSystem::FreeResources()
     // Iterate over vectors backwards to avoid memory issues
     for (auto i = freedModels.rbegin(); i != freedModels.rend(); i++)
     {
-        UnloadModel(**i);
+        //        UnloadModel(**i);
     }
     freedModels.clear();
     models.clear();
 
     for (auto i = freedTextures.rbegin(); i != freedTextures.rend(); i++)
     {
-        UnloadTexture(**i);
+        //        UnloadTexture(**i);
     }
     freedTextures.clear();
     textures.clear();
 }
 
 void ResourceSystem::ClearResources()
 {
-    for (auto& model : models) freedModels.push_back(&model.second);
-    for (auto& texture : textures) freedTextures.push_back(&texture.second);
+    //    for (auto& model : models) freedModels.push_back(&model.second);
+    //    for (auto& texture : textures) freedTextures.push_back(&texture.second);
 }
 
 void ResourceSystem::SetBaseDirectory(const String& dir)

engine/core/render/ResourceSystem.h renamed to engine/core/ResourceSystem.h

@@ -14,8 +14,11 @@
 #include <map>
 #include <vector>
 
-typedef struct Model Model;
-typedef struct Texture Texture;
+struct Model
+{};
+
+struct Texture
+{};
 
 namespace Siege
 {

engine/core/Statics.cpp

@@ -8,10 +8,8 @@
 
 #include "Statics.h"
 
-#include "input/InputSystem.h"
+#include "ResourceSystem.h"
 #include "physics/CollisionSystem.h"
-#include "render/RenderSystem.h"
-#include "render/ResourceSystem.h"
 #include "scene/SceneSystem.h"
 
 namespace Siege
@@ -22,24 +20,12 @@ CollisionSystem& Statics::Collision()
     return system;
 }
 
-InputSystem& Statics::Input()
-{
-    static InputSystem system;
-    return system;
-}
-
 ResourceSystem& Statics::Resource()
 {
     static ResourceSystem system;
     return system;
 }
 
-RenderSystem& Statics::Render()
-{
-    static RenderSystem system;
-    return system;
-}
-
 SceneSystem& Statics::Scene()
 {
     static SceneSystem system;

engine/core/Statics.h

@@ -17,12 +17,8 @@ class Statics
 
     static class CollisionSystem& Collision();
 
-    static class InputSystem& Input();
-
     static class ResourceSystem& Resource();
 
-    static class RenderSystem& Render();
-
     static class SceneSystem& Scene();
 
     static class EntitySystem& Entity();

engine/core/Ticker.cpp

@@ -0,0 +1,34 @@
+//
+// Copyright (c) 2022 Jonathan Moallem (@J-Mo63) & Aryeh Zinn (@Raelr)
+//
+// This code is released under an unmodified zlib license.
+// For conditions of distribution and use, please see:
+//     https://opensource.org/licenses/Zlib
+//
+
+#include "Ticker.h"
+
+#include <chrono>
+
+namespace Siege
+{
+long Ticker::GetCurrentTime()
+{
+    auto now = std::chrono::system_clock::now();
+    auto seconds = std::chrono::time_point_cast<std::chrono::microseconds>(now);
+    return seconds.time_since_epoch().count();
+}
+
+void Ticker::UpdateTime()
+{
+    static long previousTime = GetCurrentTime();
+    long currentTime = GetCurrentTime();
+    deltaTime = (float) (currentTime - previousTime) / 1000000.f;
+    previousTime = currentTime;
+}
+
+float Ticker::GetDeltaTime() const
+{
+    return deltaTime;
+}
+} // namespace Siege