diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e92af6045ee98e8ff09b7bc5d2b190c85958c32..a4ff3acfa8a02818960e4d0f68586d077eaa08b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,6 @@ target_compile_options( cube PRIVATE "-Wall" PRIVATE "-Wextra" - PRIVATE "-g" PRIVATE "-std=c++17" ) diff --git a/src/main.cpp b/src/main.cpp index eae10205b2387d7f18adac7f48e4d75081e5a21e..e0dc62500f7fc3802087c79882f7d2e8d6b0977a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,6 +8,7 @@ #include <fstream> #include <sstream> #include <string> +#include <chrono> #include <GL/glew.h> @@ -57,12 +58,16 @@ int main(int argc, char** args) Watcher::pollEvents(); // Load asset subsystems + TextureSystem::load(); + + ShaderSystem::createUniformBuffers(); ShaderSystem::load(); MaterialSystem::load(); ModelSystem::load(); + LOG_DEBUG("Argc %d, args[1] %s", argc, args[1]); @@ -101,7 +106,6 @@ int main(int argc, char** args) oldT = t; - // break; // For testing load performance } Scene::clean(); diff --git a/tool/discover.py b/tool/discover.py index ff2f147778ae714cb3f45052fa4ebb52a7ec76e5..3d457fbf9cd966ae2a4796a6007b1061927ec518 100644 --- a/tool/discover.py +++ b/tool/discover.py @@ -28,6 +28,7 @@ def scan_collection(collection, fileregex): if __name__ == "__main__": scan_collection("textures", "*.jpg"); scan_collection("textures", "*.png"); + scan_collection("textures", "*.tga"); scan_collection("shaders", "*.glsl"); scan_collection("materials", "*.yml"); scan_collection("models", "*.yml");