Remove even more includes

engine/asset/src/asset.cpp

@@ -10,6 +10,10 @@
 #include "json_conversions.hpp"
 #include "gfx_commandbuffer.hpp"
 #include "assertions.hpp"
+#include "renderer.hpp"
+#include "input.hpp"
+#include "physics.hpp"
+#include "imguilayer.hpp"
 
 std::unique_ptr<Mesh> load_mesh(const file::Path path) {
     Expects(!path.empty());

engine/audio/include/audio.hpp

@@ -1,11 +1,6 @@
 #pragma once
 
-#include <fstream>
+#include "path.hpp"
-#include <string>
-#include <vector>
-#include <string_view>
-
-#include "file.hpp"
 
 /*
 * Audio API

engine/core/CMakeLists.txt

@@ -48,9 +48,10 @@ target_link_libraries(Core PUBLIC
     Renderer
     nlohmann_json
     magic_enum
-    ${BULLET_LIBRARIES}
     imgui
     Log
     ${EXTRA_LIBRARIES}
-    Asset)
+    Asset
+    PRIVATE
+    ${BULLET_LIBRARIES})
 set_engine_properties(Core)

engine/core/include/cutscene.hpp

@@ -5,6 +5,7 @@
 #include "vector.hpp"
 #include "quaternion.hpp"
 #include "math.hpp"
+#include "object.hpp"
 
 struct PositionKeyFrame {
     float time;
@@ -49,6 +50,8 @@ struct Animation {
     std::vector<AnimationChannel> channels;
 };
 
+class Scene;
+
 struct Shot {
     int begin, length;
     

engine/core/include/engine.hpp

@@ -1,27 +1,13 @@
 #pragma once
 
-#include <vector>
+#include <nlohmann/json_fwd.hpp>
-#include <nlohmann/json.hpp>
-#include <iosfwd>
-#include <map>
-#include <memory>
-#include <string>
-#include <string_view>
 
-#include "scene.hpp"
-#include "renderer.hpp"
-#include "input.hpp"
-#include "cutscene.hpp"
-#include "physics.hpp"
-#include "file.hpp"
 #include "object.hpp"
-#include "imguilayer.hpp"
+#include "cutscene.hpp"
-#include "shadowpass.hpp"
-#include "scenecapture.hpp"
-#include "smaapass.hpp"
-#include "gaussianhelper.hpp"
 #include "common.hpp"
 #include "asset_types.hpp"
+#include "platform.hpp"
+#include "path.hpp"
 
 class GFX;
 
@@ -30,6 +16,11 @@ namespace ui {
 }
 
 class App;
+class Scene;
+class Input;
+class Renderer;
+class Physics;
+class ImGuiLayer;
 struct Timer;
 
 struct AnimationTarget {
@@ -51,6 +42,11 @@ public:
     @param argv Array of strings containing arguments. Can be null.
      */
     Engine(const int argc, char* argv[]);
+    
+    Engine(const Engine& other) = delete;
+    Engine(Engine&& other) = delete;
+    
+    ~Engine();
 
     /// Command line arguments, can be empty.
     std::vector<std::string_view> command_line_arguments;
@@ -338,13 +334,13 @@ private:
     Scene* _current_scene = nullptr;
     std::vector<std::unique_ptr<Scene>> _scenes;
     std::map<std::string, Scene*> _path_to_scene;
-
+    
     struct Window {
         int identifier = -1;
         prism::Extent extent;
         bool quitRequested = false;
-
+        
-        std::unique_ptr<Renderer> renderer = nullptr;
+        std::unique_ptr<Renderer> renderer;
     };
 
     std::vector<Window> _windows;
@@ -370,8 +366,8 @@ private:
     App* _app = nullptr;
     GFX* _gfx = nullptr;
 
-    std::unique_ptr<Input> _input = nullptr;
+    std::unique_ptr<Input> _input;
-    std::unique_ptr<Physics> _physics = nullptr;
+    std::unique_ptr<Physics> _physics;
 
     std::vector<Timer*> _timers, _timersToRemove;
 
@@ -379,7 +375,7 @@ private:
 
     std::vector<AnimationTarget> _animation_targets;
 
-    std::unique_ptr<ImGuiLayer> _imgui = nullptr;
+    std::unique_ptr<ImGuiLayer> _imgui;
 
     const InputButton debug_button = InputButton::Q;
 };

