From 9d822debffbc177f8c1106747b679e437cd89d2e Mon Sep 17 00:00:00 2001 From: bgkillas Date: Thu, 24 Jul 2025 00:10:23 -0400 Subject: [PATCH] rename component manager to component buffer as thats what noiter calls it --- noita_api/src/noita/types/component.rs | 18 +++++++++--------- noita_api/src/noita/types/entity.rs | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/noita_api/src/noita/types/component.rs b/noita_api/src/noita/types/component.rs index 0f56eed3..fbeb0cc1 100644 --- a/noita_api/src/noita/types/component.rs +++ b/noita_api/src/noita/types/component.rs @@ -28,34 +28,34 @@ pub struct ComponentManagerVTable { #[derive(Debug)] pub struct ComponentTypeManager { pub next_id: usize, - pub component_manager_indices: StdMap, + pub component_buffer_indices: StdMap, } impl ComponentTypeManager { - pub fn get(&self, entity_manager: &EntityManager) -> &ComponentManager { + pub fn get(&self, entity_manager: &EntityManager) -> &ComponentBuffer { let index = self - .component_manager_indices + .component_buffer_indices .get(C::STD_NAME) .copied() .unwrap(); - let mgr = entity_manager.component_managers.get(index).unwrap(); + let mgr = entity_manager.component_buffers.get(index).unwrap(); unsafe { mgr.as_ref() }.unwrap() } pub fn get_mut( &mut self, entity_manager: &mut EntityManager, - ) -> &mut ComponentManager { + ) -> &mut ComponentBuffer { let index = self - .component_manager_indices + .component_buffer_indices .get(C::STD_NAME) .copied() .unwrap(); - let mgr = entity_manager.component_managers.get(index).unwrap(); + let mgr = entity_manager.component_buffers.get(index).unwrap(); unsafe { mgr.as_mut() }.unwrap() } } #[repr(C)] #[derive(Debug)] -pub struct ComponentManager { +pub struct ComponentBuffer { pub vtable: &'static ComponentManagerVTable, pub end: usize, unk: [isize; 2], @@ -65,7 +65,7 @@ pub struct ComponentManager { pub next: StdVec, pub component_list: StdVec<*mut ComponentData>, } -impl ComponentManager { +impl ComponentBuffer { pub fn iter_components(&self, entry: usize) -> ComponentIter { if let Some(off) = self.entity_entry.get(entry) { ComponentIter { diff --git a/noita_api/src/noita/types/entity.rs b/noita_api/src/noita/types/entity.rs index 262dc8f7..e081444c 100644 --- a/noita_api/src/noita/types/entity.rs +++ b/noita_api/src/noita/types/entity.rs @@ -1,11 +1,11 @@ -use crate::noita::types::component::{ComponentData, ComponentManager}; +use crate::noita::types::component::{ComponentBuffer, ComponentData}; use crate::noita::types::{ Component, ComponentTypeManager, Inventory2Component, StdMap, StdString, StdVec, Vec2, }; use std::{mem, slice}; impl EntityManager { pub fn set_all_components(&mut self, ent: &mut Entity, enabled: bool) { - self.iter_component_managers_mut().for_each(|c| { + self.iter_component_buffers_mut().for_each(|c| { c.iter_components_mut(ent.entry) .for_each(|c| c.enabled = enabled) }) @@ -28,7 +28,7 @@ impl EntityManager { tag: &StdString, enabled: bool, ) { - self.iter_component_managers_mut().for_each(|c| { + self.iter_component_buffers_mut().for_each(|c| { c.iter_components_mut(ent.entry) .filter(|c| c.tags.has_tag(tag_manager, tag)) .for_each(|c| c.enabled = enabled) @@ -134,16 +134,16 @@ impl EntityManager { .iter_mut() .filter_map(|c| unsafe { c.as_mut() }) } - pub fn iter_component_managers(&self) -> impl Iterator { - self.component_managers + pub fn iter_component_buffers(&self) -> impl Iterator { + self.component_buffers .as_ref() .iter() .filter_map(|c| unsafe { c.as_ref() }) } - pub fn iter_component_managers_mut( + pub fn iter_component_buffers_mut( &mut self, - ) -> impl Iterator { - self.component_managers + ) -> impl Iterator { + self.component_buffers .as_mut() .iter_mut() .filter_map(|c| unsafe { c.as_mut() }) @@ -154,11 +154,11 @@ impl EntityManager { entry: usize, ) -> impl Iterator { let index = component_type_manager - .component_manager_indices + .component_buffer_indices .get(C::STD_NAME) .copied() .unwrap(); - let mgr = self.component_managers.get(index).unwrap(); + let mgr = self.component_buffers.get(index).unwrap(); unsafe { mgr.as_ref() } .unwrap() .iter_components(entry) @@ -278,14 +278,14 @@ impl EntityManager { &self, entry: usize, ) -> impl Iterator { - self.iter_component_managers() + self.iter_component_buffers() .flat_map(move |c| c.iter_components(entry)) } pub fn iter_all_components_mut( &mut self, entry: usize, ) -> impl Iterator { - self.iter_component_managers_mut() + self.iter_component_buffers_mut() .flat_map(move |c| c.iter_components_mut(entry)) } pub fn iter_in_radius(&self, pos: Vec2, radius: f32) -> impl Iterator { @@ -660,7 +660,7 @@ pub struct EntityManager { pub free_ids: StdVec, pub entities: StdVec<*mut Entity>, pub entity_buckets: StdVec>, - pub component_managers: StdVec<*mut ComponentManager>, + pub component_buffers: StdVec<*mut ComponentBuffer>, } #[repr(C)] #[derive(Debug)]