Merge branch 'WelshPixie/new-flora' into 'master'

added new flora

See merge request veloren/veloren!1074

common/src/terrain/block.rs

@@ -58,6 +58,22 @@ pub enum BlockKind {
     Scarecrow,
     StreetLamp,
     Door,
+    Bed,
+    Bench,
+    Chair,
+    CoatRack,
+    Crate,
+    DrawerLarge,
+    DrawerSmall,
+    DungeonWallDecor,
+    HangingBasket,
+    HangingSign,
+    WallLamp,
+    Planter,
+    Shelf,
+    TableLarge,
+    TableSmall,
+    Wardrobe,
 }
 
 impl BlockKind {
@@ -120,6 +136,22 @@ impl BlockKind {
             BlockKind::Scarecrow => true,
             BlockKind::StreetLamp => true,
             BlockKind::Door => false,
+            BlockKind::Bed => false,
+            BlockKind::Bench => false,
+            BlockKind::Chair => false,
+            BlockKind::CoatRack => false,
+            BlockKind::Crate => false,
+            BlockKind::DrawerLarge => false,
+            BlockKind::DrawerSmall => false,
+            BlockKind::DungeonWallDecor => false,
+            BlockKind::HangingBasket => true,
+            BlockKind::HangingSign => true,
+            BlockKind::WallLamp => true,
+            BlockKind::Planter => false,
+            BlockKind::Shelf => true,
+            BlockKind::TableLarge => false,
+            BlockKind::TableSmall => false,
+            BlockKind::Wardrobe => false,
             _ => false,
         }
     }
@@ -182,6 +214,22 @@ impl BlockKind {
             BlockKind::Scarecrow => false,
             BlockKind::StreetLamp => false,
             BlockKind::Door => false,
+            BlockKind::Bed => false,
+            BlockKind::Bench => false,
+            BlockKind::Chair => false,
+            BlockKind::CoatRack => false,
+            BlockKind::Crate => false,
+            BlockKind::DrawerLarge => false,
+            BlockKind::DrawerSmall => false,
+            BlockKind::DungeonWallDecor => false,
+            BlockKind::HangingBasket => false,
+            BlockKind::HangingSign => false,
+            BlockKind::WallLamp => false,
+            BlockKind::Planter => false,
+            BlockKind::Shelf => false,
+            BlockKind::TableLarge => false,
+            BlockKind::TableSmall => false,
+            BlockKind::Wardrobe => false,
             _ => true,
         }
     }
@@ -231,6 +279,22 @@ impl BlockKind {
             BlockKind::Scarecrow => true,
             BlockKind::StreetLamp => true,
             BlockKind::Door => false,
+            BlockKind::Bed => true,
+            BlockKind::Bench => true,
+            BlockKind::Chair => true,
+            BlockKind::CoatRack => true,
+            BlockKind::Crate => true,
+            BlockKind::DrawerLarge => true,
+            BlockKind::DrawerSmall => true,
+            BlockKind::DungeonWallDecor => true,
+            BlockKind::HangingBasket => false,
+            BlockKind::HangingSign => false,
+            BlockKind::WallLamp => false,
+            BlockKind::Planter => true,
+            BlockKind::Shelf => false,
+            BlockKind::TableLarge => true,
+            BlockKind::TableSmall => true,
+            BlockKind::Wardrobe => true,
             _ => true,
         }
     }
@@ -251,6 +315,18 @@ impl BlockKind {
             BlockKind::Carrot => 0.18,
             BlockKind::Radish => 0.18,
             BlockKind::Door => 3.0,
+            BlockKind::Bed => 1.54,
+            BlockKind::Bench => 1.45,
+            BlockKind::Chair => 1.36,
+            BlockKind::CoatRack => 2.36,
+            BlockKind::Crate => 0.90,
+            BlockKind::DrawerSmall => 1.0,
+            BlockKind::DrawerLarge => 2.0,
+            BlockKind::DungeonWallDecor => 1.0,
+            BlockKind::Planter => 1.09,
+            BlockKind::TableSmall => 1.27,
+            BlockKind::TableLarge => 1.45,
+            BlockKind::Wardrobe => 3.0,
             _ => 1.0,
         }
     }

voxygen/src/scene/terrain.rs

@@ -101,23 +101,27 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
         }),
 
         BlockKind::BlueFlower => Some(SpriteConfig {
-            variations: 7,
+            variations: 10,
             wind_sway: 0.1,
         }),
         BlockKind::PinkFlower => Some(SpriteConfig {
             variations: 4,
             wind_sway: 0.1,
         }),
+        BlockKind::PurpleFlower => Some(SpriteConfig {
+            variations: 4,
+            wind_sway: 0.1,
+        }),
         BlockKind::RedFlower => Some(SpriteConfig {
-            variations: 3,
+            variations: 4,
             wind_sway: 0.1,
         }),
         BlockKind::WhiteFlower => Some(SpriteConfig {
-            variations: 2,
+            variations: 5,
             wind_sway: 0.1,
         }),
         BlockKind::YellowFlower => Some(SpriteConfig {
-            variations: 1,
+            variations: 2,
             wind_sway: 0.1,
         }),
         BlockKind::Sunflower => Some(SpriteConfig {
@@ -179,7 +183,7 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
             wind_sway: 0.4,
         }),
         BlockKind::Fern => Some(SpriteConfig {
-            variations: 12,
+            variations: 13,
             wind_sway: 0.4,
         }),
         BlockKind::DeadBush => Some(SpriteConfig {
@@ -517,6 +521,30 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::BlueFlower, 7),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_blue-8",
+                        Vec3::new(-5.5, -4.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::BlueFlower, 8),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_blue-9",
+                        Vec3::new(-4.0, -3.0, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::BlueFlower, 9),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_blue-10",
+                        Vec3::new(-1.5, -1.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::PinkFlower, 0),
                     make_models(
@@ -557,6 +585,30 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::PurpleFlower, 1),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_purple-2",
+                        Vec3::new(-5.0, -2.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::PurpleFlower, 2),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_purple-3",
+                        Vec3::new(-3.5, -2.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::PurpleFlower, 3),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_purple-4",
+                        Vec3::new(-5.0, -4.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::RedFlower, 0),
                     make_models(
@@ -581,6 +633,14 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::RedFlower, 3),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_red-4",
+                        Vec3::new(-6.5, -6.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::WhiteFlower, 0),
                     make_models(
@@ -597,14 +657,46 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::WhiteFlower, 2),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_white-3",
+                        Vec3::new(-1.5, -1.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::WhiteFlower, 3),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_white-4",
+                        Vec3::new(-5.0, -4.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::WhiteFlower, 4),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_white-5",
+                        Vec3::new(-5.5, -5.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::YellowFlower, 0),
                     make_models(
-                        "voxygen.voxel.sprite.flowers.flower_purple_1",
+                        "voxygen.voxel.sprite.flowers.flower_yellow-1",
                         Vec3::new(-6.0, -6.0, 0.0),
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::YellowFlower, 1),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_yellow-0",
+                        Vec3::new(-5.5, -5.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::Sunflower, 0),
                     make_models(
@@ -1251,6 +1343,14 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::Fern, 12),
+                    make_models(
+                        "voxygen.voxel.sprite.ferns.fern-0",
+                        Vec3::new(-6.5, -11.5, 0.0),
+                        Vec3::unit_z(),
+                    ),
+                ),
                 // Dead Bush
                 (
                     (BlockKind::DeadBush, 0),