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 sprite rotations

Browse Source
This commit is contained in:
WelshPixie 2020-06-28 20:42:35 +02:00 committed by Joshua Barretto
parent 854b1a46bf
commit 75ca522179
9 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/lamp_wall-1.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox
View File

Binary file not shown.

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

@ -381,9 +381,9 @@ impl BlockKind {
BlockKind::Radish => 0.18,
BlockKind::Door => 3.0,
BlockKind::Bed => 1.54,
BlockKind::Bench => 1.45,
BlockKind::ChairSingle => 1.36,
BlockKind::ChairDouble => 1.36,
BlockKind::Bench => 0.5,
BlockKind::ChairSingle => 0.5,
BlockKind::ChairDouble => 0.5,
BlockKind::CoatRack => 2.36,
BlockKind::Crate => 0.90,
BlockKind::DrawerSmall => 1.0,
@ -456,6 +456,27 @@ impl Block {
| BlockKind::Window2
| BlockKind::Window3
| BlockKind::Window4
| BlockKind::Bed
| BlockKind::Bench
| BlockKind::ChairSingle
| BlockKind::ChairDouble
| BlockKind::CoatRack
| BlockKind::Crate
| BlockKind::DrawerLarge
| BlockKind::DrawerMedium
| BlockKind::DrawerSmall
| BlockKind::DungeonWallDecor
| BlockKind::HangingBasket
| BlockKind::HangingSign
| BlockKind::WallLamp
| BlockKind::Planter
| BlockKind::Shelf
| BlockKind::TableSide
| BlockKind::TableDining
| BlockKind::TableDouble
| BlockKind::WardrobeSingle
| BlockKind::WardrobeDouble
| BlockKind::Pot
| BlockKind::Door => Some(self.color[0] & 0b111),
_ => None,
}

18
voxygen/src/scene/terrain.rs
View File

@ -2195,7 +2195,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::Bed, 0),
make_models(
"voxygen.voxel.sprite.furniture.bed-0",
Vec3::new(-9.5, -6.0, 0.0),
Vec3::new(-9.5, -14.5, 0.0),
Vec3::one(),
),
),
@ -2452,7 +2452,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::HangingBasket, 0),
make_models(
"voxygen.voxel.sprite.furniture.hanging_basket-0",
Vec3::new(-6.5, -4.5, 0.0),
Vec3::new(-6.5, -3.5, 0.0),
Vec3::one(),
),
),
@ -2486,7 +2486,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::WallLamp, 1),
make_models(
"voxygen.voxel.sprite.furniture.lamp_wall-1",
Vec3::new(-9.0, -10.5, 0.0),
Vec3::new(-10.5, -9.0, 0.0),
Vec3::one(),
),
),
@ -2603,7 +2603,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::TableDining, 0),
make_models(
"voxygen.voxel.sprite.furniture.table_dining-0",
Vec3::new(-13.5, -13.5, 0.0),
Vec3::new(-8.5, -8.5, 0.0),
Vec3::one(),
),
),
@ -2611,7 +2611,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::TableDining, 1),
make_models(
"voxygen.voxel.sprite.furniture.table_dining-1",
Vec3::new(-13.5, -13.5, 0.0),
Vec3::new(-8.5, -8.5, 0.0),
Vec3::one(),
),
),
@ -2629,7 +2629,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::WardrobeSingle, 0),
make_models(
"voxygen.voxel.sprite.furniture.wardrobe_single-0",
Vec3::new(-6.0, -5.5, 0.0),
Vec3::new(-5.5, -6.0, 0.0),
Vec3::one(),
),
),
@ -2637,7 +2637,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::WardrobeSingle, 1),
make_models(
"voxygen.voxel.sprite.furniture.wardrobe_single-1",
Vec3::new(-6.5, -5.5, 0.0),
Vec3::new(-5.5, -6.5, 0.0),
Vec3::one(),
),
),
@ -2646,7 +2646,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::WardrobeDouble, 0),
make_models(
"voxygen.voxel.sprite.furniture.wardrobe_double-0",
Vec3::new(-6.5, -10.5, 0.0),
Vec3::new(-10.5, -6.5, 0.0),
Vec3::one(),
),
),
@ -2654,7 +2654,7 @@ impl<V: RectRasterableVol> Terrain<V> {
(BlockKind::WardrobeDouble, 1),
make_models(
"voxygen.voxel.sprite.furniture.wardrobe_double-1",
Vec3::new(-6.0, -10.5, 0.0),
Vec3::new(-10.5, -6.0, 0.0),
Vec3::one(),
),
),