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

Tunnel tweaks

Browse Source
This commit is contained in:
Sam 2022-03-29 17:11:13 -04:00
parent 731195f864
commit c90159840c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
world/src/site2/plot/adlet.rs
View File

@ -76,14 +76,12 @@ impl AdletStronghold {
unit_size * num_units + variation unit_size * num_units + variation
}; };
let tunnel_length = rng.gen_range(25_i32..40); let tunnel_length = rng.gen_range(35_i32..50);
let origin = entrance let origin = entrance
+ (Vec2::new(angle.cos(), angle.sin()) * (tunnel_length as f32 + cavern_radius as f32)) + (Vec2::new(angle.cos(), angle.sin()) * (tunnel_length as f32 + cavern_radius as f32))
.as_(); .as_();
// Go 50% below minimum height needed, unless entrance already below that height
// TODO: Get better heuristic for this
let cavern_alt = let cavern_alt =
(land.get_alt_approx(origin) - cavern_radius as f32).min(land.get_alt_approx(entrance)); (land.get_alt_approx(origin) - cavern_radius as f32).min(land.get_alt_approx(entrance));
@ -135,15 +133,26 @@ impl Structure for AdletStronghold {
fn render_inner(&self, _site: &Site, land: &Land, painter: &Painter) { fn render_inner(&self, _site: &Site, land: &Land, painter: &Painter) {
// Tunnel // Tunnel
let dist: f32 = self.origin.as_().distance(self.entrance.as_()); let dist: f32 = self.origin.as_().distance(self.entrance.as_());
let tunnel_radius = 5.0;
let tunnel_start = self let tunnel_start = self
.entrance .entrance
.as_() .as_()
.with_z(land.get_alt_approx(self.entrance)); .with_z(land.get_alt_approx(self.entrance));
// Adds cavern radius to ensure that tunnel fully bores into cavern
let tunnel_end = ((self.origin.as_() - self.entrance.as_()) * self.tunnel_length as f32 let tunnel_end = ((self.origin.as_() - self.entrance.as_()) * self.tunnel_length as f32
/ dist) / dist)
.with_z(self.cavern_alt) .with_z(self.cavern_alt + tunnel_radius - 1.0)
+ self.entrance.as_(); + self.entrance.as_();
painter.line(tunnel_start, tunnel_end, 5.0).clear(); painter
.line(tunnel_start, tunnel_end, tunnel_radius)
.clear();
painter
.line(
tunnel_end,
self.origin.as_().with_z(self.cavern_alt + tunnel_radius),
tunnel_radius,
)
.clear();
// Cavern // Cavern
painter painter
@ -157,7 +166,7 @@ impl Structure for AdletStronghold {
})) }))
.sample_with_column({ .sample_with_column({
let origin = self.origin.with_z(self.cavern_alt as i32); let origin = self.origin.with_z(self.cavern_alt as i32);
let radius_sqr = self.cavern_radius * self.cavern_radius; let radius_sqr = self.cavern_radius.pow(2);
move |pos, col| { move |pos, col| {
let alt = col.basement - col.cliff_offset; let alt = col.basement - col.cliff_offset;
let sphere_alt = ((radius_sqr - origin.xy().distance_squared(pos.xy())) as f32) let sphere_alt = ((radius_sqr - origin.xy().distance_squared(pos.xy())) as f32)