Skip to content

Conversation

@PaulTheLionHeart
Copy link
Contributor

I haven't completed getting perturbation to work within standard_fractal() but there are a number of files that can be merged so we have a standard way of using Id with perturbation.

The following files can be merged so we have a standard IO and display as well as batch file operation that includes perturbation:
make_batch_file.cpp, cmdfiles.cpp, get_toggles.cpp, tab_display.cpp

Currently in this branch, perturbation only uses a single reference pixel and only renders correctly if that pixel is at the highest iteration count in the image. Getting additional reference pixels is daunting without further nodification to Standard_fractal() as the iteration count needs to be reset after adding a reference. I'm not sure how to get around this. Maybe some offline discussion will help.

Main changes are in:
1. get_toggles(): perturbation: yes/no/auto
2. Modify calc_frac.cpp, PertEngine.cpp, perturbation.cpp to introduce perturbation_per_image() and perturbation_per_pixel()
3. Use g_use_perturbation to control perturbation flow within calc_frac.cpp
Changes:
1. Update cmdfiles.cpp to allow reading batch files with perturbation fractals
2. Clean up frasetup.cpp and fractalb.cpp to remove unnecessary code for perturbation
3. Simplify PertEngine.cpp to only accept initial reference
4. Symmetry, filters etc now work through standard_calc()
Added Perturbation to info screen
…ay.cpp for perturbation

1. Read and write perturbation to par files
2. Display perturbation and number of references

These need to be merged into master so we have a standard for users rather than using plot type = 'p'
@LegalizeAdulthood
Copy link
Owner

Youve got two open pull requests that appear to be identical; please close one of them.

@PaulTheLionHeart
Copy link
Contributor Author

How did I do that? It surely wasn't intentional.

@LegalizeAdulthood
Copy link
Owner

Probably just accidentally clicked the button twice or something. No big deal. :)

@PaulTheLionHeart
Copy link
Contributor Author

No worries

@LegalizeAdulthood
Copy link
Owner

The first step in getting these pull requests to green builds is to get them rebased onto master.

@PaulTheLionHeart
Copy link
Contributor Author

There have been so many commits since these pull requests were made that it is probably best to close these ones and start again from pulling down the current master and adding changes from there. Then we can create a new pull request and rebase from there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants