Merge pull request #19 from jackyarndley/development

Development

Author: jackyarndley

Cargo.toml

@@ -22,6 +22,6 @@ features = ["float", "complex"]
 
 #Additional commands that can improve performance (maybe by around 5-10%)
 [profile.release]
-lto = "fat"
-codegen-units = 1
+#lto = "fat"
+#codegen-units = 1
 #debug = true

default.toml

@@ -1,4 +1,5 @@
 image_width = 1000
 image_height = 1000
 frames = 1
-export = "colour"
+export = "colour"
+rotate = 0

long.toml

@@ -0,0 +1,4 @@
+real = "-1.7697392710757027841152006141906594654234779937259515247210119204006409471133661312119570293427350953111092082771973598855782759599980633037132375185987670114621045880606454417706999699982839165518556104246980851140230022353588311445547248451142336585544111916489341441418890633019730101854648463669109636471162672120817824917407218303348419898985242808140058964414457471465221536301689319210853379995524156624829942780946758964309072692484524503974031949154005423948971844113769257156823395255042997434557967120122936287886272994336827603988076644070845456535059390110455532123959338354686709501965947157116618024249418340042125809823163860665551942191883280150556503637746217516167947991343226606484863461721881250950867469305763323991190602711636193429181021868663451423240656141036481686672207216510178940927578426246138789051935948202201039069515784638090342979600881257471340705419667858851219686"
+imag = "0.0047957559338652178505615663220486971154304886886673920781256111752398106107280366675989298691779797136737364961830758523741254480286664920460479195128211953261155569223186412660856033539583067793744552698972305956559820659036789189846739491155635838617923497250059314208186984179036223826655324004181421335633738898275114135499319014247271095039118772708132302750547913645230844806438628351797278101552420985568133578867374426937467785916207019758747794073870494765108717384461786347756065294984135627296206900076429271573756624100323471123560470223626746460265018297930359289043411279245762239698772188260974285993117734181827318766613834051977484272020698249213489627750957498023989747438133307647274695802671234943834981584342636056200655633883556867650337796993091229444120358050723663523120235639704136824323264324209617146569763642761341662189958962136924719552069482293150925374378282906250039"
+zoom = "5E894"
+iterations = 200000

opus2.toml

@@ -0,0 +1,4 @@
+real = "-0.749999987350877481864108888020013802837969258626230419972587823828734338471228477079750588709551510361714463695461745528645748607681279674273355384334270208362211787387351792878073779449767291526542817531261340190806632565918259326812453945339010150589328574149762103412720468461829229717752036030894096315543168284825591829523451459881790177201252306571105765519675248512352116833573251629567483327363311905069239003032701051529457481196547434321797050981253335937568089213120462566208183651115805653397293307377258559233202903277271676210602323914213229679532680425641573037323936099296977383315509031245712699863469264931916441084524494037606498168268686721923874005066873080025308977190880377994951387503602088911332670208047338589057179189242986041326869049326695151373694471831244401593898610875755534119908741965159514391743447026006739832349691851901398357322220"
+imag = "0.001000038688236832013124581230049849132759425863378894883003211011278068229551274712347955044740933397589760194545872789087012331273586364914484522575986336846199522726507205442204060303594955245291999525338163887733776425296885360624117754790016039295518748100994374326514266548379714091150515954338609920973073364107748619320475410623673220046896479022827825993708176842163391900758089808211644753443666550081714232493619984139688643050056804682336073778593187461493553160679031928537192970767012461077854087872615079724603280623855121742482968568427025472006277692061641900496152974606824700919966353741349586737424130832293811657136609787251540732986491711380483513615806577672347051574909062756851877529226144646342697709731384260107991407404869126271382608377517199011953183918273014546327019813569447081536980717484300757693838699772312217708489638932599104037840"
+zoom = "8.1339E864"
+iterations = 80000000

orion.toml

