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

Merge branch 'treeco/new-trees' into 'master'

Browse Source 
More procgen trees, large map fixes

See merge request veloren/veloren!2899
This commit is contained in:
Treeco 2021-10-06 01:53:59 +00:00
commit e4c19bb2ec
18 changed files with 121 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
assets/world/manifests/trees/birch.ron
View File

@ -1,52 +0,0 @@
#![enable(unwrap_newtypes)]
[
(
specifier: "world.tree.birch.1",
center: (12, 9, 10)
),
(
specifier: "world.tree.birch.2",
center: (12, 10, 10)
),
(
specifier: "world.tree.birch.3",
center: (9, 10, 10)
),
(
specifier: "world.tree.birch.4",
center: (9, 10, 10)
),
(
specifier: "world.tree.birch.5",
center: (9, 10, 10)
),
(
specifier: "world.tree.birch.6",
center: (9, 9, 10)
),
(
specifier: "world.tree.birch.7",
center: (10, 10, 10)
),
(
specifier: "world.tree.birch.8",
center: (9, 9, 10)
),
(
specifier: "world.tree.birch.9",
center: (9, 10, 10)
),
(
specifier: "world.tree.birch.10",
center: (9, 10, 10)
),
(
specifier: "world.tree.birch.11",
center: (9, 10, 10)
),
(
specifier: "world.tree.birch.12",
center: (9, 10, 10)
),
]

BIN
assets/world/tree/birch/1.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/10.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/11.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/12.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/2.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/3.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/4.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/5.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/6.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/7.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/8.vox
View File

Binary file not shown.

BIN
assets/world/tree/birch/9.vox
View File

Binary file not shown.

1
common/src/terrain/structure.rs
View File

@ -36,6 +36,7 @@ make_case_elim!(
Sprite(kind: SpriteKind) = 18,
Chestnut = 19,
Baobab = 20,
BirchWood = 21,
}
);

9
server/src/rtsim/mod.rs
View File

