mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 10:30:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Add an include for Variations01.h which will allow a developer to make a build which is fully compatible with flam3.
This commit is contained in:
Person 2019-10-02 20:24:55 -07:00
parent 4a150132e1
commit 5a26ed5044
4 changed files with 7105 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Ember/Ember.cpp
View File

@ -18,7 +18,11 @@ template EMBER_API class QTIsaac<ISAAC_SIZE, ISAAC_INT>;
#include "Point.h" #include "Point.h"
#include "VarFuncs.h" #include "VarFuncs.h"
#include "Variation.h" #include "Variation.h"
#include "Variations01.h" #ifdef FLAM3_COMPAT
#include "Variations01_flam3_compat.h"//Do this instead if you want full compatibility with flam3.
#else
#include "Variations01.h"
#endif
#include "Variations02.h" #include "Variations02.h"
#include "Variations03.h" #include "Variations03.h"
#include "Variations04.h" #include "Variations04.h"

1
Source/Ember/EmberDefines.h
View File

@ -38,6 +38,7 @@ static void sincos(float x, float* s, float* c)
namespace EmberNs namespace EmberNs
{ {
#define EMBER_VERSION "1.0.0.17" #define EMBER_VERSION "1.0.0.17"
//#define FLAM3_COMPAT 1//Uncomment this if you want full compatibility with flam3 regarding some of the trig-based variations in Variations01.h
#define EPS6 T(1e-6) #define EPS6 T(1e-6)
#define EPS std::numeric_limits<T>::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way. #define EPS std::numeric_limits<T>::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way.
#define ISAAC_SIZE 4 #define ISAAC_SIZE 4

6
Source/Ember/VariationList.cpp
View File

@ -1,6 +1,10 @@
#include "EmberPch.h" #include "EmberPch.h"
#include "VariationList.h" #include "VariationList.h"
#include "Variations01.h" #ifdef FLAM3_COMPAT
#include "Variations01_flam3_compat.h"//Do this instead if you want full compatibility with flam3.
#else
#include "Variations01.h"
#endif
#include "Variations02.h" #include "Variations02.h"
#include "Variations03.h" #include "Variations03.h"
#include "Variations04.h" #include "Variations04.h"

7094
Source/Ember/Variations01_flam3_compat.h Normal file
View File

File diff suppressed because it is too large Load Diff