-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #286 from StarArawn/nine-patch-improvements
Added new nine-patch features
- Loading branch information
Showing
7 changed files
with
124 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,110 @@ | ||
| use bevy::prelude::{Bundle, Commands, Component, Entity, Handle, Image, In, Query, Res}; | ||
|
|
||
| use crate::{ | ||
| children::KChildren, | ||
| context::WidgetName, | ||
| on_event::OnEvent, | ||
| prelude::KayakWidgetContext, | ||
| styles::{ComputedStyles, Edge, KStyle, RenderCommand}, | ||
| widget::Widget, | ||
| }; | ||
|
|
||
| #[derive(Component, PartialEq, Clone, Default, Debug)] | ||
| pub struct NinePatch { | ||
| /// The handle to image | ||
| pub handle: Handle<Image>, | ||
| /// The size of each edge (in pixels) | ||
| pub border: Edge<f32>, | ||
| } | ||
|
|
||
| impl Widget for NinePatch {} | ||
|
|
||
| /// | ||
| /// Render's a nine-patch image as a UI widget. | ||
| /// | ||
| /// Also know as 9-slicing. This 2D technique allows users to render UI images at multiple | ||
| /// resolutions while maintaining a level of quality. The image in the middle is repeated. | ||
| /// | ||
| /// Accepts Children and Styles. | ||
| /// | ||
| /// Example: The border prop splits up the image into 9 quadrants like so: | ||
| /// 1----2----3 | ||
| /// | | | ||
| /// 4 9 5 | ||
| /// | | | ||
| /// 6----7----8 | ||
| /// The sizes of sprites for a 15 pixel border are as follows: | ||
| /// TopLeft = (15, 15) | ||
| /// TopRight = (15, 15) | ||
| /// LeftCenter = (15, image_height) | ||
| /// RightCenter = (15, image_height) | ||
| /// TopCenter = (image_width, 15) | ||
| /// BottomCenter = (image_width, 15) | ||
| /// BottomRight = (15, 15) | ||
| /// BottomLeft = (15, 15) | ||
| /// Middle = ( | ||
| /// 30 being left border + right border | ||
| /// image_width - 30 | ||
| /// 30 being top border + bottom border | ||
| /// image_height - 30 | ||
| /// ) | ||
| #[derive(Bundle)] | ||
| pub struct NinePatchBundle { | ||
| pub nine_patch: NinePatch, | ||
| pub styles: KStyle, | ||
| pub computed_styles: ComputedStyles, | ||
| pub children: KChildren, | ||
| pub on_event: OnEvent, | ||
| pub widget_name: WidgetName, | ||
| } | ||
|
|
||
| impl Default for NinePatchBundle { | ||
| fn default() -> Self { | ||
| Self { | ||
| nine_patch: Default::default(), | ||
| styles: Default::default(), | ||
| computed_styles: ComputedStyles::default(), | ||
| children: KChildren::default(), | ||
| on_event: OnEvent::default(), | ||
| widget_name: NinePatch::default().get_name(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn nine_patch_render( | ||
| In(entity): In<Entity>, | ||
| widget_context: Res<KayakWidgetContext>, | ||
| mut commands: Commands, | ||
| mut query: Query<(&KStyle, &mut ComputedStyles, &NinePatch, &KChildren)>, | ||
| ) -> bool { | ||
| if let Ok((style, mut computed_styles, nine_patch, children)) = query.get_mut(entity) { | ||
| *computed_styles = KStyle::default() | ||
| .with_style(KStyle { | ||
| render_command: RenderCommand::NinePatch { | ||
| border: nine_patch.border, | ||
| handle: nine_patch.handle.clone_weak(), | ||
| } | ||
| .into(), | ||
| ..Default::default() | ||
| }) | ||
| .with_style(style) | ||
| .into(); | ||
| children.process(&widget_context, &mut commands, Some(entity)); | ||
| } | ||
|
|
||
| true | ||
| } | ||
| use bevy::prelude::{Bundle, Commands, Component, Entity, Handle, Image, In, Query, Res}; | ||
|
|
||
| use crate::{ | ||
| children::KChildren, | ||
| context::WidgetName, | ||
| on_event::OnEvent, | ||
| prelude::KayakWidgetContext, | ||
| styles::{ComputedStyles, Edge, KStyle, RenderCommand}, | ||
| widget::Widget, | ||
| }; | ||
|
|
||
| #[derive(Component, PartialEq, Clone, Debug)] | ||
| pub struct NinePatch { | ||
| /// The handle to image | ||
| pub handle: Handle<Image>, | ||
| /// The size of each edge (in pixels) | ||
| pub border: Edge<f32>, | ||
| /// Scale of the nine patch | ||
| /// defaults to 1.0 | ||
| pub scale: f32, | ||
| } | ||
|
|
||
| impl Default for NinePatch { | ||
| fn default() -> Self { | ||
| Self { | ||
| handle: Default::default(), | ||
| border: Default::default(), | ||
| scale: 1.0, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Widget for NinePatch {} | ||
|
|
||
| /// | ||
| /// Render's a nine-patch image as a UI widget. | ||
| /// | ||
| /// Also know as 9-slicing. This 2D technique allows users to render UI images at multiple | ||
| /// resolutions while maintaining a level of quality. The image in the middle is repeated. | ||
| /// | ||
| /// Accepts Children and Styles. | ||
| /// | ||
| /// Example: The border prop splits up the image into 9 quadrants like so: | ||
| /// 1----2----3 | ||
| /// | | | ||
| /// 4 9 5 | ||
| /// | | | ||
| /// 6----7----8 | ||
| /// The sizes of sprites for a 15 pixel border are as follows: | ||
| /// TopLeft = (15, 15) | ||
| /// TopRight = (15, 15) | ||
| /// LeftCenter = (15, image_height) | ||
| /// RightCenter = (15, image_height) | ||
| /// TopCenter = (image_width, 15) | ||
| /// BottomCenter = (image_width, 15) | ||
| /// BottomRight = (15, 15) | ||
| /// BottomLeft = (15, 15) | ||
| /// Middle = ( | ||
| /// 30 being left border + right border | ||
| /// image_width - 30 | ||
| /// 30 being top border + bottom border | ||
| /// image_height - 30 | ||
| /// ) | ||
| #[derive(Bundle)] | ||
| pub struct NinePatchBundle { | ||
| pub nine_patch: NinePatch, | ||
| pub styles: KStyle, | ||
| pub computed_styles: ComputedStyles, | ||
| pub children: KChildren, | ||
| pub on_event: OnEvent, | ||
| pub widget_name: WidgetName, | ||
| } | ||
|
|
||
| impl Default for NinePatchBundle { | ||
| fn default() -> Self { | ||
| Self { | ||
| nine_patch: Default::default(), | ||
| styles: Default::default(), | ||
| computed_styles: ComputedStyles::default(), | ||
| children: KChildren::default(), | ||
| on_event: OnEvent::default(), | ||
| widget_name: NinePatch::default().get_name(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn nine_patch_render( | ||
| In(entity): In<Entity>, | ||
| widget_context: Res<KayakWidgetContext>, | ||
| mut commands: Commands, | ||
| mut query: Query<(&KStyle, &mut ComputedStyles, &NinePatch, &KChildren)>, | ||
| ) -> bool { | ||
| if let Ok((style, mut computed_styles, nine_patch, children)) = query.get_mut(entity) { | ||
| *computed_styles = KStyle::default() | ||
| .with_style(KStyle { | ||
| render_command: RenderCommand::NinePatch { | ||
| border: nine_patch.border, | ||
| handle: nine_patch.handle.clone_weak(), | ||
| scale: nine_patch.scale, | ||
| } | ||
| .into(), | ||
| ..Default::default() | ||
| }) | ||
| .with_style(style) | ||
| .into(); | ||
| children.process(&widget_context, &mut commands, Some(entity)); | ||
| } | ||
|
|
||
| true | ||
| } |