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

Fixes to jungle sprites and lillypads

Browse Source
This commit is contained in:
DemonicOnPc 2021-10-28 18:28:32 -04:00
parent c6dd425203
commit 7fc57c027b
13 changed files with 79 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/sprite/flowers/jungle_flower_red-0.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/flowers/jungle_flower_red-1.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/flowers/jungle_flower_red-6.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/flowers/jungle_flower_red-7.vox (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

0
assets/voxygen/voxel/sprite/flowers/jungle_flower_red-2.vox → assets/voxygen/voxel/sprite/jungleredgrass/jungle_grass_red-2.vox
View File

0
assets/voxygen/voxel/sprite/flowers/jungle_flower_red-3.vox → assets/voxygen/voxel/sprite/jungleredgrass/jungle_grass_red-3.vox
View File

0
assets/voxygen/voxel/sprite/flowers/jungle_flower_red-4.vox → assets/voxygen/voxel/sprite/jungleredgrass/jungle_grass_red-4.vox
View File

0
assets/voxygen/voxel/sprite/flowers/jungle_flower_red-5.vox → assets/voxygen/voxel/sprite/jungleredgrass/jungle_grass_red-5.vox
View File

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

@ -262,41 +262,11 @@ RedFlower: Some((
),
(
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-0",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-1",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-2",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-3",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-4",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-5",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-6",
offset: (-7.5, -7.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-7",
model: "voxygen.voxel.sprite.flowers.jungle_flower_red-1",
offset: (-7.5, -7.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
@ -484,6 +454,41 @@ LargeGrass: Some((
],
wind_sway: 0.5,
)),
JungleRedGrass: Some((
variations: [
(
model: "voxygen.voxel.sprite.jungleredgrass.jungle_grass_red-0",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.jungleredgrass.jungle_grass_red-1",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.jungleredgrass.jungle_grass_red-2",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.jungleredgrass.jungle_grass_red-3",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.jungleredgrass.jungle_grass_red-4",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
(
model: "voxygen.voxel.sprite.jungleredgrass.jungle_grass_red-5",
offset: (-5.5, -5.5, 0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
wind_sway: 0.1,
)),
// Fruit
Apple: Some((
variations: [
@ -983,6 +988,11 @@ LeafyPlant: Some((
offset: (-6.0, -6.0, -0.0),
lod_axes: (1.0, 1.0, 1.0),
),
],
wind_sway: 0.4,
)),
JungleLeafyPlant: Some((
variations: [
(
model: "voxygen.voxel.sprite.leafy_plant.jungle_plant-0",
offset: (-5.5, -1.5, -0.0),
@ -3632,17 +3642,17 @@ LillyPads: Some((
),
(
model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-7",
offset: (-5.5, -5.5, -17.0),
offset: (-5.5, -5.5, -18.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-8",
offset: (-4.5, -4.5, -17.0),
offset: (-4.5, -4.5, -18.0),
lod_axes: (0.0, 0.0, 0.0),
),
(
model: "voxygen.voxel.sprite.lillypads.temperate-lilypad-9",
offset: (-4.5, -4.5, -17.0),
offset: (-4.5, -4.5, -18.0),
lod_axes: (0.0, 0.0, 0.0),
),
],

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

@ -185,6 +185,8 @@ make_case_elim!(
DismantlingBench = 0x9E,
JungleFern = 0x9F,
LillyPads = 0xA0,
JungleLeafyPlant = 0xA1,
JungleRedGrass = 0xA2,
}
);

28
world/src/layer/scatter.rs
View File

@ -140,6 +140,14 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
None,
)
}),
(JungleLeafyPlant, Surface, |_, col| {
(
close(col.temp, 0.3, 0.4).min(close(col.humidity, CONFIG.jungle_hum, 0.3))
* GRASS_FACT
* 32.0,
Some((0.15, 64.0, 0.2)),
)
}),
(Fern, Surface, |_, col| {
(
close(col.temp, 0.3, 0.4).min(close(col.humidity, CONFIG.forest_hum, 0.5))
@ -150,10 +158,11 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
}),
(JungleFern, Surface, |_, col| {
(
close(col.temp, 0.3, 0.4).min(close(col.humidity, CONFIG.jungle_hum, 0.3))
* GRASS_FACT
* 4.0,
Some((0.0, 64.0, 0.5)),
close(col.temp, 0.0, 0.7).min(close(col.humidity, CONFIG.jungle_hum, 0.4))
* col.tree_density
* MUSH_FACT
* 200.0,
Some((0.0, 84.0, 0.35)),
)
}),
(Blueberry, Surface, |_, col| {
@ -228,6 +237,15 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
Some((0.1, 48.0, 0.3)),
)
}),
(JungleRedGrass, Surface, |_, col| {
(
close(col.temp, 0.0, 0.7).min(close(col.humidity, CONFIG.jungle_hum, 0.4))
* col.tree_density
* MUSH_FACT
* 400.0,
Some((0.0, 128.0, 0.25)),
)
}),
// Jungle Sprites
// (LongGrass, Surface, |c, col| {
// (
@ -612,7 +630,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
* GRASS_FACT
* 100.0
* ((col.alt - CONFIG.sea_level) / 12.0).clamped(0.0, 1.0)
* col.water_dist.map_or(0.0, |d| 1.0 / (1.0 + (d.abs() * 0.45).powi(2))),
* col.water_dist.map_or(0.0, |d| 1.0 / (1.0 + (d.abs() * 0.4).powi(2))),
Some((0.0, 128.0, 0.35)),
)
}),