slightly optimised the core loop

Author: jackyarndley

assemble_video.py

@@ -7,9 +7,9 @@
 
 from PIL import Image
 
-frames_between_keyframes = 30
-maximum_keyframe_number = 1040
-zoom_scale = 1.4
+frames_between_keyframes = 60
+maximum_keyframe_number = 135
+zoom_scale = 2.0
 
 # log1.1 of 2 is 7.27
 # 60 / that is 8.25, so lets take 8 frames per keyframe

default.toml

@@ -1,7 +1,8 @@
-image_width = 2000
-image_height = 2000
-frames = 1
+image_width = 1000
+image_height = 1000
+frames = 10
 export = "raw"
 rotate = 0
 glitch_tolerance = 0.000001
-zoom_scale = 2.0
+zoom_scale = 2.0
+auto_adjust_iterations = true

locations/11-dimensions.toml

@@ -0,0 +1,4 @@
+real = "-1.7891690186048231066744683411888387638173618368159070155822017397181006156270275749142369245820396054406395755675312183271534128923049471434097690222315419202715383264050159131947029173677395015878767362862533310902938210320999999999999999999999999999999998"
+imag = "-0.0000003393685157671825660282302661468127283482188945938569013974696942388736569110136147219176174266842972236468548795141989046122450230790250469659063534132826324119846599278074403635939133245821264547306595273202030703232999999999999999999999999999999998"
+zoom = "1.41200697933E219"
+iterations = 200000

locations/x.toml

@@ -1,4 +1,4 @@
 real = "-1.479796270901760024425279934770411525645551054432599517909807632824286254403907594526888466099962805022975196472549771681831234491695559852583955204986197762293872769474806903995564259040667568599770094383157857518790853771783314763231302599999999999999999999999998"
 imag = "-0.001199443952813447746281973233374468444560314114132538362037569205657422216739564521471119107626453330996365067987088146663639996715939831819152248618042255824652268918299630897525386638029428706473919823922522752497780934312003352081931299999999999999999999999998"
 iterations = 50000
-zoom = "4.27799999998E235"
+zoom = "4.27799999998E40"

segments.txt

@@ -1,41 +1,3 @@
-file 'segment_00000051.mp4'
-file 'segment_00000050.mp4'
-file 'segment_00000049.mp4'
-file 'segment_00000048.mp4'
-file 'segment_00000047.mp4'
-file 'segment_00000046.mp4'
-file 'segment_00000045.mp4'
-file 'segment_00000044.mp4'
-file 'segment_00000043.mp4'
-file 'segment_00000042.mp4'
-file 'segment_00000041.mp4'
-file 'segment_00000040.mp4'
-file 'segment_00000039.mp4'
-file 'segment_00000038.mp4'
-file 'segment_00000037.mp4'
-file 'segment_00000036.mp4'
-file 'segment_00000035.mp4'
-file 'segment_00000034.mp4'
-file 'segment_00000033.mp4'
-file 'segment_00000032.mp4'
-file 'segment_00000031.mp4'
-file 'segment_00000030.mp4'
-file 'segment_00000029.mp4'
-file 'segment_00000028.mp4'
-file 'segment_00000027.mp4'
-file 'segment_00000026.mp4'
-file 'segment_00000025.mp4'
-file 'segment_00000024.mp4'
-file 'segment_00000023.mp4'
-file 'segment_00000022.mp4'
-file 'segment_00000021.mp4'
-file 'segment_00000020.mp4'
-file 'segment_00000019.mp4'
-file 'segment_00000018.mp4'
-file 'segment_00000017.mp4'
-file 'segment_00000016.mp4'
-file 'segment_00000015.mp4'
-file 'segment_00000014.mp4'
 file 'segment_00000013.mp4'
 file 'segment_00000012.mp4'
 file 'segment_00000011.mp4'

src/math/perturbation.rs

@@ -15,10 +15,12 @@ impl Perturbation {
                     let mut scaled_delta_reference = 1.0f64.ldexp(pixel.delta_reference.exponent - pixel.delta_current.exponent) * pixel.delta_reference.mantissa;
 
                     while pixel.iteration < reference.current_iteration {
-                        let delta_current_float = scaled_scale_factor_1 * pixel.delta_current.mantissa;
+                        // 2 multiplications and 2 adds
+                        let z = reference.reference_data[pixel.iteration - reference.start_iteration].z_fixed + scaled_scale_factor_1 * pixel.delta_current.mantissa;
 
                         if pixel.delta_current.exponent > -500 {
-                            let z_norm = (reference.reference_data[pixel.iteration - reference.start_iteration].z_fixed + delta_current_float).norm_sqr();
+                            // 2 multiplications and one add
+                            let z_norm = z.norm_sqr();
 
                             if z_norm < reference.reference_data[pixel.iteration - reference.start_iteration].z_tolerance {
                                 pixel.glitched = true;
@@ -50,7 +52,9 @@ impl Perturbation {
 
                             // pixel.delta_current.mantissa = 2.0 * reference.data[pixel.iteration - reference.start_iteration].z_fixed * pixel.delta_current.mantissa + temp * pixel.delta_current.mantissa + scaled_delta_reference;
 
-                            pixel.delta_current.mantissa *= 2.0 * reference.reference_data[pixel.iteration - reference.start_iteration].z_fixed + delta_current_float;
+                            // 4 multiplications and 2 additions
+                            pixel.delta_current.mantissa *= z + reference.reference_data[pixel.iteration - reference.start_iteration].z_fixed;
+                            // 2 additions
                             pixel.delta_current.mantissa += scaled_delta_reference;
 
                             scaled_iterations += 1;

src/renderer.rs

@@ -233,16 +233,21 @@ impl FractalRenderer {
 
             if self.auto_adjust_iterations {
                 // test
-                let mut temp = self.data_export.iterations.clone();
-                temp.sort();
+                // let mut temp = self.data_export.iterations.clone();
+                // temp.sort();
 
                 // let new_iteration_value = *(&self.data_export.iterations).into_iter().max().unwrap() as usize;
                 // Set to value of 0.1%
-                let value = 0.999 * temp.len() as f64;
-                let new_iteration_value = temp[value as usize] as usize;
-                self.center_reference.maximum_iteration = new_iteration_value;
-                self.center_reference.current_iteration = new_iteration_value;
-                self.maximum_iteration = new_iteration_value;
+                // let value = 0.999 * temp.len() as f64;
+                // let new_iteration_value = temp[value as usize] as usize;
+
+                if self.zoom.to_float() < 1e10 {
+                    let new_iteration_value = 10000;
+                    self.center_reference.maximum_iteration = new_iteration_value;
+                    self.center_reference.current_iteration = new_iteration_value;
+                    self.maximum_iteration = new_iteration_value;
+                }
+                
             }
 
             self.remaining_frames -= 1;