Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bailout parameter #55

Merged
merged 2 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/app_state/click_modes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pub(crate) enum ClickMode {
JuliaConstant,
MandelConstant,
Move,
BailOut,
}

impl ClickMode {
Expand All @@ -16,6 +17,8 @@ impl ClickMode {
ClickMode::ZoomOut,
ClickMode::Move,
ClickMode::JuliaConstant,
ClickMode::BailOut,
ClickMode::MandelConstant,
]
}

Expand All @@ -26,6 +29,7 @@ impl ClickMode {
("move", Self::Move),
("juliaconstant", Self::JuliaConstant),
("mandelconstant", Self::MandelConstant),
("bailout", Self::BailOut),
]
.iter()
.find(|x| x.0.starts_with(&str_.to_lowercase().replace("_", "")))
Expand Down
8 changes: 8 additions & 0 deletions src/components/canvas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ impl<'a> Canvas<'a> {
ClickMode::MandelConstant => {
state.render_settings.mandel_constant = state.render_settings.coord_to_c(canvas_pos)
}
ClickMode::BailOut => {
state.render_settings.bailout = state
.render_settings
.coord_to_c(canvas_pos)
.abs()
.real()
.to_f32()
}
}

state.request_redraw();
Expand Down
2 changes: 0 additions & 2 deletions src/components/input.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//! Contains the `Input` widget.

use std::ascii::AsciiExt;

use ratatui::{
buffer::Buffer,
crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers, MouseEvent},
Expand Down
2 changes: 2 additions & 0 deletions src/frac_logic/gpu_render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pub(crate) struct ParamsBinding {
y_offset: i32,
julia_constant: [f32; 2],
mandel_constant: [f32; 2],
bailout: f32,
}

impl RenderSettings {
Expand Down Expand Up @@ -114,6 +115,7 @@ impl RenderSettings {
self.mandel_constant.real().to_f32(),
self.mandel_constant.imag().to_f32(),
],
bailout: self.bailout,
}),
usage: wgpu::BufferUsages::UNIFORM,
},
Expand Down
2 changes: 2 additions & 0 deletions src/frac_logic/render_settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ pub(crate) struct RenderSettings {
pub(crate) image_format: ImageFormat,
pub(crate) julia_constant: Complex,
pub(crate) mandel_constant: Complex,
pub(crate) bailout: f32,
}

impl Default for RenderSettings {
Expand All @@ -67,6 +68,7 @@ impl Default for RenderSettings {
wgpu_state: WgpuState::default(),
julia_constant: Complex::with_val(DF_PREC_GPU, DEFAULT_JULIA_CONSTANT),
mandel_constant: Complex::with_val(DF_PREC_GPU, DEFAULT_MANDEL_CONSTANT),
bailout: 2.0,
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/fractals/shaders/burning_ship.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ struct Params {
julia_constant_imag: f32,
mandel_constant_real: f32,
mandel_constant_imag: f32,
bailout: f32,
}


Expand Down Expand Up @@ -46,7 +47,7 @@ fn iterations(point: vec2<f32>) -> i32 {
var iter: i32 = 0i;
var z: vec2<f32> = vec2<f32>(0f, 0f);

while length(z) < 4f && iter < params.max_iter {
while length(z) < params.bailout && iter < params.max_iter {
z = vec2<f32>(
pow(z.x, 2f) - pow(z.y, 2f) - point.x,
2f * abs(z.x) * abs(z.y) - point.y
Expand Down
3 changes: 2 additions & 1 deletion src/fractals/shaders/julia.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ struct Params {
julia_constant_imag: f32,
mandel_constant_real: f32,
mandel_constant_imag: f32,
bailout: f32,
}


Expand Down Expand Up @@ -46,7 +47,7 @@ fn iterations(point: vec2<f32>) -> i32 {
var z = point;
var iter: i32 = 0i;

while length(z) < 4f && iter < params.max_iter {
while length(z) < params.bailout && iter < params.max_iter {
// z = vec2<f32>(
// pow(z.x, 2f) - pow(z.y, 2f),
// 2f * z.x * z.y + imag
Expand Down
4 changes: 3 additions & 1 deletion src/fractals/shaders/mandelbrot.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ struct Params {
julia_constant_imag: f32,
mandel_constant_real: f32,
mandel_constant_imag: f32,
bailout: f32,
}


Expand Down Expand Up @@ -41,11 +42,12 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {

// ============= Everything above this line should be the same in all fractal shaders


fn iterations(point: vec2<f32>) -> i32 {
var iter: i32 = 0i;
var z: vec2<f32> = vec2<f32>(params.mandel_constant_real, params.mandel_constant_imag);

while length(z) < 2f && iter < params.max_iter {
while length(z) < params.bailout && iter < params.max_iter {
z = vec2<f32>(
pow(z.x, 2f) - pow(z.y, 2f) + point.x,
2f * z.x * z.y + point.y
Expand Down
Loading