Skip to content

fix: Fix Hyperion and bows... #879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ version = '1.1.1'
[workspace.dependencies.flecs_ecs]
features = ['flecs_manual_registration']
git = 'https://github.com/Indra-db/Flecs-Rust'
rev = "cb296d0"
version = "0.1.3"

[workspace.dependencies.geometry]
path = 'crates/geometry'
Expand Down
2 changes: 1 addition & 1 deletion crates/hyperion/src/simulation/entity_kind.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use flecs_ecs::{core::ComponentOrPairId, macros::Component};
use flecs_ecs::macros::Component;

#[derive(Component, Copy, Clone, Debug, PartialEq, Eq, Hash)]
#[repr(C)]
Expand Down
2 changes: 1 addition & 1 deletion crates/hyperion/src/simulation/metadata/entity/flags.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use derive_more::Deref;
use flecs_ecs::{core::ComponentOrPairId, macros::Component};
use flecs_ecs::macros::Component;

use crate::simulation::metadata::Metadata;

Expand Down
4 changes: 2 additions & 2 deletions crates/system-order/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::collections::{BTreeSet, HashMap, HashSet};
use derive_more::Constructor;
use flecs_ecs::{
core::{
Builder, ComponentOrPairId, Entity, EntityView, EntityViewGet, IdOperations, QueryAPI,
QueryBuilderImpl, SystemAPI, flecs, flecs::DependsOn,
Builder, Entity, EntityView, EntityViewGet, IdOperations, QueryAPI, QueryBuilderImpl,
SystemAPI, flecs, flecs::DependsOn,
},
macros::Component,
prelude::{Module, World},
Expand Down
4 changes: 2 additions & 2 deletions events/tag/src/module/attack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::borrow::Cow;
use compact_str::format_compact;
use flecs_ecs::{
core::{
Builder, ComponentOrPairId, EntityView, EntityViewGet, QueryAPI, QueryBuilderImpl,
SystemAPI, TableIter, TermBuilderImpl, World, WorldGet, flecs,
Builder, EntityView, EntityViewGet, QueryAPI, QueryBuilderImpl, SystemAPI, TableIter,
TermBuilderImpl, World, WorldGet, flecs,
},
macros::{Component, system},
prelude::Module,
Expand Down
8 changes: 4 additions & 4 deletions events/tag/src/module/bow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ impl Module for BowModule {
world,
&mut EventQueue<event::ItemInteract>,
)
.singleton()
.multi_threaded()
//.singleton()
//.multi_threaded()
.kind::<flecs::pipeline::PostUpdate>()
.each_iter(move |it, _, event_queue| {
let _system = it.system();
Expand Down Expand Up @@ -203,7 +203,7 @@ impl Module for BowModule {
&Compose($),
&mut EventQueue<event::ProjectileEntityEvent>,
)
.multi_threaded()
//.multi_threaded()
.singleton()
.kind::<flecs::pipeline::PostUpdate>()
.each_iter(move |it, _, (compose, event_queue)| {
Expand Down Expand Up @@ -263,7 +263,7 @@ impl Module for BowModule {
world,
&mut EventQueue<event::ProjectileBlockEvent>,
)
.multi_threaded()
//.multi_threaded()
.kind::<flecs::pipeline::PreStore>()
.each_iter(move |it, _, event_queue| {
let _system = it.system();
Expand Down
5 changes: 1 addition & 4 deletions events/tag/src/module/chat.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
use flecs_ecs::{
core::{
ComponentOrPairId, EntityViewGet, QueryBuilderImpl, SystemAPI, TableIter, TermBuilderImpl,
World, flecs,
},
core::{EntityViewGet, QueryBuilderImpl, SystemAPI, TableIter, TermBuilderImpl, World, flecs},
macros::{Component, system},
prelude::Module,
};
Expand Down
5 changes: 1 addition & 4 deletions events/tag/src/module/level.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
use flecs_ecs::{
core::{
ComponentOrPairId, QueryBuilderImpl, SystemAPI, World, WorldProvider, flecs,
term::TermBuilderImpl,
},
core::{QueryBuilderImpl, SystemAPI, World, WorldProvider, flecs, term::TermBuilderImpl},
macros::Component,
prelude::Module,
};
Expand Down
2 changes: 1 addition & 1 deletion events/tag/src/module/regeneration.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use flecs_ecs::{
core::{ComponentOrPairId, QueryBuilderImpl, TermBuilderImpl, World, flecs},
core::{QueryBuilderImpl, TermBuilderImpl, World, flecs},
macros::{Component, system},
prelude::Module,
};
Expand Down
Loading