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

mesa_furniture

Browse Source
This commit is contained in:
flo 2024-05-09 13:35:18 +00:00
parent 9e98d473e6
commit 2752786f2f
31 changed files with 344 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/sprite/furniture/bed_mesa.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-0.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-1.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-10.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-11.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-3.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-4.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-5.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-6.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-7.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-8.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/cliff_decor_block-9.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

0
assets/voxygen/voxel/sprite/furniture/cliff_decor_block.vox → assets/voxygen/voxel/sprite/furniture/cliff_decor_block_.vox
View File

BIN
assets/voxygen/voxel/sprite/furniture/cupboard_mesa.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/melon.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/melon_cut.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/mirror_mesa.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wall_lamp_mesa.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wall_table_mesa.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-0.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-1.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_single_mesa-0.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_single_mesa-1.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/lantern/lantern_mesa.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

166
assets/voxygen/voxel/sprite_manifest.ron
View File

@ -2731,7 +2731,7 @@
variations: [
(
model: "voxygen.voxel.sprite.furniture.lamp_wall-2",
offset: (-5.5, -5.5, 0.0),
offset: (-5.5, 0.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
@ -4134,7 +4134,7 @@
variations: [
(
model: "voxygen.voxel.sprite.furniture.bookshelf_arabic",
offset: (-22.0, -5.5, -6.0),
offset: (-24.5, -5.5, -6.0),
lod_axes: (0.0, 0.0, 0.0),
),
],
@ -4240,11 +4240,16 @@
],
wind_sway: 0.0,
),
(MelonCut, ()): (
(Melon, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.melon_cut",
offset: (-15.0, -7.5, 0.0),
offset: (-4.5, -4.5, -0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.melon",
offset: (-5.5, -4.5, -0.0),
lod_axes: (0.0, 0.0, 0.0),
),
],
@ -4290,12 +4295,163 @@
],
wind_sway: 0.0,
),
// CliffTown Sprites
(CliffDecorBlock, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block",
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-0",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-1",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-2",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-3",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-4",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-5",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-6",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-7",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-8",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-9",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-10",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.furniture.cliff_decor_block-11",
offset: (-5.5, -5.5, 0.0),
lod_axes: (0.0, 0.0, 0.0),
),
],
wind_sway: 0.0,
),
(BedMesa, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.bed_mesa",
offset: (-9.0, -16.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
wind_sway: 0.0,
),
(CupboardMesa, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.cupboard_mesa",
offset: (-8.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
wind_sway: 0.0,
),
(WallLampMesa, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.wall_lamp_mesa",
offset: (-4.5, 0.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
wind_sway: 0.0,
),
(MesaLantern, ()): (
variations: [
(
model: "voxygen.voxel.sprite.lantern.lantern_mesa",
offset: (-3.5, -3.5, 0.0),
lod_axes: (0.5, 0.5, 0.2),
),
],
wind_sway: 0.0,
),
(MirrorMesa, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.mirror_mesa",
offset: (-10.5, -2.0, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
wind_sway: 0.0,
),
(WallTableMesa, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.wall_table_mesa",
offset: (-7.5, -5.5, 3.0),
lod_axes: (0.0, 0.0, 0.0),
),
],
wind_sway: 0.0,
),
(WardrobeDoubleMesa, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.wardrobe_double_mesa-0",
offset: (-17.0, -6.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.furniture.wardrobe_double_mesa-1",
offset: (-12.5, -6.0, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.furniture.wardrobe_double_mesa-2",
offset: (-10.5, -6.0, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
wind_sway: 0.0,
),
(WardrobeSingleMesa, ()): (
variations: [
(
model: "voxygen.voxel.sprite.furniture.wardrobe_single-0",
offset: (-7.0, -6.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.furniture.wardrobe_single-1",
offset: (-7.0, -6.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
wind_sway: 0.0,

3
common/src/terrain/block.rs
View File

@ -388,8 +388,11 @@ impl Block {
SpriteKind::Ember | SpriteKind::FireBlock => 20,
SpriteKind::WallLamp
| SpriteKind::WallLampSmall
| SpriteKind::WallLampWizard
| SpriteKind::WallLampMesa
| SpriteKind::WallSconce
| SpriteKind::FireBowlGround
| SpriteKind::MesaLantern
| SpriteKind::ChristmasOrnament
| SpriteKind::CliffDecorBlock
| SpriteKind::Orb

66
common/src/terrain/sprite.rs
View File

@ -76,30 +76,36 @@ sprites! {
// TODO: Remove sizes and variants, represent with attributes
Furniture = 2 has Ori {
// Indoor
CoatRack = 0x00,
Bed = 0x01,
Bench = 0x02,
ChairSingle = 0x03,
ChairDouble = 0x04,
DrawerLarge = 0x05,
DrawerMedium = 0x06,
DrawerSmall = 0x07,
TableSide = 0x08,
TableDining = 0x09,
TableDouble = 0x0A,
WardrobeSingle = 0x0B,
WardrobeDouble = 0x0C,
BookshelfArabic = 0x0D,
WallTableArabic = 0x0E,
TableArabicLarge = 0x0F,
TableArabicSmall = 0x10,
CupboardArabic = 0x11,
OvenArabic = 0x12,
CushionArabic = 0x13,
CanapeArabic = 0x14,
Shelf = 0x15,
Planter = 0x16,
Pot = 0x17,
CoatRack = 0x00,
Bed = 0x01,
Bench = 0x02,
ChairSingle = 0x03,
ChairDouble = 0x04,
DrawerLarge = 0x05,
DrawerMedium = 0x06,
DrawerSmall = 0x07,
TableSide = 0x08,
TableDining = 0x09,
TableDouble = 0x0A,
WardrobeSingle = 0x0B,
WardrobeDouble = 0x0C,
BookshelfArabic = 0x0D,
WallTableArabic = 0x0E,
TableArabicLarge = 0x0F,
TableArabicSmall = 0x10,
CupboardArabic = 0x11,
OvenArabic = 0x12,
CushionArabic = 0x13,
CanapeArabic = 0x14,
Shelf = 0x15,
Planter = 0x16,
Pot = 0x17,
BedMesa = 0x18,
WallTableMesa = 0x19,
MirrorMesa = 0x1A,
WardrobeSingleMesa = 0x1B,
WardrobeDoubleMesa = 0x1C,
CupboardMesa = 0x1D,
// Crafting
CraftingBench = 0x20,
Forge = 0x21,
@ -137,6 +143,7 @@ sprites! {
WallLampSmall = 0x56,
WallSconce = 0x57,
DungeonWallDecor = 0x58,
WallLampMesa = 0x59,
// Outdoor
Tent = 0x60,
Bedroll = 0x61,
@ -352,7 +359,7 @@ sprites! {
// Artificial
Grave = 0x10,
Gravestone = 0x11,
MelonCut = 0x12,
Melon = 0x12,
ForgeTools = 0x13,
JugAndBowlArabic = 0x14,
JugArabic = 0x15,
@ -374,6 +381,7 @@ sprites! {
StreetLampTall = 2,
SeashellLantern = 3,
FireBowlGround = 4,
MesaLantern = 5,
},
}
@ -439,12 +447,14 @@ impl SpriteKind {
SpriteKind::SeaDecorWindowVer => 1.09,
SpriteKind::SeaDecorPillar => 2.55,
SpriteKind::SeashellLantern => 2.09,
SpriteKind::MesaLantern => 1.3,
SpriteKind::Rope => 1.09,
SpriteKind::StreetLamp => 2.65,
SpriteKind::Carrot => 0.18,
SpriteKind::Radish => 0.18,
SpriteKind::FireBowlGround => 0.55,
SpriteKind::Bed => 0.72,
SpriteKind::BedMesa => 0.82,
SpriteKind::Bench => 0.5,
SpriteKind::ChairSingle => 0.5,
SpriteKind::ChairDouble => 0.5,
@ -460,6 +470,9 @@ impl SpriteKind {
SpriteKind::TableDouble => 1.45,
SpriteKind::WardrobeSingle => 3.0,
SpriteKind::WardrobeDouble => 3.0,
SpriteKind::WardrobeSingleMesa => 2.0,
SpriteKind::WardrobeDoubleMesa => 2.0,
SpriteKind::MirrorMesa => 2.0,
SpriteKind::Pot => 0.90,
SpriteKind::Mud => 0.36,
SpriteKind::ChestBuried => 0.91,
@ -539,7 +552,7 @@ impl SpriteKind {
SpriteKind::CupboardArabic => 4.5,
SpriteKind::WallTableArabic => 2.3,
SpriteKind::JugAndBowlArabic => 1.4,
SpriteKind::MelonCut => 0.7,
SpriteKind::Melon => 0.7,
SpriteKind::OvenArabic => 3.2,
SpriteKind::FountainArabic => 2.4,
SpriteKind::Hearth => 2.3,
@ -720,6 +733,7 @@ impl SpriteKind {
},
SpriteKind::Helm => Some((Vec3::new(0.0, -1.0, 0.0), Vec3::unit_y())),
SpriteKind::Bed => Some((Vec3::new(0.0, 0.0, 0.6), -Vec3::unit_y())),
SpriteKind::BedMesa => Some((Vec3::new(0.0, 0.0, 0.6), -Vec3::unit_y())),
SpriteKind::BedrollSnow | SpriteKind::BedrollPirate => {
Some((Vec3::new(0.0, 0.0, 0.1), -Vec3::unit_x()))
},

102
world/src/site2/plot/cliff_tower.rs
View File

@ -223,14 +223,13 @@ impl Structure for CliffTower {
painter.sprite(
sprite_pos.with_z(floor_level + 1),
match (RandomField::new(0).get(sprite_pos.with_z(floor_level + 1)))
% 10
% 8
{
0 => SpriteKind::FireBowlGround,
1 => SpriteKind::Bowl,
3 => SpriteKind::VialEmpty,
4 => SpriteKind::Crate,
5 => SpriteKind::Pot,
_ => SpriteKind::Lantern,
0 => SpriteKind::Bowl,
1 => SpriteKind::VialEmpty,
2 => SpriteKind::Crate,
3 => SpriteKind::Pot,
_ => SpriteKind::MesaLantern,
},
);
}
@ -508,21 +507,21 @@ impl Structure for CliffTower {
painter.sprite(
pos.with_z(floor_level + 1),
match (RandomField::new(0).get(pos.with_z(floor_level)))
% 8
% 9
{
0 => SpriteKind::DrawerSmall,
0 => SpriteKind::WardrobeSingleMesa,
1 => SpriteKind::CoatRack,
2 => SpriteKind::TableArabicSmall,
2 => SpriteKind::MirrorMesa,
3 => SpriteKind::CushionArabic,
4 => SpriteKind::JugArabic,
5 => SpriteKind::SepareArabic,
6 => SpriteKind::Crate,
7 => SpriteKind::Bowl,
_ => SpriteKind::Lantern,
_ => SpriteKind::MesaLantern,
},
);
}
// canapes
// beds & wardrobes
for d in 0..2 {
let pos = Vec2::new(
plot_center.x - length + 6 + (d * ((2 * length) - 12)),
@ -544,7 +543,13 @@ impl Structure for CliffTower {
.clear();
painter.rotated_sprite(
pos.with_z(floor_level + 1),
SpriteKind::CanapeArabic,
match (RandomField::new(0)
.get(pos.with_z(floor_level - d)))
% 3
{
0 => SpriteKind::WardrobeDoubleMesa,
_ => SpriteKind::BedMesa,
},
(4 * d) as u8,
);
}
@ -597,18 +602,17 @@ impl Structure for CliffTower {
);
painter.rotated_sprite(
pos.with_z(floor_level + 3),
SpriteKind::WallTableArabic,
SpriteKind::WallTableMesa,
(4 * d) as u8,
);
painter.rotated_sprite(
pos.with_z(floor_level + 4),
match (RandomField::new(0).get(pos.with_z(floor_level)))
% 4
% 3
{
0 => SpriteKind::Bowl,
1 => SpriteKind::VialEmpty,
2 => SpriteKind::JugArabic,
_ => SpriteKind::JugAndBowlArabic,
_ => SpriteKind::JugArabic,
},
(4 * d) as u8,
);
@ -619,20 +623,19 @@ impl Structure for CliffTower {
painter.sprite(
pos.with_z(floor_level + 1),
match (RandomField::new(0).get(pos.with_z(floor_level)))
% 14
% 12
{
0 => SpriteKind::DrawerSmall,
1 => SpriteKind::CoatRack,
2 => SpriteKind::TableArabicSmall,
3 => SpriteKind::CushionArabic,
4 => SpriteKind::JugArabic,
5 => SpriteKind::DrawerSmall,
5 => SpriteKind::WardrobeSingleMesa,
6 => SpriteKind::Crate,
7 => SpriteKind::DecorSetArabic,
8 => SpriteKind::VialEmpty,
9 => SpriteKind::SepareArabic,
10 => SpriteKind::TableArabicSmall,
11 => SpriteKind::Lantern,
10 => SpriteKind::MesaLantern,
_ => SpriteKind::FountainArabic,
},
);
@ -647,8 +650,8 @@ impl Structure for CliffTower {
plot_center.y - length + (d * ((2 * length) - 1)),
);
painter.rotated_sprite(
pos.with_z(floor_level + 2),
SpriteKind::CupboardArabic,
pos.with_z(floor_level + 3),
SpriteKind::CupboardMesa,
(4 * d) as u8,
);
}
@ -660,18 +663,17 @@ impl Structure for CliffTower {
);
painter.rotated_sprite(
pos.with_z(floor_level + 2),
SpriteKind::WallTableArabic,
SpriteKind::WallTableMesa,
(4 * d) as u8,
);
painter.rotated_sprite(
pos.with_z(floor_level + 3),
match (RandomField::new(0).get(pos.with_z(floor_level)))
% 5
% 4
{
0 => SpriteKind::MelonCut,
1 => SpriteKind::JugAndBowlArabic,
2 => SpriteKind::Bowl,
3 => SpriteKind::JugArabic,
0 => SpriteKind::Melon,
1 => SpriteKind::Bowl,
2 => SpriteKind::JugArabic,
_ => SpriteKind::VialEmpty,
},
(4 * d) as u8,
@ -683,19 +685,19 @@ impl Structure for CliffTower {
painter.sprite(
pos.with_z(floor_level + 1),
match (RandomField::new(0).get(pos.with_z(floor_level)))
% 12
% 11
{
0 => SpriteKind::DrawerSmall,
0 => SpriteKind::WardrobeSingleMesa,
1 => SpriteKind::Cauldron,
2 => SpriteKind::TableArabicSmall,
3 => SpriteKind::CushionArabic,
4 => SpriteKind::JugArabic,
5 => SpriteKind::DrawerSmall,
6 => SpriteKind::Crate,
7 => SpriteKind::Bowl,
8 => SpriteKind::VialEmpty,
9 => SpriteKind::CookingPot,
10 => SpriteKind::Lantern,
5 => SpriteKind::Crate,
6 => SpriteKind::Bowl,
7 => SpriteKind::VialEmpty,
8 => SpriteKind::CookingPot,
9 => SpriteKind::MesaLantern,
10 => SpriteKind::JugAndBowlArabic,
_ => SpriteKind::OvenArabic,
},
);
@ -703,6 +705,32 @@ impl Structure for CliffTower {
},
}
}
// wall lamps
let corner_pos_1 = Vec2::new(plot_center.x - length, plot_center.y - 5);
let corner_pos_2 = Vec2::new(plot_center.x - 5, plot_center.y - length);
for dir in SQUARE_4 {
let lamp_pos_1 = Vec2::new(
corner_pos_1.x + (dir.x * ((2 * length) - 1)),
corner_pos_1.y + (dir.y * 10),
)
.with_z(floor_level + 7);
painter.rotated_sprite(
lamp_pos_1,
SpriteKind::WallLampMesa,
(2 + (4 * dir.x)) as u8,
);
let lamp_pos_2 = Vec2::new(
corner_pos_2.x + (dir.x * 10),
corner_pos_2.y + (dir.y * ((2 * length) - 1)),
)
.with_z(floor_level + 7);
painter.rotated_sprite(
lamp_pos_2,
SpriteKind::WallLampMesa,
(4 - (4 * dir.y)) as u8,
);
}
}
// stairs
if floor_level > (base + 8) {

2
world/src/site2/plot/desert_city_multiplot.rs
View File

@ -1228,7 +1228,7 @@ impl Structure for DesertCityMultiPlot {
.get(c_pos.with_z(floor_level)))
% 5
{
0 => SpriteKind::MelonCut,
0 => SpriteKind::Melon,
1 => SpriteKind::JugAndBowlArabic,
2 => SpriteKind::Bowl,
3 => SpriteKind::JugArabic,