summaryrefslogtreecommitdiff
path: root/engine/src
diff options
context:
space:
mode:
authorHampusM <hampus@hampusmat.com>2024-11-11 00:14:06 +0100
committerHampusM <hampus@hampusmat.com>2024-11-11 00:14:06 +0100
commit06750934c33a8b1458d60fe8d877bbf29ffda955 (patch)
tree52514b60628372c4e8c96d5f2bf6447e69eb23be /engine/src
parentbfcb849fdf37412e0c61fd0b6f843caa6c4668a9 (diff)
chore(engine): use new entity IDs
Diffstat (limited to 'engine/src')
-rw-r--r--engine/src/lib.rs4
-rw-r--r--engine/src/renderer/opengl.rs6
2 files changed, 6 insertions, 4 deletions
diff --git a/engine/src/lib.rs b/engine/src/lib.rs
index 5df2292..abf26f5 100644
--- a/engine/src/lib.rs
+++ b/engine/src/lib.rs
@@ -2,13 +2,13 @@
#![allow(clippy::needless_pass_by_value)]
use ecs::component::Sequence as ComponentSequence;
-use ecs::entity::Uid as EntityUid;
use ecs::event::component::TypeTransformComponentsToAddedEvents;
use ecs::event::{Event, Sequence as EventSequence};
use ecs::extension::Extension;
use ecs::sole::Sole;
use ecs::system::{Into, System};
use ecs::tuple::Reduce as TupleReduce;
+use ecs::uid::Uid;
use ecs::{SoleAlreadyExistsError, World};
use crate::delta_time::{update as update_delta_time, DeltaTime, LastUpdate};
@@ -83,7 +83,7 @@ impl Engine
Self { world }
}
- pub fn spawn<Comps>(&mut self, components: Comps) -> EntityUid
+ pub fn spawn<Comps>(&mut self, components: Comps) -> Uid
where
Comps: ComponentSequence + TupleReduce<TypeTransformComponentsToAddedEvents>,
Comps::Out: EventSequence,
diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs
index 463e654..a353c6a 100644
--- a/engine/src/renderer/opengl.rs
+++ b/engine/src/renderer/opengl.rs
@@ -174,8 +174,10 @@ fn render(
new_gl_objects = Some(gl_objects.clone());
- actions
- .add_components(query.entity_uid(entity_index).unwrap(), (gl_objects,));
+ actions.add_components(
+ query.get_entity_uid(entity_index).unwrap(),
+ (gl_objects,),
+ );
&*new_gl_objects.unwrap()
};