diff --git a/Cargo.lock b/Cargo.lock index ca6c410..46f04d3 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,17 +51,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", - "getrandom", "once_cell", "version_check", ] -[[package]] -name = "aligned-vec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" - [[package]] name = "android-activity" version = "0.4.2" @@ -719,12 +712,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.26" @@ -769,12 +756,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3aaba7ff514ee9d802b562927f80b1e94e93d8e74c31b134c9c3762dabf1a36b" -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "futures-channel" version = "0.3.28" @@ -1070,7 +1051,7 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational 0.4.1", + "num-rational", "num-traits", "png", "qoi", @@ -1289,7 +1270,7 @@ version = "0.1.0" dependencies = [ "anyhow", "lyra-ecs-derive", - "rand 0.8.5", + "rand", "thiserror", ] @@ -1306,11 +1287,9 @@ dependencies = [ name = "lyra-engine" version = "0.0.1" dependencies = [ - "aligned-vec", "anyhow", "async-std", "async-trait", - "atomicell", "bytemuck", "cfg-if", "gilrs-core", @@ -1320,11 +1299,8 @@ dependencies = [ "itertools", "lyra-ecs", "lyra-resource", - "petgraph", "quote", - "stopwatch", "syn 2.0.42", - "tobj", "tracing", "tracing-appender", "tracing-log", @@ -1566,42 +1542,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational 0.1.42", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", - "num-traits", - "rand 0.4.6", - "rustc-serialize", -] - -[[package]] -name = "num-complex" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -dependencies = [ - "num-traits", - "rustc-serialize", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -1612,29 +1552,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", - "rustc-serialize", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -1826,16 +1743,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.0", -] - [[package]] name = "pin-project" version = "1.1.3" @@ -1963,19 +1870,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - [[package]] name = "rand" version = "0.8.5" @@ -1984,7 +1878,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -1994,24 +1888,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.6.4" @@ -2055,15 +1934,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -2091,12 +1961,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "rustix" version = "0.37.23" @@ -2282,15 +2146,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stopwatch" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d04b5ebc78da44d3a456319d8bc2783e7d8cc7ccbb5cb4dc3f54afbd93bf728" -dependencies = [ - "num", -] - [[package]] name = "strict-num" version = "0.1.1" @@ -2439,15 +2294,6 @@ dependencies = [ "strict-num", ] -[[package]] -name = "tobj" -version = "3.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57381207291289bad19de63acd3fbf5948ff99b2868116c367b7224c37d55f90" -dependencies = [ - "ahash 0.8.3", -] - [[package]] name = "toml_datetime" version = "0.6.3" @@ -2571,7 +2417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", - "rand 0.8.5", + "rand", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d12e414..6945df6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,26 +18,18 @@ winit = "0.28.1" tracing = "0.1.37" tracing-subscriber = { version = "0.3.16", features = [ "tracing-log" ] } tracing-log = "0.1.3" +tracing-appender = "0.2.2" wgpu = "0.15.1" async-std = { version = "1.12.0", features = [ "unstable", "attributes" ] } cfg-if = "1" bytemuck = { version = "1.12", features = [ "derive" ] } image = { version = "0.24", default-features = false, features = ["png", "jpeg"] } anyhow = "1.0" -tobj = { version = "3.2.1", features = [ - "async", -]} instant = "0.1" async-trait = "0.1.65" glam = { version = "0.24.0", features = ["bytemuck", "debug-glam-assert"] } gilrs-core = "0.5.6" syn = "2.0.26" quote = "1.0.29" -#edict = "0.5.0" -atomicell = "0.1.9" -aligned-vec = "0.5.0" -tracing-appender = "0.2.2" -stopwatch = "0.0.7" -petgraph = "0.6.4" uuid = { version = "1.5.0", features = ["v4", "fast-rng"] } itertools = "0.11.0" diff --git a/lyra-ecs/src/archetype.rs b/lyra-ecs/src/archetype.rs index 582a0d2..0ad4920 100644 --- a/lyra-ecs/src/archetype.rs +++ b/lyra-ecs/src/archetype.rs @@ -67,12 +67,15 @@ impl ComponentColumn { let dest = NonNull::new_unchecked(data.as_ptr().add(entity_index * self.info.layout.size)); ptr::copy_nonoverlapping(comp_src.as_ptr(), dest.as_ptr(), self.info.layout.size); - if is_dynamic { - unsafe { - let layout = self.info.layout.into_layout().unwrap(); - std::alloc::dealloc(comp_src.as_ptr(), layout); - } - } + // I thought there was a point for why I added the dealloc, but now the it + // only seems to cause invalid pointers crashes. + // + // if is_dynamic { + // unsafe { + // let layout = self.info.layout.into_layout().unwrap(); + // std::alloc::dealloc(comp_src.as_ptr(), layout); + // } + // } // check if a component spot is being set twice and that the entity's tick is // already stored