wip

common/src/iter.rs

@@ -0,0 +1,68 @@
+pub fn chain<T: TupleITChain>(t: T) -> T::Iter {
+    t.chain()
+}
+
+pub trait TupleITChain {
+    type Item;
+    type Iter: Iterator<Item = Self::Item>;
+
+    fn chain(self) -> Self::Iter;
+}
+
+impl<Item, A: Iterator<Item = Item>, B: Iterator<Item = Item>> TupleITChain for (A, B) {
+    type Item = Item;
+    type Iter = std::iter::Chain<A, B>;
+
+    fn chain(self) -> Self::Iter {
+        self.0.chain(self.1)
+    }
+}
+
+impl<Item, A: Iterator<Item = Item>, B: Iterator<Item = Item>, C: Iterator<Item = Item>>
+    TupleITChain for (A, B, C)
+{
+    type Item = Item;
+    type Iter = std::iter::Chain<std::iter::Chain<A, B>, C>;
+
+    fn chain(self) -> Self::Iter {
+        self.0.chain(self.1).chain(self.2)
+    }
+}
+
+impl<
+        Item,
+        A: Iterator<Item = Item>,
+        B: Iterator<Item = Item>,
+        C: Iterator<Item = Item>,
+        D: Iterator<Item = Item>,
+    > TupleITChain for (A, B, C, D)
+{
+    type Item = Item;
+    type Iter = std::iter::Chain<std::iter::Chain<std::iter::Chain<A, B>, C>, D>;
+
+    fn chain(self) -> Self::Iter {
+        self.0.chain(self.1).chain(self.2).chain(self.3)
+    }
+}
+
+impl<
+        Item,
+        A: Iterator<Item = Item>,
+        B: Iterator<Item = Item>,
+        C: Iterator<Item = Item>,
+        D: Iterator<Item = Item>,
+        E: Iterator<Item = Item>,
+    > TupleITChain for (A, B, C, D, E)
+{
+    type Item = Item;
+    type Iter =
+        std::iter::Chain<std::iter::Chain<std::iter::Chain<std::iter::Chain<A, B>, C>, D>, E>;
+
+    fn chain(self) -> Self::Iter {
+        self.0
+            .chain(self.1)
+            .chain(self.2)
+            .chain(self.3)
+            .chain(self.4)
+    }
+}

common/src/lib.rs

@@ -4,6 +4,7 @@ mod chunkid;
 pub mod error;
 mod hash;
 pub mod history;
+pub mod iter;
 pub mod logger;
 pub mod macros;
 pub mod rand;

simulation/Cargo.toml

@@ -10,21 +10,22 @@ edition = "2021"
 ordered-float = { workspace = true }
 serde         = { version = "1.0", features = ["derive"] }
 log           = "0.4.11"
-egui-inspect = { path = "../egui-inspect"}
-flat_spatial = { workspace = true, features=["serde"] }
+egui-inspect  = { path = "../egui-inspect"}
+flat_spatial  = { workspace = true, features=["serde"] }
 geom          = { path = "../geom" }
 common        = { path = "../common" }
 prototypes    = { path = "../prototypes" }
-slotmapd       = { version = "1.0", default-features = false, features = ["serde", "unstable"] }
+slotmapd      = { version = "1.0", default-features = false, features = ["serde", "unstable"] }
 rayon         = "1.6"
-profiling = { version = "1.0.5", default-features = false }
-inline_tweak = { version = "1.0.9", features = ["release_tweak"] }
+profiling     = { version = "1.0.5", default-features = false }
+inline_tweak  = { version = "1.0.9", features = ["release_tweak"] }
 pathfinding   = "4.2.1"
 serde-big-array = "0.5.0"
 lazy_static   = "1.4.0"
 arc-swap      = "1.3.0"
 derive_more   = { workspace = true }
-bitflags = "2.4.1"
+bitflags      = "2.4.1"
+itertools     = "0.12.0"
 
 [dev-dependencies]
 easybench = "1.1.0"