diff --git a/src/dawn/dawn.hpp b/src/dawn/dawn.hpp index e972067a..fb85f91e 100644 --- a/src/dawn/dawn.hpp +++ b/src/dawn/dawn.hpp @@ -49,18 +49,5 @@ extern "C" { #define GLM_ENABLE_EXPERIMENTAL 1 #include <glm/gtx/matrix_decompose.hpp> -#include <Jolt/Jolt.h> -#include <Jolt/RegisterTypes.h> -#include <Jolt/Core/Factory.h> -#include <Jolt/Core/TempAllocator.h> -#include <Jolt/Core/JobSystemThreadPool.h> -#include <Jolt/Physics/PhysicsSettings.h> -#include <Jolt/Physics/PhysicsSystem.h> -#include <Jolt/Physics/Collision/Shape/BoxShape.h> -#include <Jolt/Physics/Collision/Shape/SphereShape.h> -#include <Jolt/Physics/Body/BodyCreationSettings.h> -#include <Jolt/Physics/Body/BodyActivationListener.h> -#include <Jolt/Physics/Character/Character.h> - #include <nlohmann/json.hpp> using json = nlohmann::json; \ No newline at end of file diff --git a/src/dawnphysics/component/physics/Collider.hpp b/src/dawnphysics/component/physics/Collider.hpp index 0fa5ac0c..cb788aec 100644 --- a/src/dawnphysics/component/physics/Collider.hpp +++ b/src/dawnphysics/component/physics/Collider.hpp @@ -5,6 +5,7 @@ #pragma once #include "scene/SceneItem.hpp" +#include "dawnphysics.hpp" namespace Dawn { enum class ColliderType { diff --git a/src/dawnphysics/dawnphysics.hpp b/src/dawnphysics/dawnphysics.hpp new file mode 100644 index 00000000..0471f999 --- /dev/null +++ b/src/dawnphysics/dawnphysics.hpp @@ -0,0 +1,19 @@ +// Copyright (c) 2024 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#pragma once + +#include <Jolt/Jolt.h> +#include <Jolt/RegisterTypes.h> +#include <Jolt/Core/Factory.h> +#include <Jolt/Core/TempAllocator.h> +#include <Jolt/Core/JobSystemThreadPool.h> +#include <Jolt/Physics/PhysicsSettings.h> +#include <Jolt/Physics/PhysicsSystem.h> +#include <Jolt/Physics/Collision/Shape/BoxShape.h> +#include <Jolt/Physics/Collision/Shape/SphereShape.h> +#include <Jolt/Physics/Body/BodyCreationSettings.h> +#include <Jolt/Physics/Body/BodyActivationListener.h> +#include <Jolt/Physics/Character/Character.h> \ No newline at end of file diff --git a/src/dawnphysics/physics/PhysicsManager.hpp b/src/dawnphysics/physics/PhysicsManager.hpp index dd333d25..65609a10 100644 --- a/src/dawnphysics/physics/PhysicsManager.hpp +++ b/src/dawnphysics/physics/PhysicsManager.hpp @@ -5,6 +5,7 @@ #pragma once #include "dawn.hpp" +#include "dawnphysics.hpp" namespace Dawn { class Game;