mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-10-31 09:20:23 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged mfeemster/fractorium into master

Browse Source
This commit is contained in:
Michel Mastriani
2019-05-16 20:19:26 -03:00
parent 833f98366b b4e5c01b5a
commit 71b362efb7
11 changed files with 359 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/MSVC/Installer/FractoriumInstaller.wixproj
View File

@ -6,7 +6,7 @@
<ProductVersion>3.7</ProductVersion> <ProductVersion>3.7</ProductVersion>
<ProjectGuid>{c8096c47-e358-438c-a520-146d46b0637d}</ProjectGuid> <ProjectGuid>{c8096c47-e358-438c-a520-146d46b0637d}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<OutputName>Fractorium_1.0.0.15</OutputName> <OutputName>Fractorium_1.0.0.16</OutputName>
<OutputType>Package</OutputType> <OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

6
Builds/MSVC/Installer/Product.wxs
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?define ProductVersion="1.0.0.15" ?> <?define ProductVersion="1.0.0.16" ?>
<?define ProductName="Fractorium $(var.ProductVersion) ($(var.GpuType))" ?> <?define ProductName="Fractorium $(var.ProductVersion) ($(var.GpuType))" ?>
<?define UpgradeCode="{4714cd15-bfba-44f6-8059-9e1466ebfa6e}"?> <?define UpgradeCode="{4714cd15-bfba-44f6-8059-9e1466ebfa6e}"?>
<?define Manufacturer="Fractorium"?> <?define Manufacturer="Fractorium"?>
@ -13,7 +13,7 @@
<!-- <!--
Change this for every release. Change this for every release.
--> -->
<?define ProductCode="{4B40B3EC-7FE5-41DE-824E-EEC006B9D614}"?> <?define ProductCode="{58C93E10-4E62-4F1F-8A8F-5C567A588805}"?>
<Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)"> <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package <Package
@ -58,7 +58,7 @@
<WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)..\..\..\Data\gplv3.rtf" /> <WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)..\..\..\Data\gplv3.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="$(var.SolutionDir)..\..\..\Source\Fractorium\Icons\banner.bmp" /><!--493 x 58 pixels --> <WixVariable Id="WixUIBannerBmp" Value="$(var.SolutionDir)..\..\..\Source\Fractorium\Icons\banner.bmp" /><!--493 x 58 pixels -->
<WixVariable Id="WixUIDialogBmp" Value="$(var.SolutionDir)..\..\..\Source\Fractorium\Icons\dialog.bmp" /><!--493 × 312 pixels --> <WixVariable Id="WixUIDialogBmp" Value="$(var.SolutionDir)..\..\..\Source\Fractorium\Icons\dialog.bmp" /><!--493 <EFBFBD> 312 pixels -->
<Property Id="MSIUSEREALADMINDETECTION" Value="1" /> <Property Id="MSIUSEREALADMINDETECTION" Value="1" />
<Property Id="MSIFASTINSTALL" Value="1" /> <Property Id="MSIFASTINSTALL" Value="1" />

2
Builds/QtCreator/defaults.pri
View File

@ -1,4 +1,4 @@
VERSION = 1.0.0.15 VERSION = 1.0.0.16
win32:CONFIG += skip_target_version_ext win32:CONFIG += skip_target_version_ext
CONFIG += c++14 CONFIG += c++14

17
Data/Bench/EmberBench.ps1
View File

@ -1,7 +1,14 @@
$exe = "./EmberRender.exe" $exe = ""
#On linux do this: if ([System.Environment]::OSVersion.Platform.ToString().ToLower() -like "*win*")
#$exe = "emberrender" {
$benchprefix = "./Bench/" $exe = "./EmberRender.exe"
}
else
{
$exe = "emberrender"
}
$benchprefix = "./bench/"
$devices = "2"#Set this to whatever device index your main GPU resides at. If you are unsure, just run emberrender --opencl info to find out. $devices = "2"#Set this to whatever device index your main GPU resides at. If you are unsure, just run emberrender --opencl info to find out.
$cpuquality = 150 $cpuquality = 150
$gpuquality = 2000 $gpuquality = 2000
@ -15,7 +22,7 @@ $ssSuffixArray = @("_ss1","_ss2","_ss4")
$Script:output = "" $Script:output = ""
[Collections.Generic.List[String]] $filteredLines = "" [Collections.Generic.List[String]] $filteredLines = ""
$table = New-Object system.Data.DataTable <EFBFBD>BenchTable<EFBFBD> $table = New-Object system.Data.DataTable "BenchTable"
$col1 = New-Object system.Data.DataColumn Filename, ([string]) $col1 = New-Object system.Data.DataColumn Filename, ([string])
$col2 = New-Object system.Data.DataColumn Precision, ([string]) $col2 = New-Object system.Data.DataColumn Precision, ([string])
$col3 = New-Object system.Data.DataColumn Device,([string]) $col3 = New-Object system.Data.DataColumn Device,([string])

2
Data/Fractorium.spec
View File

@ -2,7 +2,7 @@
%define buildroot %{_topdir}/BUILDROOT %define buildroot %{_topdir}/BUILDROOT
Name: Fractorium Name: Fractorium
Version: 1.0.0.15 Version: 1.0.0.16
Release: 1 Release: 1
Summary: A fractal flame editor with GPU support Summary: A fractal flame editor with GPU support

151
Data/Version History.txt
View File

