Skip to content

Commit 630d3ed

Browse files
Clean up some files
1 parent f2ded19 commit 630d3ed

11 files changed

+9
-20
lines changed

src/renderer/app_state.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,31 +94,31 @@ impl<'a> AppState<'a> {
9494
)
9595
.add_effect(
9696
"gamma",
97-
include_str!("gamma_correct_compute.wgsl"),
97+
include_str!("shaders/gamma_correct_compute.wgsl"),
9898
Some(feature_uniform.gamma()),
9999
|_| true, // Always run (base pass)
100100
)?
101101
.add_effect(
102102
"grayscale",
103-
include_str!("grayscale_compute.wgsl"),
103+
include_str!("shaders/grayscale_compute.wgsl"),
104104
None::<u32>,
105105
|f| f.grayscale(),
106106
)?
107107
.add_effect(
108108
"copy_after_grayscale",
109-
include_str!("copy_compute.wgsl"),
109+
include_str!("shaders/copy_compute.wgsl"),
110110
None::<u32>,
111111
|f| f.grayscale(),
112112
)?
113113
.add_effect(
114114
"invert",
115-
include_str!("invert_compute.wgsl"),
115+
include_str!("shaders/invert_compute.wgsl"),
116116
None::<u32>,
117117
|f| f.invert(),
118118
)?
119119
.add_effect(
120120
"copy_after_invert",
121-
include_str!("copy_compute.wgsl"),
121+
include_str!("shaders/copy_compute.wgsl"),
122122
None::<u32>,
123123
|f| f.invert(),
124124
)?
@@ -137,14 +137,14 @@ impl<'a> AppState<'a> {
137137

138138
let image_shader = gpu_allocator.create_shader(
139139
"image_shader",
140-
include_str!("image_shader.wgsl"),
140+
include_str!("shaders/image_shader.wgsl"),
141141
vec![processed_texture_a, shape_texture_for_image],
142142
vec![feature_uniform_resource, draw_uniform_resource],
143143
);
144144

145145
let shape_shader = gpu_allocator.create_shape_shader(
146146
"shape_shader",
147-
include_str!("shape_shader.wgsl"),
147+
include_str!("shaders/shape_shader.wgsl"),
148148
shape_uniform_resource,
149149
&circle_storage_buffer,
150150
);
@@ -222,7 +222,6 @@ impl<'a> AppState<'a> {
222222
// camera panning
223223
#[cfg(feature = "camera")]
224224
if super_key_pressed {
225-
dbg!("pressed");
226225
self.window.set_cursor_icon(CursorIcon::Grab);
227226

228227
match (prev_state, self.mouse_state.pressed()) {

src/renderer/draw_uniform.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ impl DrawUniform {
3030
}
3131
}
3232

33-
pub(crate) const fn _update_camera(&mut self, view_proj: [[f32; 4]; 4]) {
33+
#[cfg(feature = "camera")]
34+
pub(crate) const fn update_camera(&mut self, view_proj: [[f32; 4]; 4]) {
3435
self.camera_view_proj = view_proj;
3536
}
3637

src/renderer/image_shader.vert

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/renderer/image_shader.vert.spv

-1.07 KB
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)