Merge pull request #154 from Maldela/atlas

Texture atlas
iced-rs · Feb 28, 2020 · bab7dbc · bab7dbc
2 parents 69c81aa + 88d4cd0
commit bab7dbc
Show file tree

Hide file tree

Showing 18 changed files with 957 additions and 351 deletions.
diff --git a/examples/svg/Cargo.toml b/examples/svg/Cargo.toml
@@ -7,3 +7,4 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["svg"] }
+env_logger = "0.7"
diff --git a/examples/svg/src/main.rs b/examples/svg/src/main.rs
@@ -1,6 +1,8 @@
 use iced::{Column, Container, Element, Length, Sandbox, Settings, Svg};
 
 pub fn main() {
+    env_logger::init();
+
     Tiger::run(Settings::default())
 }
 
@@ -22,9 +24,12 @@ impl Sandbox for Tiger {
 
     fn view(&mut self) -> Element<()> {
         let content = Column::new().padding(20).push(
-            Svg::new(format!("{}/resources/tiger.svg", env!("CARGO_MANIFEST_DIR")))
-                .width(Length::Fill)
-                .height(Length::Fill),
+            Svg::new(format!(
+                "{}/resources/tiger.svg",
+                env!("CARGO_MANIFEST_DIR")
+            ))
+            .width(Length::Fill)
+            .height(Length::Fill),
         );
 
         Container::new(content)

diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
@@ -18,7 +18,7 @@ use std::{
 /// ```
 ///
 /// <img src="https://github.com/hecrj/iced/blob/9712b319bb7a32848001b96bd84977430f14b623/examples/resources/ferris.png?raw=true" width="300">
-#[derive(Debug)]
+#[derive(Debug, Hash)]
 pub struct Image {
     handle: Handle,
     width: Length,

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -21,6 +21,7 @@ raw-window-handle = "0.3"
 glam = "0.8"
 font-kit = "0.4"
 log = "0.4"
+guillotiere = "0.4"
 
 [dependencies.image]
 version = "0.22"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ publish = false

		[dependencies]
		iced = { path = "../..", features = ["svg"] }
		env_logger = "0.7"