@ -1,3 +1,154 @@
1.0.0.15 5/13/2019
--User changes:
-Add a new stylesheet named lightdark.qss that provides a more modern looking dark theme.
-Show common folder locations such as documents, downloads, pictures in the sidebar in all file dialogs.
-Warning message about exceeding memory in final render dialog now suggests strips as the solution to the problem.
-Strips now has a tooltip explaining what it does.
-Allow more digits in the spinners on the color section the flame tab.
-Added a field called K2 which is an alternative way to set brightness, ignored when zero.
-Add manually adjustable size spinners in the final render dialog. Percentage scale and absolute size are fully synced.
-Default prefix in final render is now the filename when doing animations (coming from sequence section of the library tab).
-Changed the elliptic variation back to using a less precise version for float, and a more precise version for double. The last release had it always using double.
-New applied xaos table that shows a read-only view of actual weights by taking the base xform weights and multiplying them by the xaos values.
-New table in the xaos tab that gives a graphical representation of the probability that each xform is chosen, with and without xaos.
-Add button to transpose the xaos rows and columns.
-Add support for importing .chaos files from Chaotica.
--Pasting back to Chaotica will work for most, but not all, variations due to incompatible parameter names in some.
-Curves are now splines instead of Bezier. This adds compatibility with Chaotica, but breaks it for Apophysis. Xmls are still pastable, but the color curves will look different.
--The curve editor on the palette tab can now add points by clicking on the lines and remove points by right clicking on the points themselves, just like Chaotica.
--Splines are saved in four new xml fields: overall_curve, red_curve, green_curve and blue_curve.
-Clear all color curves when clicking Reset while holding down Ctrl.
-Interpolate color curves when generating a sequence.
-Allow for specifying the percentage of a sub batch each thread should iterate through per kernel call when running with OpenCL. This gives a roughly 1% performance increase due to having to make less kernel calls while iterating.
--This field is present for interactive editing (where it's not very useful), in the final render dialog and on the command line.
--On the command line, this is specified as --sbpctth for EmberRender and EmberAnimate.
-Allow double clicking to toggle the supersample field in the flame tab between 1 and 2 for easily checking the effect of the field.
-When showing affine values as polar coordinates, show angles normalized to 360 to match Chaotica.
-Fuse Count spinner now toggles between 15 and 100 when double clicking for easily checking the effect of the field.
-Added field for limiting the range in the x and y direction that the initial points are chosen from.
--This has no effect for many variations, but has a noticeable effect for some.
-Linux installer now uses a technology called AppImage which makes installations painless and totally dependency free, like it's been on windows for the past 20 years.
--The AppImage is wrapped in a .deb package, so installation remains familiar to ubuntu/mint users.
--RPM installer is now provided for Red Hat users.
-Added new variations:
arcsech
arcsech2
arcsinh
arctanh
asteria
block
bwraps_rand
circlecrop2
coth_spiral
crackle2
depth_blur
depth_blur2
depth_gaussian
depth_gaussian2
depth_ngon
depth_ngon2
depth_sine
depth_sine2
dragonfire
dspherical
dust
excinis
exp2
flipx
flowerdb
foci_p
gaussian
glynnia2
glynnsim4
glynnsim5
henon
henon
hex_rand
hex_truchet
hypershift
lazyjess
lens
lozi
lozi
modulusx
modulusy
oscilloscope2
point_symmetry
pointsymmetry
projective
pulse
rotate
scry2
shift
smartshape
spher
squares
starblur2
swirl3
swirl3r
tanh_spiral
target0
target2
tile_hlp
truchet_glyph
truchet_inv
truchet_knot
unicorngaloshen
vibration
vibration2,
waves22,
waves23,
waves3,
waves4,
waves42,
--hex_truchet, hex_rand should always use double. They are extremely sensitive.
--Bug fixes:
-Bounds sign was flipped for x coordinate of world space when center was not zero.
-Right clicking and dragging spinner showed menu on mouse up, even if it was very far away.
-Text boxes for size in final render dialog were hard to type in. Same bug as xform weight used to be so fixed the same way.
-Fix spelling to be plural in toggle color speed box.
-Stop using the blank user palette to generate flames. Either put colored palettes in it, or exclude it from randoms.
-Clicking the random palette button for a palette file with only one palette in it would freeze the program.
-Clicking none scale in final render did not re-render the preview.
-Use less precision on random xaos. No need for 12 decimal places.
-The term sub batch is overloaded in the options dialog. Change the naming and tooltip of those settings for cpu and opencl.
--Also made clear in the tooltip for the default opencl quality setting that the value is per device.
-The arrows spinner in palette editor appears like a read-only label. Made it look like a spinner.
-Fix border colors for various spin boxes and table headers in the style sheet. Requires reload.
-Fix a bug in the bwraps variation which would produce different results than Chaotica and Apophysis.
-Synth was allowed to be selected for random flame generation when using an Nvidia card but it shouldn't have been because Nvidia has a hard time compiling synth.
-A casting bug in the OpenCL kernels for log scaling and density filtering was preventing successful compilations on Intel iGPUs. Fixed even though we don't support anything other than AMD and Nvidia.
-Palette rotation (click and drag) position was not being reset when loading a new flame.
-When the xform circles were hidden, opening and closing the options dialog would improperly reshow them.
-Double click toggle was broken on integer spin boxes.
-Fixed tab order of some controls.
-Creating a palette from a jpg in the palette editor only produced a single color.
--Needed to package imageformats/qjpeg.dll with the Windows installer.
-The basic memory benchmark test flame was not really testing memory. Make it more spread out.
-Remove the temporal samples field from the flame tab, it was never used because it's only an animation parameter which is specified in the final render dialog or on the command line with EmberAnimate.
-The waves2b variation was never fully implemented on the GPU when the pwx or pwy value was between -1e-4 and 1e-4. Now the implementation is complete.
-EmberBench.ps1 would not run on linux.
-Deleting a flame in the library tree was taking three tries.
-Undo a change made last year which gave the wrong color index for final xforms when generating a sequence.
--Code changes:
-Add IsEmpty() to Palette to determine if a palette is all black.
-Attempt to avoid selecting a blank palette in PaletteList::GetRandomPalette().
-Add function ScanForChaosNodes() and some associated helper functions in XmlToEmber.
-Make variation param name correction be case insensitive in XmlToEmber.
-Add SubBatchPercentPerThread() method to RendererCL.
-Override enterEvent() and leaveEvent() in DoubleSpinBox and SpinBox to prevent the context menu from showing up on right mouse up after already leaving the spinner.
-Filtering the mouse wheel event in TableWidget no longer appears to be needed. It was probably an old Qt bug that has been fixed.
-Gui/ember syncing code in the final render dialog needed to be reworked to accommodate absolute sizes.
-Add fma() to a few more places in the OpenCL code.
-Add a new C# project named apoconv that attempts to convert Apophysis plugins to Fractorium style Variation classes. It's not entirely perfect, but gets most of the job done much more quickly than doing so manually.
-Remove unused OpenCL functions from variations: elliptic, poincare, mask, bMod, bSwirl, bTransform, bCollide, farblur, popcorn2_3D, falloff, falloff2, falloff3, crackle2, waves2b, hypercrop, depth_gaussian2, depth_sine, depth_sine2, dust, asteria, vibration, vibration2, arctanh, smartshape, squares, starblur2, Truchet.
--Add code in EmberTester to automatically detect such unused functions.
-No longer assume palettes are 256 elements. Can now read longer palettes.
-Ensure OpenCL images always get written when created.
-Change some menu capitalization to make the text easier on the eyes.
1.0.0.14 10/20/2018 1.0.0.14 10/20/2018
--Bug fixes --Bug fixes
-File saving was broken. -File saving was broken.

2
Data/control.package
View File

@ -8,7 +8,7 @@ Homepage: http://fractorium.com/
Vcs-Git: https://bitbucket.org/mfeemster/fractorium Vcs-Git: https://bitbucket.org/mfeemster/fractorium
Vcs-Browser: https://bitbucket.org/mfeemster/fractorium Vcs-Browser: https://bitbucket.org/mfeemster/fractorium
Package: Fractorium Package: Fractorium
Version: 1.0.0.15 Version: 1.0.0.16
Architecture: amd64 Architecture: amd64
Description: A fractal flame editor with GPU support Description: A fractal flame editor with GPU support
Fractorium Fractorium

2
Source/Ember/EmberDefines.h
View File

@ -37,7 +37,7 @@ static void sincos(float x, float* s, float* c)
namespace EmberNs namespace EmberNs
{ {
#define EMBER_VERSION "1.0.0.15" #define EMBER_VERSION "1.0.0.16"
#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

322
Source/Ember/Variations07.h
View File

@ -5160,7 +5160,7 @@ public:
ff = f; ff = f;
T x = ff * m_Length; T x = ff * m_Length;
T z = std::sqrt(1 + x * x - 2 * x * m_CosAlpha); T z = Zeps(std::sqrt(1 + x * x - x * m_CosAlpha));
T angle_sign = (int_angle - Floor<T>(k / 2) * 2) == 1 ? T(1) : T(-1); T angle_sign = (int_angle - Floor<T>(k / 2) * 2) == 1 ? T(1) : T(-1);
T final_angle = m_TwopiPower * int_angle + angle_sign * std::asin(m_SinAlpha * x / z) - T(M_PI_2); T final_angle = m_TwopiPower * int_angle + angle_sign * std::asin(m_SinAlpha * x / z) - T(M_PI_2);
T z_scaled = z * std::sqrt(rand.Frand01<T>() * m_OnemHoleSq + m_HoleSq); T z_scaled = z * std::sqrt(rand.Frand01<T>() * m_OnemHoleSq + m_HoleSq);
@ -5211,7 +5211,7 @@ public:
<< "\t\t ff = f;\n" << "\t\t ff = f;\n"
<< "\n" << "\n"
<< "\t\treal_t x = ff * " << length << ";\n" << "\t\treal_t x = ff * " << length << ";\n"
<< "\t\treal_t z = sqrt(1 + x * x - 2.0 * x * " << cosalpha << ");\n" << "\t\treal_t z = Zeps(sqrt(1 + x * x - x * " << cosalpha << "));\n"
<< "\t\treal_t angle_sign = (int_angle - floor(k/2) * 2) == 1.0 ? 1.0 : -1.0;\n" << "\t\treal_t angle_sign = (int_angle - floor(k/2) * 2) == 1.0 ? 1.0 : -1.0;\n"
<< "\t\treal_t final_angle = " << twopipower << " * int_angle + angle_sign * asin(" << sinalpha << " * x / z) - MPI2;\n" << "\t\treal_t final_angle = " << twopipower << " * int_angle + angle_sign * asin(" << sinalpha << " * x / z) - MPI2;\n"
<< "\t\treal_t z_scaled = z * sqrt(fma(MwcNext01(mwc), " << onemholesq << ", " << holesq << "));\n" << "\t\treal_t z_scaled = z * sqrt(fma(MwcNext01(mwc), " << onemholesq << ", " << holesq << "));\n"
@ -5232,7 +5232,12 @@ public:
m_TwopiPower = (M_2PI / m_Power) * T(0.5); m_TwopiPower = (M_2PI / m_Power) * T(0.5);
m_Power2 = m_Power * 2; m_Power2 = m_Power * 2;
m_SinAlpha = std::sin(m_Alpha); m_SinAlpha = std::sin(m_Alpha);
m_CosAlpha = std::cos(m_Alpha); m_CosAlpha = std::cos(m_Alpha) * 2;
}
virtual vector<string> OpenCLGlobalFuncNames() const override
{
return vector<string> { "Zeps" };
} }
protected: protected:
@ -5373,8 +5378,8 @@ public:
virtual void Precalc() override virtual void Precalc() override
{ {
T m_SinXFreqPi = T(M_PI) * m_SinXFreq; m_SinXFreqPi = T(M_PI) * m_SinXFreq;
T m_SinYFreqPi = T(M_PI) * m_SinYFreq; m_SinYFreqPi = T(M_PI) * m_SinYFreq;
} }
virtual vector<string> OpenCLGlobalFuncNames() const override virtual vector<string> OpenCLGlobalFuncNames() const override
@ -6349,7 +6354,7 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T fx = std::fmod(helper.In.x + m_X + m_Shift, 2 * m_X); T fx = std::fmod(helper.In.x + m_X + m_Shift, m_X2);
if (fx >= 0) if (fx >= 0)
helper.Out.x = m_Weight * (fx - m_X); helper.Out.x = m_Weight * (fx - m_X);
@ -6369,8 +6374,9 @@ public:
string weight = WeightDefineString(); string weight = WeightDefineString();
string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string shift = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string shift = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string x2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t fx = fmod(vIn.x + " << x << " + " << shift << ", 2 * " << x << ");\n" << "\t\treal_t fx = fmod(vIn.x + " << x << " + " << shift << ", " << x2 << ");\n"
<< "\n" << "\n"
<< "\t\tif (fx >= 0)\n" << "\t\tif (fx >= 0)\n"
<< "\t\t vOut.x = " << weight << " * (fx - " << x << ");\n" << "\t\t vOut.x = " << weight << " * (fx - " << x << ");\n"
@ -6383,18 +6389,25 @@ public:
return ss.str(); return ss.str();
} }
virtual void Precalc() override
{
m_X2 = 2 * m_X;
}
protected: protected:
void Init() void Init()
{ {
string prefix = Prefix(); string prefix = Prefix();
m_Params.clear(); m_Params.clear();
m_Params.push_back(ParamWithName<T>(&m_X, prefix + "modulusx_x", 1)); m_Params.push_back(ParamWithName<T>(&m_X, prefix + "modulusx_x", 1));
m_Params.push_back(ParamWithName<T>(&m_Shift, prefix + "modulusx_shift")); m_Params.push_back(ParamWithName<T>(&m_Shift, prefix + "modulusx_shift"));
m_Params.push_back(ParamWithName<T>(true, &m_X2, prefix + "modulusx_x2"));//Precalc.
} }
private: private:
T m_X; T m_X;
T m_Shift; T m_Shift;
T m_X2;//Precalc.
}; };
/// <summary> /// <summary>
@ -6414,7 +6427,7 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T fy = std::fmod(helper.In.y + m_Y + m_Shift, 2 * m_Y); T fy = std::fmod(helper.In.y + m_Y + m_Shift, m_Y2);
if (fy >= 0) if (fy >= 0)
helper.Out.y = m_Weight * (fy - m_Y); helper.Out.y = m_Weight * (fy - m_Y);
@ -6434,8 +6447,9 @@ public:
string weight = WeightDefineString(); string weight = WeightDefineString();
string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string shift = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string shift = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string y2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t fy = fmod(vIn.y + " << y << " + " << shift << ", 2 * " << y << ");\n" << "\t\treal_t fy = fmod(vIn.y + " << y << " + " << shift << ", " << y2 << ");\n"
<< "\n" << "\n"
<< "\t\tif (fy >= 0)\n" << "\t\tif (fy >= 0)\n"
<< "\t\t vOut.y = " << weight << " * (fy - " << y << ");\n" << "\t\t vOut.y = " << weight << " * (fy - " << y << ");\n"
@ -6448,18 +6462,25 @@ public:
return ss.str(); return ss.str();
} }
virtual void Precalc() override
{
m_Y2 = 2 * m_Y;
}
protected: protected:
void Init() void Init()
{ {
string prefix = Prefix(); string prefix = Prefix();
m_Params.clear(); m_Params.clear();
m_Params.push_back(ParamWithName<T>(&m_Y, prefix + "modulusy_y", 1)); m_Params.push_back(ParamWithName<T>(&m_Y, prefix + "modulusy_y", 1));
m_Params.push_back(ParamWithName<T>(&m_Shift, prefix + "modulusy_shift")); m_Params.push_back(ParamWithName<T>(&m_Shift, prefix + "modulusy_shift"));
m_Params.push_back(ParamWithName<T>(true, &m_Y2, prefix + "modulusy_y2"));//Precalc.
} }
private: private:
T m_Y; T m_Y;
T m_Shift; T m_Shift;
T m_Y2;
}; };
/// <summary> /// <summary>
@ -6479,10 +6500,8 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T sn = std::sin(m_AngleRad); helper.Out.x = m_Weight * (helper.In.x * m_AngleCos - helper.In.y * m_AngleSin);
T cs = std::cos(m_AngleRad); helper.Out.y = m_Weight * (helper.In.x * m_AngleSin + helper.In.y * m_AngleCos);
helper.Out.x = m_Weight * (helper.In.x * cs - helper.In.y * sn);
helper.Out.y = m_Weight * (helper.In.x * sn + helper.In.y * cs);
helper.Out.z = DefaultZ(helper); helper.Out.z = DefaultZ(helper);
} }
@ -6494,12 +6513,11 @@ public:
string index = ss2.str(); string index = ss2.str();
string weight = WeightDefineString(); string weight = WeightDefineString();
string angle = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string angle = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string anglerad = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string anglesin = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string anglecos = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t sn = sin(" << anglerad << ");\n" << "\t\tvOut.x = " << weight << " * (vIn.x * " << anglecos << " - vIn.y * " << anglesin << ");\n"
<< "\t\treal_t cs = cos(" << anglerad << ");\n" << "\t\tvOut.y = " << weight << " * (vIn.x * " << anglesin << " + vIn.y * " << anglecos << ");\n"
<< "\t\tvOut.x = " << weight << " * (vIn.x * cs - vIn.y * sn);\n"
<< "\t\tvOut.y = " << weight << " * (vIn.x * sn + vIn.y * cs);\n"
<< "\t\tvOut.z = " << DefaultZCl() << "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n"; << "\t}\n";
return ss.str(); return ss.str();
@ -6507,7 +6525,9 @@ public:
virtual void Precalc() override virtual void Precalc() override
{ {
m_AngleRad = m_Angle / 180 * T(M_PI); auto rad = m_Angle / 180 * T(M_PI);
m_AngleSin = std::sin(rad);
m_AngleCos = std::cos(rad);
} }
protected: protected:
@ -6516,12 +6536,14 @@ protected:
string prefix = Prefix(); string prefix = Prefix();
m_Params.clear(); m_Params.clear();
m_Params.push_back(ParamWithName<T>(&m_Angle, prefix + "rotate_angle")); m_Params.push_back(ParamWithName<T>(&m_Angle, prefix + "rotate_angle"));
m_Params.push_back(ParamWithName<T>(true, &m_AngleRad, prefix + "rotate_angle_rad")); m_Params.push_back(ParamWithName<T>(true, &m_AngleSin, prefix + "rotate_angle_sin"));//Precalc.
m_Params.push_back(ParamWithName<T>(true, &m_AngleCos, prefix + "rotate_angle_cos"));
} }
private: private:
T m_Angle; T m_Angle;
T m_AngleRad;//Precalc. T m_AngleSin;//Precalc.
T m_AngleCos;
}; };
/// <summary> /// <summary>
@ -6541,10 +6563,8 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T sn = std::sin(m_AngleRad); helper.Out.x = m_Weight * (helper.In.x + m_AngleCos * m_X - m_AngleSin * m_Y);
T cs = std::cos(m_AngleRad); helper.Out.y = m_Weight * (helper.In.y - m_AngleCos * m_Y - m_AngleSin * m_X);
helper.Out.x = m_Weight * (helper.In.x + cs * m_X - sn * m_Y);
helper.Out.y = m_Weight * (helper.In.y - cs * m_Y - sn * m_X);
helper.Out.z = DefaultZ(helper); helper.Out.z = DefaultZ(helper);
} }
@ -6558,12 +6578,11 @@ public:
string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string angle = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string angle = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string anglerad = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string anglesin = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string anglecos = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t sn = sin(" << anglerad << ");\n" << "\t\tvOut.x = " << weight << " * (vIn.x + " << anglecos << " * " << x << " - " << anglesin << " * " << y << ");\n"
<< "\t\treal_t cs = cos(" << anglerad << ");\n" << "\t\tvOut.y = " << weight << " * (vIn.y - " << anglecos << " * " << y << " - " << anglesin << " * " << x << ");\n"
<< "\t\tvOut.x = " << weight << " * (vIn.x + cs * " << x << " - sn * " << y << ");\n"
<< "\t\tvOut.y = " << weight << " * (vIn.y - cs * " << y << " - sn * " << x << ");\n"
<< "\t\tvOut.z = " << DefaultZCl() << "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n"; << "\t}\n";
return ss.str(); return ss.str();
@ -6571,7 +6590,9 @@ public:
virtual void Precalc() override virtual void Precalc() override
{ {
m_AngleRad = m_Angle / 180 * T(M_PI); auto rad = m_Angle / 180 * T(M_PI);
m_AngleSin = std::sin(rad);
m_AngleCos = std::cos(rad);
} }
protected: protected:
@ -6582,14 +6603,16 @@ protected:
m_Params.push_back(ParamWithName<T>(&m_X, prefix + "shift_x")); m_Params.push_back(ParamWithName<T>(&m_X, prefix + "shift_x"));
m_Params.push_back(ParamWithName<T>(&m_Y, prefix + "shift_y")); m_Params.push_back(ParamWithName<T>(&m_Y, prefix + "shift_y"));
m_Params.push_back(ParamWithName<T>(&m_Angle, prefix + "shift_angle")); m_Params.push_back(ParamWithName<T>(&m_Angle, prefix + "shift_angle"));
m_Params.push_back(ParamWithName<T>(true, &m_AngleRad, prefix + "shift_angle_rad")); m_Params.push_back(ParamWithName<T>(true, &m_AngleSin, prefix + "shift_angle_sin"));//Precalc.
m_Params.push_back(ParamWithName<T>(true, &m_AngleCos, prefix + "shift_angle_cos"));
} }
private: private:
T m_X; T m_X;
T m_Y; T m_Y;
T m_Angle; T m_Angle;
T m_AngleRad;//Precalc. T m_AngleSin;//Precalc.
T m_AngleCos;
}; };
/// <summary> /// <summary>
@ -6609,12 +6632,10 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T x0 = helper.In.x; T scalex = m_HalfScalex * (T(1.0) + std::sin(helper.In.y * m_Sxfreq));
T y0 = helper.In.y; T scaley = m_HalfScaley * (T(1.0) + std::sin(helper.In.x * m_Syfreq));
T scalex = T(0.5) * m_Scalex * (T(1.0) + std::sin(y0 * m_Sxfreq)); helper.Out.x = m_Weight * (helper.In.x + std::sin(helper.In.y * m_Freqx) * scalex);
T scaley = T(0.5) * m_Scaley * (T(1.0) + std::sin(x0 * m_Syfreq)); helper.Out.y = m_Weight * (helper.In.y + std::sin(helper.In.x * m_Freqy) * scaley);
helper.Out.x = m_Weight * (x0 + std::sin(y0 * m_Freqx) * scalex);
helper.Out.y = m_Weight * (y0 + std::sin(x0 * m_Freqy) * scaley);
helper.Out.z = DefaultZ(helper); helper.Out.z = DefaultZ(helper);
} }
@ -6625,21 +6646,20 @@ public:
ss2 << "_" << XformIndexInEmber() << "]"; ss2 << "_" << XformIndexInEmber() << "]";
string index = ss2.str(); string index = ss2.str();
string weight = WeightDefineString(); string weight = WeightDefineString();
string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string sxfreq = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string sxfreq = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string syfreq = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string syfreq = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string halfscalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string halfscaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t x0 = vIn.x;\n" << "\t\treal_t scalex = " << halfscalex << " * ((real_t)(1.0) + sin(vIn.y * " << sxfreq << "));\n"
<< "\t\treal_t y0 = vIn.y;\n" << "\t\treal_t scaley = " << halfscaley << " * ((real_t)(1.0) + sin(vIn.x * " << syfreq << "));\n"
<< "\n" << "\n"
<< "\t\treal_t scalex = (real_t)(0.5) * " << scalex << " * ((real_t)(1.0) + sin(y0 * " << sxfreq << "));\n" << "\t\tvOut.x = " << weight << " * fma(sin(vIn.y * " << freqx << "), scalex, vIn.x);\n"
<< "\t\treal_t scaley = (real_t)(0.5) * " << scaley << " * ((real_t)(1.0) + sin(x0 * " << syfreq << "));\n" << "\t\tvOut.y = " << weight << " * fma(sin(vIn.x * " << freqy << "), scaley, vIn.y);\n"
<< "\n"
<< "\t\tvOut.x = " << weight << " * (x0 + sin(y0 * " << freqx << ") * scalex);\n"
<< "\t\tvOut.y = " << weight << " * (y0 + sin(x0 * " << freqy << ") * scaley);\n"
<< "\n" << "\n"
<< "\t\tvOut.z = " << DefaultZCl() << "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n"; << "\t}\n";
@ -6648,6 +6668,8 @@ public:
virtual void Precalc() override virtual void Precalc() override
{ {
m_HalfScalex = m_Scalex * T(0.5);
m_HalfScaley = m_Scaley * T(0.5);
} }
protected: protected:
@ -6657,10 +6679,12 @@ protected:
m_Params.clear(); m_Params.clear();
m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves3_scalex", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves3_scalex", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves3_scaley", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves3_scaley", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves3_freqx", T(7.0))); m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves3_freqx", T(7.0)));
m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves3_freqy", T(13.0))); m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves3_freqy", T(13.0)));
m_Params.push_back(ParamWithName<T>(&m_Sxfreq, prefix + "waves3_sx_freq")); m_Params.push_back(ParamWithName<T>(&m_Sxfreq, prefix + "waves3_sx_freq"));
m_Params.push_back(ParamWithName<T>(&m_Syfreq, prefix + "waves3_sy_freq", T(2.0))); m_Params.push_back(ParamWithName<T>(&m_Syfreq, prefix + "waves3_sy_freq", T(2.0)));
m_Params.push_back(ParamWithName<T>(true, &m_HalfScalex, prefix + "waves3_half_scalex"));//Precalc.
m_Params.push_back(ParamWithName<T>(true, &m_HalfScaley, prefix + "waves3_half_scaley"));
} }
private: private:
@ -6670,6 +6694,8 @@ private:
T m_Freqy; T m_Freqy;
T m_Sxfreq; T m_Sxfreq;
T m_Syfreq; T m_Syfreq;
T m_HalfScalex;//Precalc.
T m_HalfScaley;
}; };
/// <summary> /// <summary>
@ -6689,16 +6715,14 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T x0 = helper.In.x; T ax = T(Floor<T>(helper.In.y * m_Freqx / M_2PI));
T y0 = helper.In.y; ax = std::sin(ax * T(12.9898) + ax * T(78.233) + T(1.0) + helper.In.y * m_Yfact001) * T(43758.5453);
T ax = T(Floor<T>(y0 * m_Freqx / M_2PI));
ax = std::sin(ax * T(12.9898) + ax * T(78.233) + T(1.0) + y0 * T(0.001) * m_Yfact) * T(43758.5453);
ax = ax - (int)ax; ax = ax - (int)ax;
if (m_Cont == 1) ax = (ax > T(0.5)) ? T(1.0) : T(0.0); if (m_Cont == 1) ax = (ax > T(0.5)) ? T(1.0) : T(0.0);
helper.Out.x = m_Weight * (x0 + std::sin(y0 * m_Freqx) * ax * ax * m_Scalex); helper.Out.x = m_Weight * (helper.In.x + std::sin(helper.In.y * m_Freqx) * ax * ax * m_Scalex);
helper.Out.y = m_Weight * (y0 + std::sin(x0 * m_Freqy) * m_Scaley); helper.Out.y = m_Weight * (helper.In.y + std::sin(helper.In.x * m_Freqy) * m_Scaley);
helper.Out.z = DefaultZ(helper); helper.Out.z = DefaultZ(helper);
} }
@ -6709,23 +6733,21 @@ public:
ss2 << "_" << XformIndexInEmber() << "]"; ss2 << "_" << XformIndexInEmber() << "]";
string index = ss2.str(); string index = ss2.str();
string weight = WeightDefineString(); string weight = WeightDefineString();
string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string cont = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cont = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string yfact = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string yfact = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string yfact001 = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t x0 = vIn.x;\n" << "\t\treal_t ax = floor(vIn.y * " << freqx << " / M_2PI);\n"
<< "\t\treal_t y0 = vIn.y;\n" << "\t\tax = sin(ax * (real_t)(12.9898) + ax * (real_t)(78.233) + (real_t)(1.0) + vIn.y * " << yfact001 << ") * (real_t)(43758.5453);\n"
<< "\n"
<< "\t\treal_t ax = floor(y0 * " << freqx << " / M_2PI);\n"
<< "\t\tax = sin(ax * (real_t)(12.9898) + ax * (real_t)(78.233) + (real_t)(1.0) + y0 * (real_t)(0.001) * " << yfact << ") * (real_t)(43758.5453);\n"
<< "\t\tax = ax - (int) ax;\n" << "\t\tax = ax - (int) ax;\n"
<< "\t\tif (" << cont << " == 1) ax = (ax > (real_t)(0.5)) ? (real_t)(1.0) : 0.0;\n" << "\t\tif (" << cont << " == 1) ax = (ax > (real_t)(0.5)) ? (real_t)(1.0) : 0.0;\n"
<< "\n" << "\n"
<< "\t\tvOut.x = " << weight << " * (x0 + sin(y0 * " << freqx << ") * ax * ax * " << scalex << ");\n" << "\t\tvOut.x = " << weight << " * fma(sin(vIn.y * " << freqx << "), ax * ax * " << scalex << ", vIn.x);\n"
<< "\t\tvOut.y = " << weight << " * (y0 + sin(x0 * " << freqy << ") * " << scaley << ");\n" << "\t\tvOut.y = " << weight << " * fma(sin(vIn.x * " << freqy << "), " << scaley << ", vIn.y);\n"
<< "\n" << "\n"
<< "\t\tvOut.z = " << DefaultZCl() << "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n"; << "\t}\n";
@ -6734,6 +6756,7 @@ public:
virtual void Precalc() override virtual void Precalc() override
{ {
m_Yfact001 = m_Yfact * T(0.001);
} }
protected: protected:
@ -6743,10 +6766,11 @@ protected:
m_Params.clear(); m_Params.clear();
m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves4_scalex", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves4_scalex", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves4_scaley", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves4_scaley", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves4_freqx", T(7.0))); m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves4_freqx", T(7.0)));
m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves4_freqy", T(13.0))); m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves4_freqy", T(13.0)));
m_Params.push_back(ParamWithName<T>(&m_Cont, prefix + "waves4_cont", T(0), eParamType::INTEGER, T(0), T(1))); m_Params.push_back(ParamWithName<T>(&m_Cont, prefix + "waves4_cont", T(0), eParamType::INTEGER, T(0), T(1)));
m_Params.push_back(ParamWithName<T>(&m_Yfact, prefix + "waves4_yfact", T(0.1))); m_Params.push_back(ParamWithName<T>(&m_Yfact, prefix + "waves4_yfact", T(0.1)));
m_Params.push_back(ParamWithName<T>(true, &m_Yfact001, prefix + "waves4_yfact001"));//Precalc.
} }
private: private:
@ -6756,6 +6780,7 @@ private:
T m_Freqy; T m_Freqy;
T m_Cont; T m_Cont;
T m_Yfact; T m_Yfact;
T m_Yfact001;//Precalc.
}; };
/// <summary> /// <summary>
@ -6775,35 +6800,33 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T x0 = helper.In.x;
T y0 = helper.In.y;
T sinx, siny; T sinx, siny;
int px = (int)m_Powerx; int px = (int)m_Powerx;
int py = (int)m_Powery; int py = (int)m_Powery;
if (m_Modex < T(0.5)) if (m_Modex < T(0.5))
{ {
sinx = std::sin(y0 * m_Freqx); sinx = std::sin(helper.In.y * m_Freqx);
} }
else else
{ {
sinx = T(0.5) * (T(1.0) + std::sin(y0 * m_Freqx)); sinx = T(0.5) * (T(1.0) + std::sin(helper.In.y * m_Freqx));
} }
T offsetx = std::pow(sinx, px) * m_Scalex; T offsetx = std::pow(sinx, px) * m_Scalex;
if (m_Modey < T(0.5)) if (m_Modey < T(0.5))
{ {
siny = std::sin(x0 * m_Freqy); siny = std::sin(helper.In.x * m_Freqy);
} }
else else
{ {
siny = T(0.5) * (T(1.0) + std::sin(x0 * m_Freqy)); siny = T(0.5) * (T(1.0) + std::sin(helper.In.x * m_Freqy));
} }
T offsety = std::pow(siny, py) * m_Scaley; T offsety = std::pow(siny, py) * m_Scaley;
helper.Out.x = m_Weight * (x0 + offsetx); helper.Out.x = m_Weight * (helper.In.x + offsetx);
helper.Out.y = m_Weight * (y0 + offsety); helper.Out.y = m_Weight * (helper.In.y + offsety);
helper.Out.z = DefaultZ(helper); helper.Out.z = DefaultZ(helper);
} }
@ -6816,34 +6839,31 @@ public:
string weight = WeightDefineString(); string weight = WeightDefineString();
string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string modex = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string modex = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string modey = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string modey = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string powerx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string powerx = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string powery = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string powery = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t x0 = vIn.x;\n"
<< "\t\treal_t y0 = vIn.y;\n"
<< "\n"
<< "\t\treal_t sinx, siny;\n" << "\t\treal_t sinx, siny;\n"
<< "\n" << "\n"
<< "\t\tint px = (int) " << powerx << ";\n" << "\t\tint px = (int) " << powerx << ";\n"
<< "\t\tint py = (int) " << powery << ";\n" << "\t\tint py = (int) " << powery << ";\n"
<< "\t\tif (" << modex << " < (real_t)(0.5)){\n" << "\t\tif (" << modex << " < (real_t)(0.5)){\n"
<< "\t\tsinx = sin(y0 * " << freqx << ");\n" << "\t\tsinx = sin(vIn.y * " << freqx << ");\n"
<< "\t\t} else {\n" << "\t\t} else {\n"
<< "\t\tsinx = (real_t)(0.5) * ((real_t)(1.0) + sin(y0 * " << freqx << "));\n" << "\t\tsinx = (real_t)(0.5) * ((real_t)(1.0) + sin(vIn.y * " << freqx << "));\n"
<< "\t\t}\n" << "\t\t}\n"
<< "\t\treal_t offsetx = pow(sinx, px) * " << scalex << ";\n" << "\t\treal_t offsetx = pow(sinx, px) * " << scalex << ";\n"
<< "\t\tif (" << modey << " < (real_t)(0.5)){\n" << "\t\tif (" << modey << " < (real_t)(0.5)){\n"
<< "\t\tsiny = sin(x0 * " << freqy << ");\n" << "\t\tsiny = sin(vIn.x * " << freqy << ");\n"
<< "\t\t} else {\n" << "\t\t} else {\n"
<< "\t\tsiny = (real_t)(0.5) * ((real_t)(1.0) + sin(x0 * " << freqy << "));\n" << "\t\tsiny = (real_t)(0.5) * ((real_t)(1.0) + sin(vIn.x * " << freqy << "));\n"
<< "\t\t}\n" << "\t\t}\n"
<< "\t\treal_t offsety = pow(siny, py) * " << scaley << ";\n" << "\t\treal_t offsety = pow(siny, py) * " << scaley << ";\n"
<< "\t\tvOut.x = " << weight << " * (x0 + offsetx);\n" << "\t\tvOut.x = " << weight << " * (vIn.x + offsetx);\n"
<< "\t\tvOut.y = " << weight << " * (y0 + offsety);\n" << "\t\tvOut.y = " << weight << " * (vIn.y + offsety);\n"
<< "\n" << "\n"
<< "\t\tvOut.z = " << DefaultZCl() << "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n"; << "\t}\n";
@ -6861,10 +6881,10 @@ protected:
m_Params.clear(); m_Params.clear();
m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves22_scalex", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves22_scalex", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves22_scaley", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves22_scaley", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves22_freqx", T(7.0))); m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves22_freqx", T(7.0)));
m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves22_freqy", T(13.0))); m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves22_freqy", T(13.0)));
m_Params.push_back(ParamWithName<T>(&m_Modex, prefix + "waves22_modex", T(0), eParamType::INTEGER, T(0), T(1))); m_Params.push_back(ParamWithName<T>(&m_Modex, prefix + "waves22_modex", T(0), eParamType::INTEGER, T(0), T(1)));
m_Params.push_back(ParamWithName<T>(&m_Modey, prefix + "waves22_modey", T(0), eParamType::INTEGER, T(0), T(1))); m_Params.push_back(ParamWithName<T>(&m_Modey, prefix + "waves22_modey", T(0), eParamType::INTEGER, T(0), T(1)));
m_Params.push_back(ParamWithName<T>(&m_Powerx, prefix + "waves22_powerx", T(2.0))); m_Params.push_back(ParamWithName<T>(&m_Powerx, prefix + "waves22_powerx", T(2.0)));
m_Params.push_back(ParamWithName<T>(&m_Powery, prefix + "waves22_powery", T(2.0))); m_Params.push_back(ParamWithName<T>(&m_Powery, prefix + "waves22_powery", T(2.0)));
} }
@ -6897,20 +6917,18 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T x0 = helper.In.x; T mx = helper.In.y * m_Freqx12Pi;
T y0 = helper.In.y;
T mx = y0 * m_Freqx * M_1_2PI;
T fx = mx - Floor<T>(mx); T fx = mx - Floor<T>(mx);
if (fx > T(0.5)) fx = T(0.5) - fx; if (fx > T(0.5)) fx = T(0.5) - fx;
T my = x0 * m_Freqy * M_1_2PI; T my = helper.In.x * m_Freqy12Pi;
T fy = my - Floor<T>(my); T fy = my - Floor<T>(my);
if (fy > T(0.5)) fy = T(0.5) - fy; if (fy > T(0.5)) fy = T(0.5) - fy;
helper.Out.x = m_Weight * (x0 + fx * m_Scalex); helper.Out.x = m_Weight * (helper.In.x + fx * m_Scalex);
helper.Out.y = m_Weight * (y0 + fy * m_Scaley); helper.Out.y = m_Weight * (helper.In.y + fy * m_Scaley);
helper.Out.z = DefaultZ(helper); helper.Out.z = DefaultZ(helper);
} }
@ -6921,22 +6939,21 @@ public:
ss2 << "_" << XformIndexInEmber() << "]"; ss2 << "_" << XformIndexInEmber() << "]";
string index = ss2.str(); string index = ss2.str();
string weight = WeightDefineString(); string weight = WeightDefineString();
string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqx12pi = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqy12pi = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t x0 = vIn.x;\n" << "\t\treal_t mx = vIn.y * " << freqx12pi << ";\n"
<< "\t\treal_t y0 = vIn.y;\n"
<< "\n"
<< "\t\treal_t mx = y0 * " << freqx << " * M_1_2PI;\n"
<< "\t\treal_t fx = mx - floor(mx);\n" << "\t\treal_t fx = mx - floor(mx);\n"
<< "\t\tif (fx > (real_t)(0.5)) fx = (real_t)(0.5) - fx;\n" << "\t\tif (fx > (real_t)(0.5)) fx = (real_t)(0.5) - fx;\n"
<< "\t\treal_t my = x0 * " << freqy << " * M_1_2PI;\n" << "\t\treal_t my = vIn.x * " << freqy12pi << ";\n"
<< "\t\treal_t fy = my - floor(my);\n" << "\t\treal_t fy = my - floor(my);\n"
<< "\t\tif (fy > (real_t)(0.5)) fy = (real_t)(0.5) - fy;\n" << "\t\tif (fy > (real_t)(0.5)) fy = (real_t)(0.5) - fy;\n"
<< "\t\tvOut.x = " << weight << " * (x0 + fx * " << scalex << ");\n" << "\t\tvOut.x = " << weight << " * fma(fx, " << scalex << ", vIn.x);\n"
<< "\t\tvOut.y = " << weight << " * (y0 + fy * " << scaley << ");\n" << "\t\tvOut.y = " << weight << " * fma(fy, " << scaley << ", vIn.y);\n"
<< "\n" << "\n"
<< "\t\tvOut.z = " << DefaultZCl() << "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n"; << "\t}\n";
@ -6945,6 +6962,8 @@ public:
virtual void Precalc() override virtual void Precalc() override
{ {
m_Freqx12Pi = m_Freqx * M_1_2PI;
m_Freqy12Pi = m_Freqy * M_1_2PI;
} }
protected: protected:
@ -6954,8 +6973,10 @@ protected:
m_Params.clear(); m_Params.clear();
m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves23_scalex", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves23_scalex", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves23_scaley", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves23_scaley", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves23_freqx", T(7.0))); m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves23_freqx", T(7.0)));
m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves23_freqy", T(13.0))); m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves23_freqy", T(13.0)));
m_Params.push_back(ParamWithName<T>(true, &m_Freqx12Pi, prefix + "waves23_freqx_12pi"));
m_Params.push_back(ParamWithName<T>(true, &m_Freqy12Pi, prefix + "waves23_freqy_12pi"));
} }
private: private:
@ -6963,6 +6984,8 @@ private:
T m_Scaley; T m_Scaley;
T m_Freqx; T m_Freqx;
T m_Freqy; T m_Freqy;
T m_Freqx12Pi;//Precalc.
T m_Freqy12Pi;
}; };
/// <summary> /// <summary>
@ -6982,16 +7005,14 @@ public:
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
{ {
T x0 = helper.In.x; T ax = T(Floor<T>(helper.In.y * m_Freqx2));
T y0 = helper.In.y; ax = std::sin(ax * T(12.9898) + ax * T(78.233) + T(1.0) + helper.In.y * m_Yfact001) * T(43758.5453);
T ax = T(Floor<T>(y0 * m_Freqx2)); ax = ax - int(ax);
ax = std::sin(ax * T(12.9898) + ax * T(78.233) + T(1.0) + y0 * T(0.001) * m_Yfact) * T(43758.5453);
ax = ax - (int)ax;
if (m_Cont == 1) ax = (ax > T(0.5)) ? T(1.0) : T(0.0); if (m_Cont == 1) ax = (ax > T(0.5)) ? T(1.0) : T(0.0);
helper.Out.x = m_Weight * (x0 + std::sin(y0 * m_Freqx) * ax * ax * m_Scalex); helper.Out.x = m_Weight * (helper.In.x + std::sin(helper.In.y * m_Freqx) * ax * ax * m_Scalex);
helper.Out.y = m_Weight * (y0 + std::sin(x0 * m_Freqy) * m_Scaley); helper.Out.y = m_Weight * (helper.In.y + std::sin(helper.In.x * m_Freqy) * m_Scaley);
helper.Out.z = DefaultZ(helper); helper.Out.z = DefaultZ(helper);
} }
@ -7002,24 +7023,22 @@ public:
ss2 << "_" << XformIndexInEmber() << "]"; ss2 << "_" << XformIndexInEmber() << "]";
string index = ss2.str(); string index = ss2.str();
string weight = WeightDefineString(); string weight = WeightDefineString();
string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scalex = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scaley = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqx = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqy = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string cont = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cont = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string yfact = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string yfact = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string freqx2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string freqx2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
string yfact001 = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t x0 = vIn.x;\n" << "\t\treal_t ax = floor(vIn.y * " << freqx2 << ");\n"
<< "\t\treal_t y0 = vIn.y;\n" << "\t\tax = sin(ax * (real_t)(12.9898) + ax * (real_t)(78.233) + (real_t)(1.0) + vIn.y * " << yfact001 << ") * (real_t)(43758.5453);\n"
<< "\n"
<< "\t\treal_t ax = floor(y0 * " << freqx2 << ");\n"
<< "\t\tax = sin(ax * (real_t)(12.9898) + ax * (real_t)(78.233) + (real_t)(1.0) + y0 * (real_t)(0.001) * " << yfact << ") * (real_t)(43758.5453);\n"
<< "\t\tax = ax - (int) ax;\n" << "\t\tax = ax - (int) ax;\n"
<< "\t\tif (" << cont << " == 1) ax = (ax > (real_t)(0.5)) ? (real_t)(1.0) : 0.0;\n" << "\t\tif (" << cont << " == 1) ax = (ax > (real_t)(0.5)) ? (real_t)(1.0) : 0.0;\n"
<< "\n" << "\n"
<< "\t\tvOut.x = " << weight << " * (x0 + sin(y0 * " << freqx << ") * ax * ax * " << scalex << ");\n" << "\t\tvOut.x = " << weight << " * fma(sin(vIn.y * " << freqx << "), ax * ax * " << scalex << ", vIn.x);\n"
<< "\t\tvOut.y = " << weight << " * (y0 + sin(x0 * " << freqy << ") * " << scaley << ");\n" << "\t\tvOut.y = " << weight << " * fma(sin(vIn.x * " << freqy << "), " << scaley << ", vIn.y);\n"
<< "\n" << "\n"
<< "\t\tvOut.z = " << DefaultZCl() << "\t\tvOut.z = " << DefaultZCl()
<< "\t}\n"; << "\t}\n";
@ -7028,6 +7047,7 @@ public:
virtual void Precalc() override virtual void Precalc() override
{ {
m_Yfact001 = m_Yfact * T(0.001);
} }
protected: protected:
@ -7037,11 +7057,12 @@ protected:
m_Params.clear(); m_Params.clear();
m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves42_scalex", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scalex, prefix + "waves42_scalex", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves42_scaley", T(0.05))); m_Params.push_back(ParamWithName<T>(&m_Scaley, prefix + "waves42_scaley", T(0.05)));
m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves42_freqx", T(7.0))); m_Params.push_back(ParamWithName<T>(&m_Freqx, prefix + "waves42_freqx", T(7.0)));
m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves42_freqy", T(13.0))); m_Params.push_back(ParamWithName<T>(&m_Freqy, prefix + "waves42_freqy", T(13.0)));
m_Params.push_back(ParamWithName<T>(&m_Cont, prefix + "waves42_cont", T(0), eParamType::INTEGER, T(0), T(1))); m_Params.push_back(ParamWithName<T>(&m_Cont, prefix + "waves42_cont", T(0), eParamType::INTEGER, T(0), T(1)));
m_Params.push_back(ParamWithName<T>(&m_Yfact, prefix + "waves42_yfact", T(0.1))); m_Params.push_back(ParamWithName<T>(&m_Yfact, prefix + "waves42_yfact", T(0.1)));
m_Params.push_back(ParamWithName<T>(&m_Freqx2, prefix + "waves42_freqx2", T(1.0))); m_Params.push_back(ParamWithName<T>(&m_Freqx2, prefix + "waves42_freqx2", T(1.0)));
m_Params.push_back(ParamWithName<T>(true, &m_Yfact001, prefix + "waves42_yfact001"));//Precalc.
} }
private: private:
@ -7052,6 +7073,7 @@ private:
T m_Cont; T m_Cont;
T m_Yfact; T m_Yfact;
T m_Freqx2; T m_Freqx2;
T m_Yfact001;//Precalc.
}; };
MAKEPREPOSTPARVAR(Splits3D, splits3D, SPLITS3D) MAKEPREPOSTPARVAR(Splits3D, splits3D, SPLITS3D)

