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

crosshair correction

Browse Source
This commit is contained in:
Pfauenauge90 2019-07-07 01:04:30 +02:00
parent de1cf1371c
commit 3be2951029
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/misc_bg/crosshair_inner.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/misc_bg/crosshair_outer.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
voxygen/src/hud/img_ids.rs
View File

@ -55,10 +55,14 @@ image_ids! {
// Crosshair // Crosshair
crosshair: "voxygen/element/misc_bg/crosshair.vox", crosshair: "voxygen/element/misc_bg/crosshair.vox",
//crosshair_outer: "voxygen/element/misc_bg/crosshair_outer.vox",
crosshair_inner: "voxygen/element/misc_bg/crosshair_inner.vox",
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
<VoxelMs9Graphic> <VoxelMs9Graphic>
crosshair_outer: "voxygen/element/misc_bg/crosshair_outer.vox",
// Buttons // Buttons
mmap_closed: "voxygen/element/buttons/button_mmap_closed.vox", mmap_closed: "voxygen/element/buttons/button_mmap_closed.vox",
mmap_closed_hover: "voxygen/element/buttons/button_mmap_closed_hover.vox", mmap_closed_hover: "voxygen/element/buttons/button_mmap_closed_hover.vox",

16
voxygen/src/hud/mod.rs
View File

@ -50,7 +50,8 @@ const MANA_COLOR: Color = Color::Rgba(0.42, 0.41, 0.66, 1.0);
widget_ids! { widget_ids! {
struct Ids { struct Ids {
// Crosshair // Crosshair
crosshair, crosshair_inner,
crosshair_outer,
// Character Names // Character Names
name_tags[], name_tags[],
@ -339,11 +340,16 @@ impl Hud {
let mut health_back_id_walker = self.ids.health_bar_backs.walk(); let mut health_back_id_walker = self.ids.health_bar_backs.walk();
// Crosshair // Crosshair
Image::new(self.imgs.crosshair) Image::new(self.imgs.crosshair_outer)
.w_h(21.0 * 2.0, 21.0 * 2.0) .w_h(21.0 * 1.5, 21.0 * 1.5)
.middle_of(ui_widgets.window) .middle_of(ui_widgets.window)
.color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.1))) .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.2)))
.set(self.ids.crosshair, ui_widgets); .set(self.ids.crosshair_outer, ui_widgets);
Image::new(self.imgs.crosshair_inner)
.w_h(21.0 * 2.0, 21.0 * 2.0)
.middle_of(self.ids.crosshair_outer)
.color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.6)))
.set(self.ids.crosshair_inner, ui_widgets);
// Render Name Tags // Render Name Tags
for (pos, name) in (&entities, &pos, &stats, player.maybe()) for (pos, name) in (&entities, &pos, &stats, player.maybe())