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

Added extra LoD level to terrain sprites

Browse Source
This commit is contained in:
Joshua Barretto 2020-04-25 15:49:06 +01:00
parent f34175a5a8
commit 93105105e0
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
voxygen/src/scene/figure/mod.rs
View File

@ -1859,7 +1859,10 @@ impl<S: Skeleton> FigureState<S> {
renderer.update_consts(&mut self.locals, &[locals]).unwrap();
renderer
.update_consts(&mut self.bone_consts, &self.skeleton.compute_matrices()[0..self.skeleton.bone_count()])
.update_consts(
&mut self.bone_consts,
&self.skeleton.compute_matrices()[0..self.skeleton.bone_count()],
)
.unwrap();
}

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

@ -327,7 +327,7 @@ impl<V: RectRasterableVol> Terrain<V> {
let (send, recv) = channel::unbounded();
let mut make_models = |s, offset, lod_axes: Vec3<f32>| {
let scaled = [1.0, 0.6, 0.4, 0.2];
let scaled = [1.0, 0.8, 0.6, 0.4, 0.2];
scaled
.iter()
.map(|lod_scale| {
@ -2255,9 +2255,10 @@ impl<V: RectRasterableVol> Terrain<V> {
// Terrain sprites
for (pos, chunk) in chunk_iter.clone() {
if chunk.visible {
let sprite_detail_low_distance = sprite_render_distance * 0.65;
let sprite_detail_mid_distance = sprite_render_distance * 0.4;
let sprite_detail_high_distance = sprite_render_distance * 0.25;
let sprite_detail_low_distance = sprite_render_distance * 0.75;
let sprite_detail_mid_distance = sprite_render_distance * 0.5;
let sprite_detail_hid_distance = sprite_render_distance * 0.35;
let sprite_detail_high_distance = sprite_render_distance * 0.15;
let chunk_center =
pos.map2(V::RECT_SIZE, |e, sz: u32| (e as f32 + 0.5) * sz as f32);
@ -2267,12 +2268,14 @@ impl<V: RectRasterableVol> Terrain<V> {
renderer.render_sprites(
if dist_sqrd < sprite_detail_high_distance.powf(2.0) {
&self.sprite_models[&kind][0]
} else if dist_sqrd < sprite_detail_mid_distance.powf(2.0) {
} else if dist_sqrd < sprite_detail_hid_distance.powf(2.0) {
&self.sprite_models[&kind][1]
} else if dist_sqrd < sprite_detail_low_distance.powf(2.0) {
} else if dist_sqrd < sprite_detail_mid_distance.powf(2.0) {
&self.sprite_models[&kind][2]
} else {
} else if dist_sqrd < sprite_detail_low_distance.powf(2.0) {
&self.sprite_models[&kind][3]
} else {
&self.sprite_models[&kind][4]
},
globals,
&instances,