contact 4 refactor

2025-03-06 19:12:35 +01:00
parent 77a95811f2
commit c29aa523dc
24 changed files with 196 additions and 155 deletions
--- a/src/bitset_image_loader.hpp
+++ b/src/bitset_image_loader.hpp
@ -1,16 +1,20 @@
 #pragma once

 #include <solanaceae/object_store/fwd.hpp>
-#include <solanaceae/contact/contact_model3.hpp>
+#include <solanaceae/contact/fwd.hpp>
 #include <solanaceae/util/bitset.hpp>

 #include "./texture_cache.hpp"

+#include <entt/entity/entity.hpp>
+#include <entt/entity/registry.hpp>
+#include <entt/entity/handle.hpp>
+
 #include <optional>

 struct ObjectContactSub final {
 	ObjectHandle o;
-	Contact3 c{entt::null};
+	Contact4 c{entt::null};
 };

 template<>