@ -150,8 +150,13 @@ pub fn init(
.iter()
.filter(|(_, site)| site.is_settlement())
.min_by_key(|(_, site)| {
let wpos = site.center * TerrainChunk::RECT_SIZE.map(|x| x as i32);
wpos.distance_squared(spawn_point.0.xy().map(|x| x as i32))
let wpos = site
.center
.as_::<i64>()
.map2(TerrainChunk::RECT_SIZE.as_::<i64>(), |e, sz| {
e * sz + sz / 2
});
wpos.distance_squared(spawn_point.0.xy().map(|x| x as i64))
})
.map(|(id, _)| id);
#[allow(clippy::single_match)]

67
voxygen/src/hud/map.rs
View File

@ -312,20 +312,13 @@ impl<'a> Widget for Map<'a> {
.get(self.client.entity())
.map_or(Vec3::zero(), |pos| pos.0);
let max_zoom = worldsize
.reduce_partial_max() as f64/*.min(f64::MAX)*/;
let map_size = Vec2::new(760.0, 760.0);
let w_src = max_zoom / zoom;
let h_src = max_zoom / zoom;
// player pos from -1 to 1
let relative_player_pos =
player_pos.xy() / (TerrainChunkSize::RECT_SIZE * worldsize).map(|x| x as f32) * 2.0
- 1.0;
let min_drag = (relative_player_pos.map(|x| x as f64) / 2.0 - 1.0) * map_size;
let max_drag = (relative_player_pos.map(|x| x as f64) / 2.0 + 1.0) * map_size;
let player_pos_chunks =
player_pos.xy().map(|x| x as f64) / TerrainChunkSize::RECT_SIZE.map(|x| x as f64);
let min_drag = player_pos_chunks - worldsize.map(|x| x as f64);
let max_drag = player_pos_chunks;
let drag = drag.clamped(min_drag, max_drag);
let handle_widget_mouse_events = |widget,
wpos: Option<Vec2<f32>>,
@ -337,8 +330,7 @@ impl<'a> Widget for Map<'a> {
match wpos {
Some(ref wpos) => events.push(Event::SetLocationMarker(*wpos)),
None => {
let tmp: Vec2<f64> =
Vec2::<f64>::from(click.xy) / map_size / zoom * max_zoom - drag;
let tmp: Vec2<f64> = Vec2::<f64>::from(click.xy) / zoom - drag;
let wpos = tmp
.map2(TerrainChunkSize::RECT_SIZE, |e, sz| e as f32 * sz as f32)
+ player_pos;
@ -355,24 +347,18 @@ impl<'a> Widget for Map<'a> {
.map(|scroll| scroll.y)
.sum();
if scrolled != 0.0 {
let min_zoom = map_size.x as f64 / worldsize.reduce_partial_max() as f64 / 2.0;
let new_zoom_lvl: f64 = (f64::log2(zoom) - scrolled * 0.03)
.exp2()
.clamped(1.0, max_zoom / 64.0);
.clamp(min_zoom, 16.0);
events.push(Event::SettingsChange(MapZoom(new_zoom_lvl)));
let cursor_mouse_pos = ui
.widget_input(map_widget)
.mouse()
.map(|mouse| mouse.rel_xy());
if let Some(cursor_pos) = cursor_mouse_pos {
// First we calc the new zoomed rect. Then we find out its mid.
// The diff between both mids is the new drag.
let w_src2 = max_zoom / new_zoom_lvl;
let h_src2 = max_zoom / new_zoom_lvl;
// range -0.5 to 0.5
let relative_mouse_pos = Vec2::from_slice(&cursor_pos) / map_size;
let drag_new = (drag
+ relative_mouse_pos * Vec2::new(w_src2 - w_src, h_src2 - h_src))
.clamped(min_drag, max_drag);
let mouse_pos = Vec2::from_slice(&cursor_pos);
let drag_new = drag + mouse_pos * (1.0 / new_zoom_lvl - 1.0 / zoom);
if drag_new != drag {
events.push(Event::SettingsChange(MapDrag(drag_new)));
}
@ -387,8 +373,7 @@ impl<'a> Widget for Map<'a> {
.map(|drag| Vec2::<f64>::from(drag.delta_xy))
.sum();
// Drag represents offset of view from the player_pos in chunk coords
let drag_new =
(drag + dragged / map_size / zoom * max_zoom).clamped(min_drag, max_drag);
let drag_new = drag + dragged / zoom;
if drag_new != drag {
events.push(Event::SettingsChange(MapDrag(drag_new)));
}
@ -408,7 +393,7 @@ impl<'a> Widget for Map<'a> {
(worldsize.y as f64 - (player_pos.y as f64 / TerrainChunkSize::RECT_SIZE.y as f64))
+ drag.y,
],
[w_src, h_src],
[map_size.x / zoom, map_size.y / zoom],
);
// X-Button
@ -770,11 +755,9 @@ impl<'a> Widget for Map<'a> {
let rcpos = rwpos.map2(TerrainChunkSize::RECT_SIZE, |e, sz| e / sz as f32)
// Add map dragging
+ drag.map(|e| e as f32);
// Convert to fractional coordinates relative to the worldsize
let rfpos = rcpos / max_zoom as f32;
// Convert to relative pixel coordinates from the center of the map
// Accounting for zooming
let rpos = rfpos.map2(map_size, |e, sz| e * sz as f32 * zoom as f32);
let rpos = rcpos.map(|e| e * zoom as f32);
if rpos
.map2(map_size, |e, sz| e.abs() > sz as f32 / 2.0)
@ -794,7 +777,7 @@ impl<'a> Widget for Map<'a> {
None => continue,
};
let rside = zoom * 6.0;
let rside = zoom * 8.0;
let title = site.name.as_deref().unwrap_or_else(|| match &site.kind {
SiteKind::Town => i18n.get("hud.map.town"),
@ -885,7 +868,7 @@ impl<'a> Widget for Map<'a> {
// Difficulty from 0-6
// 0 = towns and places without a difficulty level
if show_difficulty {
let rsize = zoom * 1.8; // Size factor for difficulty indicators
let rsize = zoom * 2.4; // Size factor for difficulty indicators
let dif_img = Image::new(match difficulty {
Some(0) => self.imgs.map_dif_1,
Some(1) => self.imgs.map_dif_2,
@ -967,21 +950,21 @@ impl<'a> Widget for Map<'a> {
match poi.kind {
PoiKind::Peak(alt) => {
let height = format!("{} m", alt);
if show_peaks && zoom > 3.0 {
if show_peaks && zoom > 2.0 {
Text::new(title)
.x_y_position_relative_to(
state.ids.map_layers[0],
position::Relative::Scalar(rpos.x as f64),
position::Relative::Scalar(rpos.y as f64 + zoom * 3.0),
position::Relative::Scalar(rpos.y as f64 + zoom * 4.0),
)
.font_size(self.fonts.cyri.scale((zoom * 2.0) as u32))
.font_size(self.fonts.cyri.scale((zoom * 3.0) as u32))
.font_id(self.fonts.cyri.conrod_id)
.graphics_for(state.ids.map_layers[0])
.color(TEXT_BG)
.set(state.ids.mmap_poi_title_bgs[i], ui);
Text::new(title)
.bottom_left_with_margins_on(state.ids.mmap_poi_title_bgs[i], 1.0, 1.0)
.font_size(self.fonts.cyri.scale((zoom * 2.0) as u32))
.font_size(self.fonts.cyri.scale((zoom * 3.0) as u32))
.font_id(self.fonts.cyri.conrod_id)
//.graphics_for(state.ids.map_layers[0])
.color(TEXT_COLOR)
@ -1004,16 +987,16 @@ impl<'a> Widget for Map<'a> {
Text::new(&height)
.mid_bottom_with_margin_on(
state.ids.mmap_poi_title_bgs[i],
-zoom * 2.5,
zoom * 3.5,
)
.font_size(self.fonts.cyri.scale((zoom * 2.0) as u32))
.font_size(self.fonts.cyri.scale((zoom * 3.0) as u32))
.font_id(self.fonts.cyri.conrod_id)
.graphics_for(state.ids.map_layers[0])
.color(TEXT_BG)
.set(state.ids.peaks_txt_bg, ui);
Text::new(&height)
.bottom_left_with_margins_on(state.ids.peaks_txt_bg, 1.0, 1.0)
.font_size(self.fonts.cyri.scale((zoom * 2.0) as u32))
.font_size(self.fonts.cyri.scale((zoom * 3.0) as u32))
.font_id(self.fonts.cyri.conrod_id)
.graphics_for(state.ids.map_layers[0])
.color(TEXT_COLOR)
@ -1022,7 +1005,7 @@ impl<'a> Widget for Map<'a> {
}
},
PoiKind::Lake(size) => {
if zoom.powi(2) * size as f64 > 37.0 {
if zoom.powi(2) * size as f64 > 30.0 {
let font_scale_factor = if size > 20 {
size as f64 / 25.0
} else if size > 10 {
@ -1170,11 +1153,9 @@ impl<'a> Widget for Map<'a> {
// Offset from map center due to dragging
let rcpos = drag.map(|e| e as f32);
// Convert to fractional coordinates relative to the worldsize
let rfpos = rcpos / max_zoom as f32;
// Convert to relative pixel coordinates from the center of the map
// Accounting for zooming
let rpos = rfpos.map2(map_size, |e, sz| e * sz as f32 * zoom as f32);
let rpos = rcpos.map(|e| e * zoom as f32);
// Don't show if outside or near the edge of the map
let arrow_sz = {
let scale = 0.5;

13
world/src/block/mod.rs
View File

@ -323,5 +323,18 @@ pub fn block_from_structure(
)
})
},
StructureBlock::BirchWood => {
let wpos = pos + structure_pos;
if field.chance(
(wpos + Vec3::new(wpos.z, wpos.z, 0) / 2)
/ Vec3::new(1 + wpos.z % 2, 1 + (wpos.z + 1) % 2, 1),
0.25,
) && wpos.z % 2 == 0
{
Some(Block::new(BlockKind::Wood, Rgb::new(70, 35, 25)))
} else {
Some(Block::new(BlockKind::Wood, Rgb::new(220, 170, 160)))
}
},
}
}

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

@ -86,7 +86,13 @@ pub fn apply_trees_to(canvas: &mut Canvas, dynamic_rng: &mut impl Rng) {
*OAK_STUMPS
},
ForestKind::Oak if QUIRKY_RAND.chance(seed + 2, 1.0 / 20.0) => {
*FRUIT_TREES
break 'model TreeModel::Procedural(
ProceduralTree::generate(
TreeConfig::apple(&mut RandomPerm::new(seed), scale),
&mut RandomPerm::new(seed),
),
StructureBlock::TemperateLeaves,
);
},
ForestKind::Palm => *PALMS,
ForestKind::Acacia => {
@ -143,7 +149,15 @@ pub fn apply_trees_to(canvas: &mut Canvas, dynamic_rng: &mut impl Rng) {
StructureBlock::PineLeaves,
);
},
ForestKind::Birch => *BIRCHES,
ForestKind::Birch => {
break 'model TreeModel::Procedural(
ProceduralTree::generate(
TreeConfig::birch(&mut RandomPerm::new(seed), scale),
&mut RandomPerm::new(seed),
),
StructureBlock::TemperateLeaves,
);
},
ForestKind::Mangrove => {
break 'model TreeModel::Procedural(
ProceduralTree::generate(
@ -226,9 +240,7 @@ pub fn apply_trees_to(canvas: &mut Canvas, dynamic_rng: &mut impl Rng) {
StructureBlock::Filled(BlockKind::Wood, Rgb::new(150, 98, 41))
},
(_, _, _, true) => StructureBlock::None,
(true, _, _, _) => {
StructureBlock::Filled(BlockKind::Wood, t.config.wood_color)
},
(true, _, _, _) => t.config.trunk_block,
(_, true, _, _) => *leaf_block,
_ => StructureBlock::None,
},
@ -330,7 +342,7 @@ pub struct TreeConfig {
pub inhabited: bool,
pub hanging_sprites: &'static [(f32, SpriteKind)],
/// The colour of branches and the trunk.
pub wood_color: Rgb<u8>,
pub trunk_block: StructureBlock,
}
impl TreeConfig {
@ -355,7 +367,32 @@ impl TreeConfig {
proportionality: 0.0,
inhabited: false,
hanging_sprites: &[(0.0002, SpriteKind::Apple), (0.00007, SpriteKind::Beehive)],
wood_color: Rgb::new(90, 45, 15),
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(90, 45, 15)),
}
}
pub fn apple(rng: &mut impl Rng, scale: f32) -> Self {
let scale = scale * (0.8 + rng.gen::<f32>().powi(2) * 0.5);
let log_scale = 1.0 + scale.log2().max(0.0);
Self {
trunk_len: 3.0 * scale,
trunk_radius: 1.5 * scale,
branch_child_len: 0.9,
branch_child_radius: 0.9,
branch_child_radius_lerp: true,
leaf_radius: 2.0 * log_scale..3.0 * log_scale,
leaf_radius_scaled: 0.0,
straightness: 0.4,
max_depth: 6,
splits: 1.0..3.0,
split_range: 0.5..2.0,
branch_len_bias: 0.0,
leaf_vertical_scale: 0.7,
proportionality: 0.0,
inhabited: false,
hanging_sprites: &[(0.03, SpriteKind::Apple), (0.02, SpriteKind::Beehive)],
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(90, 45, 15)),
}
}
@ -380,7 +417,7 @@ impl TreeConfig {
proportionality: 0.8,
inhabited: false,
hanging_sprites: &[(0.00007, SpriteKind::Beehive), (0.015, SpriteKind::Liana)],
wood_color: Rgb::new(118, 67, 42),
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(118, 67, 42)),
}
}
@ -405,7 +442,7 @@ impl TreeConfig {
proportionality: 1.0,
inhabited: false,
hanging_sprites: &[(0.00007, SpriteKind::Beehive)],
wood_color: Rgb::new(125, 60, 6),
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(125, 60, 6)),
}
}
@ -430,7 +467,32 @@ impl TreeConfig {
proportionality: 0.0,
inhabited: false,
hanging_sprites: &[(0.00007, SpriteKind::Beehive)],
wood_color: Rgb::new(110, 68, 65),
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(110, 68, 65)),
}
}
pub fn birch(rng: &mut impl Rng, scale: f32) -> Self {
let scale = scale * (0.8 + rng.gen::<f32>().powi(2) * 0.5);
let log_scale = 1.0 + scale.log2().max(0.0);
Self {
trunk_len: 24.0 * scale,
trunk_radius: 1.2 * scale,
branch_child_len: 0.4,
branch_child_radius: 0.75,
branch_child_radius_lerp: true,
leaf_radius: 4.0 * log_scale..5.0 * log_scale,
leaf_radius_scaled: 0.0,
straightness: 0.6,
max_depth: 4,
splits: 1.75..2.5,
split_range: 0.6..1.2,
branch_len_bias: 0.0,
leaf_vertical_scale: 0.5,
proportionality: 0.0,
inhabited: false,
hanging_sprites: &[(0.00007, SpriteKind::Beehive)],
trunk_block: StructureBlock::BirchWood,
}
}
@ -455,7 +517,7 @@ impl TreeConfig {
proportionality: 1.0,
inhabited: false,
hanging_sprites: &[(0.00005, SpriteKind::Beehive)],
wood_color: Rgb::new(150, 95, 65),
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(150, 95, 65)),
}
}
@ -480,7 +542,7 @@ impl TreeConfig {
proportionality: 0.5,
inhabited: false,
hanging_sprites: &[(0.00007, SpriteKind::Beehive)],
wood_color: Rgb::new(110, 42, 28),
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(110, 42, 28)),
}
}
@ -505,7 +567,7 @@ impl TreeConfig {
proportionality: 1.0,
inhabited: false,
hanging_sprites: &[(0.0001, SpriteKind::Beehive)],
wood_color: Rgb::new(90, 35, 15),
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(90, 35, 15)),
}
}
@ -529,7 +591,7 @@ impl TreeConfig {
proportionality: 0.0,
inhabited,
hanging_sprites: &[(0.00025, SpriteKind::Apple), (0.00025, SpriteKind::Beehive)],
wood_color: Rgb::new(110, 68, 22),
trunk_block: StructureBlock::Filled(BlockKind::Wood, Rgb::new(110, 68, 22)),
}
}
}