From 477bdfdfe7af0350d22342284d40de20c0636085 Mon Sep 17 00:00:00 2001 From: Snowram Date: Mon, 8 Feb 2021 00:04:10 +0100 Subject: [PATCH] Adresses some comments, various visual tweaks --- .../voxel/sprite/furniture/sconce_wall-0.vox | 3 + assets/voxygen/voxel/sprite_manifest.ron | 12 ++++ common/src/terrain/block.rs | 1 + common/src/terrain/sprite.rs | 2 + voxygen/src/scene/terrain/watcher.rs | 1 + world/src/site/dungeon/mod.rs | 58 +++++++++++++------ 6 files changed, 59 insertions(+), 18 deletions(-) create mode 100644 assets/voxygen/voxel/sprite/furniture/sconce_wall-0.vox diff --git a/assets/voxygen/voxel/sprite/furniture/sconce_wall-0.vox b/assets/voxygen/voxel/sprite/furniture/sconce_wall-0.vox new file mode 100644 index 0000000000..79c62f0ddd --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/sconce_wall-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dae9af55f76f7f9c39c1cd2ac2ea0dd10c90b8d0343e698337f0f38af8b89f8 +size 1608 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 454163267f..2de54b1163 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -1793,6 +1793,18 @@ WallLampSmall: Some(( wind_sway: 0.0, )), +// WallSconce +WallSconce: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.furniture.sconce_wall-0", + offset: (-2.5, -1.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +)), + // Planter Planter: Some(( variations: [ diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 52abcebda6..5da34b509f 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -173,6 +173,7 @@ impl Block { SpriteKind::Ember => Some(20), SpriteKind::WallLamp => Some(16), SpriteKind::WallLampSmall => Some(16), + SpriteKind::WallSconce => Some(16), SpriteKind::FireBowlGround => Some(16), SpriteKind::Velorite | SpriteKind::VeloriteFrag => Some(6), SpriteKind::CaveMushroom => Some(12), diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 884c0e4be5..8756584c33 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -127,6 +127,7 @@ make_case_elim!( EmeraldSmall = 0x64, SapphireSmall = 0x65, WallLampSmall = 0x66, + WallSconce = 0x67, } ); @@ -254,6 +255,7 @@ impl SpriteKind { | SpriteKind::HangingSign | SpriteKind::WallLamp | SpriteKind::WallLampSmall + | SpriteKind::WallSconce | SpriteKind::Planter | SpriteKind::Shelf | SpriteKind::TableSide diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs index 02cfdbb087..50f42d1668 100644 --- a/voxygen/src/scene/terrain/watcher.rs +++ b/voxygen/src/scene/terrain/watcher.rs @@ -71,6 +71,7 @@ impl BlocksOfInterest { Some(SpriteKind::StreetLampTall) => { fire_bowls.push(pos + Vec3::unit_z() * 4) }, + Some(SpriteKind::WallSconce) => fire_bowls.push(pos + Vec3::unit_z()), Some(SpriteKind::Beehive) => beehives.push(pos), Some(SpriteKind::Reed) => reeds.push(pos), Some(SpriteKind::PinkFlower) => flowers.push(pos), diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index d7c0baf622..425f092069 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -1208,7 +1208,7 @@ impl Floor { Some(Tile::Solid) => BlockMask::nothing(), Some(Tile::Tunnel) => { let light_offset: i32 = 7; - if (dist_to_wall - 4.0).abs() < f32::EPSILON + if (dist_to_wall - wall_thickness) as i32 == 1 && rtile_pos .map(|e| e % light_offset == 0) .reduce(|x, y| x ^ y) @@ -1216,8 +1216,7 @@ impl Floor { { let ori = Floor::relative_ori(self.nearest_wall(rpos).unwrap_or_default(), rpos); - // NOTE: Used only for dynamic elements like chests and entities! - let furniture = SpriteKind::WallLamp; + let furniture = SpriteKind::WallSconce; BlockMask::new(Block::air(furniture).with_ori(ori).unwrap(), 1) } else if dist_to_wall >= wall_thickness && (z as f32) < tunnel_height * (1.0 - tunnel_dist.powi(4)) @@ -1230,19 +1229,38 @@ impl Floor { Some(Tile::Room(room)) | Some(Tile::DownStair(room)) if dist_to_wall < wall_thickness || z as f32 - >= self.rooms[*room].height as f32 * (1.0 - tunnel_dist.powi(4)) - || self.rooms[*room] - .pillars - .map(|pillar_space| { - tile_pos - .map(|e| e.rem_euclid(pillar_space) == 0) - .reduce_and() - && rtile_pos.map(|e| e as f32).magnitude_squared() < 3.5f32.powi(2) - }) - .unwrap_or(false) => + >= self.rooms[*room].height as f32 * (1.0 - tunnel_dist.powi(4)) => { BlockMask::nothing() }, + + Some(Tile::Room(room)) | Some(Tile::DownStair(room)) + if self.rooms[*room] + .pillars + .map(|pillar_space| { + tile_pos + .map(|e| e.rem_euclid(pillar_space) == 0) + .reduce_and() + && rtile_pos.map(|e| e as f32).magnitude_squared() < 3.5f32.powi(2) + }) + .unwrap_or(false) => + { + if z == 1 && rtile_pos.map(|e| e as f32).magnitude_squared() > 3.0f32.powi(2) { + let ori = Floor::relative_ori( + self.nearest_wall(rtile_pos).unwrap_or_default(), + rtile_pos, + ); + let furniture = SpriteKind::WallSconce; + BlockMask::new(Block::air(furniture).with_ori(ori).unwrap(), 1) + } else if z < self.rooms[*room].height + && rtile_pos.map(|e| e as f32).magnitude_squared() > 3.0f32.powi(2) + { + vacant + } else { + BlockMask::nothing() + } + } + Some(Tile::Room(_)) => { let light_offset: i32 = 7; if z == 0 { @@ -1253,9 +1271,11 @@ impl Floor { .reduce(|x, y| x ^ y) && z == 1 { - let ori = - Floor::relative_ori(self.nearest_wall(rpos).unwrap_or_default(), rpos); - let furniture = SpriteKind::WallLamp; + let ori = Floor::relative_ori( + self.nearest_wall(rpos).unwrap_or_else(Vec2::zero), + rpos, + ); + let furniture = SpriteKind::WallSconce; BlockMask::new(Block::air(furniture).with_ori(ori).unwrap(), 1) } else { vacant @@ -1275,8 +1295,10 @@ impl Floor { stretch, ); let furniture = SpriteKind::WallLampSmall; - let ori = - Floor::relative_ori(self.nearest_wall(rtile_pos).unwrap_or_default(), rpos); + let ori = Floor::relative_ori( + self.nearest_wall(rtile_pos).unwrap_or_else(Vec2::zero), + rpos, + ); if z < self.rooms[*room].height { block.resolve_with(vacant) } else if z as f32 % stretch == 0.0