Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed quirky tree-like structures

Browse Source
This commit is contained in:
Joshua Barretto
2021-08-02 19:22:18 +01:00
parent a22c0ab48f
commit cb0f10b754
1 changed files with 46 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
world/src/layer/tree.rs
View File

@ -3,7 +3,7 @@ use crate::{
block::block_from_structure, block::block_from_structure,
column::ColumnGen, column::ColumnGen,
util::{RandomPerm, Sampler, UnitChooser}, util::{RandomPerm, Sampler, UnitChooser},
Canvas, CONFIG, Canvas,
}; };
use common::{ use common::{
assets::AssetHandle, assets::AssetHandle,
@ -31,8 +31,6 @@ lazy_static! {
static ref BIRCHES: AssetHandle<StructuresGroup> = Structure::load_group("trees.birch"); static ref BIRCHES: AssetHandle<StructuresGroup> = Structure::load_group("trees.birch");
static ref MANGROVE_TREES: AssetHandle<StructuresGroup> = static ref MANGROVE_TREES: AssetHandle<StructuresGroup> =
Structure::load_group("trees.mangrove_trees"); Structure::load_group("trees.mangrove_trees");
static ref QUIRKY: AssetHandle<StructuresGroup> = Structure::load_group("trees.quirky");
static ref QUIRKY_DRY: AssetHandle<StructuresGroup> = Structure::load_group("trees.quirky_dry");
static ref SWAMP_TREES: AssetHandle<StructuresGroup> = static ref SWAMP_TREES: AssetHandle<StructuresGroup> =
Structure::load_group("trees.swamp_trees"); Structure::load_group("trees.swamp_trees");
} }
@ -72,8 +70,6 @@ pub fn apply_trees_to(canvas: &mut Canvas, dynamic_rng: &mut impl Rng) {
let tree = if let Some(tree) = tree_cache.entry(pos).or_insert_with(|| { let tree = if let Some(tree) = tree_cache.entry(pos).or_insert_with(|| {
let col = ColumnGen::new(info.chunks()).get((pos, info.index()))?; let col = ColumnGen::new(info.chunks()).get((pos, info.index()))?;
let is_quirky = QUIRKY_RAND.chance(seed, 1.0 / 500.0);
// Ensure that it's valid to place a *thing* here // Ensure that it's valid to place a *thing* here
if col.alt < col.water_level if col.alt < col.water_level
|| col.spawn_rate < 0.9 || col.spawn_rate < 0.9
@ -84,68 +80,59 @@ pub fn apply_trees_to(canvas: &mut Canvas, dynamic_rng: &mut impl Rng) {
} }
// Ensure that it's valid to place a tree here // Ensure that it's valid to place a tree here
if !is_quirky && ((seed.wrapping_mul(13)) & 0xFF) as f32 / 256.0 > col.tree_density if ((seed.wrapping_mul(13)) & 0xFF) as f32 / 256.0 > col.tree_density {
{
return None; return None;
} }
Some(Tree { Some(Tree {
pos: Vec3::new(pos.x, pos.y, col.alt as i32), pos: Vec3::new(pos.x, pos.y, col.alt as i32),
model: 'model: { model: 'model: {
let models: AssetHandle<_> = if is_quirky { let models: AssetHandle<_> = match forest_kind {
if col.temp > CONFIG.desert_temp { ForestKind::Oak if QUIRKY_RAND.chance(seed + 1, 1.0 / 16.0) => {
*QUIRKY_DRY *OAK_STUMPS
} else { },
*QUIRKY ForestKind::Oak if QUIRKY_RAND.chance(seed + 2, 1.0 / 20.0) => {
} *FRUIT_TREES
} else { },
match forest_kind { ForestKind::Palm => *PALMS,
ForestKind::Oak if QUIRKY_RAND.chance(seed + 1, 1.0 / 16.0) => { ForestKind::Acacia => *ACACIAS,
*OAK_STUMPS ForestKind::Baobab => *BAOBABS,
}, // ForestKind::Oak => *OAKS,
ForestKind::Oak if QUIRKY_RAND.chance(seed + 2, 1.0 / 20.0) => { ForestKind::Oak => {
*FRUIT_TREES break 'model TreeModel::Procedural(
}, ProceduralTree::generate(
ForestKind::Palm => *PALMS, TreeConfig::oak(&mut RandomPerm::new(seed), scale),
ForestKind::Acacia => *ACACIAS, &mut RandomPerm::new(seed),
ForestKind::Baobab => *BAOBABS, ),
// ForestKind::Oak => *OAKS, StructureBlock::TemperateLeaves,
ForestKind::Oak => { );
break 'model TreeModel::Procedural( },
ProceduralTree::generate( //ForestKind::Pine => *PINES,
TreeConfig::oak(&mut RandomPerm::new(seed), scale), ForestKind::Pine => {
break 'model TreeModel::Procedural(
ProceduralTree::generate(
TreeConfig::pine(&mut RandomPerm::new(seed), scale),
&mut RandomPerm::new(seed),
),
StructureBlock::PineLeaves,
);
},
ForestKind::Birch => *BIRCHES,
ForestKind::Mangrove => *MANGROVE_TREES,
ForestKind::Swamp => *SWAMP_TREES,
ForestKind::Giant => {
break 'model TreeModel::Procedural(
ProceduralTree::generate(
TreeConfig::giant(
&mut RandomPerm::new(seed), &mut RandomPerm::new(seed),
scale,
inhabited,
), ),
StructureBlock::TemperateLeaves, &mut RandomPerm::new(seed),
); ),
}, StructureBlock::TemperateLeaves,
//ForestKind::Pine => *PINES, );
ForestKind::Pine => { },
break 'model TreeModel::Procedural(
ProceduralTree::generate(
TreeConfig::pine(&mut RandomPerm::new(seed), scale),
&mut RandomPerm::new(seed),
),
StructureBlock::PineLeaves,
);
},
ForestKind::Birch => *BIRCHES,
ForestKind::Mangrove => *MANGROVE_TREES,
ForestKind::Swamp => *SWAMP_TREES,
ForestKind::Giant => {
break 'model TreeModel::Procedural(
ProceduralTree::generate(
TreeConfig::giant(
&mut RandomPerm::new(seed),
scale,
inhabited,
),
&mut RandomPerm::new(seed),
),
StructureBlock::TemperateLeaves,
);
},
}
}; };
let models = models.read(); let models = models.read();