From 3dcf338ebb194c659cced6b5e4f1ab46cb37e524 Mon Sep 17 00:00:00 2001 From: Gustav Lund Date: Mon, 7 May 2018 14:56:47 +0200 Subject: Dummy texture importer Added a dummy importer for textures to use with the server platform. Allows for running a project in headless mode without crashing when loading scenes containing textured objects Also as a result decreases load time as no image files have to be loaded. --- platform/server/os_server.cpp | 6 ++++++ platform/server/os_server.h | 3 +++ 2 files changed, 9 insertions(+) (limited to 'platform') diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index a8be4fbc3..3b1be780d 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -30,6 +30,7 @@ #include "os_server.h" #include "drivers/dummy/audio_driver_dummy.h" #include "drivers/dummy/rasterizer_dummy.h" +#include "drivers/dummy/texture_loader_dummy.h" #include "print_string.h" #include "servers/visual/visual_server_raster.h" #include @@ -83,6 +84,9 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int _ensure_user_data_dir(); + resource_loader_dummy = memnew(ResourceFormatDummyTexture); + ResourceLoader::add_resource_format_loader(resource_loader_dummy); + return OK; } @@ -99,6 +103,8 @@ void OS_Server::finalize() { memdelete(power_manager); + memdelete(resource_loader_dummy); + args.clear(); } diff --git a/platform/server/os_server.h b/platform/server/os_server.h index 2cc6f0c47..f1a880ecc 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -32,6 +32,7 @@ #include "../x11/crash_handler_x11.h" #include "../x11/power_x11.h" +#include "drivers/dummy/texture_loader_dummy.h" #include "drivers/rtaudio/audio_driver_rtaudio.h" #include "drivers/unix/os_unix.h" #include "main/input_default.h" @@ -65,6 +66,8 @@ class OS_Server : public OS_Unix { CrashHandler crash_handler; + ResourceFormatDummyTexture *resource_loader_dummy; + protected: virtual int get_video_driver_count() const; virtual const char *get_video_driver_name(int p_driver) const; -- cgit v1.2.3-70-g09d2