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

Fixed temperate dungeon entrance height and wall artifacts around dungeons

Browse Source
This commit is contained in:
Maxicarlos08 2023-07-09 20:18:48 +02:00
parent 2d616352a2
commit ed8fe545f8
No known key found for this signature in database
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/world/structure/dungeon/temperate_entrance/ruins_4.vox (Stored with Git LFS)
View File

Binary file not shown.

30
world/src/site2/plot/dungeon.rs
View File

@ -1027,10 +1027,6 @@ impl Floor {
)
}));
// Fill Walls
let walls_only = painter.prim(Primitive::without(wall_contours, walls_fat));
painter.fill(walls_only, Fill::Block(stone_wall));
// The surface 1 unit thicker than the walls is used to place the torches onto
let wall_contour_surface = painter.prim(Primitive::sampling(floor_prim, {
let tiles = Arc::clone(&tiles);
@ -1096,6 +1092,8 @@ impl Floor {
.without(lighting_mask_x.intersect(lighting_mask_y))
};
let walls_only = painter.prim(Primitive::without(wall_contours, walls_fat));
// Declare collections of various disjoint primitives that need postprocessing
// after handling all the local information per-tile
let mut stairs_bb = Vec::new();
@ -1113,9 +1111,9 @@ impl Floor {
min: tile_corner,
max: tile_corner + Vec2::broadcast(TILE_SIZE),
};
let outer_tile_aabr = Aabr {
min: tile_corner - Vec2::broadcast(2),
max: tile_corner + Vec2::broadcast(TILE_SIZE + 2),
let outer_tile_aabr = |dist| Aabr {
min: tile_corner - Vec2::broadcast(dist),
max: tile_corner + Vec2::broadcast(TILE_SIZE + dist),
};
let tile_center = tile_corner + Vec2::broadcast(TILE_SIZE / 2);
let (mut height, room) = match tile {
@ -1126,7 +1124,21 @@ impl Floor {
Tile::Solid => continue,
};
let tile_floor_fill = painter.prim(Primitive::Aabb(aabr_with_z(tile_aabr, floor_z - 1..floor_z)));
// TODO: Get outer tile aabb
let outer_tile_aabb = painter.prim(Primitive::Aabb(aabr_with_z(
outer_tile_aabr(0),
floor_z - 2..(floor_z + tunnel_height as i32) + 2,
)));
let walls_in_tile = painter.prim(Primitive::intersect(outer_tile_aabb, walls_only));
// Fill Walls
painter.fill(walls_in_tile, Fill::Block(stone_wall));
let tile_floor_fill = painter.prim(Primitive::Aabb(aabr_with_z(
tile_aabr,
floor_z - 1..floor_z,
)));
painter.fill(tile_floor_fill, Fill::Block(stone_wall));
// Sprites are contained to the level above the floor, and not within walls
@ -1155,7 +1167,7 @@ impl Floor {
let radius = TILE_SIZE as f32 / 2.0;
let aabb = aabr_with_z(tile_aabr, floor_z..floor_z + self.total_depth());
let outer_aabb = aabr_with_z(
outer_tile_aabr,
outer_tile_aabr(2),
floor_z + tunnel_height as i32..floor_z + self.total_depth() - 1,
);
let bb = painter.prim(match kind {