Initial implementation of machine markers

src/Main.cpp

@@ -1,27 +1,10 @@
 #include "util/Timer.h"
 
-#include "renderer/camera/SimpleCamera.h"
-
-#include <imgui/imgui.h>
-
-
-
-#include "universe/vehicle/Vehicle.h"
 #include "assets/Model.h"
-
 #include "physics/ground/GroundShape.h"
-#include "renderer/lighting/SunLight.h"
-
 #include "OSP.h"
-
-#include "universe/vehicle/VehicleLoader.h"
 #include "game/scenes/flight/FlightScene.h"
 #include "game/scenes/editor/EditorScene.h"
-
-#include <util/fmt/glm.h>
-
-#include <game/input/JoystickDebug.h>
-
 #include <util/Profiler.h>
 
 static int iteration = 0;
@@ -38,12 +21,12 @@ int main(int argc, char** argv)
 
 	PROFILE_FUNC();
 
-	osp.game_state.load_scene(new FlightScene());
+	osp.game_state.load_scene(new EditorScene());
 
 	while (osp.should_loop())
 	{
 		PROFILE_BLOCK("frame");
-		
+
 		osp.start_frame();
 		osp.update();
 		osp.render();

src/assets/Model.cpp

@@ -171,13 +171,15 @@ void Model::process_mesh(aiMesh* mesh, const aiScene* scene, Node* to, bool draw
 			ai_mat->GetTexture(type_t, 0, &path);
 
 			std::string path_s = std::string(path.C_Str());
+			logger->info("Loading texture: {}", path_s);
 			// Sanitize the path
 			replace_all(path_s, "\\", "/");
 			// We find 'res/', after it is the package name, and then the name, pretty easy
 			size_t pos = path_s.find("res/");
 			if (pos == std::string::npos)
 			{
-				logger->warn("Invalid path '{}' given in texture, ignoring!", path_s);
+				// It may be a relative path
+				logger->warn("Invalid path '{}' given in texture, ignoring! Make sure you enable absolute path mode", path_s);
 			}
 			else
 			{