mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
1796c09ca1
See the doc comments in `common/src/vol.rs` for more information on
the API itself.
The changes include:
* Consistent `Err`/`Error` naming.
* Types are named `...Error`.
* `enum` variants are named `...Err`.
* Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation
to an upcoming change where a “map” in the game related sense will
be added.
* Add volume iterators. There are two types of them:
* _Position_ iterators obtained from the trait `IntoPosIterator`
using the method
`fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
which returns an iterator over `Vec3<i32>`.
* _Volume_ iterators obtained from the trait `IntoVolIterator`
using the method
`fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
which returns an iterator over `(Vec3<i32>, &Self::Vox)`.
Those traits will usually be implemented by references to volume
types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some
type which usually implements several volume traits, such as `Chunk`).
* _Position_ iterators iterate over the positions valid for that
volume.
* _Volume_ iterators do the same but return not only the position
but also the voxel at that position, in each iteration.
* Introduce trait `RectSizedVol` for the use case which we have with
`Chonk`: A `Chonk` is sized only in x and y direction.
* Introduce traits `RasterableVol`, `RectRasterableVol`
* `RasterableVol` represents a volume that is compile-time sized and has
its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen
because such a volume can be used with `VolGrid3d`.
* `RectRasterableVol` represents a volume that is compile-time sized at
least in x and y direction and has its lower bound at `(0, 0, z)`.
There's no requirement on he lower bound or size in z direction.
The name `RectRasterableVol` was chosen because such a volume can be
used with `VolGrid2d`.
62 lines
1.2 KiB
Rust
62 lines
1.2 KiB
Rust
pub mod biome;
|
|
pub mod block;
|
|
pub mod chonk;
|
|
pub mod structure;
|
|
|
|
// Reexports
|
|
pub use self::{
|
|
biome::BiomeKind,
|
|
block::{Block, BlockKind},
|
|
structure::Structure,
|
|
};
|
|
|
|
use crate::{vol::RectVolSize, volumes::vol_grid_2d::VolGrid2d};
|
|
use serde_derive::{Deserialize, Serialize};
|
|
use vek::*;
|
|
|
|
// TerrainChunkSize
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct TerrainChunkSize;
|
|
|
|
impl RectVolSize for TerrainChunkSize {
|
|
const RECT_SIZE: Vec2<u32> = Vec2 { x: 32, y: 32 };
|
|
}
|
|
|
|
// TerrainChunkMeta
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct TerrainChunkMeta {
|
|
name: Option<String>,
|
|
biome: BiomeKind,
|
|
}
|
|
|
|
impl TerrainChunkMeta {
|
|
pub fn new(name: Option<String>, biome: BiomeKind) -> Self {
|
|
Self { name, biome }
|
|
}
|
|
|
|
pub fn void() -> Self {
|
|
Self {
|
|
name: None,
|
|
biome: BiomeKind::Void,
|
|
}
|
|
}
|
|
|
|
pub fn name(&self) -> &str {
|
|
self.name
|
|
.as_ref()
|
|
.map(|s| s.as_str())
|
|
.unwrap_or("Wilderness")
|
|
}
|
|
|
|
pub fn biome(&self) -> BiomeKind {
|
|
self.biome
|
|
}
|
|
}
|
|
|
|
// Terrain type aliases
|
|
|
|
pub type TerrainChunk = chonk::Chonk;
|
|
pub type TerrainGrid = VolGrid2d<TerrainChunk>;
|