Merge pull request #52 from altunenes/fix-namings

altunenes · web-flow · commit aad8d2c2dd72 · 2025-04-07T17:22:48.000+03:00
fix namings
diff --git a/src/bin/clifford.rs b/src/bin/clifford.rs
@@ -29,7 +29,7 @@ impl UniformProvider for FeedbackParams {
         bytemuck::bytes_of(self)
     }
 }
-struct FeedbackShader {
+struct Clifford {
     base: BaseShader,
     renderer_pass2: Renderer,
     params_uniform: UniformBinding<FeedbackParams>,
@@ -43,7 +43,7 @@ struct FeedbackShader {
     atomic_buffer: AtomicBuffer,
     atomic_bind_group_layout: wgpu::BindGroupLayout,
 }
-impl FeedbackShader {
+impl Clifford {
     fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {
         let settings = self.base.export_manager.settings();
         let (capture_texture, output_buffer) = self.base.create_capture_texture(
@@ -163,7 +163,7 @@ impl FeedbackShader {
 }
 
 
-impl ShaderManager for FeedbackShader {
+impl ShaderManager for Clifford {
     fn init(core: &Core) -> Self {
         let texture_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
             entries: &[
@@ -504,6 +504,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
     let (app, event_loop) = ShaderApp::new("Clifford", 800, 600);
     app.run(event_loop, |core| {
-        FeedbackShader::init(core)
+        Clifford::init(core)
     })
 }
diff --git a/src/bin/droste.rs b/src/bin/droste.rs
@@ -29,11 +29,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
     let (app, event_loop) = ShaderApp::new("Droste", 800, 600);
     app.run(event_loop, |core| {
-        SpiralShader::init(core)
+        Droste::init(core)
     })
 }
 
-struct SpiralShader {
+struct Droste {
     base: BaseShader,
     params_uniform: UniformBinding<ShaderParams>,
     hot_reload: ShaderHotReload,
@@ -43,7 +43,7 @@ struct SpiralShader {
     params_bind_group_layout: wgpu::BindGroupLayout,
 }
 
-impl SpiralShader {
+impl Droste {
     fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {
         let settings = self.base.export_manager.settings();
         let (capture_texture, output_buffer) = self.base.create_capture_texture(
@@ -175,7 +175,7 @@ impl SpiralShader {
         }
     }
 }
-impl ShaderManager for SpiralShader {
+impl ShaderManager for Droste {
     fn init(core: &cuneus::Core) -> Self {
         let time_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
             entries: &[wgpu::BindGroupLayoutEntry {
diff --git a/src/bin/gabornoise.rs b/src/bin/gabornoise.rs
@@ -33,11 +33,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
     let (app, event_loop) = ShaderApp::new("gabornoise", 800, 600);
     app.run(event_loop, |core| {
-        SpiralShader::init(core)
+        Gabor::init(core)
     })
 }
 
-struct SpiralShader {
+struct Gabor {
     base: BaseShader,
     params_uniform: UniformBinding<ShaderParams>,
     hot_reload: ShaderHotReload,
@@ -47,7 +47,7 @@ struct SpiralShader {
     params_bind_group_layout: wgpu::BindGroupLayout,
 }
 
-impl SpiralShader {
+impl Gabor {
     fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {
         let settings = self.base.export_manager.settings();
         let (capture_texture, output_buffer) = self.base.create_capture_texture(
@@ -179,7 +179,7 @@ impl SpiralShader {
         }
     }
 }
-impl ShaderManager for SpiralShader {
+impl ShaderManager for Gabor {
     fn init(core: &cuneus::Core) -> Self {
         let time_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
             entries: &[wgpu::BindGroupLayoutEntry {
diff --git a/src/bin/lich.rs b/src/bin/lich.rs
@@ -32,7 +32,7 @@ impl UniformProvider for LightningParams {
 }
 
 
-struct AttractorShader {
+struct Lich {
     base: BaseShader,
     renderer_pass2: Renderer,
     renderer_pass3: Renderer,
@@ -48,7 +48,7 @@ struct AttractorShader {
     atomic_bind_group_layout: wgpu::BindGroupLayout,
 }
 
-impl AttractorShader {
+impl Lich {
     fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {
         let settings = self.base.export_manager.settings();
         let (capture_texture, output_buffer) = self.base.create_capture_texture(
@@ -222,7 +222,7 @@ impl AttractorShader {
     }
 }
 
-impl ShaderManager for AttractorShader {
+impl ShaderManager for Lich {
     fn init(core: &Core) -> Self {
         let texture_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
             entries: &[
@@ -659,6 +659,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 env_logger::init();
 let (app, event_loop) = ShaderApp::new("Lich", 800, 600);
 app.run(event_loop, |core| {
-    AttractorShader::init(core)
+    Lich::init(core)
 })
 }
diff --git a/src/bin/satan.rs b/src/bin/satan.rs
@@ -24,7 +24,7 @@ impl UniformProvider for AttractorParams {
     }
 }
 
-struct AttractorShader {
+struct Satan {
     base: BaseShader,
     renderer_pass2: Renderer,
     renderer_pass3: Renderer,
@@ -38,7 +38,7 @@ struct AttractorShader {
     params_bind_group_layout: wgpu::BindGroupLayout,
 }
 
-impl AttractorShader {
+impl Satan {
     fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {
         let settings = self.base.export_manager.settings();
         let (capture_texture, output_buffer) = self.base.create_capture_texture(
@@ -206,7 +206,7 @@ impl AttractorShader {
     }
 }
 
-impl ShaderManager for AttractorShader {
+impl ShaderManager for Satan {
     fn init(core: &Core) -> Self {
         let texture_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
             entries: &[
@@ -594,6 +594,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 env_logger::init();
 let (app, event_loop) = ShaderApp::new("satan", 800, 600);
 app.run(event_loop, |core| {
-    AttractorShader::init(core)
+    Satan::init(core)
 })
 }
diff --git a/src/bin/scenecolor.rs b/src/bin/scenecolor.rs
@@ -29,11 +29,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
     let (app, event_loop) = ShaderApp::new("scenecolor", 800, 600);
     app.run(event_loop, |core| {
-        SpiralShader::init(core)
+        SceneColor::init(core)
     })
 }
 
-struct SpiralShader {
+struct SceneColor {
     base: BaseShader,
     params_uniform: UniformBinding<ShaderParams>,
     hot_reload: ShaderHotReload,
@@ -43,7 +43,7 @@ struct SpiralShader {
     params_bind_group_layout: wgpu::BindGroupLayout,
 }
 
-impl SpiralShader {
+impl SceneColor {
     fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {
         let settings = self.base.export_manager.settings();
         let (capture_texture, output_buffer) = self.base.create_capture_texture(
@@ -175,7 +175,7 @@ impl SpiralShader {
         }
     }
 }
-impl ShaderManager for SpiralShader {
+impl ShaderManager for SceneColor {
     fn init(core: &cuneus::Core) -> Self {
         let time_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
             entries: &[wgpu::BindGroupLayoutEntry {
diff --git a/src/bin/voronoi.rs b/src/bin/voronoi.rs
@@ -22,10 +22,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
     let (app, event_loop) = ShaderApp::new("voronoi", 800, 600);
     app.run(event_loop, |core| {
-        SpiralShader::init(core)
+        Voronoi::init(core)
     })
 }
-struct SpiralShader {
+struct Voronoi {
     base: BaseShader,
     params_uniform: UniformBinding<ShaderParams>,
     hot_reload: ShaderHotReload,
@@ -34,7 +34,7 @@ struct SpiralShader {
     resolution_bind_group_layout: wgpu::BindGroupLayout,
     params_bind_group_layout: wgpu::BindGroupLayout,
 }
-impl SpiralShader {
+impl Voronoi {
     fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {
         let settings = self.base.export_manager.settings();
         let (capture_texture, output_buffer) = self.base.create_capture_texture(
@@ -166,7 +166,7 @@ impl SpiralShader {
         }
     }
 }
-impl ShaderManager for SpiralShader {
+impl ShaderManager for Voronoi {
     fn init(core: &cuneus::Core) -> Self {
         let time_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
             entries: &[wgpu::BindGroupLayoutEntry {

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`29`	`29`	`env_logger::init();`
`30`	`30`	`let (app, event_loop) = ShaderApp::new("Droste", 800, 600);`
`31`	`31`	`app.run(event_loop, \|core\| {`
`32`		`- SpiralShader::init(core)`
	`32`	`+ Droste::init(core)`
`33`	`33`	`})`
`34`	`34`	`}`
`35`	`35`
`36`		`-struct SpiralShader {`
	`36`	`+struct Droste {`
`37`	`37`	`base: BaseShader,`
`38`	`38`	`params_uniform: UniformBinding<ShaderParams>,`
`39`	`39`	`hot_reload: ShaderHotReload,`
`@@ -43,7 +43,7 @@ struct SpiralShader {`
`43`	`43`	`params_bind_group_layout: wgpu::BindGroupLayout,`
`44`	`44`	`}`
`45`	`45`
`46`		`-impl SpiralShader {`
	`46`	`+impl Droste {`
`47`	`47`	`fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {`
`48`	`48`	`let settings = self.base.export_manager.settings();`
`49`	`49`	`let (capture_texture, output_buffer) = self.base.create_capture_texture(`
`@@ -175,7 +175,7 @@ impl SpiralShader {`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`}`
`178`		`-impl ShaderManager for SpiralShader {`
	`178`	`+impl ShaderManager for Droste {`
`179`	`179`	`fn init(core: &cuneus::Core) -> Self {`
`180`	`180`	`let time_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {`
`181`	`181`	`entries: &[wgpu::BindGroupLayoutEntry {`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`33`	`33`	`env_logger::init();`
`34`	`34`	`let (app, event_loop) = ShaderApp::new("gabornoise", 800, 600);`
`35`	`35`	`app.run(event_loop, \|core\| {`
`36`		`- SpiralShader::init(core)`
	`36`	`+ Gabor::init(core)`
`37`	`37`	`})`
`38`	`38`	`}`
`39`	`39`
`40`		`-struct SpiralShader {`
	`40`	`+struct Gabor {`
`41`	`41`	`base: BaseShader,`
`42`	`42`	`params_uniform: UniformBinding<ShaderParams>,`
`43`	`43`	`hot_reload: ShaderHotReload,`
`@@ -47,7 +47,7 @@ struct SpiralShader {`
`47`	`47`	`params_bind_group_layout: wgpu::BindGroupLayout,`
`48`	`48`	`}`
`49`	`49`
`50`		`-impl SpiralShader {`
	`50`	`+impl Gabor {`
`51`	`51`	`fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {`
`52`	`52`	`let settings = self.base.export_manager.settings();`
`53`	`53`	`let (capture_texture, output_buffer) = self.base.create_capture_texture(`
`@@ -179,7 +179,7 @@ impl SpiralShader {`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`}`
`182`		`-impl ShaderManager for SpiralShader {`
	`182`	`+impl ShaderManager for Gabor {`
`183`	`183`	`fn init(core: &cuneus::Core) -> Self {`
`184`	`184`	`let time_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {`
`185`	`185`	`entries: &[wgpu::BindGroupLayoutEntry {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ impl UniformProvider for LightningParams {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`
`35`		`-struct AttractorShader {`
	`35`	`+struct Lich {`
`36`	`36`	`base: BaseShader,`
`37`	`37`	`renderer_pass2: Renderer,`
`38`	`38`	`renderer_pass3: Renderer,`
`@@ -48,7 +48,7 @@ struct AttractorShader {`
`48`	`48`	`atomic_bind_group_layout: wgpu::BindGroupLayout,`
`49`	`49`	`}`
`50`	`50`
`51`		`-impl AttractorShader {`
	`51`	`+impl Lich {`
`52`	`52`	`fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {`
`53`	`53`	`let settings = self.base.export_manager.settings();`
`54`	`54`	`let (capture_texture, output_buffer) = self.base.create_capture_texture(`
`@@ -222,7 +222,7 @@ impl AttractorShader {`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
`225`		`-impl ShaderManager for AttractorShader {`
	`225`	`+impl ShaderManager for Lich {`
`226`	`226`	`fn init(core: &Core) -> Self {`
`227`	`227`	`let texture_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {`
`228`	`228`	`entries: &[`
`@@ -659,6 +659,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`659`	`659`	`env_logger::init();`
`660`	`660`	`let (app, event_loop) = ShaderApp::new("Lich", 800, 600);`
`661`	`661`	`app.run(event_loop, \|core\| {`
`662`		`- AttractorShader::init(core)`
	`662`	`+ Lich::init(core)`
`663`	`663`	`})`
`664`	`664`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ impl UniformProvider for AttractorParams {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-struct AttractorShader {`
	`27`	`+struct Satan {`
`28`	`28`	`base: BaseShader,`
`29`	`29`	`renderer_pass2: Renderer,`
`30`	`30`	`renderer_pass3: Renderer,`
`@@ -38,7 +38,7 @@ struct AttractorShader {`
`38`	`38`	`params_bind_group_layout: wgpu::BindGroupLayout,`
`39`	`39`	`}`
`40`	`40`
`41`		`-impl AttractorShader {`
	`41`	`+impl Satan {`
`42`	`42`	`fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {`
`43`	`43`	`let settings = self.base.export_manager.settings();`
`44`	`44`	`let (capture_texture, output_buffer) = self.base.create_capture_texture(`
`@@ -206,7 +206,7 @@ impl AttractorShader {`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
`209`		`-impl ShaderManager for AttractorShader {`
	`209`	`+impl ShaderManager for Satan {`
`210`	`210`	`fn init(core: &Core) -> Self {`
`211`	`211`	`let texture_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {`
`212`	`212`	`entries: &[`
`@@ -594,6 +594,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`594`	`594`	`env_logger::init();`
`595`	`595`	`let (app, event_loop) = ShaderApp::new("satan", 800, 600);`
`596`	`596`	`app.run(event_loop, \|core\| {`
`597`		`- AttractorShader::init(core)`
	`597`	`+ Satan::init(core)`
`598`	`598`	`})`
`599`	`599`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`22`	`22`	`env_logger::init();`
`23`	`23`	`let (app, event_loop) = ShaderApp::new("voronoi", 800, 600);`
`24`	`24`	`app.run(event_loop, \|core\| {`
`25`		`- SpiralShader::init(core)`
	`25`	`+ Voronoi::init(core)`
`26`	`26`	`})`
`27`	`27`	`}`
`28`		`-struct SpiralShader {`
	`28`	`+struct Voronoi {`
`29`	`29`	`base: BaseShader,`
`30`	`30`	`params_uniform: UniformBinding<ShaderParams>,`
`31`	`31`	`hot_reload: ShaderHotReload,`
`@@ -34,7 +34,7 @@ struct SpiralShader {`
`34`	`34`	`resolution_bind_group_layout: wgpu::BindGroupLayout,`
`35`	`35`	`params_bind_group_layout: wgpu::BindGroupLayout,`
`36`	`36`	`}`
`37`		`-impl SpiralShader {`
	`37`	`+impl Voronoi {`
`38`	`38`	`fn capture_frame(&mut self, core: &Core, time: f32) -> Result<Vec<u8>, wgpu::SurfaceError> {`
`39`	`39`	`let settings = self.base.export_manager.settings();`
`40`	`40`	`let (capture_texture, output_buffer) = self.base.create_capture_texture(`
`@@ -166,7 +166,7 @@ impl SpiralShader {`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`
`169`		`-impl ShaderManager for SpiralShader {`
	`169`	`+impl ShaderManager for Voronoi {`
`170`	`170`	`fn init(core: &cuneus::Core) -> Self {`
`171`	`171`	`let time_bind_group_layout = core.device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {`
`172`	`172`	`entries: &[wgpu::BindGroupLayoutEntry {`