diff --git a/assets/voxygen/element/misc_bg/crosshair_inner.vox b/assets/voxygen/element/misc_bg/crosshair_inner.vox new file mode 100644 index 0000000000..e7910ebdc1 --- /dev/null +++ b/assets/voxygen/element/misc_bg/crosshair_inner.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebd152f729ba3dd3eb971482a78b9527c4c8ed32888ad64d469021bafa4780a5 +size 1116 diff --git a/assets/voxygen/element/misc_bg/crosshair_outer.vox b/assets/voxygen/element/misc_bg/crosshair_outer.vox new file mode 100644 index 0000000000..8bf3d60dc2 --- /dev/null +++ b/assets/voxygen/element/misc_bg/crosshair_outer.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5151fb769cfac65218cc64f3a366b65016a7894270753dc58b12fe2a2981dda +size 1464 diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 3beaca6409..14abc02cae 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -55,10 +55,14 @@ image_ids! { // Crosshair 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", //////////////////////////////////////////////////////////////////////// + crosshair_outer: "voxygen/element/misc_bg/crosshair_outer.vox", + // Buttons mmap_closed: "voxygen/element/buttons/button_mmap_closed.vox", mmap_closed_hover: "voxygen/element/buttons/button_mmap_closed_hover.vox", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 6ca538e98f..d5c784ddc6 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -50,7 +50,8 @@ const MANA_COLOR: Color = Color::Rgba(0.42, 0.41, 0.66, 1.0); widget_ids! { struct Ids { // Crosshair - crosshair, + crosshair_inner, + crosshair_outer, // Character Names name_tags[], @@ -339,11 +340,16 @@ impl Hud { let mut health_back_id_walker = self.ids.health_bar_backs.walk(); // Crosshair - Image::new(self.imgs.crosshair) - .w_h(21.0 * 2.0, 21.0 * 2.0) + Image::new(self.imgs.crosshair_outer) + .w_h(21.0 * 1.5, 21.0 * 1.5) .middle_of(ui_widgets.window) - .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.1))) - .set(self.ids.crosshair, ui_widgets); + .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.2))) + .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 for (pos, name) in (&entities, &pos, &stats, player.maybe())