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 'pfau/map-transp-hotfix' into 'master'

Browse Source 
Hotfix for map flickering while turning

See merge request veloren/veloren!720
This commit is contained in:
Monty Marz 2020-01-12 19:01:02 +00:00
commit 9c65c43713
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/fixture/selection_bg - Kopie.vox (Stored with Git LFS)
View File

Binary file not shown.

8
voxygen/src/hud/map.rs
View File

@ -87,12 +87,8 @@ impl<'a> Widget for Map<'a> {
fn update(self, args: widget::UpdateArgs<Self>) -> Self::Event {
let widget::UpdateArgs { state, ui, .. } = args;
// Set map transparency to 0.5 when player is moving
/*let vel = match self.velocity {
Some(velocity) => velocity.0.magnitude(),
None => 0.0,
};*/
let mut fade = 1.0;
if self.velocity > 7.0 {
if self.velocity > 2.5 {
fade = 0.7
};
@ -165,7 +161,7 @@ impl<'a> Widget for Map<'a> {
// Map Image
Image::new(/*self.world_map*/ self.imgs.map_placeholder)
.middle_of(state.ids.map_bg)
.color(Some(Color::Rgba(1.0, 1.0, 1.0, fade)))
.color(Some(Color::Rgba(1.0, 1.0, 1.0, fade - 0.1)))
.w_h(700.0, 700.0)
.parent(state.ids.map_bg)
.set(state.ids.grid, ui);