4
Source/Ember/XmlToEmber.cpp
View File

@ -198,6 +198,10 @@ XmlToEmber<T>::XmlToEmber()
{ "osco2_amplitude", "oscilloscope2_amplitude" }, { "osco2_amplitude", "oscilloscope2_amplitude" },
{ "osco2_perturbation", "oscilloscope2_perturbation" }, { "osco2_perturbation", "oscilloscope2_perturbation" },
{ "osco2_damping", "oscilloscope2_damping" }, { "osco2_damping", "oscilloscope2_damping" },
{ "oscope_separation", "oscilloscope_separation" },
{ "oscope_frequency", "oscilloscope_frequency" },
{ "oscope_amplitude", "oscilloscope_amplitude" },
{ "oscope_damping", "oscilloscope_damping" },
{ "power", "scry2_power" }, { "power", "scry2_power" },
{ "faber_w_angle", "w_angle" }, { "faber_w_angle", "w_angle" },
{ "faber_w_hypergon", "w_hypergon" }, { "faber_w_hypergon", "w_hypergon" },

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
fractorium (1.0.0.16-0ubuntu1) bionic; urgency=low
* release 1.0.0.16
-- Matt Feemster <matt.feemster@gmail.com> Thu, 16 May 2019 14:58:06 +0100
fractorium (1.0.0.15-0ubuntu1) bionic; urgency=low
* release 1.0.0.15
-- Matt Feemster <matt.feemster@gmail.com> Mon, 13 May 2019 22:46:22 -0700
fractorium (1.0.0.14-0ubuntu1) bionic; urgency=low fractorium (1.0.0.14-0ubuntu1) bionic; urgency=low
* release 1.0.0.14 * release 1.0.0.14