removed assimp

refactor cmake restore tests
hotstreams · Dec 5, 2023 · 775567e · 775567e
1 parent 5c15fc1
commit 775567e
Show file tree

Hide file tree

Showing 97 changed files with 1,401 additions and 10,895 deletions.
diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml
@@ -25,7 +25,7 @@ jobs:
       - name: build
         run: |
           mkdir build
-          cmake -DGLSLANG_SHADER_OUTPUT=ON -S . -B build
+          cmake -DBUILD_SAMPLES=OFF -DBUILD_TESTS=ON -DOPENGL_SHADER_OUTPUT=ON -S . -B build
           cd build
           make
       - name: test

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "thirdparty/assimp"]
-	path = thirdparty/assimp
-	url = https://github.com/assimp/assimp
 [submodule "thirdparty/stbimage"]
 	path = thirdparty/stbimage
 	url = https://github.com/nothings/stb

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/demo/assets.cpp b/demo/assets.cpp
diff --git a/demo/demo.cpp b/demo/demo.cpp
@@ -1,10 +1,9 @@
 #include "assets.hpp"
-#include "scene.hpp"
+//#include "scene.hpp"
 
 #include <limitless/core/context_observer.hpp>
 #include <limitless/text/text_instance.hpp>
 #include <limitless/util/color_picker.hpp>
-#include <iostream>
 #include <limitless/core/state_query.hpp>
 #include <limitless/core/texture/state_texture.hpp>
 
@@ -19,7 +18,7 @@ class Game : public MouseMoveObserver, public KeyObserver, public FramebufferObs
     Camera camera;
     Renderer render;
     DemoAssets assets;
-    LimitlessDemo::DemoScene scene;
+//    LimitlessDemo::DemoScene scene;
 
     bool done {};
     bool hidden_text {};
@@ -29,7 +28,7 @@ class Game : public MouseMoveObserver, public KeyObserver, public FramebufferObs
         , camera {window_size}
         , render {context}
         , assets {context, render, ENGINE_ASSETS_DIR}
