diff options
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | examples/integration_opengl/Cargo.toml (renamed from examples/integration_gl/Cargo.toml) | 2 | ||||
| -rw-r--r-- | examples/integration_opengl/README.md (renamed from examples/integration_gl/README.md) | 2 | ||||
| -rw-r--r-- | examples/integration_opengl/src/controls.rs (renamed from examples/integration_gl/src/controls.rs) | 0 | ||||
| -rw-r--r-- | examples/integration_opengl/src/main.rs (renamed from examples/integration_gl/src/main.rs) | 0 | ||||
| -rw-r--r-- | examples/integration_opengl/src/scene.rs (renamed from examples/integration_gl/src/scene.rs) | 0 | ||||
| -rw-r--r-- | examples/integration_wgpu/Cargo.toml (renamed from examples/integration/Cargo.toml) | 2 | ||||
| -rw-r--r-- | examples/integration_wgpu/README.md (renamed from examples/integration/README.md) | 6 | ||||
| -rw-r--r-- | examples/integration_wgpu/src/controls.rs (renamed from examples/integration/src/controls.rs) | 0 | ||||
| -rw-r--r-- | examples/integration_wgpu/src/main.rs (renamed from examples/integration/src/main.rs) | 0 | ||||
| -rw-r--r-- | examples/integration_wgpu/src/scene.rs (renamed from examples/integration/src/scene.rs) | 0 | ||||
| -rw-r--r-- | examples/integration_wgpu/src/shader/frag.spv (renamed from examples/integration/src/shader/frag.spv) | bin | 352 -> 352 bytes | |||
| -rw-r--r-- | examples/integration_wgpu/src/shader/vert.spv (renamed from examples/integration/src/shader/vert.spv) | bin | 904 -> 904 bytes |
13 files changed, 9 insertions, 7 deletions
@@ -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 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 <hector0193@gmail.com>"] edition = "2018" diff --git a/examples/integration_gl/README.md b/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 index 13b7fbc2..13b7fbc2 100644 --- a/examples/integration_gl/src/controls.rs +++ b/examples/integration_opengl/src/controls.rs diff --git a/examples/integration_gl/src/main.rs b/examples/integration_opengl/src/main.rs index 925102e3..925102e3 100644 --- a/examples/integration_gl/src/main.rs +++ b/examples/integration_opengl/src/main.rs diff --git a/examples/integration_gl/src/scene.rs b/examples/integration_opengl/src/scene.rs index 596381b3..596381b3 100644 --- a/examples/integration_gl/src/scene.rs +++ b/examples/integration_opengl/src/scene.rs diff --git a/examples/integration/Cargo.toml b/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 <hector0193@gmail.com>"] edition = "2018" diff --git a/examples/integration/README.md b/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 index 36ee9b7e..36ee9b7e 100644 --- a/examples/integration/src/controls.rs +++ b/examples/integration_wgpu/src/controls.rs diff --git a/examples/integration/src/main.rs b/examples/integration_wgpu/src/main.rs index 6f319466..6f319466 100644 --- a/examples/integration/src/main.rs +++ b/examples/integration_wgpu/src/main.rs diff --git a/examples/integration/src/scene.rs b/examples/integration_wgpu/src/scene.rs index 3e8277c8..3e8277c8 100644 --- a/examples/integration/src/scene.rs +++ b/examples/integration_wgpu/src/scene.rs diff --git a/examples/integration/src/shader/frag.spv b/examples/integration_wgpu/src/shader/frag.spv Binary files differindex 9d6807c9..9d6807c9 100644 --- a/examples/integration/src/shader/frag.spv +++ b/examples/integration_wgpu/src/shader/frag.spv diff --git a/examples/integration/src/shader/vert.spv b/examples/integration_wgpu/src/shader/vert.spv Binary files differindex 0cabc9c0..0cabc9c0 100644 --- a/examples/integration/src/shader/vert.spv +++ b/examples/integration_wgpu/src/shader/vert.spv |