summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2023-11-14 12:49:49 +0100
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2023-11-14 12:49:49 +0100
commit9489e29e6619b14ed9f41a8887c4b34158266f71 (patch)
tree34b574112df5f2e63dff66d3a01e470077ce7c9b /examples
parent2dda9132cda6d2a2279759f3447bae4e1c277555 (diff)
downloadiced-9489e29e6619b14ed9f41a8887c4b34158266f71.tar.gz
iced-9489e29e6619b14ed9f41a8887c4b34158266f71.tar.bz2
iced-9489e29e6619b14ed9f41a8887c4b34158266f71.zip
Re-organize `custom` module as `pipeline` module
... and move `Shader` widget to `iced_widget` crate
Diffstat (limited to 'examples')
-rw-r--r--examples/custom_shader/src/main.rs11
-rw-r--r--examples/custom_shader/src/primitive.rs15
2 files changed, 16 insertions, 10 deletions
diff --git a/examples/custom_shader/src/main.rs b/examples/custom_shader/src/main.rs
index 76fa1625..f6370f46 100644
--- a/examples/custom_shader/src/main.rs
+++ b/examples/custom_shader/src/main.rs
@@ -3,15 +3,20 @@ mod cubes;
mod pipeline;
mod primitive;
+use crate::camera::Camera;
use crate::cubes::Cubes;
+use crate::pipeline::Pipeline;
+
+use iced::executor;
+use iced::time::Instant;
use iced::widget::{
checkbox, column, container, row, slider, text, vertical_space, Shader,
};
+use iced::window;
use iced::{
- executor, window, Alignment, Application, Color, Command, Element, Length,
- Renderer, Subscription, Theme,
+ Alignment, Application, Color, Command, Element, Length, Renderer,
+ Subscription, Theme,
};
-use std::time::Instant;
fn main() -> iced::Result {
IcedCubes::run(iced::Settings::default())
diff --git a/examples/custom_shader/src/primitive.rs b/examples/custom_shader/src/primitive.rs
index f81ce95d..520ceb8e 100644
--- a/examples/custom_shader/src/primitive.rs
+++ b/examples/custom_shader/src/primitive.rs
@@ -4,17 +4,18 @@ pub mod vertex;
mod buffer;
mod uniforms;
-use crate::camera::Camera;
-use crate::pipeline::Pipeline;
-use crate::primitive::cube::Cube;
+pub use buffer::Buffer;
+pub use cube::Cube;
+pub use uniforms::Uniforms;
+pub use vertex::Vertex;
+
+use crate::Camera;
+use crate::Pipeline;
+
use iced::advanced::graphics::Transformation;
use iced::widget::shader;
use iced::{Color, Rectangle, Size};
-pub use crate::primitive::vertex::Vertex;
-pub use buffer::Buffer;
-pub use uniforms::Uniforms;
-
/// A collection of `Cube`s that can be rendered.
#[derive(Debug)]
pub struct Primitive {