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

add: capability to disable blending for particular BlockKinds

Browse Source
This commit is contained in:
Imbris 2020-01-18 00:24:48 -05:00
parent ae1fa5e4c4
commit 4b01c1b082
3 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ pub enum BlockKind {
Velorite,
VeloriteFrag,
Chest,
Leaves,
}
impl BlockKind {

46
voxygen/src/mesh/terrain.rs
View File

@ -3,7 +3,7 @@ use crate::{
render::{self, FluidPipeline, Mesh, TerrainPipeline},
};
use common::{
terrain::Block,
terrain::{Block, BlockKind},
vol::{ReadVol, RectRasterableVol, Vox},
volumes::vol_grid_2d::{CachedVolGrid2d, VolGrid2d},
};
@ -13,6 +13,19 @@ use vek::*;
type TerrainVertex = <TerrainPipeline as render::Pipeline>::Vertex;
type FluidVertex = <FluidPipeline as render::Pipeline>::Vertex;
trait Blendable {
fn is_blended(&self) -> bool;
}
impl Blendable for BlockKind {
fn is_blended(&self) -> bool {
match self {
BlockKind::Leaves => false,
_ => true,
}
}
}
fn calc_light<V: RectRasterableVol<Vox = Block> + ReadVol + Debug>(
bounds: Aabb<i32>,
vol: &VolGrid2d<V>,
@ -317,16 +330,15 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
}
}
let get_color = |maybe_block: Option<&Block>| {
let get_color = |maybe_block: Option<&Block>, neighbour: bool| {
maybe_block
.filter(|vox| vox.is_opaque())
.filter(|vox| vox.is_opaque() && (!neighbour || vox.is_blended()))
.and_then(|vox| vox.get_color())
.map(|col| Rgba::from_opaque(col))
.unwrap_or(Rgba::zero())
};
let mut blocks = [[[None; 3]; 3]; 3];
let mut colors = [[[Rgba::zero(); 3]; 3]; 3];
for i in 0..3 {
for j in 0..3 {
for k in 0..3 {
@ -334,7 +346,6 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
Vec3::new(x, y, z_start) + Vec3::new(i as i32, j as i32, k as i32)
- 1,
));
colors[k][j][i] = get_color(block.as_ref());
blocks[k][j][i] = block;
}
}
@ -348,8 +359,6 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
lights[1] = lights[2];
blocks[0] = blocks[1];
blocks[1] = blocks[2];
colors[0] = colors[1];
colors[1] = colors[2];
for i in 0..3 {
for j in 0..3 {
@ -360,20 +369,35 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
for i in 0..3 {
for j in 0..3 {
let block = Some(flat_get(pos + Vec3::new(i as i32, j as i32, 2) - 1));
colors[2][j][i] = get_color(block.as_ref());
blocks[2][j][i] = block;
}
}
let block = blocks[1][1][1];
let colors = if block.map_or(false, |vox| vox.is_blended()) {
let mut colors = [[[Rgba::zero(); 3]; 3]; 3];
for i in 0..3 {
for j in 0..3 {
for k in 0..3 {
colors[i][j][k] = get_color(
blocks[i][j][k].as_ref(),
i != 1 || j != 1 || k != 1,
)
}
}
}
colors
} else {
[[[get_color(blocks[1][1][1].as_ref(), false); 3]; 3]; 3]
};
// Create mesh polygons
if block.map(|vox| vox.is_opaque()).unwrap_or(false) {
if block.map_or(false, |vox| vox.is_opaque()) {
vol::push_vox_verts(
&mut opaque_mesh,
faces_to_make(&blocks, false, |vox| !vox.is_opaque()),
offs,
&colors, //&[[[colors[1][1][1]; 3]; 3]; 3],
&colors,
|pos, norm, col, ao, light| {
let light = (light.min(ao) * 255.0) as u32;
let norm = if norm.x != 0.0 {
@ -399,7 +423,7 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
},
&lights,
);
} else if block.map(|vox| vox.is_fluid()).unwrap_or(false) {
} else if block.map_or(false, |vox| vox.is_fluid()) {
vol::push_vox_verts(
&mut fluid_mesh,
faces_to_make(&blocks, false, |vox| vox.is_air()),

6
world/src/block/mod.rs
View File

@ -575,7 +575,7 @@ pub fn block_from_structure(
match sblock {
StructureBlock::None => None,
StructureBlock::TemperateLeaves => Some(Block::new(
BlockKind::Normal,
BlockKind::Leaves,
Lerp::lerp(
Rgb::new(0.0, 132.0, 94.0),
Rgb::new(142.0, 181.0, 0.0),
@ -584,12 +584,12 @@ pub fn block_from_structure(
.map(|e| e as u8),
)),
StructureBlock::PineLeaves => Some(Block::new(
BlockKind::Normal,
BlockKind::Leaves,
Lerp::lerp(Rgb::new(0.0, 60.0, 50.0), Rgb::new(30.0, 100.0, 10.0), lerp)
.map(|e| e as u8),
)),
StructureBlock::PalmLeaves => Some(Block::new(
BlockKind::Normal,
BlockKind::Leaves,
Lerp::lerp(
Rgb::new(0.0, 108.0, 113.0),
Rgb::new(30.0, 156.0, 10.0),