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

where possible, replace intersect(painter.cylinder with intersect(painter.aabb

Browse Source
This commit is contained in:
flo666 2023-04-03 15:22:26 +02:00 committed by Sam
parent f4c7ab16d2
commit 72418e6804
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -779,7 +779,7 @@ impl Structure for AdletStronghold {
), ),
(pos + ((igloo_pos - pos) / 2)) (pos + ((igloo_pos - pos) / 2))
.with_z(alt as i32 + 9 + height_handle), .with_z(alt as i32 + 9 + height_handle),
igloo_pos.with_z(alt as i32 + 4 + height_handle), igloo_pos.with_z(alt as i32 + 5 + height_handle),
1.0, 1.0,
) )
.fill(bone_hide_fill.clone()); .fill(bone_hide_fill.clone());
@ -1621,7 +1621,7 @@ impl Structure for AdletStronghold {
// clear room // clear room
painter painter
.sphere_with_radius(wpos.with_z((alt as i32) + 2), 6.0) .sphere_with_radius(wpos.with_z((alt as i32) + 2), 6.0)
.intersect(painter.cylinder(Aabb { .intersect(painter.aabb(Aabb {
min: (wpos - 6).with_z(alt as i32), min: (wpos - 6).with_z(alt as i32),
max: (wpos + 6).with_z(alt as i32 + 2 * hut_radius), max: (wpos + 6).with_z(alt as i32 + 2 * hut_radius),
})) }))
@ -1663,7 +1663,7 @@ impl Structure for AdletStronghold {
} }
painter painter
.sphere_with_radius(wpos.with_z((alt as i32) + 2), 5.0) .sphere_with_radius(wpos.with_z((alt as i32) + 2), 5.0)
.intersect(painter.cylinder(Aabb { .intersect(painter.aabb(Aabb {
min: (wpos - 5).with_z(alt as i32), min: (wpos - 5).with_z(alt as i32),
max: (wpos + 5).with_z((alt as i32) + 2 * hut_radius), max: (wpos + 5).with_z((alt as i32) + 2 * hut_radius),
})) }))
@ -1757,7 +1757,7 @@ impl Structure for AdletStronghold {
.sphere_with_radius(bosshut_pos.with_z((alt as i32) + 2), 14.0), .sphere_with_radius(bosshut_pos.with_z((alt as i32) + 2), 14.0),
) )
.intersect( .intersect(
painter.cylinder(Aabb { painter.aabb(Aabb {
min: (bosshut_pos - 2 * hut_radius).with_z(alt as i32), min: (bosshut_pos - 2 * hut_radius).with_z(alt as i32),
max: (bosshut_pos + 2 * hut_radius) max: (bosshut_pos + 2 * hut_radius)
.with_z((alt as i32) + 2 * hut_radius), .with_z((alt as i32) + 2 * hut_radius),
@ -1784,7 +1784,7 @@ impl Structure for AdletStronghold {
.sphere_with_radius(bosshut_pos.with_z((alt as i32) + 2), 14.0), .sphere_with_radius(bosshut_pos.with_z((alt as i32) + 2), 14.0),
) )
.intersect( .intersect(
painter.cylinder(Aabb { painter.aabb(Aabb {
min: (bosshut_pos - 2 * hut_radius).with_z(alt as i32), min: (bosshut_pos - 2 * hut_radius).with_z(alt as i32),
max: (bosshut_pos + 2 * hut_radius) max: (bosshut_pos + 2 * hut_radius)
.with_z((alt as i32) + 2 * hut_radius), .with_z((alt as i32) + 2 * hut_radius),
@ -1813,7 +1813,7 @@ impl Structure for AdletStronghold {
7.0, 7.0,
) )
.intersect( .intersect(
painter.cylinder(Aabb { painter.aabb(Aabb {
min: Vec2::new( min: Vec2::new(
bosshut_pos.x - 7, bosshut_pos.x - 7,
bosshut_pos.y - hut_radius + (2 * (hut_radius * n) - 7), bosshut_pos.y - hut_radius + (2 * (hut_radius * n) - 7),