engine/core/include/file.hpp

@@ -9,6 +9,7 @@
 
 #include "log.hpp"
 #include "file_utils.hpp"
+#include "path.hpp"
 
 namespace file {
     enum class Domain {
@@ -133,5 +134,4 @@ namespace file {
     inline Path internal_domain = "/internal", app_domain = "/app";
 }
 
-
 inline std::array<std::string, 3> domain_data;

engine/core/include/physics.hpp

@@ -1,14 +1,20 @@
 #pragma once
 
-#include <btBulletDynamicsCommon.h>
 #include <memory>
 
 #include "vector.hpp"
 #include "object.hpp"
 
+class btBroadphaseInterface;
+class btDefaultCollisionConfiguration;
+class btCollisionDispatcher;
+class btSequentialImpulseConstraintSolver;
+class btDiscreteDynamicsWorld;
+
 class Physics {
 public:
     Physics();
+    ~Physics();
 
     void update(float deltaTime);
 

engine/core/src/debug.cpp

@@ -9,6 +9,8 @@
 #include "gfx.hpp"
 #include "asset.hpp"
 #include "imgui_utility.hpp"
+#include "scene.hpp"
+#include "renderer.hpp"
 
 void draw_general() {
     ImGui::Text("Platform: %s", platform::get_name());

engine/core/src/engine.cpp

@@ -2,22 +2,25 @@
 
 #include <nlohmann/json.hpp>
 
-#include "timer.hpp"
+#include "scene.hpp"
-#include "gfx.hpp"
-#include "renderer.hpp"
-#include "screen.hpp"
-#include "file.hpp"
-#include "transform.hpp"
-#include "math.hpp"
-#include "cutscene.hpp"
-#include "log.hpp"
-#include "imguilayer.hpp"
-#include "app.hpp"
-#include "json_conversions.hpp"
-#include "debug.hpp"
-#include "assertions.hpp"
 #include "console.hpp"
+#include "log.hpp"
 #include "asset.hpp"
+#include "json_conversions.hpp"
+#include "app.hpp"
+#include "assertions.hpp"
+#include "screen.hpp"
+#include "renderer.hpp"
+#include "gfx.hpp"
+#include "imguilayer.hpp"
+#include "debug.hpp"
+#include "timer.hpp"
+#include "physics.hpp"
+#include "input.hpp"
+
+// TODO: remove these in the future
+#include "shadowpass.hpp"
+#include "scenecapture.hpp"
 
 Engine::Engine(const int argc, char* argv[]) {
     console::info(System::Core, "Prism Engine loading...");
@@ -37,6 +40,8 @@ Engine::Engine(const int argc, char* argv[]) {
     assetm = std::make_unique<AssetManager>();
 }
 
+Engine::~Engine() {}
+
 void Engine::set_app(App* app) {
     Expects(app != nullptr);
     
@@ -400,7 +405,7 @@ void Engine::add_window(void* native_handle, const int identifier, const prism::
     
     _gfx->initialize_view(native_handle, identifier, drawable_extent.width, drawable_extent.height);
 
-    Window window;
+    Window& window = _windows.emplace_back();
     window.identifier = identifier;
     window.extent = extent;
     window.renderer = std::make_unique<Renderer>(_gfx);
@@ -408,7 +413,6 @@ void Engine::add_window(void* native_handle, const int identifier, const prism::
     window.renderer->resize(drawable_extent);
 
     render_ready = true;
-    _windows.push_back(std::move(window));
 }
 
 void Engine::remove_window(const int identifier) {

engine/core/src/physics.cpp

@@ -1,11 +1,16 @@
 #include "physics.hpp"
 
+#include <btBulletDynamicsCommon.h>
+
 #include "engine.hpp"
+#include "scene.hpp"
 
 Physics::Physics() {
     reset();
 }
 
+Physics::~Physics() {}
+
 void Physics::update(float deltaTime) {
     if(engine->get_scene() == nullptr)
         return;

engine/renderer/CMakeLists.txt

@@ -31,10 +31,10 @@ target_link_libraries(Renderer
     stb
     Math
     Utility
-    Core
     imgui
     SMAA::SMAA
-    ShaderCompiler)
+    ShaderCompiler
+    Core)
 target_include_directories(Renderer PUBLIC include)
 set_engine_properties(Renderer)
 

engine/renderer/include/renderer.hpp

@@ -4,13 +4,12 @@
 #include <vector>
 #include <cmath>
 
-#include "file.hpp"
 #include "pass.hpp"
 #include "matrix.hpp"
 #include "object.hpp"
-#include "dofpass.hpp"
 #include "common.hpp"
 #include "render_options.hpp"
+#include "path.hpp"
 
 namespace ui {
     class Screen;
@@ -45,6 +44,7 @@ class Material;
 class Renderer {
 public:
     Renderer(GFX* gfx, const bool enable_imgui = true);
+    ~Renderer();
 
     void resize(const prism::Extent extent);
     void resize_viewport(const prism::Extent extent);

engine/renderer/src/imguipass.cpp

@@ -8,6 +8,7 @@
 #include "gfx_commandbuffer.hpp"
 #include "log.hpp"
 #include "assertions.hpp"
+#include "renderer.hpp"
 
 void ImGuiPass::initialize() {
     ImGuiIO& io = ImGui::GetIO();

engine/renderer/src/materialcompiler.cpp

@@ -6,6 +6,7 @@
 #include "string_utils.hpp"
 #include "shadercompiler.hpp"
 #include "material_nodes.hpp"
+#include "renderer.hpp"
 
 ShaderSource get_shader(std::string filename, bool skinned, bool cubemap) {
     auto shader_file = file::open(file::internal_domain / filename);

engine/renderer/src/renderer.cpp

@@ -98,6 +98,8 @@ Renderer::Renderer(GFX* gfx, const bool enable_imgui) : gfx(gfx) {
     createBRDF();
 }
 
+Renderer::~Renderer() {}
+
 void Renderer::resize(const prism::Extent extent) {
     this->extent = extent;
 

engine/renderer/src/shadowpass.cpp

@@ -8,6 +8,7 @@
 #include "materialcompiler.hpp"
 #include "assertions.hpp"
 #include "frustum.hpp"
+#include "renderer.hpp"
 
 struct PushConstant {
     Matrix4x4 mvp, model;

engine/utility/CMakeLists.txt

@@ -6,6 +6,8 @@ set(SRC
     include/common.hpp
     include/aabb.hpp
     include/file_utils.hpp
+    include/assertions.hpp
+    include/path.hpp
     
     src/string_utils.cpp)
 

engine/utility/include/path.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <filesystem>
+
+namespace file {
+    using Path = std::filesystem::path;
+}

tools/common/include/commoneditor.hpp

@@ -19,6 +19,8 @@
 #include "assertions.hpp"
 #include "log.hpp"
 #include "asset.hpp"
+#include "scene.hpp"
+#include "renderer.hpp"
 
 class TransformCommand : public Command {
 public:

tools/common/src/commoneditor.cpp

@@ -20,6 +20,8 @@
 #include "imgui_utility.hpp"
 #include "screen.hpp"
 #include "console.hpp"
+#include "input.hpp"
+#include "scenecapture.hpp"
 
 const std::map<ImGuiKey, InputButton> imToPl = {
     {ImGuiKey_Tab, InputButton::Tab},

tools/common/src/debugpass.cpp

@@ -9,6 +9,7 @@
 #include "asset.hpp"
 #include "log.hpp"
 #include "materialcompiler.hpp"
+#include "renderer.hpp"
 
 struct BillPushConstant {
     Matrix4x4 view, mvp;

tools/editor/src/uieditor.cpp

@@ -1,5 +1,6 @@
 #include "uieditor.hpp"
 
+#include <nlohmann/json.hpp>
 #include <imgui.h>
 #include <imgui_stdlib.h>
 #include <imgui_internal.h>