merging with upstream

CMakeLists.txt

@@ -142,7 +142,6 @@ target_compile_options(
     cube
     PRIVATE "-Wall"
     PRIVATE "-Wextra"
-    PRIVATE "-g"
     PRIVATE "-std=c++17"
 )
 

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();

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");