pke: first-pass promote pke_level over pke_scene

Major runtime ownership overhaul (scene -> level).

Major ecs 'marked for removal' overhaul, ensuring
that entities and their components are actually
being removed when levels are unloaded.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/serialization-camera.cpp b/src/serialization-camera.cpp
index c955a9f..bc3c716 100644
--- a/src/serialization-camera.cpp
+++ b/src/serialization-camera.cpp
@@ -3,17 +3,17 @@
 
 #include "camera.hpp"
 #include "compile-time-assert.hpp"
-#include "pk.h"
-#include "serialization-component.hpp"
 #include "ecs.hpp"
+#include "level.hpp"
 #include "math-helpers.hpp"
-#include "scene.hpp"
-
-#include <BulletCollision/CollisionShapes/btCollisionShape.h>
-
+#include "serialization-component.hpp"
 #include "serialization.hpp"
 #include "vendor-glm-include.hpp"
 
+#include "pk.h"
+
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
+
 pk_handle pke_serialize_camera(srlztn_serialize_helper *h, const PkeCamera *cam) {
 	assert(h != nullptr);
 	assert(cam != nullptr);
@@ -184,7 +184,7 @@ void pke_deserialize_camera(srlztn_deserialize_helper *h, pke_kve_container *kve
 	rCam.type = cam.type;
 	rCam.view = cam.view;
 	rCam.isPrimary = cam.isPrimary;
-	pke_scene_register_camera(h->scene->scene_handle, rCam.camHandle);
+	pke_level_register_camera(h->level, &rCam);
 	if (targetInstanceIndex != uint32_t(-1)) {
 		rCam.phys.target_inst_handle = h->mapping[targetInstanceIndex].created_instance->instanceHandle;
 		PkeCamera_TargetInstance(rCam.camHandle, h->mapping[targetInstanceIndex].created_instance);