-        , scene {context, assets}
+//        , scene {context, assets}
     {
         camera.setPosition({-3.0f, 2.0f, 3.0f});
 
@@ -69,7 +68,7 @@ class Game : public MouseMoveObserver, public KeyObserver, public FramebufferObs
         }
 
         if (key == GLFW_KEY_TAB && state == InputState::Pressed) {
-            scene.next(camera);
+//            scene.next(camera);
         }
 
         if (key == GLFW_KEY_SPACE && state == InputState::Pressed) {
@@ -117,8 +116,8 @@ class Game : public MouseMoveObserver, public KeyObserver, public FramebufferObs
             auto delta_time = duration_cast<duration<float>>(current_time - last_time).count();
             last_time = current_time;
 
-            scene.update(context, camera);
-            render.draw(context, assets, scene.getCurrentScene(), camera);
+//            scene.update(context, camera);
+//            render.draw(context, assets, scene.getCurrentScene(), camera);
 
             context.swapBuffers();
             context.pollEvents();

diff --git a/demo/effects_demoscene.cpp b/demo/effects_demoscene.cpp
@@ -7,7 +7,6 @@
 #include <limitless/fx/emitters/beam_emitter.hpp>
 #include <limitless/fx/emitters/sprite_emitter.hpp>
 #include <limitless/fx/emitters/mesh_emitter.hpp>
-#include <limitless/loaders/model_loader.hpp>
 #include <limitless/instances/model_instance.hpp>
 #include <limitless/models/skeletal_model.hpp>
 #include <limitless/fx/modules/mesh_location_attachment.hpp>

diff --git a/include/limitless/core/context_debug.hpp b/include/limitless/core/context_debug.hpp
@@ -4,7 +4,7 @@
 #include <GLFW/glfw3.h>
 
 namespace Limitless {
-    #ifdef GL_DEBUG
+    #ifdef LIMITLESS_OPENGL_DEBUG
         inline uint64_t gl_error_count = 0;
 
         void APIENTRY glDebugOutput(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);

diff --git a/include/limitless/loaders/asset_manager.hpp b/include/limitless/loaders/asset_manager.hpp
@@ -3,7 +3,6 @@
 #include <limitless/core/context_thread_pool.hpp>
 #include <limitless/models/abstract_model.hpp>
 #include <limitless/util/filesystem.hpp>
-#include <limitless/loaders/model_loader.hpp>
 #include <limitless/loaders/texture_loader.hpp>
 
 namespace Limitless {

diff --git a/include/limitless/loaders/model_loader.hpp b/include/limitless/loaders/model_loader.hpp
diff --git a/include/limitless/ms/material.hpp b/include/limitless/ms/material.hpp
@@ -210,7 +210,7 @@ namespace Limitless::ms {
          * Mutable property getters for primitives
          */
         glm::vec4& getColor();
-        glm::vec4& getEmissiveColor();
+        glm::vec3& getEmissiveColor();
         float& getMetallic();
         float& getRoughness();
         float& getIoR();

diff --git a/include/limitless/ms/material_builder.hpp b/include/limitless/ms/material_builder.hpp
@@ -17,7 +17,7 @@ namespace Limitless::ms {
     class Material::Builder {
     private:
         static inline std::map<UniqueMaterial, uint64_t> unique_materials;
-        static inline uint64_t next_shader_index {};
+        static inline uint64_t next_shader_index {1};
         static inline std::mutex mutex;
 
         std::map<Property, std::unique_ptr<Uniform>> properties;

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -0,0 +1,24 @@
+#########################################
+cmake_minimum_required(VERSION 3.10)
+
+#########################################
+project(limitless-engine-samples)
+
+if (NOT BUILD_SAMPLES)
+    return()
+endif()
+
+add_executable(limitless-demo
+    demo/demo.cpp
+    #    demo/materials_demoscene.cpp
+    #    demo/lighting_demoscene.cpp
+    #    demo/effects_demoscene.cpp
+    #    demo/models_demoscene.cpp
+    demo/assets.cpp
+)
+target_link_libraries(limitless-demo PRIVATE limitless-engine)
+
+add_executable(limitless-gltf-viewer
+    demo/gltf_viewer/gltf_viewer.cpp
+)
+target_link_libraries(limitless-gltf-viewer PRIVATE limitless-engine)
diff --git a/demo/gltf_viewer/gltf_viewer.cpp → samples/gltf_viewer/gltf_viewer.cpp b/demo/gltf_viewer/gltf_viewer.cpp → samples/gltf_viewer/gltf_viewer.cpp
diff --git a/shaders/postprocessing/dof.frag b/shaders/postprocessing/dof.frag
@@ -1,4 +1,4 @@
-Limitless::GLSL_VERSION
+ENGINE::COMMON
 Limitless::Extensions
 
 #include "../pipeline/scene.glsl"

diff --git a/shaders/postprocessing/dof.vert b/shaders/postprocessing/dof.vert
@@ -1,4 +1,4 @@
-Limitless::GLSL_VERSION
+ENGINE::COMMON
 Limitless::Extensions
 
 layout(location = 0) in vec3 position;

diff --git a/shaders/postprocessing/fxaa.frag b/shaders/postprocessing/fxaa.frag
@@ -1,4 +1,4 @@
-Limitless::GLSL_VERSION
+ENGINE::COMMON
 Limitless::Extensions
 
 in vec2 uv;

diff --git a/shaders/postprocessing/fxaa.vert b/shaders/postprocessing/fxaa.vert
@@ -1,4 +1,4 @@
-Limitless::GLSL_VERSION
+ENGINE::COMMON
 Limitless::Extensions
 
 layout(location = 0) in vec3 vertex_position;

diff --git a/shaders/postprocessing/postprocess.frag b/shaders/postprocessing/postprocess.frag
@@ -1,4 +1,4 @@
-Limitless::GLSL_VERSION
+ENGINE::COMMON
 Limitless::Extensions
 
 in vec2 fs_uv;

diff --git a/shaders/postprocessing/postprocess.vert b/shaders/postprocessing/postprocess.vert
@@ -1,4 +1,4 @@
-Limitless::GLSL_VERSION
+ENGINE::COMMON
 Limitless::Extensions
 
 layout(location = 0) in vec3 position;

diff --git a/src/limitless/core/context_debug.cpp b/src/limitless/core/context_debug.cpp
@@ -4,7 +4,7 @@
 
 using namespace Limitless;
 
-#ifdef GL_DEBUG
+#ifdef LIMITLESS_OPENGL_DEBUG
 
 void Limitless::activate_debug() {
 	GLint flags;

diff --git a/src/limitless/core/context_initializer.cpp b/src/limitless/core/context_initializer.cpp
@@ -69,7 +69,7 @@ void ContextInitializer::getExtensions() noexcept {
         extensions.emplace_back(name);
     }
 
-	#ifdef OPENGL_TOSTER
+	#ifdef LIMITLESS_OPENGL_NO_EXTENSIONS
         std::cerr << "OpenGL toster mode" << std::endl;
 		extensions.clear();
         extensions.emplace_back("GL_ARB_shader_storage_buffer_object");

diff --git a/src/limitless/core/shader/shader.cpp b/src/limitless/core/shader/shader.cpp
@@ -40,7 +40,7 @@ void Shader::checkStatus() const {
 
     if (log_size == 0) {
 
-#ifdef GLSLANG_SHADER_OUTPUT
+#ifdef LIMITLESS_OPENGL_SHADER_OUTPUT
         static int i = 0;
 
         for (const auto& [ext, t]: shader_file_extensions) {

diff --git a/src/limitless/loaders/effect_loader.cpp b/src/limitless/loaders/effect_loader.cpp
@@ -6,7 +6,6 @@
 #include <limitless/serialization/effect_serializer.hpp>
 
 #include <limitless/assets.hpp>
-#include <limitless/loaders/asset_manager.hpp>
 #include <limitless/util/bytebuffer.hpp>
 #include <limitless/instances/effect_instance.hpp>
 

diff --git a/src/limitless/loaders/material_loader.cpp b/src/limitless/loaders/material_loader.cpp
@@ -6,7 +6,6 @@
 #include <limitless/util/bytebuffer.hpp>
 #include <limitless/ms/material.hpp>
 #include <limitless/serialization/material_serializer.hpp>
-#include <limitless/loaders/asset_manager.hpp>
 
 using namespace Limitless;
 using namespace Limitless::ms;