@@ -0,0 +1,4 @@
+real = "-0.7499999873508774818641088880200138028379692586262304199725878238287343384712284770797505887095515103617144636954617455286457486076812796742733553843342702083622117873873517928780737794497672901267230430626297336988810230734399361344818375773549399347875427428347264988553944011302460192928350281876904124203104238715822950990748008617950706353815706458979765197961555377834051564401967392434897239319"
+imag = "0.0010000386882368320131245812300498491327594258633788948830032110112780682295512747123479550447409333975897601945458727890870123312735863649144845225759863368461995227265072054422040603035949595533881367262322728165337116691191170116264549163097731201190091878205909302494936965023533854506636169170005449301928128392733712616089780239330345939551040094373518357099774818911598783954917116723235106496"
+zoom = "1E394"
+iterations = 20000000

src/renderer.rs

@@ -1,9 +1,9 @@
-use crate::util::{data_export::*, ComplexFixed, ComplexArbitrary, PixelData, complex_extended::ComplexExtended, float_extended::FloatExtended, string_to_extended, extended_to_string};
+use crate::util::{data_export::*, ComplexFixed, ComplexArbitrary, PixelData, complex_extended::ComplexExtended, float_extended::FloatExtended, string_to_extended, extended_to_string, get_approximation_terms, get_delta_top_left};
 use crate::math::{SeriesApproximation, Perturbation, Reference};
 
 use std::time::Instant;
-use std::cmp::{min, max};
 use std::io::Write;
+use std::cmp::max;
 
 use rand::seq::SliceRandom;
 use rayon::prelude::*;
