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 'coastal_town_fence_fix' into 'master'

Browse Source 
coastal town fence fix

See merge request veloren/veloren!4070
This commit is contained in:
Joshua Barretto 2023-08-15 22:34:38 +00:00
commit 7497ef93c8
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
world/src/site2/plot/coastal_house.rs
View File

@ -72,8 +72,8 @@ impl Structure for CoastalHouse {
// fence, blue gates
painter
.aabb(Aabb {
min: Vec2::new(center.x - length - 6, center.y - width - 6).with_z(base - 1),
max: Vec2::new(center.x + length + 7, center.y + width + 7).with_z(base),
min: Vec2::new(center.x - length - 6, center.y - width - 6).with_z(base - 2),
max: Vec2::new(center.x + length + 7, center.y + width + 7).with_z(base - 1),
})
.fill(blue_broken.clone());
@ -90,7 +90,7 @@ impl Structure for CoastalHouse {
painter
.aabb(Aabb {
min: Vec2::new(center.x - length - 6, center.y - width - 6).with_z(base - height),
max: Vec2::new(center.x + length + 7, center.y + width + 7).with_z(base - 1),
max: Vec2::new(center.x + length + 7, center.y + width + 7).with_z(base - 2),
})
.fill(white.clone());
for f in 0..8 {

6
world/src/site2/plot/coastal_workshop.rs
View File

@ -70,8 +70,8 @@ impl Structure for CoastalWorkshop {
// fence, blue gates
painter
.aabb(Aabb {
min: Vec2::new(center.x - length - 6, center.y - width - 6).with_z(base - 1),
max: Vec2::new(center.x + length + 7, center.y + width + 7).with_z(base),
min: Vec2::new(center.x - length - 6, center.y - width - 6).with_z(base - 2),
max: Vec2::new(center.x + length + 7, center.y + width + 7).with_z(base - 1),
})
.fill(blue_broken.clone());
@ -88,7 +88,7 @@ impl Structure for CoastalWorkshop {
painter
.aabb(Aabb {
min: Vec2::new(center.x - length - 6, center.y - width - 6).with_z(base - height),
max: Vec2::new(center.x + length + 7, center.y + width + 7).with_z(base - 1),
max: Vec2::new(center.x + length + 7, center.y + width + 7).with_z(base - 2),
})
.fill(white.clone());
for f in 0..8 {

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

@ -80,16 +80,10 @@ impl Structure for SavannahPit {
)
.fill(clay.clone());
// outside cylinder and decor
painter
.cylinder(Aabb {
min: (center - (3 * length) - 3).with_z(base - 1),
max: (center + (3 * length) + 3).with_z(base),
})
.fill(wood_light.clone());
painter
.cylinder(Aabb {
min: (center - (3 * length) - 2).with_z(base - (1 * length)),
max: (center + (3 * length) + 2).with_z(base + 1),
max: (center + (3 * length) + 2).with_z(base),
})
.fill(clay.clone());
painter
@ -223,8 +217,8 @@ impl Structure for SavannahPit {
// top ring
painter
.cylinder(Aabb {
min: (center - (3 * length) - 1).with_z(base),
max: (center + (3 * length) + 1).with_z(base + 1),
min: (center - (3 * length) - 1).with_z(base - 1),
max: (center + (3 * length) + 1).with_z(base),
})
.fill(wood_light.clone());
// floor 0 ring