bailwillharr/engine
1
0
Fork 0
mirror of https://github.com/bailwillharr/engine.git synced 2024-09-21 04:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change something??

Browse Source
This commit is contained in:
bailehuni 2024-04-29 18:51:52 +01:00
parent 4f8252476c
commit 119978774c
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/scene.h
View File

@ -108,6 +108,14 @@ class Scene {
ecs_systems_.emplace_back(hash, std::make_unique<T>(this)); ecs_systems_.emplace_back(hash, std::make_unique<T>(this));
} }
/* Pushes old systems starting at 'index' along by 1 */
template <typename T>
void RegisterSystemAtIndex(size_t index)
{
size_t hash = typeid(T).hash_code();
ecs_systems_.emplace(ecs_systems_.begin() + index, hash, std::make_unique<T>(this));
}
template <typename T> template <typename T>
T* GetSystem() T* GetSystem()
{ {

8
src/scene.cpp
View File

@ -26,11 +26,11 @@ Scene::Scene(Application* app) : app_(app) {
RegisterComponent<UIRenderableComponent>(); RegisterComponent<UIRenderableComponent>();
// Order here matters: // Order here matters:
RegisterSystem<CustomBehaviourSystem>(); // potentially modifies transforms
RegisterSystem<TransformSystem>(); RegisterSystem<TransformSystem>();
RegisterSystem<CollisionSystem>(); RegisterSystem<CollisionSystem>(); // depends on transformed world matrix
RegisterSystem<CustomBehaviourSystem>(); RegisterSystem<MeshRenderSystem>(); // depends on transformed world matrix
RegisterSystem<MeshRenderSystem>(); RegisterSystem<UIRenderSystem>(); // does nothing as of now
RegisterSystem<UIRenderSystem>();
} }
Scene::~Scene() {} Scene::~Scene() {}

4
test/src/game.cpp
View File

@ -68,7 +68,7 @@ void PlayGame(GameSettings settings)
//engine::Entity temple = engine::util::LoadGLTF(*start_scene, "C:/games/temple.glb", true); //engine::Entity temple = engine::util::LoadGLTF(*start_scene, "C:/games/temple.glb", true);
start_scene->RegisterComponent<CameraControllerComponent>(); start_scene->RegisterComponent<CameraControllerComponent>();
start_scene->RegisterSystem<CameraControllerSystem>(); start_scene->RegisterSystemAtIndex<CameraControllerSystem>(0);
start_scene->AddComponent<CameraControllerComponent>(camera)->noclip = true; start_scene->AddComponent<CameraControllerComponent>(camera)->noclip = true;
start_scene->GetPosition(camera).z += 10.0f; start_scene->GetPosition(camera).z += 10.0f;
} }
@ -93,7 +93,7 @@ void PlayGame(GameSettings settings)
camera_transform->is_static = false; camera_transform->is_static = false;
main_scene->RegisterComponent<CameraControllerComponent>(); main_scene->RegisterComponent<CameraControllerComponent>();
main_scene->RegisterSystem<CameraControllerSystem>(); main_scene->RegisterSystemAtIndex<CameraControllerSystem>(0);
main_scene->AddComponent<CameraControllerComponent>(camera); main_scene->AddComponent<CameraControllerComponent>(camera);
/* floor */ /* floor */