From d4743183d40c6044ce6fa39e2a52919a32912cda Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 19 May 2020 14:23:28 +0200 Subject: Draft first working version of `iced_glow` :tada: --- glow/Cargo.toml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 glow/Cargo.toml (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml new file mode 100644 index 00000000..e130d563 --- /dev/null +++ b/glow/Cargo.toml @@ -0,0 +1,34 @@ +[package] +name = "iced_glow" +version = "0.1.0" +authors = ["Héctor Ramón Jiménez "] +edition = "2018" +description = "A glow renderer for iced" +license = "MIT AND OFL-1.1" +repository = "https://github.com/hecrj/iced" + +[dependencies] +raw-window-handle = "0.3" +euclid = "0.20" +glow = "0.4" +bytemuck = "1.2" +glam = "0.8" +font-kit = "0.6" +log = "0.4" +glyph_brush = "0.6" + +[dependencies.iced_native] +version = "0.2" +path = "../native" + +[dependencies.iced_style] +version = "0.1" +path = "../style" + +[dependencies.surfman] +path = "../../surfman/surfman" +default-features = false +features = ["sm-raw-window-handle", "sm-x11"] + +[dependencies.glow_glyph] +path = "../../glow_glyph" -- cgit From 05af8d00d4c0f7b8e0ece85224fd90a92da86da8 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 19 May 2020 17:15:44 +0200 Subject: Draft new `iced_graphics` crate :tada: --- glow/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index e130d563..212fbb30 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -21,9 +21,9 @@ glyph_brush = "0.6" version = "0.2" path = "../native" -[dependencies.iced_style] +[dependencies.iced_graphics] version = "0.1" -path = "../style" +path = "../graphics" [dependencies.surfman] path = "../../surfman/surfman" -- cgit From e0c4f1a08e756f11c30a99cd739fe78267e5040b Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 19 May 2020 20:20:51 +0200 Subject: Move `font::Source` to `iced_graphics` --- glow/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index 212fbb30..158e2bf0 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -13,7 +13,6 @@ euclid = "0.20" glow = "0.4" bytemuck = "1.2" glam = "0.8" -font-kit = "0.6" log = "0.4" glyph_brush = "0.6" @@ -24,6 +23,7 @@ path = "../native" [dependencies.iced_graphics] version = "0.1" path = "../graphics" +features = ["font-source"] [dependencies.surfman] path = "../../surfman/surfman" -- cgit From f0480854a9cd76f443848dbfa14256089b56abfe Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 19 May 2020 20:30:46 +0200 Subject: Move built-in fonts to `iced_graphics` --- glow/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index 158e2bf0..72ed8758 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -23,7 +23,7 @@ path = "../native" [dependencies.iced_graphics] version = "0.1" path = "../graphics" -features = ["font-source"] +features = ["font-source", "font-fallback", "font-icons"] [dependencies.surfman] path = "../../surfman/surfman" -- cgit From e0e4ee73feead3f05730625c7e1917b63f0b384e Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 21 May 2020 00:37:47 +0200 Subject: Implement `iced_glutin` :tada: --- glow/Cargo.toml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index 72ed8758..148f4fd5 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -7,8 +7,12 @@ description = "A glow renderer for iced" license = "MIT AND OFL-1.1" repository = "https://github.com/hecrj/iced" +[features] +canvas = ["iced_graphics/canvas"] +image = [] +svg = [] + [dependencies] -raw-window-handle = "0.3" euclid = "0.20" glow = "0.4" bytemuck = "1.2" @@ -23,12 +27,7 @@ path = "../native" [dependencies.iced_graphics] version = "0.1" path = "../graphics" -features = ["font-source", "font-fallback", "font-icons"] - -[dependencies.surfman] -path = "../../surfman/surfman" -default-features = false -features = ["sm-raw-window-handle", "sm-x11"] +features = ["font-source", "font-fallback", "font-icons", "opengl"] [dependencies.glow_glyph] path = "../../glow_glyph" -- cgit From bbfb1c040c92e36b3d23a2167ad3432c819b9668 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 21 May 2020 19:50:53 +0200 Subject: Update to latest `glow` --- glow/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index 148f4fd5..f57831bd 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -14,12 +14,15 @@ svg = [] [dependencies] euclid = "0.20" -glow = "0.4" bytemuck = "1.2" glam = "0.8" log = "0.4" glyph_brush = "0.6" +[dependencies.glow] +git = "https://github.com/grovesNL/glow" +rev = "722a850e972a69c3012fcb3687758eacbdac2823" + [dependencies.iced_native] version = "0.2" path = "../native" -- cgit From 1b287cddaf1951bbd65e60996eea6d356c131c1f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 22 May 2020 05:35:36 +0200 Subject: Use git repository for `glow_glyph` --- glow/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index f57831bd..d1f1e3d7 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -33,4 +33,5 @@ path = "../graphics" features = ["font-source", "font-fallback", "font-icons", "opengl"] [dependencies.glow_glyph] -path = "../../glow_glyph" +git = "https://github.com/hecrj/glow_glyph" +rev = "f027ffa49962d78ac85e282c635e848bef785ee9" -- cgit From 6f71a8e3d5e47ab05653315b0d44b35af6a20338 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 22 May 2020 05:52:11 +0200 Subject: Use `get_uniform_location` for wider compatibility --- glow/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index d1f1e3d7..b0d244f0 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -34,4 +34,4 @@ features = ["font-source", "font-fallback", "font-icons", "opengl"] [dependencies.glow_glyph] git = "https://github.com/hecrj/glow_glyph" -rev = "f027ffa49962d78ac85e282c635e848bef785ee9" +rev = "8ec7982d9e0ce828769d4ba7abe73b0b0ec22db6" -- cgit From d6bf8955dbca03898e379aae376d91677bb4d223 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 22 May 2020 19:17:07 +0200 Subject: Use published `glow` and `glow_glyph` versions --- glow/Cargo.toml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index b0d244f0..53952608 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -13,16 +13,14 @@ image = [] svg = [] [dependencies] +glow = "0.4" +glow_glyph = "0.1" euclid = "0.20" bytemuck = "1.2" glam = "0.8" log = "0.4" glyph_brush = "0.6" -[dependencies.glow] -git = "https://github.com/grovesNL/glow" -rev = "722a850e972a69c3012fcb3687758eacbdac2823" - [dependencies.iced_native] version = "0.2" path = "../native" @@ -31,7 +29,3 @@ path = "../native" version = "0.1" path = "../graphics" features = ["font-source", "font-fallback", "font-icons", "opengl"] - -[dependencies.glow_glyph] -git = "https://github.com/hecrj/glow_glyph" -rev = "8ec7982d9e0ce828769d4ba7abe73b0b0ec22db6" -- cgit From 22ced3485eb6f295faaab1e31d8d1b8d61fc422b Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 27 May 2020 05:05:13 +0200 Subject: Introduce feature flags to enable `iced_glow` Also keep `iced_wgpu` as the default renderer for the time being. --- glow/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index 53952608..dd6bbefc 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -9,6 +9,7 @@ repository = "https://github.com/hecrj/iced" [features] canvas = ["iced_graphics/canvas"] +# Not supported yet! image = [] svg = [] -- cgit From 823ea1573245b849a0696543838a7ad1d0f914d8 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 27 May 2020 23:09:27 +0200 Subject: Update `glyph_brush` and `glow_glyph` --- glow/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index dd6bbefc..a18fffe1 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -15,12 +15,12 @@ svg = [] [dependencies] glow = "0.4" -glow_glyph = "0.1" +glow_glyph = "0.2" +glyph_brush = "0.7" euclid = "0.20" bytemuck = "1.2" glam = "0.8" log = "0.4" -glyph_brush = "0.6" [dependencies.iced_native] version = "0.2" -- cgit From 16c1261d8265265bc618f03cccc11cddb1f70697 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 28 May 2020 04:03:51 +0200 Subject: Enable `doc_cfg` for `docs.rs` in `iced_glow` --- glow/Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'glow/Cargo.toml') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index a18fffe1..262f0264 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -30,3 +30,7 @@ path = "../native" version = "0.1" path = "../graphics" features = ["font-source", "font-fallback", "font-icons", "opengl"] + +[package.metadata.docs.rs] +rustdoc-args = ["--cfg", "docsrs"] +all-features = true -- cgit