mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Added mushroom inner bevel
This commit is contained in:
parent
bfc55d7b17
commit
46118acef3
@ -711,9 +711,12 @@ pub fn apply_caverns_to<R: Rng>(canvas: &mut Canvas, dynamic_rng: &mut R) {
|
|||||||
let head_dist = ((rpos - Vec3::unit_z() * mushroom.stalk)
|
let head_dist = ((rpos - Vec3::unit_z() * mushroom.stalk)
|
||||||
/ Vec2::broadcast(head_radius).with_z(head_height))
|
/ Vec2::broadcast(head_radius).with_z(head_height))
|
||||||
.magnitude();
|
.magnitude();
|
||||||
|
|
||||||
|
let stalk = mushroom.stalk + Lerp::lerp(head_height * 0.5, 0.0, dist / head_radius);
|
||||||
|
|
||||||
// Head
|
// Head
|
||||||
if rpos.z > mushroom.stalk
|
if rpos.z > stalk
|
||||||
&& rpos.z < mushroom.stalk + head_height
|
&& rpos.z <= mushroom.stalk + head_height
|
||||||
&& dist
|
&& dist
|
||||||
< head_radius * (1.0 - (rpos.z - mushroom.stalk) / head_height).powf(0.125)
|
< head_radius * (1.0 - (rpos.z - mushroom.stalk) / head_height).powf(0.125)
|
||||||
{
|
{
|
||||||
@ -724,7 +727,7 @@ pub fn apply_caverns_to<R: Rng>(canvas: &mut Canvas, dynamic_rng: &mut R) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if rpos.z <= mushroom.stalk
|
if rpos.z <= mushroom.stalk + head_height - 1.0
|
||||||
&& dist_sq
|
&& dist_sq
|
||||||
< (stalk_radius * Lerp::lerp(1.5, 0.75, rpos.z / mushroom.stalk)).powi(2)
|
< (stalk_radius * Lerp::lerp(1.5, 0.75, rpos.z / mushroom.stalk)).powi(2)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user