Fixed Queries not returning results if only tags are used.

* Fixed entities improperly storing their slots in the entity storage, overriding previous values in large operations.
* Fixed entities not clearing slot information on destruction.
* Fixed entities being moved to the wrong locations after a hole was created during destruction.
* Fixed some bugs in x64 and webasm test apps.

Author: Dandielo

source/code/example/webasm/private/example_webasm.cxx

@@ -113,7 +113,7 @@ struct TestTrait : public ice::Trait
     ice::Timer timer;
 
     using TestArchetype = ice::ecs::ArchetypeDefinition<C1, C2>;
-    static constexpr ice::ecs::ArchetypeDefinition Archetype_TestArchetype = TestArchetype{};
+    static constexpr ice::ecs::ArchetypeDefinition Archetype_TestArchetype = TestArchetype{ "test-arch" };
 
     ice::ecs::EntityOperations* _ops;
     ice::ecs::Entity _my_entity[10000];
@@ -123,8 +123,7 @@ struct TestTrait : public ice::Trait
 
         update.engine.entity_index().create_many(_my_entity);
         _ops = ice::addressof(update.world.entity_operations());
-
-        ice::ecs::queue_set_archetype(*_ops, _my_entity, Archetype_TestArchetype);
+        _ops->set("test-arch", _my_entity);
 
         ICE_LOG(LogSeverity::Retail, LogTag::Game, "Test Activated!");
         timer = ice::timer::create_timer(update.clock, 100_Tms);
@@ -138,7 +137,7 @@ struct TestTrait : public ice::Trait
         query<ice::ecs::Entity>().tags<C1, C2>().for_each_block(
             [&](ice::ucount count, ice::ecs::Entity const* entities) noexcept
             {
-                ice::ecs::queue_batch_remove_entities(*_ops, { entities, count });
+                _ops->destroy({ entities, count });
             }
         );
 
@@ -187,9 +186,7 @@ struct TestTrait : public ice::Trait
             ICE_LOG(LogSeverity::Info, LogTag::Game, "TestTrait::logic {}", x.load());
         }
 
-        ICE_LOG(LogSeverity::Debug, LogTag::Game, "{}", std::hash<std::thread::id>{}(std::this_thread::get_id()));
         co_await ice::await_scheduled_on(tasks, update.thread.tasks, update.thread.main);
-        ICE_LOG(LogSeverity::Debug, LogTag::Game, "{}", std::hash<std::thread::id>{}(std::this_thread::get_id()));
         co_return;
     }
 

source/code/iceshard/engine/private/ecs/ecs_archetype_index.cxx

@@ -28,11 +28,11 @@ namespace ice::ecs
             return base_offset;
         }
 
-        auto contains_required_components(
+        bool contains_required_components(
             ice::Span<ice::ecs::detail::QueryTypeInfo const> in_conditions,
             ice::Span<ice::StringID const> in_required_tags,
             ice::Span<ice::StringID const> checked_identifiers
-        ) noexcept -> ice::u32
+        ) noexcept
         {
             using QueryTypeInfo = ice::ecs::detail::QueryTypeInfo;
 
@@ -93,7 +93,7 @@ namespace ice::ecs
                 matched_components += (identifier_hash == condition_hash);
             }
 
-            return result ? matched_components : 0;
+            return result;
         }
 
     } // namespace detail
@@ -367,15 +367,15 @@ namespace ice::ecs
                 continue;
             }
 
-            ice::u32 const matched_components = ice::ecs::detail::contains_required_components(
+            bool const was_matched = ice::ecs::detail::contains_required_components(
                 query_info,
                 query_tags,
                 archetype_info.component_identifiers
             );
 
             // If we don't match any component in a full optional query, we still skip this archetype.
             //  #todo: we should probably also check for the existance of the EntityHandle in the query. Then the check should be `> 1`
-            if (matched_components > 0)
+            if (was_matched)
             {
                 ice::array::push_back(out_archetypes, entry->archetype_identifier);
             }

source/code/iceshard/engine/private/ecs/ecs_entity_storage.cxx

@@ -317,6 +317,7 @@ namespace ice::ecs
         void batch_remove_entities(
             ice::ecs::ArchetypeIndex const& archetypes,
             ice::HashMap<ice::ecs::detail::EntityDestructor> const& destructors,
+            ice::Span<ice::ecs::EntityDataSlot> dst_data_slots,
             ice::Span<ice::ecs::Entity const> entities_to_remove,
             ice::Span<ice::ecs::detail::DataBlock*> data_blocks,
             ice::Span<ice::ecs::EntityDataSlot> data_slots
@@ -481,15 +482,23 @@ namespace ice::ecs
                         first_slot_info, // The initially removed slot
                         component_info,
                         component_info,
-                        del_data_details, /* src data block */
-                        dst_data_details /* dst data block */
+                        dst_data_details, /* src data block */
+                        del_data_details /* dst data block */
                     );
                 }
 
                 // Remove entity count from the block we moved from (we can just forget the data existed)
                 archetype_block->block_entity_count -= span_size;
 
             } while(it != end);
+
+            // Clear all references
+            // TODO: We might not need this later once we extend Operations with a "type" flag.
+            for (ice::ecs::Entity entity : entities_to_remove)
+            {
+                ice::ecs::EntityInfo const ei = ice::ecs::entity_info(entity);
+                dst_data_slots[ei.index] = {}; // Reset the slot info!
+            }
         }
 
         auto default_filter(void const*, void const*) noexcept
@@ -755,10 +764,10 @@ namespace ice::ecs
                     }
                 }
 
-                // #todo allow different archetypes maybe?
-                ICE_ASSERT(
+                ICE_LOG_IF(
                     same_archetype == true,
-                    "Entities in operation have different archetypes, operation is illformed!"
+                    LogSeverity::Warning, LogTag::Engine,
+                    "Entities in operation have different archetypes, not all operations can handle this yet! Check for possible bugs!"
                 );
             }
 
@@ -976,6 +985,7 @@ namespace ice::ecs
                         }
 
                         // Update the remianing count
+                        processed_count += entities_stored;
                         remaining_count -= entities_stored;
                         data_block_it->block_entity_count += entities_stored;
                     }
@@ -1063,6 +1073,7 @@ namespace ice::ecs
                     ice::ecs::detail::batch_remove_entities(
                         _archetype_index,
                         _destructors,
+                        _data_slots,
                         entities,
                         _data_blocks,
                         _data_slots

source/code/test/private/game.cxx

@@ -135,8 +135,6 @@ struct TestTrait : public ice::Trait
     ice::Allocator& _alloc;
     ice::Timer timer;
 
-    ice::ecs::Archetype _arch_test;
-
     ice::ecs::EntityOperations* _ops;
     ice::ecs::Entity _my_entity[10000];
 
@@ -145,7 +143,7 @@ struct TestTrait : public ice::Trait
 
         update.engine.entity_index().create_many(_my_entity);
         _ops = ice::addressof(update.world.entity_operations());
-        _ops->set(_arch_test, _my_entity);
+        _ops->set("test-arch", _my_entity);
 
         ICE_LOG(LogSeverity::Retail, LogTag::Game, "Test Activated!");
         timer = ice::timer::create_timer(update.clock, 100_Tms);