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 'WelshPixie/grassets' into 'master'

Browse Source 
Welsh pixie/grassets

See merge request veloren/veloren!1106
This commit is contained in:
Monty Marz 2020-06-25 21:12:31 +00:00
commit 508d23c4db
16 changed files with 121 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/flowers/flower_red-5.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/grass/grass_large-0.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/grass/grass_large-1.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/grass/grass_large-2.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox Normal file
View File

Binary file not shown.

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

@ -74,6 +74,7 @@ pub enum BlockKind {
TableLarge,
TableSmall,
Wardrobe,
LargeGrass,
}
impl BlockKind {
@ -230,6 +231,7 @@ impl BlockKind {
BlockKind::TableLarge => false,
BlockKind::TableSmall => false,
BlockKind::Wardrobe => false,
BlockKind::LargeGrass => false,
_ => true,
}
}

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

@ -109,11 +109,11 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
wind_sway: 0.1,
}),
BlockKind::PurpleFlower => Some(SpriteConfig {
variations: 4,
variations: 8,
wind_sway: 0.1,
}),
BlockKind::RedFlower => Some(SpriteConfig {
variations: 4,
variations: 5,
wind_sway: 0.1,
}),
BlockKind::WhiteFlower => Some(SpriteConfig {
@ -141,13 +141,17 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
variations: 5,
wind_sway: 0.1,
}),
BlockKind::LargeGrass => Some(SpriteConfig {
variations: 3,
wind_sway: 0.5,
}),
BlockKind::Apple => Some(SpriteConfig {
variations: 1,
wind_sway: 0.0,
}),
BlockKind::Mushroom => Some(SpriteConfig {
variations: 11,
variations: 17,
wind_sway: 0.0,
}),
BlockKind::Liana => Some(SpriteConfig {
@ -609,6 +613,38 @@ impl<V: RectRasterableVol> Terrain<V> {
Vec3::one(),
),
),
(
(BlockKind::PurpleFlower, 4),
make_models(
"voxygen.voxel.sprite.flowers.flower_purple-5",
Vec3::new(-2.5, -2.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::PurpleFlower, 5),
make_models(
"voxygen.voxel.sprite.flowers.flower_purple-6",
Vec3::new(-4.5, -4.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::PurpleFlower, 6),
make_models(
"voxygen.voxel.sprite.flowers.flower_purple-7",
Vec3::new(-5.5, -5.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::PurpleFlower, 7),
make_models(
"voxygen.voxel.sprite.flowers.flower_purple-8",
Vec3::new(-6.0, -6.0, 0.0),
Vec3::one(),
),
),
(
(BlockKind::RedFlower, 0),
make_models(
@ -641,6 +677,14 @@ impl<V: RectRasterableVol> Terrain<V> {
Vec3::one(),
),
),
(
(BlockKind::RedFlower, 4),
make_models(
"voxygen.voxel.sprite.flowers.flower_red-5",
Vec3::new(-3.5, -3.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::WhiteFlower, 0),
make_models(
@ -714,6 +758,30 @@ impl<V: RectRasterableVol> Terrain<V> {
),
),
// Grass
(
(BlockKind::LargeGrass, 0),
make_models(
"voxygen.voxel.sprite.grass.grass_large-0",
Vec3::new(-2.0, -2.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::LongGrass, 1),
make_models(
"voxygen.voxel.sprite.grass.grass_large-1",
Vec3::new(-5.5, -5.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::LongGrass, 2),
make_models(
"voxygen.voxel.sprite.grass.grass_large-2",
Vec3::new(-5.5, -5.0, 0.0),
Vec3::one(),
),
),
(
(BlockKind::LongGrass, 0),
make_models(
@ -938,6 +1006,54 @@ impl<V: RectRasterableVol> Terrain<V> {
Vec3::one(),
),
),
(
(BlockKind::Mushroom, 11),
make_models(
"voxygen.voxel.sprite.mushrooms.mushroom-11",
Vec3::new(-8.0, -8.0, 0.0),
Vec3::one(),
),
),
(
(BlockKind::Mushroom, 12),
make_models(
"voxygen.voxel.sprite.mushrooms.mushroom-12",
Vec3::new(-5.0, -5.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::Mushroom, 13),
make_models(
"voxygen.voxel.sprite.mushrooms.mushroom-13",
Vec3::new(-5.5, -5.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::Mushroom, 14),
make_models(
"voxygen.voxel.sprite.mushrooms.mushroom-14",
Vec3::new(-2.5, -2.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::Mushroom, 15),
make_models(
"voxygen.voxel.sprite.mushrooms.mushroom-15",
Vec3::new(-1.5, -1.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::Mushroom, 16),
make_models(
"voxygen.voxel.sprite.mushrooms.mushroom-16",
Vec3::new(-5.5, -5.5, 0.0),
Vec3::one(),
),
),
(
(BlockKind::Liana, 0),
make_models(