Compare commits
3 commits
0b9cea1f93
...
3912438259
Author | SHA1 | Date | |
---|---|---|---|
3912438259 | |||
894174e063 | |||
4a0098445a |
3 changed files with 4 additions and 4 deletions
|
@ -26,7 +26,7 @@ members = [
|
||||||
destructure_traitobject = "0.3.0"
|
destructure_traitobject = "0.3.0"
|
||||||
itertools = "0.14.0"
|
itertools = "0.14.0"
|
||||||
serde = { version = "1.0.203", features = ["derive"] }
|
serde = { version = "1.0.203", features = ["derive"] }
|
||||||
ron = "0.9.0"
|
ron = "0.10.0"
|
||||||
paste = "1.0.15"
|
paste = "1.0.15"
|
||||||
chrono = { version = "0.4.35", features = ["serde"] }
|
chrono = { version = "0.4.35", features = ["serde"] }
|
||||||
anyhow = { version = "1.0.86", features = ["backtrace"] }
|
anyhow = { version = "1.0.86", features = ["backtrace"] }
|
||||||
|
|
|
@ -33,7 +33,7 @@ pub struct InputMap {
|
||||||
pub direction_mapping: HashMap<Keycode, GuiDirection>,
|
pub direction_mapping: HashMap<Keycode, GuiDirection>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait EventSystem<Func, T> {
|
pub trait EventSystem<Func, C> {
|
||||||
fn event_system(world_builder: &mut WorldBuilder, func: Func);
|
fn event_system(world_builder: &mut WorldBuilder, func: Func);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -405,6 +405,7 @@ macro_rules! impl_event_system {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl_event_system!();
|
impl_event_system!();
|
||||||
|
impl_event_system!(A,);
|
||||||
impl_event_system!(A, B,);
|
impl_event_system!(A, B,);
|
||||||
impl_event_system!(A, B, C,);
|
impl_event_system!(A, B, C,);
|
||||||
impl_event_system!(A, B, C, D,);
|
impl_event_system!(A, B, C, D,);
|
||||||
|
|
|
@ -54,7 +54,7 @@ impl SkyBox {
|
||||||
.graphics_info()?
|
.graphics_info()?
|
||||||
.sample_count;
|
.sample_count;
|
||||||
|
|
||||||
let context = world.resources.get_mut_unchecked::<Context>();
|
let (context, scene): (&mut Context, &mut Scene) = world.resources.get_mut()?;
|
||||||
|
|
||||||
let images = images.into();
|
let images = images.into();
|
||||||
let cube_map = Image::cube_map([
|
let cube_map = Image::cube_map([
|
||||||
|
@ -121,7 +121,6 @@ impl SkyBox {
|
||||||
.build(context.device().clone())?;
|
.build(context.device().clone())?;
|
||||||
let descriptor_set = descriptor_pool.prepare_set().allocate()?;
|
let descriptor_set = descriptor_pool.prepare_set().allocate()?;
|
||||||
|
|
||||||
let scene = world.resources.get::<Scene>();
|
|
||||||
let view = scene.view();
|
let view = scene.view();
|
||||||
|
|
||||||
descriptor_set.update(&[
|
descriptor_set.update(&[
|
||||||
|
|
Loading…
Reference in a new issue