@@ -12,7 +12,7 @@ use config::Config;
 pub struct FractalRenderer {
     image_width: usize,
     image_height: usize,
-    aspect: f64,
+    rotate: f64,
     zoom: FloatExtended,
     maximum_iteration: usize,
     glitch_tolerance: f64,
@@ -28,6 +28,7 @@ impl FractalRenderer {
     pub fn new(settings: Config) -> Self {
         let image_width = settings.get_int("image_width").unwrap_or(1000) as usize;
         let image_height = settings.get_int("image_height").unwrap_or(1000) as usize;
+        let rotate = settings.get_float("rotate").unwrap_or(0.0).to_radians();
         let maximum_iteration = settings.get_int("iterations").unwrap_or(1000) as usize;
         let initial_zoom = settings.get_str("zoom").unwrap_or(String::from("1E0")).to_ascii_uppercase();
         let center_real = settings.get_str("real").unwrap_or(String::from("-0.75"));
@@ -44,24 +45,14 @@ impl FractalRenderer {
         };
         let display_glitches = false;
 
-        let aspect = image_width as f64 / image_height as f64;
         let zoom = string_to_extended(&initial_zoom);
-
         let delta_pixel =  (-2.0 * (4.0 / image_height as f64 - 2.0) / zoom) / image_height as f64;
-
         let radius = delta_pixel * image_width as f64;
         let precision = max(64, -radius.exponent + 64);
-
         let center_location = ComplexArbitrary::with_val(
             precision as u32,
             ComplexArbitrary::parse("(".to_owned() + &center_real + "," + &center_imag + ")").expect("Location is not valid!"));
-
-        let auto_approximation = if approximation_order == 0 {
-            let auto = (((image_width * image_height) as f64).log(1e6).powf(6.619) * 16.0f64) as usize;
-            min(max(auto, 3), 64)
-        } else {
-            approximation_order
-        };
+        let auto_approximation = get_approximation_terms(approximation_order, image_width, image_height);
 
         let reference = Reference::new(center_location.clone(), center_location.clone(), 1, maximum_iteration);
         let series_approximation = SeriesApproximation::new_central(&center_location, 
@@ -73,7 +64,7 @@ impl FractalRenderer {
         FractalRenderer {
             image_width,
             image_height,
-            aspect,
+            rotate,
             zoom,
             maximum_iteration,
             glitch_tolerance,
@@ -100,12 +91,16 @@ impl FractalRenderer {
             self.series_approximation.generate_approximation(&self.center_reference);
         }
 
-        let delta_pixel =  (-2.0 * (4.0 / self.image_height as f64 - 2.0) / self.zoom.mantissa) / self.image_height as f64;
-        // This should be the delta relative to the image, without the big zoom factor applied.
-        let delta_top_left = ComplexFixed::new((4.0 / self.image_width as f64 - 2.0) / self.zoom.mantissa * self.aspect as f64, (4.0 / self.image_height as f64 - 2.0) / self.zoom.mantissa);
+        let cos_rotate = self.rotate.cos();
+        let sin_rotate = self.rotate.sin();
+        let delta_pixel = 4.0 / ((self.image_height - 1) as f64 * self.zoom.mantissa);
+        let delta_top_left = get_delta_top_left(delta_pixel, self.image_width, self.image_height, cos_rotate, sin_rotate);
+
         let delta_pixel_extended = FloatExtended::new(delta_pixel, -self.zoom.exponent);
 
         self.series_approximation.delta_pixel_square = delta_pixel_extended * delta_pixel_extended;
+
+        // Used for placing the probe points
         self.series_approximation.delta_top_left = ComplexExtended::new(delta_top_left, -self.zoom.exponent);
         self.series_approximation.check_approximation();
 
@@ -119,9 +114,13 @@ impl FractalRenderer {
             .map(|index| {
                 let i = index % self.image_width;
                 let j = index / self.image_width;
-                let element = ComplexFixed::new(i as f64 * delta_pixel + delta_top_left.re, j as f64 * delta_pixel + delta_top_left.im);
+                // This could be changed to account for rotation, and jittering if needed
+                let element = ComplexFixed::new(
+                    i as f64 * delta_pixel * cos_rotate - j as f64 * delta_pixel * sin_rotate + delta_top_left.re, 
+                    i as f64 * delta_pixel * sin_rotate + j as f64 * delta_pixel * cos_rotate + delta_top_left.im
+                );
+                
                 let point_delta = ComplexExtended::new(element, -self.zoom.exponent);
-
                 let new_delta = self.series_approximation.evaluate(point_delta, None);
 
                 PixelData {
@@ -148,7 +147,6 @@ impl FractalRenderer {
         print!("| {:<15}", iteration_time.elapsed().as_millis());
         std::io::stdout().flush().unwrap();
 
-
         let correction_time = Instant::now();
 
         // Remove all non-glitched points from the remaining points
@@ -184,7 +182,6 @@ impl FractalRenderer {
 
         print!("| {:<15}", correction_time.elapsed().as_millis());
         std::io::stdout().flush().unwrap();
-
 
         let saving_time = Instant::now();
         self.data_export.save(&filename);

src/util/mod.rs

@@ -1,4 +1,5 @@
 use std::f64::consts::{LOG2_10, LOG10_2};
+use std::cmp::{min, max};
 
 pub mod data_export;
 pub mod float_extended;
@@ -74,6 +75,28 @@ pub fn extended_to_string(value: FloatExtended) -> String {
     format!("{:.2}E{}", first * 10.0f64.powf(second.fract()), second.floor() as i32)
 }
 
+pub fn get_delta_top_left(delta_pixel: f64, image_width: usize, image_height: usize, cos_rotate: f64, sin_rotate: f64) -> ComplexFixed<f64> {
+    let aspect = image_width as f64 / image_height as f64;
+
+    let temp_real = -0.5 * (image_height - 1) as f64 * delta_pixel * aspect as f64;
+    let temp_imag = -0.5 * (image_height - 1) as f64 * delta_pixel;
+
+    ComplexFixed::new(
+        temp_real * cos_rotate - temp_imag * sin_rotate, 
+        temp_real * sin_rotate + temp_imag * cos_rotate)
+}
+
+pub fn get_approximation_terms(approximation_order: usize, image_width: usize, image_height: usize) -> usize {
+    if approximation_order == 0 {
+        let auto = (((image_width * image_height) as f64).log(1e6).powf(6.619) * 16.0f64) as usize;
+        min(max(auto, 3), 64)
+    } else {
+        approximation_order
+    }
+}
+
+
+
 #[derive(Clone)]
 pub struct PixelData {
     pub image_x: usize,