From 615c39a4fe0fecd86524cca685eb59701cf7369c Mon Sep 17 00:00:00 2001 From: Attila Uygun Date: Sun, 25 Jun 2023 17:10:34 +0200 Subject: [PATCH] Move asset loaders to engine/asset --- build/android/app/CMakeLists.txt | 10 +++++----- build/linux/Makefile | 12 ++++++------ src/demo/credits.cc | 4 ++-- src/demo/demo.h | 2 +- src/demo/enemy.cc | 4 ++-- src/demo/hud.cc | 4 ++-- src/demo/menu.cc | 6 +++--- src/demo/player.cc | 2 +- src/engine/{ => asset}/font.cc | 4 ++-- src/engine/{ => asset}/font.h | 6 +++--- src/engine/{ => asset}/image.cc | 4 ++-- src/engine/{ => asset}/image.h | 6 +++--- src/engine/{ => asset}/mesh.cc | 2 +- src/engine/{ => asset}/mesh.h | 6 +++--- src/engine/{ => asset}/shader_source.cc | 2 +- src/engine/{ => asset}/shader_source.h | 6 +++--- src/engine/{ => asset}/sound.cc | 2 +- src/engine/{ => asset}/sound.h | 6 +++--- src/engine/engine.cc | 10 +++++----- src/engine/renderer/geometry.cc | 2 +- src/engine/renderer/opengl/render_command.cc | 6 +++--- src/engine/renderer/opengl/renderer_opengl.cc | 6 +++--- src/engine/renderer/shader.cc | 2 +- src/engine/renderer/texture.cc | 2 +- src/engine/renderer/vulkan/renderer_vulkan.cc | 6 +++--- 25 files changed, 61 insertions(+), 61 deletions(-) rename src/engine/{ => asset}/font.cc (98%) rename src/engine/{ => asset}/font.h (93%) rename src/engine/{ => asset}/image.cc (99%) rename src/engine/{ => asset}/image.h (92%) rename src/engine/{ => asset}/mesh.cc (99%) rename src/engine/{ => asset}/mesh.h (94%) rename src/engine/{ => asset}/shader_source.cc (98%) rename src/engine/{ => asset}/shader_source.h (89%) rename src/engine/{ => asset}/sound.cc (99%) rename src/engine/{ => asset}/sound.h (92%) diff --git a/build/android/app/CMakeLists.txt b/build/android/app/CMakeLists.txt index a0bdd94..d2b3dab 100644 --- a/build/android/app/CMakeLists.txt +++ b/build/android/app/CMakeLists.txt @@ -61,16 +61,18 @@ add_library(kaliber SHARED ../../../src/demo/sky_quad.cc ../../../src/engine/animatable.cc ../../../src/engine/animator.cc + ../../../src/engine/asset/font.cc + ../../../src/engine/asset/image.cc + ../../../src/engine/asset/mesh.cc + ../../../src/engine/asset/shader_source.cc + ../../../src/engine/asset/sound.cc ../../../src/engine/audio/audio_bus.cc ../../../src/engine/audio/audio_mixer.cc ../../../src/engine/audio/audio_sink_oboe.cc ../../../src/engine/audio/sinc_resampler.cc ../../../src/engine/drawable.cc ../../../src/engine/engine.cc - ../../../src/engine/font.cc ../../../src/engine/image_quad.cc - ../../../src/engine/image.cc - ../../../src/engine/mesh.cc ../../../src/engine/persistent_data.cc ../../../src/engine/platform/asset_file_android.cc ../../../src/engine/platform/asset_file.cc @@ -86,10 +88,8 @@ add_library(kaliber SHARED ../../../src/engine/renderer/vulkan/renderer_vulkan.cc ../../../src/engine/renderer/vulkan/vulkan_context_android.cc ../../../src/engine/renderer/vulkan/vulkan_context.cc - ../../../src/engine/shader_source.cc ../../../src/engine/solid_quad.cc ../../../src/engine/sound_player.cc - ../../../src/engine/sound.cc ../../../src/third_party/android/gl3stub.c ../../../src/third_party/android/GLContext.cpp ../../../src/third_party/glslang/glslang/GenericCodeGen/CodeGen.cpp diff --git a/build/linux/Makefile b/build/linux/Makefile index e0384d9..330e846 100644 --- a/build/linux/Makefile +++ b/build/linux/Makefile @@ -94,16 +94,18 @@ $(BASE_LIB): $(BASE_OBJS) ENGINE_SRC := \ $(SRC_ROOT)/engine/animatable.cc \ $(SRC_ROOT)/engine/animator.cc \ + $(SRC_ROOT)/engine/asset/font.cc \ + $(SRC_ROOT)/engine/asset/image.cc \ + $(SRC_ROOT)/engine/asset/mesh.cc \ + $(SRC_ROOT)/engine/asset/shader_source.cc \ + $(SRC_ROOT)/engine/asset/sound.cc \ $(SRC_ROOT)/engine/audio/audio_bus.cc \ $(SRC_ROOT)/engine/audio/audio_mixer.cc \ $(SRC_ROOT)/engine/audio/audio_sink_alsa.cc \ $(SRC_ROOT)/engine/audio/sinc_resampler.cc \ $(SRC_ROOT)/engine/drawable.cc \ $(SRC_ROOT)/engine/engine.cc \ - $(SRC_ROOT)/engine/font.cc \ $(SRC_ROOT)/engine/image_quad.cc \ - $(SRC_ROOT)/engine/image.cc \ - $(SRC_ROOT)/engine/mesh.cc \ $(SRC_ROOT)/engine/persistent_data.cc \ $(SRC_ROOT)/engine/platform/asset_file_linux.cc \ $(SRC_ROOT)/engine/platform/asset_file.cc \ @@ -119,10 +121,8 @@ ENGINE_SRC := \ $(SRC_ROOT)/engine/renderer/vulkan/renderer_vulkan.cc \ $(SRC_ROOT)/engine/renderer/vulkan/vulkan_context_linux.cc \ $(SRC_ROOT)/engine/renderer/vulkan/vulkan_context.cc \ - $(SRC_ROOT)/engine/shader_source.cc \ $(SRC_ROOT)/engine/solid_quad.cc \ - $(SRC_ROOT)/engine/sound_player.cc \ - $(SRC_ROOT)/engine/sound.cc + $(SRC_ROOT)/engine/sound_player.cc ENGINE_LIB := $(BUILD_DIR)/libengine.a ENGINE_OBJS := $(call objs_from_src, $(ENGINE_SRC)) diff --git a/src/demo/credits.cc b/src/demo/credits.cc index fe721ee..12cab16 100644 --- a/src/demo/credits.cc +++ b/src/demo/credits.cc @@ -3,9 +3,9 @@ #include "base/log.h" #include "base/vecmath.h" #include "demo/demo.h" +#include "engine/asset/font.h" +#include "engine/asset/image.h" #include "engine/engine.h" -#include "engine/font.h" -#include "engine/image.h" #include "engine/input_event.h" using namespace base; diff --git a/src/demo/demo.h b/src/demo/demo.h index 89ed04f..e60ef2c 100644 --- a/src/demo/demo.h +++ b/src/demo/demo.h @@ -3,7 +3,7 @@ #include "base/closure.h" #include "engine/animator.h" -#include "engine/font.h" +#include "engine/asset/font.h" #include "engine/game.h" #include "engine/persistent_data.h" #include "engine/solid_quad.h" diff --git a/src/demo/enemy.cc b/src/demo/enemy.cc index 46c2144..ec13724 100644 --- a/src/demo/enemy.cc +++ b/src/demo/enemy.cc @@ -9,9 +9,9 @@ #include "base/collusion_test.h" #include "base/interpolation.h" #include "base/log.h" +#include "engine/asset/font.h" +#include "engine/asset/image.h" #include "engine/engine.h" -#include "engine/font.h" -#include "engine/image.h" #include "engine/renderer/geometry.h" #include "demo/demo.h" diff --git a/src/demo/hud.cc b/src/demo/hud.cc index 47f75d4..bae7d0d 100644 --- a/src/demo/hud.cc +++ b/src/demo/hud.cc @@ -3,9 +3,9 @@ #include "base/interpolation.h" #include "base/log.h" #include "base/vecmath.h" +#include "engine/asset/font.h" +#include "engine/asset/image.h" #include "engine/engine.h" -#include "engine/font.h" -#include "engine/image.h" #include "demo/demo.h" diff --git a/src/demo/menu.cc b/src/demo/menu.cc index afe15c8..fb79e5a 100644 --- a/src/demo/menu.cc +++ b/src/demo/menu.cc @@ -7,12 +7,12 @@ #include "base/collusion_test.h" #include "base/interpolation.h" #include "base/log.h" +#include "engine/asset/font.h" +#include "engine/asset/image.h" +#include "engine/asset/sound.h" #include "engine/engine.h" -#include "engine/font.h" -#include "engine/image.h" #include "engine/input_event.h" #include "engine/renderer/renderer.h" -#include "engine/sound.h" #include "demo/demo.h" diff --git a/src/demo/player.cc b/src/demo/player.cc index 2aeb1d2..2db3220 100644 --- a/src/demo/player.cc +++ b/src/demo/player.cc @@ -2,8 +2,8 @@ #include "base/interpolation.h" #include "base/log.h" +#include "engine/asset/font.h" #include "engine/engine.h" -#include "engine/font.h" #include "engine/input_event.h" #include "demo/demo.h" diff --git a/src/engine/font.cc b/src/engine/asset/font.cc similarity index 98% rename from src/engine/font.cc rename to src/engine/asset/font.cc index 6f9038e..612d63c 100644 --- a/src/engine/font.cc +++ b/src/engine/asset/font.cc @@ -1,4 +1,4 @@ -#include "engine/font.h" +#include "engine/asset/font.h" #include #include @@ -9,7 +9,7 @@ #define STB_TRUETYPE_IMPLEMENTATION #define STBTT_STATIC -#include "../third_party/stb/stb_truetype.h" +#include "third_party/stb/stb_truetype.h" namespace eng { diff --git a/src/engine/font.h b/src/engine/asset/font.h similarity index 93% rename from src/engine/font.h rename to src/engine/asset/font.h index f6f49e8..5a45e81 100644 --- a/src/engine/font.h +++ b/src/engine/asset/font.h @@ -1,5 +1,5 @@ -#ifndef ENGINE_FONT_H -#define ENGINE_FONT_H +#ifndef ENGINE_ASSET_FONT_H +#define ENGINE_ASSET_FONT_H #include #include @@ -51,4 +51,4 @@ class Font { } // namespace eng -#endif // ENGINE_FONT_H +#endif // ENGINE_ASSET_FONT_H diff --git a/src/engine/image.cc b/src/engine/asset/image.cc similarity index 99% rename from src/engine/image.cc rename to src/engine/asset/image.cc index a74802f..b36ff1e 100644 --- a/src/engine/image.cc +++ b/src/engine/asset/image.cc @@ -1,4 +1,4 @@ -#include "engine/image.h" +#include "engine/asset/image.h" #include #include @@ -12,7 +12,7 @@ // This 3rd party library is written in C and uses malloc, which means that we // have to do the same. -#include "../third_party/stb/stb_image.h" +#include "third_party/stb/stb_image.h" using namespace base; diff --git a/src/engine/image.h b/src/engine/asset/image.h similarity index 92% rename from src/engine/image.h rename to src/engine/asset/image.h index d9f1b21..05e44aa 100644 --- a/src/engine/image.h +++ b/src/engine/asset/image.h @@ -1,5 +1,5 @@ -#ifndef ENGINE_IMAGE_H -#define ENGINE_IMAGE_H +#ifndef ENGINE_ASSET_IMAGE_H +#define ENGINE_ASSET_IMAGE_H #include #include @@ -56,4 +56,4 @@ class Image { } // namespace eng -#endif // ENGINE_IMAGE_H +#endif // ENGINE_ASSET_IMAGE_H diff --git a/src/engine/mesh.cc b/src/engine/asset/mesh.cc similarity index 99% rename from src/engine/mesh.cc rename to src/engine/asset/mesh.cc index a3accc1..07805d5 100644 --- a/src/engine/mesh.cc +++ b/src/engine/asset/mesh.cc @@ -1,4 +1,4 @@ -#include "engine/mesh.h" +#include "engine/asset/mesh.h" #include diff --git a/src/engine/mesh.h b/src/engine/asset/mesh.h similarity index 94% rename from src/engine/mesh.h rename to src/engine/asset/mesh.h index 6ad7f92..c955508 100644 --- a/src/engine/mesh.h +++ b/src/engine/asset/mesh.h @@ -1,5 +1,5 @@ -#ifndef ENGINE_MESH_H -#define ENGINE_MESH_H +#ifndef ENGINE_ASSET_MESH_H +#define ENGINE_ASSET_MESH_H #include #include @@ -51,4 +51,4 @@ class Mesh { } // namespace eng -#endif // ENGINE_MESH_H +#endif // ENGINE_ASSET_MESH_H diff --git a/src/engine/shader_source.cc b/src/engine/asset/shader_source.cc similarity index 98% rename from src/engine/shader_source.cc rename to src/engine/asset/shader_source.cc index 9121c29..f72ae62 100644 --- a/src/engine/shader_source.cc +++ b/src/engine/asset/shader_source.cc @@ -1,4 +1,4 @@ -#include "engine/shader_source.h" +#include "engine/asset/shader_source.h" #include diff --git a/src/engine/shader_source.h b/src/engine/asset/shader_source.h similarity index 89% rename from src/engine/shader_source.h rename to src/engine/asset/shader_source.h index 3748363..7ac01d1 100644 --- a/src/engine/shader_source.h +++ b/src/engine/asset/shader_source.h @@ -1,5 +1,5 @@ -#ifndef ENGINE_SHADER_CODE_H -#define ENGINE_SHADER_CODE_H +#ifndef ENGINE_ASSET_SHADER_CODE_H +#define ENGINE_ASSET_SHADER_CODE_H #include #include @@ -38,4 +38,4 @@ class ShaderSource { } // namespace eng -#endif // ENGINE_SHADER_CODE_H +#endif // ENGINE_ASSET_SHADER_CODE_H diff --git a/src/engine/sound.cc b/src/engine/asset/sound.cc similarity index 99% rename from src/engine/sound.cc rename to src/engine/asset/sound.cc index 316b097..7a0c49c 100644 --- a/src/engine/sound.cc +++ b/src/engine/asset/sound.cc @@ -1,4 +1,4 @@ -#include "engine/sound.h" +#include "engine/asset/sound.h" #include diff --git a/src/engine/sound.h b/src/engine/asset/sound.h similarity index 92% rename from src/engine/sound.h rename to src/engine/asset/sound.h index 9cdf5f5..03850c4 100644 --- a/src/engine/sound.h +++ b/src/engine/asset/sound.h @@ -1,5 +1,5 @@ -#ifndef ENGINE_SOUND_H -#define ENGINE_SOUND_H +#ifndef ENGINE_ASSET_SOUND_H +#define ENGINE_ASSET_SOUND_H #include #include @@ -43,4 +43,4 @@ class Sound final : public AudioBus { } // namespace eng -#endif // ENGINE_SOUND_H +#endif // ENGINE_ASSET_SOUND_H diff --git a/src/engine/engine.cc b/src/engine/engine.cc index 21c01d9..547bb46 100644 --- a/src/engine/engine.cc +++ b/src/engine/engine.cc @@ -3,15 +3,17 @@ #include "base/log.h" #include "base/task_runner.h" #include "engine/animator.h" +#include "engine/asset/font.h" +#include "engine/asset/image.h" +#include "engine/asset/mesh.h" +#include "engine/asset/shader_source.h" +#include "engine/asset/sound.h" #include "engine/audio/audio_mixer.h" #include "engine/drawable.h" -#include "engine/font.h" #include "engine/game.h" #include "engine/game_factory.h" -#include "engine/image.h" #include "engine/image_quad.h" #include "engine/input_event.h" -#include "engine/mesh.h" #include "engine/platform/platform.h" #include "engine/renderer/geometry.h" #include "engine/renderer/opengl/renderer_opengl.h" @@ -19,8 +21,6 @@ #include "engine/renderer/shader.h" #include "engine/renderer/texture.h" #include "engine/renderer/vulkan/renderer_vulkan.h" -#include "engine/shader_source.h" -#include "engine/sound.h" #include "third_party/texture_compressor/texture_compressor.h" using namespace base; diff --git a/src/engine/renderer/geometry.cc b/src/engine/renderer/geometry.cc index 748e39f..f9f8b9e 100644 --- a/src/engine/renderer/geometry.cc +++ b/src/engine/renderer/geometry.cc @@ -1,6 +1,6 @@ #include "engine/renderer/geometry.h" -#include "engine/mesh.h" +#include "engine/asset/mesh.h" #include "engine/renderer/renderer.h" namespace eng { diff --git a/src/engine/renderer/opengl/render_command.cc b/src/engine/renderer/opengl/render_command.cc index 05cc707..14ad0e0 100644 --- a/src/engine/renderer/opengl/render_command.cc +++ b/src/engine/renderer/opengl/render_command.cc @@ -1,8 +1,8 @@ #include "engine/renderer/opengl/render_command.h" -#include "engine/image.h" -#include "engine/mesh.h" -#include "engine/shader_source.h" +#include "engine/asset/image.h" +#include "engine/asset/mesh.h" +#include "engine/asset/shader_source.h" #ifdef _DEBUG #define RENDER_COMMAND_IMPL(NAME, GLOBAL) \ diff --git a/src/engine/renderer/opengl/renderer_opengl.cc b/src/engine/renderer/opengl/renderer_opengl.cc index fadafc9..75e42b9 100644 --- a/src/engine/renderer/opengl/renderer_opengl.cc +++ b/src/engine/renderer/opengl/renderer_opengl.cc @@ -13,13 +13,13 @@ #ifdef THREADED_RENDERING #include "base/task_runner.h" #endif // THREADED_RENDERING -#include "engine/image.h" -#include "engine/mesh.h" +#include "engine/asset/image.h" +#include "engine/asset/mesh.h" +#include "engine/asset/shader_source.h" #include "engine/renderer/geometry.h" #include "engine/renderer/opengl/render_command.h" #include "engine/renderer/shader.h" #include "engine/renderer/texture.h" -#include "engine/shader_source.h" using namespace base; diff --git a/src/engine/renderer/shader.cc b/src/engine/renderer/shader.cc index bffbb8b..a9da170 100644 --- a/src/engine/renderer/shader.cc +++ b/src/engine/renderer/shader.cc @@ -1,7 +1,7 @@ #include "engine/renderer/shader.h" +#include "engine/asset/shader_source.h" #include "engine/renderer/renderer.h" -#include "engine/shader_source.h" using namespace base; diff --git a/src/engine/renderer/texture.cc b/src/engine/renderer/texture.cc index c09bed6..1aca424 100644 --- a/src/engine/renderer/texture.cc +++ b/src/engine/renderer/texture.cc @@ -1,7 +1,7 @@ #include "engine/renderer/texture.h" #include "base/log.h" -#include "engine//image.h" +#include "engine/asset/image.h" #include "engine/renderer/renderer.h" namespace eng { diff --git a/src/engine/renderer/vulkan/renderer_vulkan.cc b/src/engine/renderer/vulkan/renderer_vulkan.cc index fe69277..8e293e1 100644 --- a/src/engine/renderer/vulkan/renderer_vulkan.cc +++ b/src/engine/renderer/vulkan/renderer_vulkan.cc @@ -7,12 +7,12 @@ #include "base/log.h" #include "base/vecmath.h" -#include "engine/image.h" -#include "engine/mesh.h" +#include "engine/asset/image.h" +#include "engine/asset/mesh.h" +#include "engine/asset/shader_source.h" #include "engine/renderer/geometry.h" #include "engine/renderer/shader.h" #include "engine/renderer/texture.h" -#include "engine/shader_source.h" #include "third_party/glslang/SPIRV/GlslangToSpv.h" #include "third_party/glslang/glslang/Include/ResourceLimits.h" #include "third_party/glslang/glslang/Include/Types.h"