From 77a0b68aa176782e95048795aec15c20a3e60ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 13 Aug 2021 20:01:28 +0700 Subject: [PATCH] Rename `integration` examples --- Cargo.toml | 4 ++-- .../Cargo.toml | 2 +- .../README.md | 2 +- .../src/controls.rs | 0 .../src/main.rs | 0 .../src/scene.rs | 0 .../{integration => integration_wgpu}/Cargo.toml | 2 +- .../{integration => integration_wgpu}/README.md | 6 ++++-- .../src/controls.rs | 0 .../{integration => integration_wgpu}/src/main.rs | 0 .../{integration => integration_wgpu}/src/scene.rs | 0 .../src/shader/frag.spv | Bin .../src/shader/vert.spv | Bin 13 files changed, 9 insertions(+), 7 deletions(-) rename examples/{integration_gl => integration_opengl}/Cargo.toml (91%) rename examples/{integration_gl => integration_opengl}/README.md (94%) rename examples/{integration_gl => integration_opengl}/src/controls.rs (100%) rename examples/{integration_gl => integration_opengl}/src/main.rs (100%) rename examples/{integration_gl => integration_opengl}/src/scene.rs (100%) rename examples/{integration => integration_wgpu}/Cargo.toml (89%) rename examples/{integration => integration_wgpu}/README.md (79%) rename examples/{integration => integration_wgpu}/src/controls.rs (100%) rename examples/{integration => integration_wgpu}/src/main.rs (100%) rename examples/{integration => integration_wgpu}/src/scene.rs (100%) rename examples/{integration => integration_wgpu}/src/shader/frag.spv (100%) rename examples/{integration => integration_wgpu}/src/shader/vert.spv (100%) diff --git a/Cargo.toml b/Cargo.toml index fdc2ceba..bd20fbb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,8 @@ members = [ "examples/events", "examples/game_of_life", "examples/geometry", - "examples/integration", + "examples/integration_wgpu", + "examples/integration_opengl", "examples/pane_grid", "examples/pick_list", "examples/pokedex", @@ -86,7 +87,6 @@ members = [ "examples/tooltip", "examples/url_handler", "examples/menu", - "examples/integration_gl", ] [dependencies] diff --git a/examples/integration_gl/Cargo.toml b/examples/integration_opengl/Cargo.toml similarity index 91% rename from examples/integration_gl/Cargo.toml rename to examples/integration_opengl/Cargo.toml index 80d7adad..0917f2ec 100644 --- a/examples/integration_gl/Cargo.toml +++ b/examples/integration_opengl/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "integration_gl" +name = "integration_opengl" version = "0.1.0" authors = ["Héctor Ramón Jiménez "] edition = "2018" diff --git a/examples/integration_gl/README.md b/examples/integration_opengl/README.md similarity index 94% rename from examples/integration_gl/README.md rename to examples/integration_opengl/README.md index 87491508..08cce7a6 100644 --- a/examples/integration_gl/README.md +++ b/examples/integration_opengl/README.md @@ -1,4 +1,4 @@ -## Integration +## OpenGL integration A demonstration of how to integrate Iced in an existing graphical OpenGL application. diff --git a/examples/integration_gl/src/controls.rs b/examples/integration_opengl/src/controls.rs similarity index 100% rename from examples/integration_gl/src/controls.rs rename to examples/integration_opengl/src/controls.rs diff --git a/examples/integration_gl/src/main.rs b/examples/integration_opengl/src/main.rs similarity index 100% rename from examples/integration_gl/src/main.rs rename to examples/integration_opengl/src/main.rs diff --git a/examples/integration_gl/src/scene.rs b/examples/integration_opengl/src/scene.rs similarity index 100% rename from examples/integration_gl/src/scene.rs rename to examples/integration_opengl/src/scene.rs diff --git a/examples/integration/Cargo.toml b/examples/integration_wgpu/Cargo.toml similarity index 89% rename from examples/integration/Cargo.toml rename to examples/integration_wgpu/Cargo.toml index 4515502f..743c655e 100644 --- a/examples/integration/Cargo.toml +++ b/examples/integration_wgpu/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "integration" +name = "integration_wgpu" version = "0.1.0" authors = ["Héctor Ramón Jiménez "] edition = "2018" diff --git a/examples/integration/README.md b/examples/integration_wgpu/README.md similarity index 79% rename from examples/integration/README.md rename to examples/integration_wgpu/README.md index d5aabc19..53ffd3e5 100644 --- a/examples/integration/README.md +++ b/examples/integration_wgpu/README.md @@ -1,6 +1,7 @@ -## Integration +## `wgpu` integration -A demonstration of how to integrate Iced in an existing graphical application. +A demonstration of how to integrate Iced in an existing graphical application +that leverages [`wgpu`]. The __[`main`]__ file contains all the code of the example. @@ -16,3 +17,4 @@ cargo run --package integration ``` [`main`]: src/main.rs +[`wgpu`]: https://github.com/gfx-rs/wgpu diff --git a/examples/integration/src/controls.rs b/examples/integration_wgpu/src/controls.rs similarity index 100% rename from examples/integration/src/controls.rs rename to examples/integration_wgpu/src/controls.rs diff --git a/examples/integration/src/main.rs b/examples/integration_wgpu/src/main.rs similarity index 100% rename from examples/integration/src/main.rs rename to examples/integration_wgpu/src/main.rs diff --git a/examples/integration/src/scene.rs b/examples/integration_wgpu/src/scene.rs similarity index 100% rename from examples/integration/src/scene.rs rename to examples/integration_wgpu/src/scene.rs diff --git a/examples/integration/src/shader/frag.spv b/examples/integration_wgpu/src/shader/frag.spv similarity index 100% rename from examples/integration/src/shader/frag.spv rename to examples/integration_wgpu/src/shader/frag.spv diff --git a/examples/integration/src/shader/vert.spv b/examples/integration_wgpu/src/shader/vert.spv similarity index 100% rename from examples/integration/src/shader/vert.spv rename to examples/integration_wgpu/src/shader/vert.spv