From 039335e4c539bc8f53156de49f9e9ac756546605 Mon Sep 17 00:00:00 2001
From: Jonas Johan Solsvik <jonasjso@stud.ntnu.no>
Date: Mon, 7 May 2018 18:45:53 +0200
Subject: [PATCH] merging with upstream
---
CMakeLists.txt | 1 -
src/main.cpp | 6 +++++-
tool/discover.py | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e92af6..a4ff3ac 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 eae1020..e0dc625 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 ff2f147..3d457fb 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");
--
GitLab