engine: embed media files

Author: illwieckz

CMakeLists.txt

@@ -1039,6 +1039,9 @@ if (BUILD_CLIENT)
 
     # Generate GLSL include files.
     daemon_embed_files("EngineShaders" "GLSL")
+
+    # Generate media include files.
+    daemon_embed_files("EngineMedia" "MEDIA")
 endif()
 
 if (BUILD_SERVER)

src.cmake

@@ -86,6 +86,13 @@ else()
     include (${ENGINE_DIR}/renderer/src.cmake)
 endif()
 
+set(MEDIA_EMBED_DIR ${ENGINE_DIR}/media)
+set(MEDIA_EMBED_LIST
+	gfx/2d/bigchars.png
+	scripts/engine.shader
+	sound/null.wav
+)
+
 set(GLSL_EMBED_DIR "${ENGINE_DIR}/renderer/glsl_source")
 set(GLSL_EMBED_LIST
     # Common shader libraries

src/common/FileSystem.cpp

@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "shared/VMMain.h"
 #else
 #include "engine/qcommon/qcommon.h"
+#include "DaemonEmbedded/EngineMedia.h"
 #endif
 
 #include "IPC/CommonSyscalls.h"
@@ -1542,6 +1543,12 @@ std::string ReadFile(Str::StringRef path, std::error_code& err) {
 #ifdef BUILD_ENGINE
 std::string ReadFile(Str::StringRef path, std::error_code& err)
 {
+	if (EngineMedia::HasFile(path))
+	{
+		Log::Warn("Loading internal file: %s", path);
+		return EngineMedia::ReadFile(path);
+	}
+
 	auto it = fileMap.find(path);
 	if (it == fileMap.end()) {
 		SetErrorCodeFilesystem(err, filesystem_error::no_such_file, path);

pkg/daemon_src.dpkdir/gfx/2d/bigchars.png renamed to src/engine/media/gfx/2d/bigchars.png

@@ -1,5 +1,7 @@
 
 set(RENDERERLIST
+    ${DAEMON_EMBEDDED_DIR}/EngineMedia.cpp
+    ${DAEMON_EMBEDDED_DIR}/EngineMedia.h
     ${DAEMON_EMBEDDED_DIR}/EngineShaders.cpp
     ${DAEMON_EMBEDDED_DIR}/EngineShaders.h
     ${ENGINE_DIR}/renderer/BufferBind.h