Remove iced_glow, glyph-brush, and wgpu_glyph dependencies

iced-rs · Feb 24, 2023 · b9a9576 · b9a9576
1 parent 573d27e
commit b9a9576
Show file tree

Hide file tree

Showing 47 changed files with 30 additions and 3,846 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,19 +14,15 @@ categories = ["gui"]
 [features]
 default = ["wgpu"]
 # Enables the `Image` widget
-image = ["iced_wgpu?/image", "iced_glow?/image", "image_rs"]
+image = ["iced_wgpu?/image", "image_rs"]
 # Enables the `Svg` widget
-svg = ["iced_wgpu?/svg", "iced_glow?/svg"]
+svg = ["iced_wgpu?/svg"]
 # Enables the `Canvas` widget
 canvas = ["iced_graphics/canvas"]
 # Enables the `QRCode` widget
 qr_code = ["iced_graphics/qr_code"]
 # Enables the `iced_wgpu` renderer
 wgpu = ["iced_wgpu"]
-# Enables using system fonts
-default_system_font = ["iced_wgpu?/default_system_font", "iced_glow?/default_system_font"]
-# Enables the `iced_glow` renderer. Overrides `iced_wgpu`
-glow = ["iced_glow", "iced_glutin"]
 # Enables a debug view in native platforms (press F12)
 debug = ["iced_winit/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
@@ -44,7 +40,6 @@ chrome-trace = [
     "iced_winit/chrome-trace",
     "iced_glutin?/trace",
     "iced_wgpu?/tracing",
-    "iced_glow?/tracing",
 ]
 
 [badges]
@@ -55,7 +50,6 @@ members = [
     "core",
     "futures",
     "graphics",
-    "glow",
     "glutin",
     "lazy",
     "native",
@@ -72,7 +66,6 @@ iced_native = { version = "0.9", path = "native" }
 iced_graphics = { version = "0.7", path = "graphics" }
 iced_winit = { version = "0.8", path = "winit", features = ["application"] }
 iced_glutin = { version = "0.7", path = "glutin", optional = true }
-iced_glow = { version = "0.7", path = "glow", optional = true }
 thiserror = "1.0"
 
 [dependencies.image_rs]

diff --git a/examples/integration_wgpu/.gitignore → examples/integration/.gitignore b/examples/integration_wgpu/.gitignore → examples/integration/.gitignore
diff --git a/examples/integration_wgpu/Cargo.toml → examples/integration/Cargo.toml b/examples/integration_wgpu/Cargo.toml → examples/integration/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "integration_wgpu"
+name = "integration"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"

diff --git a/examples/integration_wgpu/README.md → examples/integration/README.md b/examples/integration_wgpu/README.md → examples/integration/README.md
diff --git a/examples/integration_wgpu/index.html → examples/integration/index.html b/examples/integration_wgpu/index.html → examples/integration/index.html
@@ -8,8 +8,8 @@
     <h1>integration_wgpu</h1>
     <canvas id="iced_canvas"></canvas>
     <script type="module">
-      import init from "./integration_wgpu.js";
-      init('./integration_wgpu_bg.wasm');
+      import init from "./integration.js";
+      init('./integration_bg.wasm');
     </script>
     <style>
       body {

diff --git a/examples/integration_wgpu/src/controls.rs → examples/integration/src/controls.rs b/examples/integration_wgpu/src/controls.rs → examples/integration/src/controls.rs
diff --git a/examples/integration_wgpu/src/main.rs → examples/integration/src/main.rs b/examples/integration_wgpu/src/main.rs → examples/integration/src/main.rs
diff --git a/examples/integration_wgpu/src/scene.rs → examples/integration/src/scene.rs b/examples/integration_wgpu/src/scene.rs → examples/integration/src/scene.rs
diff --git a/...les/integration_wgpu/src/shader/frag.wgsl → examples/integration/src/shader/frag.wgsl b/...les/integration_wgpu/src/shader/frag.wgsl → examples/integration/src/shader/frag.wgsl
diff --git a/...les/integration_wgpu/src/shader/vert.wgsl → examples/integration/src/shader/vert.wgsl b/...les/integration_wgpu/src/shader/vert.wgsl → examples/integration/src/shader/vert.wgsl
diff --git a/examples/integration_opengl/Cargo.toml b/examples/integration_opengl/Cargo.toml
diff --git a/examples/integration_opengl/README.md b/examples/integration_opengl/README.md
diff --git a/examples/integration_opengl/src/controls.rs b/examples/integration_opengl/src/controls.rs
diff --git a/examples/integration_opengl/src/main.rs b/examples/integration_opengl/src/main.rs