From 066420e2e277aa0fd09dae23691eb15a5e262790 Mon Sep 17 00:00:00 2001 From: Person Date: Fri, 14 Jun 2019 15:45:32 -0700 Subject: [PATCH 1/5] Formatting --- Source/Fractorium/Fractorium.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Fractorium/Fractorium.cpp b/Source/Fractorium/Fractorium.cpp index 9972633..10b8fa9 100644 --- a/Source/Fractorium/Fractorium.cpp +++ b/Source/Fractorium/Fractorium.cpp @@ -404,11 +404,10 @@ bool Fractorium::eventFilter(QObject* o, QEvent* e) } else if (o == this) { - auto focusedctrlSpin = dynamic_cast(this->focusWidget()); + auto focusedctrlSpin = dynamic_cast(this->focusWidget()); + auto focusedctrlDbSpin = dynamic_cast(this->focusWidget()); - auto focusedctrlDbSpin = dynamic_cast(this->focusWidget()); - - if (!focusedctrlSpin && !focusedctrlDbSpin)//Doesn't seem to matter, but just to be safe. + if (!focusedctrlSpin && !focusedctrlDbSpin)//Must exclude these because otherwise, typing a minus key in any of the spinners will switch the xform. { unsigned int index = combo->currentIndex(); From d34e2ffa4a2414ac8fd2745ebc14f23a271109f7 Mon Sep 17 00:00:00 2001 From: Person Date: Tue, 18 Jun 2019 21:29:58 -0700 Subject: [PATCH 2/5] --User changes -Fix xform selection logic to prevent selecting hidden pre and post xforms. -Add hex_modulus. --Bug fixes -starblur was wrong. --Code changes -Optimize Truchet_hex_crop, Truchet_hex_fill. -Cleanup Truchet_inv. -Add new file Variations08.h, and move Gnarly and inkdrop there. --- .../Installer/FractoriumInstaller.wixproj | 2 +- Builds/MSVC/Installer/Product.wxs | 4 +- Builds/MSVC/VS2015/Ember.rc | Bin 4502 -> 0 bytes Builds/MSVC/VS2015/Ember.vcxproj | 172 --- Builds/MSVC/VS2015/Ember.vcxproj.filters | 169 --- Builds/MSVC/VS2015/EmberAnimate.rc | 98 -- Builds/MSVC/VS2015/EmberAnimate.vcxproj | 152 --- .../MSVC/VS2015/EmberAnimate.vcxproj.filters | 62 - Builds/MSVC/VS2015/EmberCL.rc | Bin 4528 -> 0 bytes Builds/MSVC/VS2015/EmberCL.vcxproj | 154 --- Builds/MSVC/VS2015/EmberCL.vcxproj.filters | 89 -- Builds/MSVC/VS2015/EmberGenome.rc | 98 -- Builds/MSVC/VS2015/EmberGenome.vcxproj | 151 --- .../MSVC/VS2015/EmberGenome.vcxproj.filters | 61 - Builds/MSVC/VS2015/EmberRender.rc | 98 -- Builds/MSVC/VS2015/EmberRender.vcxproj | 152 --- .../MSVC/VS2015/EmberRender.vcxproj.filters | 61 - Builds/MSVC/VS2015/EmberTester.vcxproj | 144 --- .../MSVC/VS2015/EmberTester.vcxproj.filters | 48 - Builds/MSVC/VS2015/Fractorium.rc | Bin 4470 -> 0 bytes Builds/MSVC/VS2015/Fractorium.sln | 76 -- Builds/MSVC/VS2015/Fractorium.vcxproj | 770 ------------ Builds/MSVC/VS2015/Fractorium.vcxproj.filters | 489 -------- Builds/MSVC/VS2015/resource.h | 14 - Builds/MSVC/VS2015/resource1.h | 14 - Builds/MSVC/VS2015/zlib.props | 37 - Builds/MSVC/VS2017/Ember.rc | Bin 4522 -> 4522 bytes Builds/MSVC/VS2017/Ember.vcxproj | 1 + Builds/MSVC/VS2017/Ember.vcxproj.filters | 3 + Builds/MSVC/VS2017/EmberAnimate.rc | 8 +- Builds/MSVC/VS2017/EmberCL.rc | Bin 4548 -> 4548 bytes Builds/MSVC/VS2017/EmberGenome.rc | 8 +- Builds/MSVC/VS2017/EmberRender.rc | 8 +- Builds/MSVC/VS2017/Fractorium.rc | Bin 4490 -> 4490 bytes Builds/QtCreator/Ember/Ember.pro | 1 + Builds/QtCreator/defaults.pri | 2 +- Source/Ember/Ember.cpp | 6 +- Source/Ember/EmberDefines.h | 10 +- Source/Ember/Variation.h | 15 +- Source/Ember/VariationList.cpp | 6 +- Source/Ember/Variations02.h | 4 +- Source/Ember/Variations03.h | 24 +- Source/Ember/Variations07.h | 1036 +++++++---------- Source/Ember/Variations08.h | 317 +++++ Source/EmberCL/EmberCLStructs.h | 12 +- Source/Fractorium/AboutDialog.ui | 2 +- Source/Fractorium/GLEmberController.h | 3 +- Source/Fractorium/GLWidget.cpp | 346 ++++-- Source/apoconv/Form1.cs | 14 +- 49 files changed, 1104 insertions(+), 3837 deletions(-) delete mode 100644 Builds/MSVC/VS2015/Ember.rc delete mode 100644 Builds/MSVC/VS2015/Ember.vcxproj delete mode 100644 Builds/MSVC/VS2015/Ember.vcxproj.filters delete mode 100644 Builds/MSVC/VS2015/EmberAnimate.rc delete mode 100644 Builds/MSVC/VS2015/EmberAnimate.vcxproj delete mode 100644 Builds/MSVC/VS2015/EmberAnimate.vcxproj.filters delete mode 100644 Builds/MSVC/VS2015/EmberCL.rc delete mode 100644 Builds/MSVC/VS2015/EmberCL.vcxproj delete mode 100644 Builds/MSVC/VS2015/EmberCL.vcxproj.filters delete mode 100644 Builds/MSVC/VS2015/EmberGenome.rc delete mode 100644 Builds/MSVC/VS2015/EmberGenome.vcxproj delete mode 100644 Builds/MSVC/VS2015/EmberGenome.vcxproj.filters delete mode 100644 Builds/MSVC/VS2015/EmberRender.rc delete mode 100644 Builds/MSVC/VS2015/EmberRender.vcxproj delete mode 100644 Builds/MSVC/VS2015/EmberRender.vcxproj.filters delete mode 100644 Builds/MSVC/VS2015/EmberTester.vcxproj delete mode 100644 Builds/MSVC/VS2015/EmberTester.vcxproj.filters delete mode 100644 Builds/MSVC/VS2015/Fractorium.rc delete mode 100644 Builds/MSVC/VS2015/Fractorium.sln delete mode 100644 Builds/MSVC/VS2015/Fractorium.vcxproj delete mode 100644 Builds/MSVC/VS2015/Fractorium.vcxproj.filters delete mode 100644 Builds/MSVC/VS2015/resource.h delete mode 100644 Builds/MSVC/VS2015/resource1.h delete mode 100644 Builds/MSVC/VS2015/zlib.props create mode 100644 Source/Ember/Variations08.h diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj index 870f5dc..44c6b42 100644 --- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj +++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj @@ -6,7 +6,7 @@ 3.7 {c8096c47-e358-438c-a520-146d46b0637d} 2.0 - Fractorium_1.0.0.16 + Fractorium_1.0.0.17 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index ac023c1..df5b1d0 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + p}p4t<*thnzIyF*Sdf$lljcXs3UdQi9lbJ@Pw`vTZ< zhL@nr4q9B69L<5FCpk9kz*^R}BipuJYg*S1t;X&)^L=aBXLee=_iU4$2J;}Rez7J9|Np3vajer!8)=-8?8U_-bL#z^prhn?6307d+#BCm8bslcxn4Dp2dPh zK02j5#Ak=tCwU#ObkT!9G?$ag`90M^BEl5i<~Hk6FGI^ z?DZ^_TRkXl*bY(UbE-xD9FbjHaPAUa4Tk9cU_^zOZD<@4!(FiU!GGbnmcZR$U1w*5 zw<0y{c*r{IU9$Cqz2d9|+-4y}ms6kDvQCK_A$^LYKsnMun~(6_p2|~Nz*-O@&uir+ zOwNn4J_)0FSXZ%Rew_#qn^>goYDn10*5j(H-^W&&R^<{Fmv6l#1D@*6<9TK8jxt>Q z?UAfTWjm&-9TV^VW{?cpyI-cYzmnB=2fI@EXso3ioySj_npZ% zo2j2r*AS!k2+zz;H1n$tdD;c8MonnB`+A?XY_LNSB#bbwn06O^&Y~hq;Pc8snVtG(?n9wVI65T*6*-_ENwcX10?lutC@3OZ_`jS z-t$#LmAQ$HWuG$KCq#jIz;krJK(js;7$WEBE?e)XAc-sX)=7TKJLLF0RtK-B(~%x! z_^Ttj;?5h|EfICXs?Waek23OIu^KXO0T=q%Ksik*NWBe4vd{H#9Vl+XK|YJz9ej$; zCp@>TrRkWjDwgj?f<1I5xHES*tLq+s?In%x^vstgon1i+RpZL^d0jw3)>l_B=Br+R z-ZnKXb?VNSiKt6PzFiu?oI47#^%c5GuXDPO2^ika*%NgpTdq^s19!rRh>JesEB5np zsZXtt$!{E$IKmDsFG+LCSy3j9g2%Kjr{hDpl#ZS@n97J4E6MuF7*;LwnI_*=oewJ0YLYLRDoye2_J2Ck z#k=i-MAAO__}YKp|3>z9U;I8(+WH$svw!{nRL_ - - - - Debug - x64 - - - Release - x64 - - - - {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67} - Win32Proj - EmberNs - Ember - - - - DynamicLibrary - true - MultiByte - false - v140 - - - DynamicLibrary - false - false - MultiByte - v140 - - - - - - - - - - - - - true - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - false - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_EMBER;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - - - $(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\tbb\include - Default - EmberPch.h - Precise - /bigobj %(AdditionalOptions) - true - false - true - false - AnySuitable - true - - - Windows - true - libxml2.lib;tbb.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;%(AdditionalLibraryDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBER;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - - - $(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\tbb\include - Speed - EmberPch.h - true - /bigobj %(AdditionalOptions) - Precise - true - false - false - false - true - - - Windows - true - true - true - libxml2.lib;tbb.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/Ember.vcxproj.filters b/Builds/MSVC/VS2015/Ember.vcxproj.filters deleted file mode 100644 index e19c36a..0000000 --- a/Builds/MSVC/VS2015/Ember.vcxproj.filters +++ /dev/null @@ -1,169 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {bc119dca-b280-4071-b72d-f8c377b2e192} - - - {39f9b624-d25e-4af7-9f76-3b1a36a8a0f5} - - - {1ae77918-b5ee-4186-9fec-802fed55144e} - - - {782f9ed7-c2d4-4cad-9676-f707ccde10a6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Filters - - - Header Files\Filters - - - Header Files\Filters - - - Header Files\Xml - - - Header Files\Xml - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Variations - - - Header Files\Variations - - - Header Files\Variations - - - Header Files\Variations - - - Header Files\Variations - - - Header Files\Variations - - - Header Files\Variations - - - Header Files\Variations - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Variations - - - Header Files - - - Header Files\Variations - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files\Variations - - - Header Files\Xml - - - Header Files\Xml - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberAnimate.rc b/Builds/MSVC/VS2015/EmberAnimate.rc deleted file mode 100644 index 3731628..0000000 --- a/Builds/MSVC/VS2015/EmberAnimate.rc +++ /dev/null @@ -1,98 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include -#include "resource.h" -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - #pragma code_page(1252) - - ///////////////////////////////////////////////////////////////////////////// - // - // Icon - // - - // Icon with lowest ID value placed first to ensure application icon - // remains consistent on all systems. - IDI_ICON1 ICON "..\\..\\..\\Source\\Fractorium\\Icons\\Fractorium.ico" - - #ifdef APSTUDIO_INVOKED - ///////////////////////////////////////////////////////////////////////////// - // - // TEXTINCLUDE - // - - 1 TEXTINCLUDE - BEGIN - "resource.h\0" - END - - 2 TEXTINCLUDE - BEGIN - "\0" - END - - 3 TEXTINCLUDE - BEGIN - "\r\n" - "\0" - END - - #endif // APSTUDIO_INVOKED - - - ///////////////////////////////////////////////////////////////////////////// - // - // Version - // - - VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 6 - PRODUCTVERSION 1, 0, 0, 6 - FILEFLAGSMASK 0x3fL - #ifdef _DEBUG - FILEFLAGS 0x1L - #else - FILEFLAGS 0x0L - #endif - FILEOS 0x40004L - FILETYPE 0x0L - FILESUBTYPE 0x0L - BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Open Source" - VALUE "FileDescription", "Renders fractal flames as animations with motion blur" - VALUE "FileVersion", "1.0.0.6" - VALUE "InternalName", "EmberAnimate.exe" - VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2017, GPL v3" - VALUE "OriginalFilename", "EmberAnimate.exe" - VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "1.0.0.6" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END - END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED - ///////////////////////////////////////////////////////////////////////////// - // - // Generated from the TEXTINCLUDE 3 resource. - // - - - ///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Builds/MSVC/VS2015/EmberAnimate.vcxproj b/Builds/MSVC/VS2015/EmberAnimate.vcxproj deleted file mode 100644 index 30ebc7a..0000000 --- a/Builds/MSVC/VS2015/EmberAnimate.vcxproj +++ /dev/null @@ -1,152 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {35285FCF-6FA8-410E-841B-70AE744D38B8} - Win32Proj - EmberAnimate - EmberAnimate - - - - Application - true - MultiByte - false - v140 - - - Application - false - false - MultiByte - v140 - - - - - - - - - - - - - true - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - false - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - - - EmberCommonPch.h - true - false - true - false - AnySuitable - true - - - Console - true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - - - EmberCommonPch.h - true - true - false - false - true - - - Console - true - true - true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - - - - - - - - - - {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} - - - {f6a9102c-69a9-48fb-bc4b-49e49af43236} - - - - - - - - - - - - - - - - Create - Create - - - - - - - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberAnimate.vcxproj.filters b/Builds/MSVC/VS2015/EmberAnimate.vcxproj.filters deleted file mode 100644 index 5b0a143..0000000 --- a/Builds/MSVC/VS2015/EmberAnimate.vcxproj.filters +++ /dev/null @@ -1,62 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - - Resource Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberCL.rc b/Builds/MSVC/VS2015/EmberCL.rc deleted file mode 100644 index 5b2acf1b16547a6747ac25501c64081898ef522f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4528 zcmd6qTTdE66vxjiP5K?S_)^nGL5)q5rimA%rYJ^`w228(0c&ExuuyB#&))X;pJ8Md z77VrzWU{++IrrO~{quX>)-AFlyRj?lThC&ijt$sruov6VF6@@op1om2c5Q9z^7Pps z@NKcz=PSG+vn%EiD^a_#J7CuArM-a5y8EuM+vW5Y=$3>1VE1mX1%-Ps*X)~poB^Ak z;w9+3gBF(+N3-MTNsb*mv6|KG%=Ycjs@AkqE3v!J{Mah?m7N;zBim)C!aT?-d6#bl z>B2X%GB%v_M+YnQ>^u4ou#W6dN9!-V57BxLJ!Ov)`x`uy-h0Yl`H{aoUfTZ4XR#oW zkB%X>Qq*hsG%}+yv_w{8h&_2ks8*GCMoG z6{%szLzY<|lC7WYEoU|0c4tB~IrVuh>*S~r(r0!QC`TG-^BKPTBYAR5SPMerd9A#J z$@#3TPr_&()E*2@f8WMK0>+!i2Mm0Hyz2#YN$AG1(vpA>enqfJyRDB|%LWHzqbMX#!oJ5n0ItG$8YZ%$s}F_5dway~ z1TIzL@{EdAUjQ#~I&k%-jHE}@s2bHGBEo*!Cbgw9;*qX2s){A*)EPPCrOu(5mwQaj zQz<5Bw5j4T)_V%4kiyYDr#hFmPZdc$hb^Sl*m}eYvefB^PLR~YZA_i}YMX`{^Pa2` zs>@YuEc@i)J|GIz0bZl~4VtyFKo>cCkJ&n(f+Q~3dnfrN?~vn@SPi_QK1X`w;jez^ zjvKFQ4@A@jt2X<(J@UwR$EwS`23+W31LZWOAoV^N$u8H&b)Z;5w@Wm=;CXu!7D6cjfM5b=n=Q;^m834PDO2UeTkR>fq)}m(I2zRgvDhFnYFUP>?s&BlP*I z^PjX;3Cmr&b4jsAl-)A2rKtdS?WoB9cUVGNU(=5a!0@)8K2fi-=X!@Da0iTtSZOo9 zV+${vI@bc({mxM-6R#DZevp0Hl2k{W6?xJscu}ilBrKxc2{e1?KXksEZ>Maj(i9f) z+4xRP-mf{=1&y<-8%in=YTYuYV_OE}Y>c_JGOvjyWu<5efW_ILvsUWIv M)BmE=5g={<0tT5O>i_@% diff --git a/Builds/MSVC/VS2015/EmberCL.vcxproj b/Builds/MSVC/VS2015/EmberCL.vcxproj deleted file mode 100644 index 04229f9..0000000 --- a/Builds/MSVC/VS2015/EmberCL.vcxproj +++ /dev/null @@ -1,154 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {F6A9102C-69A9-48FB-BC4B-49E49AF43236} - Win32Proj - EmberCLns - EmberCL - - - - DynamicLibrary - true - MultiByte - false - v140 - - - DynamicLibrary - false - false - MultiByte - v140 - - - - - - - - - - - - - true - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(Platform)\$(Configuration)\ - - - false - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_EMBERCL;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - - - $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - Default - EmberCLPch.h - true - false - true - false - AnySuitable - true - - - Windows - true - libxml2.lib;tbb.lib;opencl.lib;Opengl32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBERCL;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - - - $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - Speed - EmberCLPch.h - /bigobj %(AdditionalOptions) - Precise - true - false - true - false - true - - - Windows - true - true - true - libxml2.lib;tbb.lib;opencl.lib;Opengl32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - - - {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} - true - true - false - true - false - - - - - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberCL.vcxproj.filters b/Builds/MSVC/VS2015/EmberCL.vcxproj.filters deleted file mode 100644 index 9fb2fd9..0000000 --- a/Builds/MSVC/VS2015/EmberCL.vcxproj.filters +++ /dev/null @@ -1,89 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {d66f35ca-a4cd-470a-9c56-653b0665b598} - - - - - Source Files - - - Source Files - - - Source Files - - - Kernel Creators - - - Kernel Creators - - - Kernel Creators - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Kernel Creators - - - Kernel Creators - - - Kernel Creators - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberGenome.rc b/Builds/MSVC/VS2015/EmberGenome.rc deleted file mode 100644 index 8e33d9c..0000000 --- a/Builds/MSVC/VS2015/EmberGenome.rc +++ /dev/null @@ -1,98 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include -#include "resource.h" -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - #pragma code_page(1252) - - ///////////////////////////////////////////////////////////////////////////// - // - // Icon - // - - // Icon with lowest ID value placed first to ensure application icon - // remains consistent on all systems. - IDI_ICON1 ICON "..\\..\\..\\Source\\Fractorium\\Icons\\Fractorium.ico" - - #ifdef APSTUDIO_INVOKED - ///////////////////////////////////////////////////////////////////////////// - // - // TEXTINCLUDE - // - - 1 TEXTINCLUDE - BEGIN - "resource.h\0" - END - - 2 TEXTINCLUDE - BEGIN - "\0" - END - - 3 TEXTINCLUDE - BEGIN - "\r\n" - "\0" - END - - #endif // APSTUDIO_INVOKED - - - ///////////////////////////////////////////////////////////////////////////// - // - // Version - // - - VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 6 - PRODUCTVERSION 1, 0, 0, 6 - FILEFLAGSMASK 0x3fL - #ifdef _DEBUG - FILEFLAGS 0x1L - #else - FILEFLAGS 0x0L - #endif - FILEOS 0x40004L - FILETYPE 0x0L - FILESUBTYPE 0x0L - BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Open Source" - VALUE "FileDescription", "Manipulates fractal flames parameter files" - VALUE "FileVersion", "1.0.0.6" - VALUE "InternalName", "EmberGenome.exe" - VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2017, GPL v3" - VALUE "OriginalFilename", "EmberGenome.exe" - VALUE "ProductName", "Ember Genome" - VALUE "ProductVersion", "1.0.0.6" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END - END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED - ///////////////////////////////////////////////////////////////////////////// - // - // Generated from the TEXTINCLUDE 3 resource. - // - - - ///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Builds/MSVC/VS2015/EmberGenome.vcxproj b/Builds/MSVC/VS2015/EmberGenome.vcxproj deleted file mode 100644 index 5842ca0..0000000 --- a/Builds/MSVC/VS2015/EmberGenome.vcxproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {7930CAAC-9FC4-4202-B6A3-E760F73F88B7} - Win32Proj - EmberGenome - EmberGenome - - - - Application - true - MultiByte - false - v140 - - - Application - false - false - MultiByte - v140 - - - - - - - - - - - - - true - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - false - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - - - EmberCommonPch.h - true - false - true - false - AnySuitable - true - - - Console - true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - - - EmberCommonPch.h - true - true - false - false - true - - - Console - true - true - true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - - - - - - - - - {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} - - - {f6a9102c-69a9-48fb-bc4b-49e49af43236} - - - - - - - - - - - - - - - Create - Create - - - - - - - - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberGenome.vcxproj.filters b/Builds/MSVC/VS2015/EmberGenome.vcxproj.filters deleted file mode 100644 index 3d1270f..0000000 --- a/Builds/MSVC/VS2015/EmberGenome.vcxproj.filters +++ /dev/null @@ -1,61 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Resource Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberRender.rc b/Builds/MSVC/VS2015/EmberRender.rc deleted file mode 100644 index b0ced61..0000000 --- a/Builds/MSVC/VS2015/EmberRender.rc +++ /dev/null @@ -1,98 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include -#include "resource.h" -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - #pragma code_page(1252) - - ///////////////////////////////////////////////////////////////////////////// - // - // Icon - // - - // Icon with lowest ID value placed first to ensure application icon - // remains consistent on all systems. - IDI_ICON1 ICON "..\\..\\..\\Source\\Fractorium\\Icons\\Fractorium.ico" - - #ifdef APSTUDIO_INVOKED - ///////////////////////////////////////////////////////////////////////////// - // - // TEXTINCLUDE - // - - 1 TEXTINCLUDE - BEGIN - "resource.h\0" - END - - 2 TEXTINCLUDE - BEGIN - "\0" - END - - 3 TEXTINCLUDE - BEGIN - "\r\n" - "\0" - END - - #endif // APSTUDIO_INVOKED - - - ///////////////////////////////////////////////////////////////////////////// - // - // Version - // - - VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 6 - PRODUCTVERSION 1, 0, 0, 6 - FILEFLAGSMASK 0x3fL - #ifdef _DEBUG - FILEFLAGS 0x1L - #else - FILEFLAGS 0x0L - #endif - FILEOS 0x40004L - FILETYPE 0x0L - FILESUBTYPE 0x0L - BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Open Source" - VALUE "FileDescription", "Renders fractal flames as single images" - VALUE "FileVersion", "1.0.0.6" - VALUE "InternalName", "EmberRender.exe" - VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2017, GPL v3" - VALUE "OriginalFilename", "EmberRender.exe" - VALUE "ProductName", "Ember Render" - VALUE "ProductVersion", "1.0.0.6" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END - END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED - ///////////////////////////////////////////////////////////////////////////// - // - // Generated from the TEXTINCLUDE 3 resource. - // - - - ///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Builds/MSVC/VS2015/EmberRender.vcxproj b/Builds/MSVC/VS2015/EmberRender.vcxproj deleted file mode 100644 index fa55163..0000000 --- a/Builds/MSVC/VS2015/EmberRender.vcxproj +++ /dev/null @@ -1,152 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29} - Win32Proj - EmberRender - EmberRender - - - - Application - true - MultiByte - false - v140 - - - Application - false - false - MultiByte - v140 - - - - - - - - - - - - - true - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - false - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - - - EmberCommonPch.h - true - false - true - false - AnySuitable - true - - - Console - true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - - - EmberCommonPch.h - Precise - true - false - true - false - true - - - Console - true - true - true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - - - - - - - - - {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} - - - {f6a9102c-69a9-48fb-bc4b-49e49af43236} - - - - - - - - - - - - - - - Create - Create - - - - - - - - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberRender.vcxproj.filters b/Builds/MSVC/VS2015/EmberRender.vcxproj.filters deleted file mode 100644 index 8b02474..0000000 --- a/Builds/MSVC/VS2015/EmberRender.vcxproj.filters +++ /dev/null @@ -1,61 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Resource Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberTester.vcxproj b/Builds/MSVC/VS2015/EmberTester.vcxproj deleted file mode 100644 index 048f053..0000000 --- a/Builds/MSVC/VS2015/EmberTester.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {320F611A-F9CE-4196-A8DC-FA24B2E8A320} - Win32Proj - EmberTester - EmberTester - - - - Application - true - MultiByte - false - v140 - - - Application - false - false - MultiByte - v140 - - - - - - - - - - - - - true - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - false - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;OPENEXR_DLL;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - - - EmberCommonPch.h - true - false - true - false - AnySuitable - true - - - Console - true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;OPENEXR_DLL;%(PreprocessorDefinitions) - $(TargetDir)$(TargetName).pdb - $(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include - - - EmberCommonPch.h - true - true - false - false - true - - - Console - true - true - true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - - - - - - {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} - - - {f6a9102c-69a9-48fb-bc4b-49e49af43236} - - - - - - - - - - - - - - Create - Create - - - - - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/EmberTester.vcxproj.filters b/Builds/MSVC/VS2015/EmberTester.vcxproj.filters deleted file mode 100644 index be5b41b..0000000 --- a/Builds/MSVC/VS2015/EmberTester.vcxproj.filters +++ /dev/null @@ -1,48 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/Fractorium.rc b/Builds/MSVC/VS2015/Fractorium.rc deleted file mode 100644 index 37fce87e77a31cabcda4417d5c7f9f5ed415834e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4470 zcmd6rU2hsk6o$_&k@_Dt=^gkhD^Nd)wzd zvje*}*rv(_8ZEOkbG|=k`S+h)+qJ|F?8?q;YS)(X3~a_;pS{%Pc4|XbAM80Ju}izK zG0&9!8S^=NQ)c1Kc{}4hVI^u;HUVbGezHe!+4cDeyJJp=K%YD8FZSK{&Y|!f%pLn` zzpjBT-{K|c@`8i7Y~P6bCssrEOLUiIzhbAScFfMz!jfIyf?ZR4w!*ThYbtuO;{b@q zZpDFHP~LcIdseqU?8J`X*0l~Cj__WMoqcODME7q-vKF%kjU#J-QL{Gq&zx%s+&$I} zcJ}zKK_Tu0$Oh{sJU`kC&bq+8Ukh=8Ega#vAv znF3J{ibOe;LF9kP9pR$%LqAQ7nCAvd~viPs;bi^F;xa3kdiH#;v)gd0LK;AVX z++8sFvof4^>@(x$+(o`vV{~4}4ziYPqiQp^k>f?*q`q1OwUgN>RF2@akWs2h%Bwv) zBtCmY={}lvT;Db|v17jx`TLotw?A(4ksICu8inT6AQy;xmr9$;7!h}_yOgbTVYIK#ZXHz@Nr#kthn@0Xb zQK|iaTL-?yc@ZWdD%E2ux!<=L#vxofMAk8}-P-^!a;kgJY9Q$WRiI10i_f3-8o#zO z9>rRr&RV0_9g_t?>Jl0RxtG)em1>U01ywf1diUW}3OHl>wqmSkpAM1+4sVcFR5kT&>9eF7&qK#v2X!;c)!RGRSoSHyedaY-_nSKM4biJf{tT$ip~{x9P_a%F zDM;dqy>rRG@VgGHk5^Q)q(>S4*HrxpePB$tYBP`ET=uvqBj1FTdRo4BM9M`R>K3mxK_KEJZAN+oK0Pc*D5DOO! z-5-L4iM>Lfs{QO9Y7mbtpuUk^t0n1VoON%JZqZ9x4w&zT%9DI%_0e>?(EGleD*CYprZOY-n2a~X5L>DNA>&j@tL~Rd77eQ3i# zazEzVX8XEclt|j=pU?wTjW@Y5MrzwPhdLm+mTw6iP4%<*y+82G84)%5s?nFo>RVev fR^R@2Abv+gPSK{@ewSV!`D5ycYTZM=8KmuhjPxTZ diff --git a/Builds/MSVC/VS2015/Fractorium.sln b/Builds/MSVC/VS2015/Fractorium.sln deleted file mode 100644 index fe074a1..0000000 --- a/Builds/MSVC/VS2015/Fractorium.sln +++ /dev/null @@ -1,76 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ember", "Ember.vcxproj", "{2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberTester", "EmberTester.vcxproj", "{320F611A-F9CE-4196-A8DC-FA24B2E8A320}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fractorium", "Fractorium.vcxproj", "{6547D5FA-64CE-44BA-9D3C-B6E217456445}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberRender", "EmberRender.vcxproj", "{4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberAnimate", "EmberAnimate.vcxproj", "{35285FCF-6FA8-410E-841B-70AE744D38B8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberGenome", "EmberGenome.vcxproj", "{7930CAAC-9FC4-4202-B6A3-E760F73F88B7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberCL", "EmberCL.vcxproj", "{F6A9102C-69A9-48FB-BC4B-49E49AF43236}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "FractoriumInstaller", "..\Installer\FractoriumInstaller.wixproj", "{C8096C47-E358-438C-A520-146D46B0637D}" - ProjectSection(ProjectDependencies) = postProject - {F6A9102C-69A9-48FB-BC4B-49E49AF43236} = {F6A9102C-69A9-48FB-BC4B-49E49AF43236} - {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29} = {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29} - {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67} = {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67} - {7930CAAC-9FC4-4202-B6A3-E760F73F88B7} = {7930CAAC-9FC4-4202-B6A3-E760F73F88B7} - {35285FCF-6FA8-410E-841B-70AE744D38B8} = {35285FCF-6FA8-410E-841B-70AE744D38B8} - {6547D5FA-64CE-44BA-9D3C-B6E217456445} = {6547D5FA-64CE-44BA-9D3C-B6E217456445} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CD06D80-903E-45D6-90F3-3C3EB4FFE46F}" - ProjectSection(SolutionItems) = preProject - ..\..\..\Data\Version History.txt = ..\..\..\Data\Version History.txt - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug|x64.ActiveCfg = Debug|x64 - {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug|x64.Build.0 = Debug|x64 - {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|x64.ActiveCfg = Release|x64 - {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|x64.Build.0 = Release|x64 - {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug|x64.ActiveCfg = Debug|x64 - {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug|x64.Build.0 = Debug|x64 - {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release|x64.ActiveCfg = Release|x64 - {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release|x64.Build.0 = Release|x64 - {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug|x64.ActiveCfg = Debug|x64 - {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug|x64.Build.0 = Debug|x64 - {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|x64.ActiveCfg = Release|x64 - {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|x64.Build.0 = Release|x64 - {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug|x64.ActiveCfg = Debug|x64 - {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug|x64.Build.0 = Debug|x64 - {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|x64.ActiveCfg = Release|x64 - {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|x64.Build.0 = Release|x64 - {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug|x64.ActiveCfg = Debug|x64 - {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug|x64.Build.0 = Debug|x64 - {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|x64.ActiveCfg = Release|x64 - {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|x64.Build.0 = Release|x64 - {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug|x64.ActiveCfg = Debug|x64 - {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug|x64.Build.0 = Debug|x64 - {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|x64.ActiveCfg = Release|x64 - {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|x64.Build.0 = Release|x64 - {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug|x64.ActiveCfg = Debug|x64 - {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug|x64.Build.0 = Debug|x64 - {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|x64.ActiveCfg = Release|x64 - {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|x64.Build.0 = Release|x64 - {C8096C47-E358-438C-A520-146D46B0637D}.Debug|x64.ActiveCfg = Debug|x64 - {C8096C47-E358-438C-A520-146D46B0637D}.Release|x64.ActiveCfg = Release|x64 - {C8096C47-E358-438C-A520-146D46B0637D}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Builds/MSVC/VS2015/Fractorium.vcxproj b/Builds/MSVC/VS2015/Fractorium.vcxproj deleted file mode 100644 index bc3b776..0000000 --- a/Builds/MSVC/VS2015/Fractorium.vcxproj +++ /dev/null @@ -1,770 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {6547D5FA-64CE-44BA-9D3C-B6E217456445} - Qt4VSv1.0 - - - - Application - MultiByte - v140 - - - Application - MultiByte - v140 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - AllRules.ruleset - - - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ - - - true - - - true - - - - UNICODE;WIN32;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_HELP_LIB;QT_OPENGL_LIB;QT_WIDGETS_LIB;QT_XML_LIB;%(PreprocessorDefinitions) - .;.\PaletteEditor;$(QTDIR)\include;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName;$(QTDIR)\..\qtmultimedia\include\QtMultimedia;$(QTDIR)\..\qtmultimedia\include;$(QTDIR)\..\qttools\include;$(QTDIR)\..\qttools\include\QtHelp;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtOpenGL;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;.\GeneratedFiles;$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\Fractorium;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) - Disabled - ProgramDatabase - MultiThreadedDebugDLL - false - Use - FractoriumPch.h - $(IntDir)$(TargetName).pch - $(TargetDir)$(TargetName).pdb - - - /bigobj -Zm150 %(AdditionalOptions) - true - true - false - Level3 - AnySuitable - true - - - Windows - $(OutDir)\$(ProjectName).exe - $(ProjectDir)..\..\..\Deps;$(QTDIR)\lib;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName);%(AdditionalLibraryDirectories) - true - qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5OpenGLd.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;Ws2_32.lib;libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;%(AdditionalDependencies) - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\boxtail_pack_02.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\boxtail_pack_03_triangle.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\boxtail_pack_04_mineshack.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fardareismai_pack_01_variety_number_128.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fardareismai_pack_02_b_sides.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fardareismai_pack_03_old_and_new.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fardareismai_pack_04_hoard.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fractaldesire_pack_01.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\rce_ordinary_pack_01_colornation.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_01.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_02_colder.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_02_dark.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_02_warmer.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_03.gradient" "$(OutDir)" - -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\dark_windows.qss" "$(OutDir)" - -xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Cored.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Guid.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Widgetsd.dll" "$(OutDir)" - -xcopy /F /Y /R /D "$(QTDIR)\plugins\platforms\qwindowsd.dll" "$(OutDir)\platforms\" - - - - - - UNICODE;WIN32;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_HELP_LIB;QT_OPENGL_LIB;QT_WIDGETS_LIB;QT_XML_LIB;%(PreprocessorDefinitions) - .;.\PaletteEditor;$(QTDIR)\include;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles;$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName;$(QTDIR)\..\qtmultimedia\include\QtMultimedia;$(QTDIR)\..\qtmultimedia\include;$(QTDIR)\..\qttools\include;$(QTDIR)\..\qttools\include\QtHelp;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtOpenGL;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;.\GeneratedFiles;$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\Fractorium;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\Deps\include\OpenEXR;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) - ProgramDatabase - MultiThreadedDLL - false - Use - FractoriumPch.h - $(IntDir)$(TargetName).pch - $(TargetDir)$(TargetName).pdb - - - true - true - false - /bigobj -Zm150 %(AdditionalOptions) - false - Level3 - true - - - Windows - $(OutDir)\$(ProjectName).exe - $(ProjectDir)..\..\..\Deps;$(QTDIR)\lib;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName);%(AdditionalLibraryDirectories) - true - qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgets.lib;Ws2_32.lib;libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;%(AdditionalDependencies) - 0.1 - - - xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" - -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\boxtail_pack_02.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\boxtail_pack_03_triangle.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\boxtail_pack_04_mineshack.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fardareismai_pack_01_variety_number_128.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fardareismai_pack_02_b_sides.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fardareismai_pack_03_old_and_new.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fardareismai_pack_04_hoard.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\fractaldesire_pack_01.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\rce_ordinary_pack_01_colornation.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_01.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_02_colder.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_02_dark.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_02_warmer.gradient" "$(OutDir)" -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\tatasz_pack_03.gradient" "$(OutDir)" - -xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\dark_windows.qss" "$(OutDir)" - -xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Core.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Gui.dll" "$(OutDir)" -xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Widgets.dll" "$(OutDir)" - -xcopy /F /Y /R /D "$(QTDIR)\plugins\platforms\qwindows.dll" "$(OutDir)\platforms\" - - - - - Use - Use - - - - - - - Use - Use - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - Moc%27ing VariationsDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/VariationsDialog.h" - Moc%27ing VariationsDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/VariationsDialog.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - Moc%27ing QssDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/QssDialog.h" - Moc%27ing QssDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/QssDialog.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - Moc%27ing csshighlighter.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/csshighlighter.h" - Moc%27ing csshighlighter.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/csshighlighter.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing LibraryTreeWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/LibraryTreeWidget.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing LibraryTreeWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/LibraryTreeWidget.h" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ColorPanel.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/ColorPanel.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ColorPanel.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/ColorPanel.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ColorPickerWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/ColorPickerWidget.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ColorPickerWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/ColorPickerWidget.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ColorTriangle.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/ColorTriangle.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ColorTriangle.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/ColorTriangle.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing GradientColorsView.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/GradientColorsView.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing GradientColorsView.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/GradientColorsView.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing PaletteEditor.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/PaletteEditor.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing PaletteEditor.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/PaletteEditor/PaletteEditor.h" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." - - - - - Moc%27ing QssTextEdit.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/QssTextEdit.h" - Moc%27ing QssTextEdit.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/QssTextEdit.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - - - - Moc%27ing OptionsDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/OptionsDialog.h" - Moc%27ing OptionsDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/OptionsDialog.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - Moc%27ing AboutDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/AboutDialog.h" - Moc%27ing AboutDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/AboutDialog.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - Moc%27ing FinalRenderDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FinalRenderDialog.h" - Moc%27ing FinalRenderDialog.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FinalRenderDialog.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - %(AdditionalInputs) - - - - - - - %(AdditionalInputs) - - - - - - - - - Moc%27ing FractoriumSettings.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FractoriumSettings.h" - Moc%27ing FractoriumSettings.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FractoriumSettings.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - Moc%27ing TwoButtonComboWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TwoButtonComboWidget.h" - Moc%27ing TwoButtonComboWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TwoButtonComboWidget.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - - Moc%27ing CurvesGraphicsView.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/CurvesGraphicsView.h" - Moc%27ing CurvesGraphicsView.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/CurvesGraphicsView.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - Moc%27ing DoubleSpinBoxTableItemDelegate.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBoxTableItemDelegate.h" - Moc%27ing DoubleSpinBoxTableItemDelegate.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBoxTableItemDelegate.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - - - - - - - - - - Moc%27ing GLWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/GLWidget.h" - Moc%27ing GLWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/GLWidget.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - - Moc%27ing DoubleSpinBox.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBox.h" - Moc%27ing DoubleSpinBox.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBox.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - Moc%27ing SpinBox.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/SpinBox.h" - Moc%27ing SpinBox.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/SpinBox.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - Moc%27ing StealthComboBox.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/StealthComboBox.h" - Moc%27ing StealthComboBox.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/StealthComboBox.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - - %(AdditionalInputs) - - - - - - - %(AdditionalInputs) - - - - - - - - - Moc%27ing TableWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TableWidget.h" - Moc%27ing TableWidget.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TableWidget.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - - Moc%27ing Fractorium.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/Fractorium.h" - Moc%27ing Fractorium.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_HELP_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -D_MBCS "-I." "-I.\PaletteEditor" "-I$(QTDIR)\include" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles" "-I$(ProjectDir)..\..\..\Fractorium\GeneratedFiles\ConfigurationName" "-I$(QTDIR)\..\qtmultimedia\include\QtMultimedia" "-I$(QTDIR)\..\qtmultimedia\include" "-I$(QTDIR)\..\qttools\include" "-I$(QTDIR)\..\qttools\include\QtHelp" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtXml" "-I.\GeneratedFiles" "-I$(ProjectDir)..\..\..\Source\Ember" "-I$(ProjectDir)..\..\..\Source\EmberCL" "-I$(ProjectDir)..\..\..\Source\EmberCommon" "-I$(ProjectDir)..\..\..\Source\Fractorium" "-I$(ProjectDir)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/Fractorium.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - - - - - - Document - %(FullPath);%(AdditionalInputs) - Rcc%27ing %(Identity)... - .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp - %(FullPath);%(AdditionalInputs) - Rcc%27ing %(Identity)... - .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp - Designer - - - - - Document - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - Designer - - - - - {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} - - - {f6a9102c-69a9-48fb-bc4b-49e49af43236} - - - - - Document - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - - - Document - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - Designer - - - - - Document - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/Fractorium.vcxproj.filters b/Builds/MSVC/VS2015/Fractorium.vcxproj.filters deleted file mode 100644 index 5a528cc..0000000 --- a/Builds/MSVC/VS2015/Fractorium.vcxproj.filters +++ /dev/null @@ -1,489 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;cxx;c;def - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h - - - {99349809-55BA-4b9d-BF79-8FDBB0286EB3} - ui - - - {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E} - qrc;* - false - - - {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11} - moc;h;cpp - False - - - {44a6e761-1e1f-46ce-820d-b80d1c0265ae} - cpp;moc - False - - - {cc25f297-1a73-4c08-9b5f-8dad7c7c7452} - cpp;moc - False - - - {d61ea4d8-e7a6-4d86-934e-992611e1c181} - - - {84e24710-0e4f-4aa3-9f74-82cd2a3b39a7} - - - {5555e39d-b8d2-4bac-bf6c-6763228b15bc} - - - {26fa32d9-268c-4021-8398-d40d46344dff} - - - {811962f9-51c1-48ba-a9da-f5ce981aea71} - - - {5ba9fccd-8922-4037-956f-d57177a43700} - - - {30bfa226-b712-471b-a4ff-cf01d10cf1f4} - - - - - Source Files - - - Generated Files - - - Source Files - - - Widgets - - - Widgets - - - Dialogs - - - Dialogs - - - Dialogs - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - MainWindows - - - Source Files - - - MainWindows - - - Controllers - - - Controllers - - - Controllers - - - Widgets - - - MainWindows - - - MainWindows - - - Dialogs - - - Dialogs\Qss - - - Dialogs\Qss - - - Dialogs\Qss - - - Dialogs\Qss - - - Dialogs\Qss - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Generated Files\Debug - - - Generated Files\Release - - - Widgets - - - Dialogs\PaletteEditor - - - Generated Files\Debug - - - Generated Files\Release - - - Dialogs\PaletteEditor - - - Generated Files\Debug - - - Generated Files\Release - - - Dialogs\PaletteEditor - - - Generated Files\Debug - - - Generated Files\Release - - - Dialogs\PaletteEditor - - - Generated Files\Debug - - - Generated Files\Release - - - Dialogs\PaletteEditor - - - Generated Files\Debug - - - Generated Files\Release - - - - - Generated Files - - - Glm - - - Header Files - - - Header Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Header Files - - - Controllers - - - Controllers - - - Controllers - - - Header Files - - - Header Files - - - Widgets - - - Generated Files - - - Generated Files - - - Dialogs\Qss - - - Dialogs\Qss - - - Dialogs\PaletteEditor - - - Generated Files - - - - - Resource Files - - - Form Files - - - Form Files - - - Form Files - - - Form Files - - - Widgets - - - Widgets - - - Widgets - - - Dialogs - - - Dialogs - - - Dialogs - - - Widgets - - - MainWindows - - - Widgets - - - Widgets - - - Header Files - - - Widgets - - - Widgets - - - Widgets - - - Form Files - - - Dialogs - - - Form Files - - - Dialogs\Qss - - - Dialogs\Qss - - - Dialogs\Qss - - - Widgets - - - Dialogs\PaletteEditor - - - Dialogs\PaletteEditor - - - Dialogs\PaletteEditor - - - Dialogs\PaletteEditor - - - Dialogs\PaletteEditor - - - Form Files - - - Header Files - - - - - - - - Resource Files - - - \ No newline at end of file diff --git a/Builds/MSVC/VS2015/resource.h b/Builds/MSVC/VS2015/resource.h deleted file mode 100644 index 320fe20..0000000 --- a/Builds/MSVC/VS2015/resource.h +++ /dev/null @@ -1,14 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by EmberCL.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/Builds/MSVC/VS2015/resource1.h b/Builds/MSVC/VS2015/resource1.h deleted file mode 100644 index dad2fe4..0000000 --- a/Builds/MSVC/VS2015/resource1.h +++ /dev/null @@ -1,14 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Ember.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/Builds/MSVC/VS2015/zlib.props b/Builds/MSVC/VS2015/zlib.props deleted file mode 100644 index 25979fd..0000000 --- a/Builds/MSVC/VS2015/zlib.props +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - ..\..\..\..\zlib - - diff --git a/Builds/MSVC/VS2017/Ember.rc b/Builds/MSVC/VS2017/Ember.rc index 3c005ce50c70a11057c24e30754ab2d918900b36..e21f73ca3c164785d53cd4805921669e2ffb7180 100644 GIT binary patch delta 38 scmZ3byh?e)Hx5Sg$=^9F8O=8vavo;_aum76Hw*C0U<8V+ + diff --git a/Builds/MSVC/VS2017/Ember.vcxproj.filters b/Builds/MSVC/VS2017/Ember.vcxproj.filters index b3b4441..7b55592 100644 --- a/Builds/MSVC/VS2017/Ember.vcxproj.filters +++ b/Builds/MSVC/VS2017/Ember.vcxproj.filters @@ -131,6 +131,9 @@ Header Files\Xml + + Header Files\Variations + diff --git a/Builds/MSVC/VS2017/EmberAnimate.rc b/Builds/MSVC/VS2017/EmberAnimate.rc index 05b87aa..087c37e 100644 --- a/Builds/MSVC/VS2017/EmberAnimate.rc +++ b/Builds/MSVC/VS2017/EmberAnimate.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 16 - PRODUCTVERSION 1, 0, 0, 16 + FILEVERSION 1, 0, 0, 17 + PRODUCTVERSION 1, 0, 0, 17 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as animations with motion blur" - VALUE "FileVersion", "1, 0, 0, 16" + VALUE "FileVersion", "1, 0, 0, 17" VALUE "InternalName", "EmberAnimate.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2019, GPL v3" VALUE "OriginalFilename", "EmberAnimate.exe" VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "1, 0, 0, 16" + VALUE "ProductVersion", "1, 0, 0, 17" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/VS2017/EmberCL.rc b/Builds/MSVC/VS2017/EmberCL.rc index e1d29db0aa4214fc18583649ecc4f831eca3a2d6..b6218cd07c36ee8be90db9645d3f671074b762ea 100644 GIT binary patch delta 44 zcmX@2d_;M}7Y;`A$zM4v8O=BAb6#fxatwLJH_P!XVPrOEP?~&^S9tRc-Z#tuRpkzW delta 44 zcmX@2d_;M}7Y;_V$zM4v8O=89b6#fxatwLJH_P!XVPrOAP?~&^S9tRc-Z#tuRe%nC diff --git a/Builds/MSVC/VS2017/EmberGenome.rc b/Builds/MSVC/VS2017/EmberGenome.rc index 8aab48c..3cd1b55 100644 --- a/Builds/MSVC/VS2017/EmberGenome.rc +++ b/Builds/MSVC/VS2017/EmberGenome.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 16 - PRODUCTVERSION 1, 0, 0, 16 + FILEVERSION 1, 0, 0, 17 + PRODUCTVERSION 1, 0, 0, 17 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Manipulates fractal flames parameter files" - VALUE "FileVersion", "1, 0, 0, 16" + VALUE "FileVersion", "1, 0, 0, 17" VALUE "InternalName", "EmberGenome.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2019, GPL v3" VALUE "OriginalFilename", "EmberGenome.exe" VALUE "ProductName", "Ember Genome" - VALUE "ProductVersion", "1, 0, 0, 16" + VALUE "ProductVersion", "1, 0, 0, 17" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/VS2017/EmberRender.rc b/Builds/MSVC/VS2017/EmberRender.rc index c2d1669..16900df 100644 --- a/Builds/MSVC/VS2017/EmberRender.rc +++ b/Builds/MSVC/VS2017/EmberRender.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 16 - PRODUCTVERSION 1, 0, 0, 16 + FILEVERSION 1, 0, 0, 17 + PRODUCTVERSION 1, 0, 0, 17 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as single images" - VALUE "FileVersion", "1, 0, 0, 16" + VALUE "FileVersion", "1, 0, 0, 17" VALUE "InternalName", "EmberRender.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2019, GPL v3" VALUE "OriginalFilename", "EmberRender.exe" VALUE "ProductName", "Ember Render" - VALUE "ProductVersion", "1, 0, 0, 16" + VALUE "ProductVersion", "1, 0, 0, 17" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/VS2017/Fractorium.rc b/Builds/MSVC/VS2017/Fractorium.rc index d7b17b6f57ac372c46ccceaa0592833ed9c58fc3..812b048489c4ba13066279aa90182e49f3cecf44 100644 GIT binary patch delta 46 zcmeBD?o!@xj)T#B@_7zRR&xek2Cm8doT8hRIA<^c1q->wH(%o3#>i;Cxs#WX1pq#{ B4DtW~ delta 46 zcmeBD?o!@xj)T!`@_7zRRx<`(2Cm8doT8hRIA<^c1q->wH(%o3#>i;4xs#WX1pq!< B4DJ8` diff --git a/Builds/QtCreator/Ember/Ember.pro b/Builds/QtCreator/Ember/Ember.pro index 98ac54e..a07001f 100644 --- a/Builds/QtCreator/Ember/Ember.pro +++ b/Builds/QtCreator/Ember/Ember.pro @@ -82,6 +82,7 @@ HEADERS += \ $$PRJ_SRC_DIR/Variations05.h \ $$PRJ_SRC_DIR/Variations06.h \ $$PRJ_SRC_DIR/Variations07.h \ + $$PRJ_SRC_DIR/Variations08.h \ $$PRJ_SRC_DIR/VariationsDC.h \ $$PRJ_SRC_DIR/VarFuncs.h \ $$PRJ_SRC_DIR/Xform.h \ diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index 72381ef..02969d1 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -1,4 +1,4 @@ -VERSION = 1.0.0.16 +VERSION = 1.0.0.17 win32:CONFIG += skip_target_version_ext CONFIG += c++14 diff --git a/Source/Ember/Ember.cpp b/Source/Ember/Ember.cpp index 5662d17..6fb85f6 100644 --- a/Source/Ember/Ember.cpp +++ b/Source/Ember/Ember.cpp @@ -25,6 +25,7 @@ template EMBER_API class QTIsaac; #include "Variations05.h" #include "Variations06.h" #include "Variations07.h" +#include "Variations08.h" #include "VariationsDC.h" #include "VariationList.h" #include "Affine2D.h" @@ -422,8 +423,8 @@ uint Timing::m_ProcessorCount; EXPORTPREPOSTREGVAR(TileHlp, T) \ EXPORTPREPOSTREGVAR(Truchet, T) \ EXPORTPREPOSTREGVAR(TruchetFill, T) \ - EXPORTPREPOSTREGVAR(TruchetHexFill, T) \ - EXPORTPREPOSTREGVAR(TruchetHexCrop, T) \ + EXPORTPREPOSTREGVAR(TruchetHexFill, T) \ + EXPORTPREPOSTREGVAR(TruchetHexCrop, T) \ EXPORTPREPOSTREGVAR(TruchetGlyph, T) \ EXPORTPREPOSTREGVAR(TruchetInv, T) \ EXPORTPREPOSTREGVAR(TruchetKnot, T) \ @@ -493,6 +494,7 @@ uint Timing::m_ProcessorCount; EXPORTPREPOSTREGVAR(Waves4, T) \ EXPORTPREPOSTREGVAR(Gnarly, T) \ EXPORTPREPOSTREGVAR(Inkdrop, T) \ + EXPORTPREPOSTREGVAR(HexModulus, T) \ template EMBER_API class VariationList; \ template EMBER_API class SpatialFilter; \ template EMBER_API class GaussianFilter; \ diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index 1d2bbee..92d2532 100644 --- a/Source/Ember/EmberDefines.h +++ b/Source/Ember/EmberDefines.h @@ -37,7 +37,7 @@ static void sincos(float x, float* s, float* c) namespace EmberNs { -#define EMBER_VERSION "1.0.0.16" +#define EMBER_VERSION "1.0.0.17" #define EPS6 T(1e-6) #define EPS std::numeric_limits::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way. #define ISAAC_SIZE 4 @@ -52,10 +52,10 @@ namespace EmberNs #define M_3PI (T(M_PI * 3)) #define M_PI2 (T(M_PI_2)) #define M_PI4 (T(M_PI_4)) -#define SQRT3 T(1.7320508075688772935274463415059) -#define SQRT3_2 T(0.86602540378443864676372317075294) -#define SQRT3_3 T(0.57735026918962576450914878050196) -#define SQRT5 T(2.2360679774997896964091736687313) +#define M_SQRT3 T(1.7320508075688772935274463415059) +#define M_SQRT3_2 T(0.86602540378443864676372317075294) +#define M_SQRT3_3 T(0.57735026918962576450914878050196) +#define M_SQRT5 T(2.2360679774997896964091736687313) #define M_PHI T(1.61803398874989484820458683436563) #define M_1_2PI T(0.15915494309189533576888376337251) #define M_PI3 T(1.0471975511965977461542144610932) diff --git a/Source/Ember/Variation.h b/Source/Ember/Variation.h index f2a0b6a..573b1c4 100644 --- a/Source/Ember/Variation.h +++ b/Source/Ember/Variation.h @@ -225,6 +225,7 @@ enum class eVariationId : et VAR_HEXCROP , VAR_HEXES , VAR_HEXNIX3D , + VAR_HEX_MODULUS, VAR_HEX_RAND, VAR_HEX_TRUCHET, VAR_HO , @@ -423,8 +424,8 @@ enum class eVariationId : et VAR_TRADE , VAR_TRUCHET, VAR_TRUCHET_FILL, - VAR_TRUCHET_HEX_FILL, - VAR_TRUCHET_HEX_CROP, + VAR_TRUCHET_HEX_FILL, + VAR_TRUCHET_HEX_CROP, VAR_TRUCHET_GLYPH, VAR_TRUCHET_INV, VAR_TRUCHET_KNOT, @@ -643,6 +644,7 @@ enum class eVariationId : et VAR_PRE_HEXCROP, VAR_PRE_HEXES, VAR_PRE_HEXNIX3D, + VAR_PRE_HEX_MODULUS, VAR_PRE_HEX_RAND, VAR_PRE_HEX_TRUCHET, VAR_PRE_HO, @@ -840,8 +842,8 @@ enum class eVariationId : et VAR_PRE_TRADE, VAR_PRE_TRUCHET, VAR_PRE_TRUCHET_FILL, - VAR_PRE_TRUCHET_HEX_FILL, - VAR_PRE_TRUCHET_HEX_CROP, + VAR_PRE_TRUCHET_HEX_FILL, + VAR_PRE_TRUCHET_HEX_CROP, VAR_PRE_TRUCHET_GLYPH, VAR_PRE_TRUCHET_INV, VAR_PRE_TRUCHET_KNOT, @@ -1060,6 +1062,7 @@ enum class eVariationId : et VAR_POST_HEXCROP, VAR_POST_HEXES, VAR_POST_HEXNIX3D, + VAR_POST_HEX_MODULUS, VAR_POST_HEX_RAND, VAR_POST_HEX_TRUCHET, VAR_POST_HO, @@ -1257,8 +1260,8 @@ enum class eVariationId : et VAR_POST_TRADE, VAR_POST_TRUCHET, VAR_POST_TRUCHET_FILL, - VAR_POST_TRUCHET_HEX_FILL, - VAR_POST_TRUCHET_HEX_CROP, + VAR_POST_TRUCHET_HEX_FILL, + VAR_POST_TRUCHET_HEX_CROP, VAR_POST_TRUCHET_GLYPH, VAR_POST_TRUCHET_INV, VAR_POST_TRUCHET_KNOT, diff --git a/Source/Ember/VariationList.cpp b/Source/Ember/VariationList.cpp index 723a4af..37c9835 100644 --- a/Source/Ember/VariationList.cpp +++ b/Source/Ember/VariationList.cpp @@ -7,6 +7,7 @@ #include "Variations05.h" #include "Variations06.h" #include "Variations07.h" +#include "Variations08.h" #include "VariationsDC.h" namespace EmberNs @@ -308,8 +309,8 @@ VariationList::VariationList() ADDPREPOSTREGVAR(BlurHeart) ADDPREPOSTREGVAR(Truchet) ADDPREPOSTREGVAR(TruchetFill) - ADDPREPOSTREGVAR(TruchetHexFill) - ADDPREPOSTREGVAR(TruchetHexCrop) + ADDPREPOSTREGVAR(TruchetHexFill) + ADDPREPOSTREGVAR(TruchetHexCrop) ADDPREPOSTREGVAR(TruchetGlyph) ADDPREPOSTREGVAR(TruchetInv) ADDPREPOSTREGVAR(TruchetKnot) @@ -433,6 +434,7 @@ VariationList::VariationList() ADDPREPOSTREGVAR(Waves42) ADDPREPOSTREGVAR(Gnarly) ADDPREPOSTREGVAR(Inkdrop) + ADDPREPOSTREGVAR(HexModulus) //ADDPREPOSTREGVAR(LinearXZ) //ADDPREPOSTREGVAR(LinearYZ) //DC are special. diff --git a/Source/Ember/Variations02.h b/Source/Ember/Variations02.h index f9a8b49..54a65ce 100644 --- a/Source/Ember/Variations02.h +++ b/Source/Ember/Variations02.h @@ -2458,7 +2458,7 @@ public: virtual void Precalc() override { - m_Five = 1 / SQRT5; + m_Five = 1 / M_SQRT5; m_NatLog = std::log(M_PHI); } @@ -2534,7 +2534,7 @@ public: virtual void Precalc() override { - m_Five = 1 / SQRT5; + m_Five = 1 / M_SQRT5; m_NatLog = std::log(M_PHI); } diff --git a/Source/Ember/Variations03.h b/Source/Ember/Variations03.h index 0f6586d..780e8b0 100644 --- a/Source/Ember/Variations03.h +++ b/Source/Ember/Variations03.h @@ -1149,15 +1149,16 @@ public: virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T f = rand.Frand01() * m_Power * 2; - T angle = T(int(f)); + int intangle = int(f); + T angle = T(intangle); f -= angle; T x = f * m_Length; T z = std::sqrt(1 + SQR(x) - 2 * x * std::cos(m_Alpha)); - if (int(angle) & 1) - angle = M_2PI / m_Power * (int(angle) / 2) + std::asin(std::sin(m_Alpha) * x / z); + if (intangle & 1) + angle = M_2PI / m_Power * (intangle / 2) + std::asin(std::sin(m_Alpha) * x / z); else - angle = M_2PI / m_Power * (int(angle) / 2) - std::asin(std::sin(m_Alpha) * x / z); + angle = M_2PI / m_Power * (intangle / 2) - std::asin(std::sin(m_Alpha) * x / z); z *= std::sqrt(rand.Frand01()); T temp = angle - T(M_PI_2); @@ -1179,17 +1180,18 @@ public: string alpha = "parVars[" + ToUpper(m_Params[i++].Name()) + index; ss << "\t{\n" << "\t\treal_t f = MwcNext01(mwc) * " << power << " * 2;\n" - << "\t\treal_t angle = (real_t)(int)(f);\n" + << "\t\tint intangle = (int)(f);\n" + << "\t\treal_t angle = (real_t)intangle;\n" << "\n" << "\t\tf -= angle;\n" << "\n" << "\t\treal_t x = f * " << length << ";\n" << "\t\treal_t z = sqrt(fma(x, x, (real_t)(1.0)) - (real_t)(2.0) * x * cos(" << alpha << "));\n" << "\n" - << "\t\tif (((int)angle) & 1)\n" - << "\t\t angle = fma(M_2PI / " << power << ", ((int)angle) / 2, asin(sin(" << alpha << ") * x / z));\n" + << "\t\tif (intangle & 1)\n" + << "\t\t angle = fma(M_2PI / " << power << ", (real_t)(intangle / 2), asin(sin(" << alpha << ") * x / z));\n" << "\t\telse\n" - << "\t\t angle = fma(M_2PI / " << power << ", ((int)angle) / 2, -asin(sin(" << alpha << ") * x / z));\n" + << "\t\t angle = fma(M_2PI / " << power << ", (real_t)(intangle / 2), -asin(sin(" << alpha << ") * x / z));\n" << "\n" << "\t\tz *= sqrt(MwcNext01(mwc));\n" << "\n" @@ -1214,10 +1216,10 @@ protected: { string prefix = Prefix(); m_Params.clear(); - m_Params.push_back(ParamWithName(&m_Power, prefix + "starblur_power", 5, eParamType::INTEGER_NONZERO)); - m_Params.push_back(ParamWithName(&m_Range, prefix + "starblur_range", T(0.4016228317))); + m_Params.push_back(ParamWithName(&m_Power, prefix + "starblur_power", 5, eParamType::INTEGER_NONZERO)); + m_Params.push_back(ParamWithName(&m_Range, prefix + "starblur_range", T(0.4016228317))); m_Params.push_back(ParamWithName(true, &m_Length, prefix + "starblur_length"));//Precalc. - m_Params.push_back(ParamWithName(true, &m_Alpha, prefix + "starblur_alpha")); + m_Params.push_back(ParamWithName(true, &m_Alpha, prefix + "starblur_alpha")); } private: diff --git a/Source/Ember/Variations07.h b/Source/Ember/Variations07.h index 0504aef..607604d 100644 --- a/Source/Ember/Variations07.h +++ b/Source/Ember/Variations07.h @@ -1324,7 +1324,8 @@ public: helper.Out.x = x1 - helper.In.x; helper.Out.y = y1 - helper.In.y; } - helper.Out.z = DefaultZ(helper); + + helper.Out.z = DefaultZ(helper); } virtual string OpenCLString() const override @@ -1456,9 +1457,9 @@ protected: { string prefix = Prefix(); m_Params.clear(); - m_Params.push_back(ParamWithName(&m_Exponent, prefix + "Truchet_fill_exponent", 2, eParamType::REAL_CYCLIC, T(0.001), 2)); - m_Params.push_back(ParamWithName(&m_ArcWidth, prefix + "Truchet_fill_arc_width", T(0.5), eParamType::REAL_CYCLIC, T(0.001), 1)); - m_Params.push_back(ParamWithName(&m_Seed, prefix + "Truchet_fill_seed")); + m_Params.push_back(ParamWithName(&m_Exponent, prefix + "Truchet_fill_exponent", 2, eParamType::REAL_CYCLIC, T(0.001), 2)); + m_Params.push_back(ParamWithName(&m_ArcWidth, prefix + "Truchet_fill_arc_width", T(0.5), eParamType::REAL_CYCLIC, T(0.001), 1)); + m_Params.push_back(ParamWithName(&m_Seed, prefix + "Truchet_fill_seed")); m_Params.push_back(ParamWithName(true, &m_FinalExponent, prefix + "Truchet_fill_final_exponent"));//Precalc m_Params.push_back(ParamWithName(true, &m_OneOverEx, prefix + "Truchet_fill_oneoverex")); m_Params.push_back(ParamWithName(true, &m_Width, prefix + "Truchet_fill_width")); @@ -1488,184 +1489,178 @@ template class TruchetHexFillVariation : public ParametricVariation { public: - TruchetHexFillVariation(T weight = 1.0) : ParametricVariation("Truchet_hex_fill", eVariationId::VAR_TRUCHET_HEX_FILL, weight) - { - Init(); - } + TruchetHexFillVariation(T weight = 1.0) : ParametricVariation("Truchet_hex_fill", eVariationId::VAR_TRUCHET_HEX_FILL, weight) + { + Init(); + } - PARVARCOPY(TruchetHexFillVariation) + PARVARCOPY(TruchetHexFillVariation) - virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override - { - //round - T rx = Floor(std::log(rand.Frand01()) * (rand.Frand01() < T(0.5) ? m_SpreadX : -m_SpreadX)); - T rz = Floor(std::log(rand.Frand01()) * (rand.Frand01() < T(0.5) ? m_SpreadY : -m_SpreadY)); + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override + { + //round + T rx = T(Floor(std::log(rand.Frand01()) * (rand.Frand01() < T(0.5) ? m_Spreadx : -m_Spreadx))); + T rz = T(Floor(std::log(rand.Frand01()) * (rand.Frand01() < T(0.5) ? m_Spready : -m_Spready))); + T FX_h = M_SQRT3 * rx + M_SQRT3_2 * (rand.Frand01() < T(0.5) ? rz : -rz); + T FY_h = T(1.5) * rz; + bool add = true; - T fx_h = SQRT3 * rx + SQRT3_2 * (rand.Frand01() < T(0.5) ? rz : -rz); - T fy_h = T(1.5) * rz; + if (m_Seed == 1) + if (!(int(rx) & 1) && !(int(rz) & 1)) + add = false; - bool add = true; + if (m_Seed >= 2) + { + T hash_f = std::sin(FX_h * T(12.9898) + FY_h * T(78.233) + m_Seed) * T(43758.5453); + hash_f = hash_f - Floor(hash_f); - if (m_Seed == T(1)) - { - if (((((int) rx) % 2) == 0) && ((((int) rz) % 2) == 0)) - add = false; - } - else if (m_Seed >= T(2)) - { - T hash_f = std::sin(fx_h * T(12.9898) + fy_h * T(78.233) + m_Seed) * T(43758.5453); - hash_f = hash_f - Floor(hash_f); - if (hash_f < T(0.5)) - add = false; - } + if (hash_f < T(0.5)) + add = false; //pi/3 + } - //exponential to make a tiled circle - T rangle = floor(rand.Frand01() * m_3N) * M_2PI * m_1_3N; - T x_aux = m_FlipX ? (add ? helper.In.x : -helper.In.x) : helper.In.x; - T y_aux = m_FlipY ? (add ? helper.In.y : -helper.In.y) : helper.In.y; - T fx = x_aux * m_1_3N; - T fy = y_aux * m_1_3N; + //exponential to make a tiled circle + T rangle = Floor(rand.Frand01() * m_3nPrecalc) * M_2PI * m_13nPrecalc; + T y_aux = m_Flipy ? (add ? helper.In.y : -helper.In.y) : helper.In.y; + T x_aux = m_Flipx ? (add ? helper.In.x : -helper.In.x) : helper.In.x; + T FY = y_aux * m_13nPrecalc; + T FX = x_aux * m_13nPrecalc; + T ang = FY * T(M_PI) + rangle; + T a = 1 + FX * T(M_PI); + FX = a * std::cos(ang); + FY = a * std::sin(ang); + //split + T A = std::atan2(FY, FX); - T ang = fy * M_PI + rangle; - T a = T(1) + fx * M_PI; - fx = a * std::cos(ang); - fy = a * std::sin(ang); + if (A < 0) + A += M_2PI; - //split - T a2 = std::atan2(fy, fx); + A = T(Floor(T(1.5) * A * T(M_1_PI))); + ang = (T(M_PI) + A * M_2PI) / 3; + T FX_new = FX - std::cos(ang) * 2; + T FY_new = FY - std::sin(ang) * 2; - if (a2 < T(0)) - a2 += M_2PI; + //rotate by 30 to fit the hex + if (add) + { + FX = M_SQRT3_2 * FX_new - T(0.5) * FY_new; + FY = T(0.5) * FX_new + M_SQRT3_2 * FY_new; + } + else + { + FX = M_SQRT3_2 * FX_new + T(0.5) * FY_new; + FY = -T(0.5) * FX_new + M_SQRT3_2 * FY_new; + } - ang = (M_PI + Floor(T(1.5) * a2 * M_1_PI) * M_2PI) / T(3.0); + helper.Out.x = m_Weight * (FX * T(0.5) + FX_h); + helper.Out.y = m_Weight * (FY * T(0.5) + FY_h); + helper.Out.z = DefaultZ(helper); + } - T fx_new = fx - std::cos(ang) * T(2); - T fy_new = fy - std::sin(ang) * T(2); + virtual string OpenCLString() const override + { + ostringstream ss, ss2; + intmax_t i = 0, varIndex = IndexInXform(); + ss2 << "_" << XformIndexInEmber() << "]"; + string index = ss2.str(); + string weight = WeightDefineString(); + string n = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string flipx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string flipy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string spreadx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string spready = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string seed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string p3nprecalc = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string p13nprecalc = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + ss << "\t{\n" + << "\t\t//round\n" + << "\t\treal_t rx = floor(log(MwcNext01(mwc)) * (MwcNext01(mwc) < (real_t)(0.5) ? " << spreadx << " : -" << spreadx << "));\n" + << "\t\treal_t rz = floor(log(MwcNext01(mwc)) * (MwcNext01(mwc) < (real_t)(0.5) ? " << spready << " : -" << spready << "));\n" + << "\t\treal_t FX_h = M_SQRT3 * rx + M_SQRT3_2 * (MwcNext01(mwc) < (real_t)(0.5) ? rz : -rz);\n" + << "\t\treal_t FY_h = 1.5 * rz;\n" + << "\n" + << "\t\tbool add = true;\n" + << "\n" + << "\t\tif (" << seed << " == 1)\n" + << "\t\t if (!((int)rx & 1) && !((int)rz & 1))\n" + << "\t\t add = false;\n" + << "\n" + << "\t\tif (" << seed << " >= 2)\n" + << "\t\t{\n" + << "\t\t real_t hash_f = sin(fma(FX_h, (real_t)(12.9898), fma(FY_h, (real_t)(78.233), " << seed << "))) * (real_t)(43758.5453);\n" + << "\t\t hash_f = hash_f - floor(hash_f);\n" + << "\n" + << "\t\t if (hash_f < (real_t)(0.5))\n" + << "\t\t add = false; //pi/3\n" + << "\t\t}\n" + << "\n" + << "\t\t//exponential to make a tiled circle\n" + << "\t\treal_t rangle = floor(MwcNext01(mwc) * " << p3nprecalc << ") * M_2PI * " << p13nprecalc << ";\n" + << "\t\treal_t y_aux = " << flipy << " ? (add ? vIn.y : -vIn.y) : vIn.y;\n" + << "\t\treal_t x_aux = " << flipx << " ? (add ? vIn.x : -vIn.x) : vIn.x;\n" + << "\t\treal_t FY = y_aux * " << p13nprecalc << ";\n" + << "\t\treal_t FX = x_aux * " << p13nprecalc << ";\n" + << "\t\treal_t ang = fma(FY, MPI, rangle);\n" + << "\t\treal_t a = fma(FX, MPI, (real_t)(1.0));\n" + << "\t\tFX = a * cos(ang);\n" + << "\t\tFY = a * sin(ang);\n" + << "\t\t//split\n" + << "\t\treal_t A = atan2(FY, FX);\n" + << "\n" + << "\t\tif (A < 0) A += M_2PI;\n" + << "\t\t A = floor((real_t)(1.5) * A * M1PI);\n" + << "\n" + << "\t\tang = fma(A, M_2PI, MPI) / (real_t)(3.0);\n" + << "\t\treal_t FX_new = FX - cos(ang) * (real_t)(2.0);\n" + << "\t\treal_t FY_new = FY - sin(ang) * (real_t)(2.0);\n" + << "\t\t//rotate by 30 to fit the hex\n" + << "\t\tif (add)\n" + << "\t\t{\n" + << "\t\t FX = fma(M_SQRT3_2, FX_new, -((real_t)(0.5) * FY_new));\n" + << "\t\t FY = fma((real_t)(0.5), FX_new, M_SQRT3_2 * FY_new);\n" + << "\t\t}\n" + << "\t\telse\n" + << "\t\t{\n" + << "\t\t FX = fma(M_SQRT3_2, FX_new, (real_t)(0.5) * FY_new);\n" + << "\t\t FY = fma(-(real_t)(0.5), FX_new, M_SQRT3_2 * FY_new);\n" + << "\t\t}\n" + << "\n" + << "\t\tvOut.x = " << weight << " * fma(FX, (real_t)(0.5), FX_h);\n" + << "\t\tvOut.y = " << weight << " * fma(FY, (real_t)(0.5), FY_h);\n" + << "\t\tvOut.z = " << DefaultZCl() + << "\t}\n"; + return ss.str(); + } - //rotate by 30 to fit the hex - if (add) - { - fx = SQRT3_2 * fx_new - T(0.5) * fy_new; - fy = 0.5 * fx_new + SQRT3_2 * fy_new; - } - else - { - fx = SQRT3_2 * fx_new + T(0.5) * fy_new; - fy = -T(0.5) * fx_new + SQRT3_2 * fy_new; - } - - helper.Out.x = (fx * T(0.5) + fx_h) * m_Weight; - helper.Out.y = (fy * T(0.5) + fy_h) * m_Weight; - helper.Out.z = DefaultZ(helper); - } - - virtual string OpenCLString() const override - { - ostringstream ss, ss2; - intmax_t i = 0; - ss2 << "_" << XformIndexInEmber() << "]"; - string index = ss2.str(); - string weight = WeightDefineString(); - string pN = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string flipX = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string flipY = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string spreadX = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string spreadY = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string seed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string p3N = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string p1_3N = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - ss << "\t{\n" - << "\t\treal_t rx = floor(log(MwcNext01(mwc)) * (MwcNext01(mwc) < (real_t)(0.5) ? " << m_SpreadX << " : -" << m_SpreadX << "));\n" - << "\t\treal_t rz = floor(log(MwcNext01(mwc)) * (MwcNext01(mwc) < (real_t)(0.5) ? " << m_SpreadY << " : -" << m_SpreadY << "));\n" - << "\n" - << "\t\treal_t fx_h = SQRT3 * rx + SQRT3_2 * (MwcNext01(mwc) < (real_t)(0.5) ? rz : -rz);\n" - << "\t\treal_t fy_h = (real_t)(1.5) * rz;\n" - << "\n" - << "\t\tbool add = true;\n" - << "\n" - << "\t\tif (" << seed << " == (real_t)(1))\n" - << "\t\t{\n" - << "\t\t if (((((int) rx) % 2) == 0) && ((((int) rz) % 2) == 0))\n" - << "\t\t add = false;\n" - << "\t\t}\n" - << "\t\telse if (" << seed << " >= (real_t)(2))\n" - << "\t\t{\n" - << "\t\t real_t hash_f = sin(fx_h * (real_t)(12.9898) + fy_h * (real_t)(78.233) + " << seed << ") * (real_t)(43758.5453);\n" - << "\t\t hash_f = hash_f - floor(hash_f);\n" - << "\t\t if (hash_f < (real_t)(0.5))\n" - << "\t\t add = false;\n" - << "\t\t}\n" - << "\n" - << "\t\treal_t rangle = floor(MwcNext01(mwc) * " << p3N << ") * M_2PI * " << p1_3N << ";\n" - << "\t\treal_t x_aux = " << flipX << " ? (add ? vIn.x : -vIn.x) : vIn.x;\n" - << "\t\treal_t y_aux = " << flipY << " ? (add ? vIn.y : -vIn.y) : vIn.y;\n" - << "\t\treal_t fx = x_aux * " << p1_3N << ";\n" - << "\t\treal_t fy = y_aux * " << p1_3N << ";\n" - << "\n" - << "\t\treal_t ang = fy * M_PI + rangle;\n" - << "\t\treal_t a = (real_t)(1) + fx * M_PI;\n" - << "\t\tfx = a * cos(ang);\n" - << "\t\tfy = a * sin(ang);\n" - << "\n" - << "\t\treal_t a2 = atan2(fy, fx);\n" - << "\n" - << "\t\tif (a2 < (real_t)(0))\n" - << "\t\t a2 += M_2PI;\n" - << "\n" - << "\t\tang = (M_PI + floor((real_t)(1.5) * a2 * M_1_PI) * M_2PI) / (real_t)(3.0);\n" - << "\n" - << "\t\treal_t fx_new = fx - cos(ang) * (real_t)(2);\n" - << "\t\treal_t fy_new = fy - sin(ang) * (real_t)(2);\n" - << "\n" - << "\t\tif (add)\n" - << "\t\t{\n" - << "\t\t fx = SQRT3_2 * fx_new - (real_t)(0.5) * fy_new;\n" - << "\t\t fy = 0.5 * fx_new + SQRT3_2 * fy_new;\n" - << "\t\t}\n" - << "\t\telse\n" - << "\t\t{\n" - << "\t\t fx = SQRT3_2 * fx_new + (real_t)(0.5) * fy_new;\n" - << "\t\t fy = -(real_t)(0.5) * fx_new + SQRT3_2 * fy_new;\n" - << "\t\t}\n" - << "\n" - << "\t\tvOut.x = (fx * (real_t)(0.5) + fx_h) * " << weight << ";\n" - << "\t\tvOut.y = (fy * (real_t)(0.5) + fy_h) * " << weight << ";\n" - << "\n" - << "\t\tvOut.z = " << DefaultZCl() - << "\t}\n"; - return ss.str(); - } - - virtual void Precalc() override - { - m_3N = T(3.0) * m_N; - m_1_3N = T(1.0) / m_3N; - } + virtual void Precalc() override + { + m_3nPrecalc = 3 * m_N; + m_13nPrecalc = 1 / Zeps(m_3nPrecalc); + } protected: - void Init() - { - string prefix = Prefix(); - m_Params.clear(); - m_Params.push_back(ParamWithName(&m_N, prefix + "Truchet_hex_fill_n", 3)); - m_Params.push_back(ParamWithName(&m_FlipX, prefix + "Truchet_hex_fill_flipx", 1, eParamType::INTEGER, 0, 1)); - m_Params.push_back(ParamWithName(&m_FlipY, prefix + "Truchet_hex_fill_flipy", 1, eParamType::INTEGER, 0, 1)); - m_Params.push_back(ParamWithName(&m_SpreadX, prefix + "Truchet_hex_fill_spreadx", 1)); - m_Params.push_back(ParamWithName(&m_SpreadY, prefix + "Truchet_hex_fill_spready", 1)); - m_Params.push_back(ParamWithName(&m_Seed, prefix + "Truchet_hex_fill_seed")); - m_Params.push_back(ParamWithName(true, &m_3N, prefix + "Truchet_hex_fill_3N"));//Precalc - m_Params.push_back(ParamWithName(true, &m_1_3N, prefix + "Truchet_hex_fill_1_3N")); - } + void Init() + { + string prefix = Prefix(); + m_Params.clear(); + m_Params.push_back(ParamWithName(&m_N, prefix + "Truchet_hex_fill_n", T(3), eParamType::INTEGER)); + m_Params.push_back(ParamWithName(&m_Flipx, prefix + "Truchet_hex_fill_flipx", T(1), eParamType::INTEGER, T(0), T(1))); + m_Params.push_back(ParamWithName(&m_Flipy, prefix + "Truchet_hex_fill_flipy", T(1), eParamType::INTEGER, T(0), T(1))); + m_Params.push_back(ParamWithName(&m_Spreadx, prefix + "Truchet_hex_fill_spreadx", T(1.0))); + m_Params.push_back(ParamWithName(&m_Spready, prefix + "Truchet_hex_fill_spready", T(1.0))); + m_Params.push_back(ParamWithName(&m_Seed, prefix + "Truchet_hex_fill_seed", T(0), eParamType::INTEGER)); + m_Params.push_back(ParamWithName(true, &m_3nPrecalc, prefix + "Truchet_hex_fill_3n_precalc"));//Precalc. + m_Params.push_back(ParamWithName(true, &m_13nPrecalc, prefix + "Truchet_hex_fill_1_3n_precalc")); + } private: - T m_N; - T m_FlipX; - T m_FlipY; - T m_SpreadX; - T m_SpreadY; - T m_Seed; - T m_3N;//Precalc. - T m_1_3N; + T m_N; + T m_Flipx; + T m_Flipy; + T m_Spreadx; + T m_Spready; + T m_Seed; + T m_3nPrecalc;//Precalc. + T m_13nPrecalc; }; /// @@ -1677,262 +1672,290 @@ template class TruchetHexCropVariation : public ParametricVariation { public: - TruchetHexCropVariation(T weight = 1.0) : ParametricVariation("Truchet_hex_crop", eVariationId::VAR_TRUCHET_HEX_CROP, weight) - { - Init(); - } + TruchetHexCropVariation(T weight = 1.0) : ParametricVariation("Truchet_hex_crop", eVariationId::VAR_TRUCHET_HEX_CROP, weight) + { + Init(); + } - PARVARCOPY(TruchetHexCropVariation) + PARVARCOPY(TruchetHexCropVariation) - virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override - { - //get hex - T x = SQRT3_3 * helper.In.x - helper.In.y / T(3.0); - T z = T(2.0) * helper.In.y / T(3.0); - T y = -x - z; + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override + { + //get hex + T yover3 = helper.In.y / 3; + T x = M_SQRT3_3 * helper.In.x - yover3; + T z = T(2.0) * yover3; + T y = -x - z; + //round + T rx = std::round(x); + T ry = std::round(y); + T rz = std::round(z); + T x_diff = std::abs(rx - x); + T y_diff = std::abs(ry - y); + T z_diff = std::abs(rz - z); - //round - T rx = Round(x); - T ry = Round(y); - T rz = Round(z); + if ((x_diff > y_diff) && (x_diff > z_diff)) + rx = -ry - rz; + else if (y_diff > z_diff) + ry = -rx - rz; + else + rz = -rx - ry; - T x_diff = std::abs(rx - x); - T y_diff = std::abs(ry - y); - T z_diff = std::abs(rz - z); + T FX_h = M_SQRT3 * rx + M_SQRT3_2 * rz; + T FY_h = T(1.5) * rz; + T FX = helper.In.x - FX_h; + T FY = helper.In.y - FY_h; + T add = 0.0; - if ((x_diff > y_diff) && (x_diff > z_diff)) - rx = -ry-rz; - else if (y_diff > z_diff) - ry = -rx-rz; - else - rz = -rx-ry; + if (m_Seed == 1) + { + if (!(int(rx) & 1) && !(int(rz) & 1)) + add = M_PI3; + } + else if (m_Seed >= 2) + { + T hash_f = std::sin(FX_h * T(12.9898) + FY_h * T(78.233) + m_Seed) * T(43758.5453); + hash_f = hash_f - Floor(hash_f); - T fx_h = SQRT3 * rx + SQRT3_2 * rz; - T fy_h = T(1.5) * rz; + if (hash_f < T(0.5)) + add = M_PI3; + } - T fx = helper.In.x - fx_h; - T fy = helper.In.y - fy_h; + T angle = std::atan2(FY, FX) + M_PI6 - add; + T coef = T(0.47746482927568600730665129011754); //1.5 / pi + T angle2 = Floor(angle * coef) / coef + M_PI6 + add; //or subtract T(0.5) + T x0 = std::cos(angle2); + T y0 = std::sin(angle2); + T dist = std::sqrt(Sqr(FX - x0) + Sqr(FY - y0)); - T add = 0; + if (m_Inv) + { + if ((dist > m_D1Precalc) || (dist < m_D2Precalc)) + { + if (m_Mode < T(0.5)) + { + FX = 0; + FY = 0; + } + else + { + if (m_Mode < 1.5) + { + FX = x0; + FY = y0; + } + else + { + T rangle = std::atan2(FY - y0, FX - x0); + T D; - if (m_Seed == T(1)) - { - if (((((int) rx) % 2) == 0) && ((((int) rz) % 2) == 0)) - add = M_PI3; - } - else if (m_Seed >= T(2)) - { - T hash_f = std::sin(fx_h * T(12.9898) + fy_h * T(78.233) + m_Seed) * T(43758.5453); - hash_f = hash_f - Floor(hash_f); - if (hash_f < T(0.5)) - add = M_PI3; - } + if (rand.Frand01() < T(0.5)) + D = m_D1Precalc; + else + D = m_D2Precalc; - T angle = std::atan2(fy, fx) + M_PI6 - add; - T angle2 = Floor(angle * m_Coef) / m_Coef + M_PI6 + add; //or subtract 0.5 - T x0 = std::cos(angle2); - T y0 = std::sin(angle2); - T dist = std::sqrt(SQR(fx - x0) + SQR(fy - y0)); + FX = x0 + std::cos(rangle) * D; + FY = y0 + std::sin(rangle) * D; + } + } + } + } + else + { + if ((dist < m_D1Precalc) && (dist > m_D2Precalc)) + { + if (m_Mode < T(0.5)) + { + FX = 0; + FY = 0; + } + else + { + if (m_Mode < 1.5) + { + FX = x0; + FY = y0; + } + else + { + T rangle = std::atan2(FY - y0, FX - x0); + T D; - if (m_Inv) - { - if ((dist > m_D1) || (dist < m_D2)) - { - if (m_Mode < T(0.5)) - { - fx = 0; - fy = 0; - } - else if (m_Mode < T(1.5)) - { - fx = x0; - fy = y0; - } - else - { - T rangle = std::atan2(fy - y0, fx - x0); - T d = (rand.Frand01() < T(0.5)) ? m_D1 : m_D2; - fx = x0 + std::cos(rangle) * d; - fy = y0 + std::sin(rangle) * d; - } - } + if (rand.Frand01() < T(0.5)) + D = m_D1Precalc; + else + D = m_D2Precalc; - } - else - { - if ((dist < m_D1) && (dist > m_D2)) - { - if (m_Mode < T(0.5)) - { - fx = 0; - fy = 0; - } - else if (m_Mode < T(1.5)) - { - fx = x0; - fy = y0; - } - else - { - T rangle = std::atan2(fy - y0, fx - x0); - T d = (rand.Frand01() < T(0.5)) ? m_D1 : m_D2; - fx = x0 + std::cos(rangle) * d; - fy = y0 + std::sin(rangle) * d; - } - } - } + FX = x0 + std::cos(rangle) * D; + FY = y0 + std::sin(rangle) * D; + } + } + } + } - helper.Out.x = (fx + fx_h) * m_Weight; - helper.Out.y = (fy + fy_h) * m_Weight; - helper.Out.z = DefaultZ(helper); - } + helper.Out.x = (FX + FX_h) * m_Weight; + helper.Out.y = (FY + FY_h) * m_Weight; + helper.Out.z = DefaultZ(helper); + } - virtual string OpenCLString() const override - { - ostringstream ss, ss2; - intmax_t i = 0; - ss2 << "_" << XformIndexInEmber() << "]"; - string index = ss2.str(); - string weight = WeightDefineString(); - string wd = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string mode = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string inv = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string seed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string d1 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string d2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string coef = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - ss << "\t{\n" - << "\t\treal_t x = SQRT3_3 * vIn.x - vIn.y / (real_t)(3.0);\n" - << "\t\treal_t z = (real_t)(2.0) * vIn.y / (real_t)(3.0);\n" - << "\t\treal_t y = -x - z;\n" - << "\t\treal_t rx = Round(x);\n" - << "\t\treal_t ry = Round(y);\n" - << "\t\treal_t rz = Round(z);\n" - << "\t\treal_t x_diff = fabs(rx - x);\n" - << "\t\treal_t y_diff = fabs(ry - y);\n" - << "\t\treal_t z_diff = fabs(rz - z);\n" - << "\n" - << "\t\tif ((x_diff > y_diff) && (x_diff > z_diff))\n" - << "\t\t rx = -ry-rz;\n" - << "\t\telse if (y_diff > z_diff)\n" - << "\t\t ry = -rx-rz;\n" - << "\t\telse\n" - << "\t\trz = -rx-ry;\n" - << "\n" - << "\t\treal_t fx_h = SQRT3 * rx + SQRT3_2 * rz;\n" - << "\t\treal_t fy_h = (real_t)(1.5) * rz;\n" - << "\t\treal_t fx = vIn.x - fx_h;\n" - << "\t\treal_t fy = vIn.y - fy_h;\n" - << "\t\treal_t add = 0;\n" - << "\n" - << "\t\tif (" << seed << " == (real_t)(1))\n" - << "\t\t{\n" - << "\t\t if (((((int) rx) % 2) == 0) && ((((int) rz) % 2) == 0))\n" - << "\t\t add = M_PI3;\n" - << "\t\t}\n" - << "\t\telse if (" << seed << " >= (real_t)(2))\n" - << "\t\t{\n" - << "\t\t real_t hash_f = sin(fx_h * (real_t)(12.9898) + fy_h * (real_t)(78.233) + " << seed << ") * (real_t)(43758.5453);\n" - << "\t\t hash_f = hash_f - floor(hash_f);\n" - << "\t\t if (hash_f < (real_t)(0.5))\n" - << "\t\t add = M_PI3;\n" - << "\t\t}\n" - << "\n" - << "\t\treal_t angle = atan2(fy, fx) + M_PI6 - add;\n" - << "\t\treal_t angle2 = floor(angle * " << coef << ") / " << coef << " + M_PI6 + add;\n" - << "\t\treal_t x0 = cos(angle2);\n" - << "\t\treal_t y0 = sin(angle2);\n" - << "\t\treal_t dist = sqrt(SQR(fx - x0) + SQR(fy - y0));\n" - << "\n" - << "\t\tif (" << inv << ")\n" - << "\t\t{\n" - << "\t\t if ((dist > " << d1 << ") || (dist < " << d2 << "))\n" - << "\t\t {\n" - << "\t\t if (" << mode << " < (real_t)(0.5))\n" - << "\t\t {\n" - << "\t\t fx = 0;\n" - << "\t\t fy = 0;\n" - << "\t\t }\n" - << "\t\t else if (" << mode << " < (real_t)(1.5))\n" - << "\t\t {\n" - << "\t\t fx = x0;\n" - << "\t\t fy = y0;\n" - << "\t\t }\n" - << "\t\t else\n" - << "\t\t {\n" - << "\t\t real_t rangle = atan2(fy - y0, fx - x0);\n" - << "\t\t real_t d = (MwcNext01(mwc) < (real_t)(0.5)) ? " << d1 << " : " << d2 << ";\n" - << "\t\t fx = x0 + cos(rangle) * d;\n" - << "\t\t fy = y0 + sin(rangle) * d;\n" - << "\t\t }\n" - << "\t\t }\n" - << "\t\t}\n" - << "\t\telse\n" - << "\t\t{\n" - << "\t\t if ((dist < " << d1 << ") && (dist > " << d2 << "))\n" - << "\t\t {\n" - << "\t\t if (" << mode << " < (real_t)(0.5))\n" - << "\t\t {\n" - << "\t\t fx = 0;\n" - << "\t\t fy = 0;\n" - << "\t\t }\n" - << "\t\t else if (" << mode << " < (real_t)(1.5))\n" - << "\t\t {\n" - << "\t\t fx = x0;\n" - << "\t\t fy = y0;\n" - << "\t\t }\n" - << "\t\t else\n" - << "\t\t {\n" - << "\t\t real_t rangle = atan2(fy - y0, fx - x0);\n" - << "\t\t real_t d = (MwcNext01(mwc) < (real_t)(0.5)) ? " << d1 << " : " << d2 << ";\n" - << "\t\t fx = x0 + cos(rangle) * d;\n" - << "\t\t fy = y0 + sin(rangle) * d;\n" - << "\t\t }\n" - << "\t\t }\n" - << "\t\t}\n" - << "\n" - << "\t\t\tvOut.x = (fx + fx_h) * " << weight << ";\n" - << "\t\t\tvOut.y = (fy + fy_h) * " << weight << ";\n" - << "\n" - << "\t\tvOut.z = " << DefaultZCl() - << "\t}\n"; - return ss.str(); - } + virtual string OpenCLString() const override + { + ostringstream ss, ss2; + intmax_t i = 0, varIndex = IndexInXform(); + ss2 << "_" << XformIndexInEmber() << "]"; + string index = ss2.str(); + string weight = WeightDefineString(); + string wd = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string mode = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string inv = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string seed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string d1precalc = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string d2precalc = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + ss << "\t{\n" + << "\t\treal_t yover3 = vIn.y / (real_t)(3.0);\n" + << "\t\treal_t x = fma(M_SQRT3_3, vIn.x, -yover3);\n" + << "\t\treal_t z = (real_t)(2.0) * yover3;\n" + << "\t\treal_t y = -x - z;\n" + << "\n" + << "\t\treal_t rx = round(x);\n" + << "\t\treal_t ry = round(y);\n" + << "\t\treal_t rz = round(z);\n" + << "\n" + << "\t\treal_t x_diff = fabs(rx - x);\n" + << "\t\treal_t y_diff = fabs(ry - y);\n" + << "\t\treal_t z_diff = fabs(rz - z);\n" + << "\n" + << "\t\tif ((x_diff > y_diff) && (x_diff > z_diff))\n" + << "\t\t rx = -ry - rz;\n" + << "\t\telse if (y_diff > z_diff)\n" + << "\t\t ry = -rx - rz;\n" + << "\t\telse\n" + << "\t\t rz = -rx - ry;\n" + << "\n" + << "\t\treal_t FX_h = fma(M_SQRT3, rx, M_SQRT3_2 * rz);\n" + << "\t\treal_t FY_h = (real_t)(1.5) * rz;\n" + << "\t\treal_t FX = vIn.x - FX_h;\n" + << "\t\treal_t FY = vIn.y - FY_h;\n" + << "\t\treal_t add = 0;\n" + << "\n" + << "\t\tif (" << seed << " == 1)\n" + << "\t\t{\n" + << "\t\t if (!((int)rx & 1) && !((int)rz & 1)) \n" + << "\t\t add = M_PI3;\n" + << "\t\t}\n" + << "\t\telse if (" << seed << " >= 2)\n" + << "\t\t{\n" + << "\t\t real_t hash_f = sin(FX_h * (real_t)(12.9898) + FY_h * (real_t)(78.233) + " << seed << ") * (real_t)(43758.5453);\n" + << "\t\t hash_f = hash_f - floor(hash_f);\n" + << "\n" + << "\t\t if (hash_f < (real_t)(0.5))\n" + << "\t\t add = M_PI3;\n" + << "\t\t}\n" + << "\n" + << "\t\treal_t angle = atan2(FY, FX) + M_PI6 - add;\n" + << "\t\treal_t coef = (real_t)(0.47746482927568600730665129011754);\n" + << "\t\treal_t angle2 = floor(angle * coef) / coef + M_PI6 + add;\n" + << "\t\treal_t x0 = cos(angle2);\n" + << "\t\treal_t y0 = sin(angle2);\n" + << "\t\treal_t dist = sqrt(Sqr(FX - x0) + Sqr(FY - y0));\n" + << "\n" + << "\t\tif (" << inv << ")\n" + << "\t\t{\n" + << "\t\t if ((dist > " << d1precalc << ") || (dist < " << d2precalc << "))\n" + << "\t\t {\n" + << "\t\t if (" << mode << " < (real_t)(0.5))\n" + << "\t\t {\n" + << "\t\t FX = 0.0;\n" + << "\t\t FY = 0.0;\n" + << "\t\t }\n" + << "\t\t else if (" << mode << " < 1.5)\n" + << "\t\t {\n" + << "\t\t FX = x0;\n" + << "\t\t FY = y0;\n" + << "\t\t }\n" + << "\t\t else\n" + << "\t\t {\n" + << "\t\t real_t rangle = atan2(FY - y0, FX - x0);\n" + << "\t\t real_t D;\n" + << "\n" + << "\t\t if (MwcNext01(mwc) < (real_t)(0.5))\n" + << "\t\t D = " << d1precalc << ";\n" + << "\t\t else\n" + << "\t\t D = " << d2precalc << ";\n" + << "\n" + << "\t\t FX = fma(cos(rangle), D, x0);\n" + << "\t\t FY = fma(sin(rangle), D, y0);\n" + << "\t\t }\n" + << "\t\t }\n" + << "\t\t}\n" + << "\t\telse\n" + << "\t\t{\n" + << "\t\t if ((dist < " << d1precalc << ") && (dist > " << d2precalc << "))\n" + << "\t\t {\n" + << "\t\t if (" << mode << " < (real_t)(0.5))\n" + << "\t\t {\n" + << "\t\t FX = 0.0;\n" + << "\t\t FY = 0.0;\n" + << "\t\t }\n" + << "\t\t else if (" << mode << " < 1.5)\n" + << "\t\t {\n" + << "\t\t FX = x0;\n" + << "\t\t FY = y0;\n" + << "\t\t }\n" + << "\t\t else\n" + << "\t\t {\n" + << "\t\t real_t rangle = atan2(FY - y0, FX - x0);\n" + << "\t\t real_t D;\n" + << "\n" + << "\t\t if (MwcNext01(mwc) < (real_t)(0.5))\n" + << "\t\t D = " << d1precalc << ";\n" + << "\t\t else\n" + << "\t\t D = " << d2precalc << ";\n" + << "\n" + << "\t\t FX = fma(cos(rangle), D, x0);\n" + << "\t\t FY = fma(sin(rangle), D, y0);\n" + << "\t\t }\n" + << "\t\t }\n" + << "\t\t}\n" + << "\n" + << "\t\tvOut.x = (FX + FX_h) * " << weight << ";\n" + << "\t\tvOut.y = (FY + FY_h) * " << weight << ";\n" + << "\t\tvOut.z = " << DefaultZCl() + << "\t}\n"; + return ss.str(); + } - virtual vector OpenCLGlobalFuncNames() const override - { - return vector { "Round" }; - } + virtual void Precalc() override + { + m_D1Precalc = T(0.5) + m_Wd; + m_D2Precalc = T(0.5) - m_Wd; + } - virtual void Precalc() override - { - m_D1 = T(0.5) + m_Wd; - m_D2 = T(0.5) - m_Wd; - m_Coef = T(1.5) / T(M_PI); - } + virtual vector OpenCLGlobalFuncNames() const override + { + return vector { "Sqr" }; + } protected: - void Init() - { - string prefix = Prefix(); - m_Params.clear(); - m_Params.push_back(ParamWithName(&m_Wd, prefix + "Truchet_hex_crop_wd", T(0.2), eParamType::REAL_CYCLIC, 0, 5)); - m_Params.push_back(ParamWithName(&m_Mode, prefix + "Truchet_hex_crop_mode", 0, eParamType::INTEGER, 0, 2)); - m_Params.push_back(ParamWithName(&m_Inv, prefix + "Truchet_hex_crop_inv", 0, eParamType::INTEGER, 0, 1)); - m_Params.push_back(ParamWithName(&m_Seed, prefix + "Truchet_hex_crop_seed")); - m_Params.push_back(ParamWithName(true, &m_D1, prefix + "Truchet_hex_crop_d1"));//Precalc - m_Params.push_back(ParamWithName(true, &m_D2, prefix + "Truchet_hex_crop_d2")); - m_Params.push_back(ParamWithName(true, &m_Coef, prefix + "Truchet_hex_crop_coef")); - } + void Init() + { + string prefix = Prefix(); + m_Params.clear(); + m_Params.push_back(ParamWithName(&m_Wd, prefix + "Truchet_hex_crop_wd", T(0.2), eParamType::REAL, 0, 5)); + m_Params.push_back(ParamWithName(&m_Mode, prefix + "Truchet_hex_crop_mode", 0, eParamType::INTEGER, 0, 2)); + m_Params.push_back(ParamWithName(&m_Inv, prefix + "Truchet_hex_crop_inv", 0, eParamType::INTEGER, 0, 1)); + m_Params.push_back(ParamWithName(&m_Seed, prefix + "Truchet_hex_crop_seed", 0, eParamType::INTEGER)); + m_Params.push_back(ParamWithName(true, &m_D1Precalc, prefix + "Truchet_hex_crop_d1_precalc"));//Precalc. + m_Params.push_back(ParamWithName(true, &m_D2Precalc, prefix + "Truchet_hex_crop_d2_precalc")); + } private: - T m_Wd; - T m_Mode; - T m_Inv; - T m_Seed; - T m_D1;//Precalc. - T m_D2; - T m_Coef; + T m_Wd; + T m_Mode; + T m_Inv; + T m_Seed; + T m_D1Precalc;//Precalc. + T m_D2Precalc; }; /// @@ -6468,11 +6491,11 @@ public: << "\t\t}\n" << "\t\telse\n" << "\t\t{\n" - << "\t\treal_t xrand = floor(vIn.x + 0.5) * " << seed2 << ";\n" - << "\t\treal_t yrand = floor(vIn.y + 0.5) * " << seed2 << ";\n" - << "\t\treal_t niter = xrand + yrand + xrand * yrand;\n" - << "\t\treal_t randint0 = (niter + " << seed << ") * " << seed2half << ";\n" - << "\t\treal_t randint = fmod(fma(randint0, (real_t)(32747.0), (real_t)(12345.0)), (real_t)(65535.0));\n" + << "\t\t real_t xrand = floor(vIn.x + 0.5) * " << seed2 << ";\n" + << "\t\t real_t yrand = floor(vIn.y + 0.5) * " << seed2 << ";\n" + << "\t\t real_t niter = xrand + yrand + xrand * yrand;\n" + << "\t\t real_t randint0 = (niter + " << seed << ") * " << seed2half << ";\n" + << "\t\t real_t randint = fmod(fma(randint0, (real_t)(32747.0), (real_t)(12345.0)), (real_t)(65535.0));\n" << "\t\t tiletype = fmod(randint, 2.0);\n" << "\t\t}\n" << "\n" @@ -6481,6 +6504,7 @@ public: << "\t\treal2 R = (real2)(pow(pow(fabs(xval1), " << n << ") + pow(fabs(y), " << n << "), " << onen << "), pow(pow(fabs(xval2), " << n << ") + pow(fabs(y - 1), " << n << "), " << onen << "));\n" << "\t\treal_t r00 = fabs(R.x - 0.5) / " << rmax << ";\n" << "\t\treal_t r11 = fabs(R.y - 0.5) / " << rmax << ";\n" + << "\n" << "\t\tif (r00 > 1 && r11 > 1)\n" << "\t\t{\n" << "\t\t vOut.x = (x + floor(vIn.x)) * " << size << ";\n" @@ -6491,6 +6515,7 @@ public: << "\t\t vOut.x = 0;\n" << "\t\t vOut.y = 0;\n" << "\t\t}\n" + << "\n" << "\t\tvOut.z = " << DefaultZCl() << "\t}\n"; return ss.str(); @@ -7533,201 +7558,6 @@ private: T m_Yfact001;//Precalc. }; -/// -/// Gnarly. -/// -template -class GnarlyVariation : public ParametricVariation -{ -public: - GnarlyVariation(T weight = 1.0) : ParametricVariation("gnarly", eVariationId::VAR_GNARLY, weight) - { - Init(); - } - - PARVARCOPY(GnarlyVariation) - - virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override - { - T Vx, Vy; - T Cx, Cy; - T Lx, Ly; - T r, theta, s, c; - Vx = helper.In.x; - Vy = helper.In.y; - - if (m_GnarlyCellSize != T(0)) - { - Cx = (Floor(Vx / m_GnarlyCellSize) + T(0.5)) * m_GnarlyCellSize; - Cy = (Floor(Vy / m_GnarlyCellSize) + T(0.5)) * m_GnarlyCellSize; - Lx = Vx - Cx; - Ly = Vy - Cy; - - if ((Lx * Lx + Ly * Ly) <= m_R2) - { - r = (Lx * Lx + Ly * Ly) / m_R2; - theta = m_GnarlyTwist * std::log(r); - sincos(theta, &s, &c); - Vx = Cx + c * Lx + s * Ly; - Vy = Cy - s * Lx + c * Ly; - } - } - - helper.Out.x = m_Weight * Vx; - helper.Out.y = m_Weight * Vy; - helper.Out.z = DefaultZ(helper); - } - - virtual string OpenCLString() const override - { - ostringstream ss, ss2; - intmax_t i = 0, varIndex = IndexInXform(); - ss2 << "_" << XformIndexInEmber() << "]"; - string index = ss2.str(); - string weight = WeightDefineString(); - string cellsize = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string twist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - string r2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - ss << "\t{\n" - << "\t\treal_t Vx, Vy, Cx, Cy, Lx, Ly, Lxy;\n" - << "\t\treal_t r, theta, s, c;\n" - << "\n" - << "\t\tVx = vIn.x;\n" - << "\t\tVy = vIn.y;\n" - << "\n" - << "\t\tif (" << cellsize << " != (real_t)(0))\n" - << "\t\t{\n" - << "\t\t\tCx = (floor(Vx / " << cellsize << ") + (real_t)(0.5)) * " << cellsize << ";\n" - << "\t\t\tCy = (floor(Vy / " << cellsize << ") + (real_t)(0.5)) * " << cellsize << ";\n" - << "\n" - << "\t\t\tLx = Vx - Cx;\n" - << "\t\t\tLy = Vy - Cy;\n" - << "\t\t\tLxy = fma(Lx, Lx, Ly * Ly);\n" - << "\n" - << "\t\t\tif (Lxy <= " << r2 << ")\n" - << "\t\t\t{\n" - << "\t\t\t\tr = Lxy / " << r2 << ";\n" - << "\t\t\t\ttheta = " << twist << " * log(r);\n" - << "\t\t\t\ts = sin(theta);\n" - << "\t\t\t\tc = cos(theta);\n" - << "\t\t\t\tVx = Cx + c * Lx + s * Ly;\n" - << "\t\t\t\tVy = Cy - s * Lx + c * Ly;\n" - << "\t\t\t}\n" - << "\t\t}\n" - << "\n" - << "\t\tvOut.x = " << weight << " * Vx;\n" - << "\t\tvOut.y = " << weight << " * Vy;\n" - << "\t\tvOut.z = " << DefaultZCl() - << "\t}\n"; - return ss.str(); - } - - virtual void Precalc() override - { - T radius = T(0.5) * m_GnarlyCellSize; - m_R2 = Zeps(SQR(radius)); - } - -protected: - void Init() - { - string prefix = Prefix(); - m_Params.clear(); - m_Params.push_back(ParamWithName(&m_GnarlyCellSize, prefix + "gnarly_cellsize", T(1))); - m_Params.push_back(ParamWithName(&m_GnarlyTwist, prefix + "gnarly_twist", T(1))); - m_Params.push_back(ParamWithName(true, &m_R2, prefix + "gnarly_r2"));//Precalc. - } - -private: - T m_GnarlyCellSize; - T m_GnarlyTwist; - T m_R2;//Precalc. -}; - -/// -/// inkdrop by Jess. -/// -template -class InkdropVariation : public ParametricVariation -{ -public: - InkdropVariation(T weight = 1.0) : ParametricVariation("inkdrop", eVariationId::VAR_INKDROP, weight) - { - Init(); - } - - PARVARCOPY(InkdropVariation) - - virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override - { - T distx = helper.In.x - m_X; - T disty = helper.In.y - m_Y; - T dist2 = SQR(distx) + SQR(disty); - T adjust = std::sqrt(dist2 + m_Rad2) - std::sqrt(dist2); - T bearing = std::atan2(disty, distx); - T x = helper.In.x + (std::cos(bearing) * adjust); - T y = helper.In.y + (std::sin(bearing) * adjust); - helper.Out.x = m_Weight * x; - helper.Out.y = m_Weight * y; - helper.Out.z = DefaultZ(helper); - } - - virtual string OpenCLString() const override - { - ostringstream ss, ss2; - intmax_t i = 0, varIndex = IndexInXform(); - ss2 << "_" << XformIndexInEmber() << "]"; - string index = ss2.str(); - string weight = WeightDefineString(); - string r = "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 rad2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - ss << "\t{\n" - << "\t\treal_t distx = vIn.x - " << x << ";\n" - << "\t\treal_t disty = vIn.y - " << y << ";\n" - << "\t\treal_t dist2 = SQR(distx) + SQR(disty);\n" - << "\t\treal_t adjust = sqrt(dist2 + " << rad2 << ") - sqrt(dist2);\n" - << "\n" - << "\t\treal_t bearing = atan2(disty, distx);\n" - << "\t\treal_t x = fma(cos(bearing), adjust, vIn.x);\n" - << "\t\treal_t y = fma(sin(bearing), adjust, vIn.y);\n" - << "\n" - << "\t\tvOut.x = " << weight << " * x;\n" - << "\t\tvOut.y = " << weight << " * y;\n" - << "\t\tvOut.z = " << DefaultZCl() - << "\t}\n"; - return ss.str(); - } - - virtual void Precalc() override - { - m_Rad2 = SQR(m_R); - } - - virtual vector OpenCLGlobalFuncNames() const override - { - return vector { "Zeps" }; - } - -protected: - void Init() - { - string prefix = Prefix(); - m_Params.clear(); - m_Params.push_back(ParamWithName(&m_R, prefix + "inkdrop_r", T(0.5), eParamType::REAL, 0)); - m_Params.push_back(ParamWithName(&m_X, prefix + "inkdrop_x")); - m_Params.push_back(ParamWithName(&m_Y, prefix + "inkdrop_y")); - m_Params.push_back(ParamWithName(true, &m_Rad2, prefix + "inkdrop_rad2"));//Precalc. - } - -private: - T m_R; - T m_X; - T m_Y; - T m_Rad2;//Precalc. -}; - MAKEPREPOSTPARVAR(Splits3D, splits3D, SPLITS3D) MAKEPREPOSTPARVAR(Waves2B, waves2b, WAVES2B) MAKEPREPOSTPARVAR(JacCn, jac_cn, JAC_CN) @@ -7798,6 +7628,4 @@ MAKEPREPOSTPARVAR(Waves23, waves23, WAVES23) MAKEPREPOSTPARVAR(Waves42, waves42, WAVES42) MAKEPREPOSTPARVAR(Waves3, waves3, WAVES3) MAKEPREPOSTPARVAR(Waves4, waves4, WAVES4) -MAKEPREPOSTPARVAR(Gnarly, gnarly, GNARLY) -MAKEPREPOSTPARVAR(Inkdrop, inkdrop, INKDROP) } diff --git a/Source/Ember/Variations08.h b/Source/Ember/Variations08.h new file mode 100644 index 0000000..ddf54e8 --- /dev/null +++ b/Source/Ember/Variations08.h @@ -0,0 +1,317 @@ +#pragma once + +#include "Variation.h" + +namespace EmberNs +{ +/// +/// Gnarly. +/// +template +class GnarlyVariation : public ParametricVariation +{ +public: + GnarlyVariation(T weight = 1.0) : ParametricVariation("gnarly", eVariationId::VAR_GNARLY, weight) + { + Init(); + } + + PARVARCOPY(GnarlyVariation) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override + { + T Vx, Vy; + T Cx, Cy; + T Lx, Ly; + T r, theta, s, c; + Vx = helper.In.x; + Vy = helper.In.y; + + if (m_GnarlyCellSize != T(0)) + { + Cx = (Floor(Vx / m_GnarlyCellSize) + T(0.5)) * m_GnarlyCellSize; + Cy = (Floor(Vy / m_GnarlyCellSize) + T(0.5)) * m_GnarlyCellSize; + Lx = Vx - Cx; + Ly = Vy - Cy; + + if ((Lx * Lx + Ly * Ly) <= m_R2) + { + r = (Lx * Lx + Ly * Ly) / m_R2; + theta = m_GnarlyTwist * std::log(r); + sincos(theta, &s, &c); + Vx = Cx + c * Lx + s * Ly; + Vy = Cy - s * Lx + c * Ly; + } + } + + helper.Out.x = m_Weight * Vx; + helper.Out.y = m_Weight * Vy; + helper.Out.z = DefaultZ(helper); + } + + virtual string OpenCLString() const override + { + ostringstream ss, ss2; + intmax_t i = 0, varIndex = IndexInXform(); + ss2 << "_" << XformIndexInEmber() << "]"; + string index = ss2.str(); + string weight = WeightDefineString(); + string cellsize = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string twist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string r2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + ss << "\t{\n" + << "\t\treal_t Vx, Vy, Cx, Cy, Lx, Ly, Lxy;\n" + << "\t\treal_t r, theta, s, c;\n" + << "\n" + << "\t\tVx = vIn.x;\n" + << "\t\tVy = vIn.y;\n" + << "\n" + << "\t\tif (" << cellsize << " != (real_t)(0))\n" + << "\t\t{\n" + << "\t\t\tCx = (floor(Vx / " << cellsize << ") + (real_t)(0.5)) * " << cellsize << ";\n" + << "\t\t\tCy = (floor(Vy / " << cellsize << ") + (real_t)(0.5)) * " << cellsize << ";\n" + << "\n" + << "\t\t\tLx = Vx - Cx;\n" + << "\t\t\tLy = Vy - Cy;\n" + << "\t\t\tLxy = fma(Lx, Lx, Ly * Ly);\n" + << "\n" + << "\t\t\tif (Lxy <= " << r2 << ")\n" + << "\t\t\t{\n" + << "\t\t\t\tr = Lxy / " << r2 << ";\n" + << "\t\t\t\ttheta = " << twist << " * log(r);\n" + << "\t\t\t\ts = sin(theta);\n" + << "\t\t\t\tc = cos(theta);\n" + << "\t\t\t\tVx = Cx + c * Lx + s * Ly;\n" + << "\t\t\t\tVy = Cy - s * Lx + c * Ly;\n" + << "\t\t\t}\n" + << "\t\t}\n" + << "\n" + << "\t\tvOut.x = " << weight << " * Vx;\n" + << "\t\tvOut.y = " << weight << " * Vy;\n" + << "\t\tvOut.z = " << DefaultZCl() + << "\t}\n"; + return ss.str(); + } + + virtual void Precalc() override + { + T radius = T(0.5) * m_GnarlyCellSize; + m_R2 = Zeps(SQR(radius)); + } + +protected: + void Init() + { + string prefix = Prefix(); + m_Params.clear(); + m_Params.push_back(ParamWithName(&m_GnarlyCellSize, prefix + "gnarly_cellsize", T(1))); + m_Params.push_back(ParamWithName(&m_GnarlyTwist, prefix + "gnarly_twist", T(1))); + m_Params.push_back(ParamWithName(true, &m_R2, prefix + "gnarly_r2"));//Precalc. + } + +private: + T m_GnarlyCellSize; + T m_GnarlyTwist; + T m_R2;//Precalc. +}; + +/// +/// inkdrop by Jess. +/// +template +class InkdropVariation : public ParametricVariation +{ +public: + InkdropVariation(T weight = 1.0) : ParametricVariation("inkdrop", eVariationId::VAR_INKDROP, weight) + { + Init(); + } + + PARVARCOPY(InkdropVariation) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override + { + T distx = helper.In.x - m_X; + T disty = helper.In.y - m_Y; + T dist2 = SQR(distx) + SQR(disty); + T adjust = std::sqrt(dist2 + m_Rad2) - std::sqrt(dist2); + T bearing = std::atan2(disty, distx); + T x = helper.In.x + (std::cos(bearing) * adjust); + T y = helper.In.y + (std::sin(bearing) * adjust); + helper.Out.x = m_Weight * x; + helper.Out.y = m_Weight * y; + helper.Out.z = DefaultZ(helper); + } + + virtual string OpenCLString() const override + { + ostringstream ss, ss2; + intmax_t i = 0, varIndex = IndexInXform(); + ss2 << "_" << XformIndexInEmber() << "]"; + string index = ss2.str(); + string weight = WeightDefineString(); + string r = "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 rad2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + ss << "\t{\n" + << "\t\treal_t distx = vIn.x - " << x << ";\n" + << "\t\treal_t disty = vIn.y - " << y << ";\n" + << "\t\treal_t dist2 = SQR(distx) + SQR(disty);\n" + << "\t\treal_t adjust = sqrt(dist2 + " << rad2 << ") - sqrt(dist2);\n" + << "\n" + << "\t\treal_t bearing = atan2(disty, distx);\n" + << "\t\treal_t x = fma(cos(bearing), adjust, vIn.x);\n" + << "\t\treal_t y = fma(sin(bearing), adjust, vIn.y);\n" + << "\n" + << "\t\tvOut.x = " << weight << " * x;\n" + << "\t\tvOut.y = " << weight << " * y;\n" + << "\t\tvOut.z = " << DefaultZCl() + << "\t}\n"; + return ss.str(); + } + + virtual void Precalc() override + { + m_Rad2 = SQR(m_R); + } + +protected: + void Init() + { + string prefix = Prefix(); + m_Params.clear(); + m_Params.push_back(ParamWithName(&m_R, prefix + "inkdrop_r", T(0.5), eParamType::REAL, 0)); + m_Params.push_back(ParamWithName(&m_X, prefix + "inkdrop_x")); + m_Params.push_back(ParamWithName(&m_Y, prefix + "inkdrop_y")); + m_Params.push_back(ParamWithName(true, &m_Rad2, prefix + "inkdrop_rad2"));//Precalc. + } + +private: + T m_R; + T m_X; + T m_Y; + T m_Rad2;//Precalc. +}; + +/// +/// hex_modulus. +/// By tatasz. +/// +template +class HexModulusVariation : public ParametricVariation +{ +public: + HexModulusVariation(T weight = 1.0) : ParametricVariation("hex_modulus", eVariationId::VAR_HEX_MODULUS, weight) + { + Init(); + } + + PARVARCOPY(HexModulusVariation) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override + { + //get hex + T X = helper.In.x * m_HsizePrecalc; + T Y = helper.In.y * m_HsizePrecalc; + T yover3 = Y / 3; + T x = M_SQRT3_3 * X - yover3; + T z = T(2.0) * yover3; + T y = -x - z; + //round + T rx = std::round(x); + T ry = std::round(y); + T rz = std::round(z); + T x_diff = std::abs(rx - x); + T y_diff = std::abs(ry - y); + T z_diff = std::abs(rz - z); + + if ((x_diff > y_diff) & (x_diff > z_diff)) + rx = -ry - rz; + else if (y_diff > z_diff) + ry = -rx - rz; + else + rz = -rx - ry; + + T FX_h = M_SQRT3 * rx + M_SQRT3_2 * rz; + T FY_h = T(1.5) * rz; + T FX = X - FX_h; + T FY = Y - FY_h; + helper.Out.x = FX * m_WeightPrecalc; + helper.Out.y = FY * m_WeightPrecalc; + helper.Out.z = DefaultZ(helper); + } + + virtual string OpenCLString() const override + { + ostringstream ss, ss2; + intmax_t i = 0, varIndex = IndexInXform(); + ss2 << "_" << XformIndexInEmber() << "]"; + string index = ss2.str(); + string weight = WeightDefineString(); + string size = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string hsizeprecalc = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + string weightprecalc = "parVars[" + ToUpper(m_Params[i++].Name()) + index; + ss << "\t{\n" + << "\t\t//get hex\n" + << "\t\treal_t X = vIn.x * " << hsizeprecalc << ";\n" + << "\t\treal_t Y = vIn.y * " << hsizeprecalc << ";\n" + << "\t\treal_t yover3 = Y / (real_t)(3.0);\n" + << "\t\treal_t x = fma(M_SQRT3_3, X, -yover3);\n" + << "\t\treal_t z = (real_t)(2.0) * yover3;\n" + << "\t\treal_t y = -x - z;\n" + << "\t\t//round\n" + << "\t\treal_t rx = round(x);\n" + << "\t\treal_t ry = round(y);\n" + << "\t\treal_t rz = round(z);\n" + << "\n" + << "\t\treal_t x_diff = fabs(rx - x);\n" + << "\t\treal_t y_diff = fabs(ry - y);\n" + << "\t\treal_t z_diff = fabs(rz - z);\n" + << "\n" + << "\t\tif ((x_diff > y_diff) & (x_diff > z_diff))\n" + << "\t\trx = -ry - rz;\n" + << "\t\telse if (y_diff > z_diff)\n" + << "\t\try = -rx - rz;\n" + << "\t\telse\n" + << "\t\trz = -rx - ry;\n" + << "\n" + << "\t\treal_t FX_h = fma(M_SQRT3, rx, M_SQRT3_2 * rz);\n" + << "\t\treal_t FY_h = (real_t)(1.5) * rz;\n" + << "\n" + << "\t\treal_t FX = X - FX_h;\n" + << "\t\treal_t FY = Y - FY_h;\n" + << "\n" + << "\t\tvOut.x = FX * " << weightprecalc << ";\n" + << "\t\tvOut.y = FY * " << weightprecalc << ";\n" + << "\t\tvOut.z = " << DefaultZCl() + << "\t}\n"; + return ss.str(); + } + + virtual void Precalc() override + { + m_HsizePrecalc = M_SQRT3_2 / Zeps(m_Size); + m_WeightPrecalc = m_Weight / M_SQRT3_2; + } + +protected: + void Init() + { + string prefix = Prefix(); + m_Params.clear(); + m_Params.push_back(ParamWithName(&m_Size, prefix + "hex_modulus_size", T(1.0))); + m_Params.push_back(ParamWithName(true, &m_HsizePrecalc, prefix + "hex_modulus_hsize_precalc"));//Precalc. + m_Params.push_back(ParamWithName(true, &m_WeightPrecalc, prefix + "hex_modulus_weight_precalc")); + } + +private: + T m_Size; + T m_HsizePrecalc;//Precalc. + T m_WeightPrecalc; +}; + +MAKEPREPOSTPARVAR(Gnarly, gnarly, GNARLY) +MAKEPREPOSTPARVAR(Inkdrop, inkdrop, INKDROP) +MAKEPREPOSTPARVAR(HexModulus, hex_modulus, HEX_MODULUS) +} \ No newline at end of file diff --git a/Source/EmberCL/EmberCLStructs.h b/Source/EmberCL/EmberCLStructs.h index 94f97cc..6427214 100644 --- a/Source/EmberCL/EmberCLStructs.h +++ b/Source/EmberCL/EmberCLStructs.h @@ -81,12 +81,12 @@ static string ConstantDefinesString(bool doublePrecision) "#define M2PI ((real_t)M_2_PI)\n" "#define M_2PI (MPI * 2)\n" "#define M_3PI (MPI * 3)\n" - "#define SQRT3 ((real_t)(1.7320508075688772935274463415059))\n" - "#define SQRT3_2 ((real_t)(0.86602540378443864676372317075294))\n" - "#define SQRT3_3 ((real_t)(0.57735026918962576450914878050196))\n" - "#define SQRT5 2.2360679774997896964091736687313\n" - "#define M_PHI 1.61803398874989484820458683436563\n" - "#define M_1_2PI 0.15915494309189533576888376337251\n" + "#define M_SQRT3 ((real_t)(1.7320508075688772935274463415059))\n" + "#define M_SQRT3_2 ((real_t)(0.86602540378443864676372317075294))\n" + "#define M_SQRT3_3 ((real_t)(0.57735026918962576450914878050196))\n" + "#define M_SQRT5 ((real_t)(2.2360679774997896964091736687313))\n" + "#define M_PHI ((real_t)(1.61803398874989484820458683436563))\n" + "#define M_1_2PI ((real_t)(0.15915494309189533576888376337251))\n" "#define M_PI3 ((real_t)(1.0471975511965977461542144610932))\n" "#define M_PI6 ((real_t)(0.52359877559829887307710723054658))\n" "#define DEG_2_RAD (MPI / 180)\n" diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index 640ba82..ce680f5 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -58,7 +58,7 @@ QFrame::NoFrame - <html><head/><body><p align="center"><span style=" font-size:10pt;">Fractorium 1.0.0.16</span></p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><a href="http://fractorium.com"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">fractorium.com</span></a></p></body></html> + <html><head/><body><p align="center"><span style=" font-size:10pt;">Fractorium 1.0.0.17</span></p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><a href="http://fractorium.com"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">fractorium.com</span></a></p></body></html> Qt::RichText diff --git a/Source/Fractorium/GLEmberController.h b/Source/Fractorium/GLEmberController.h index b27a237..5dd0857 100644 --- a/Source/Fractorium/GLEmberController.h +++ b/Source/Fractorium/GLEmberController.h @@ -147,7 +147,8 @@ private: m4T m_Projection; Affine2D m_DragSrcTransform; - vector> m_DragSrcTransforms; + std::map> m_DragSrcPreTransforms; + std::map> m_DragSrcPostTransforms; Xform* m_HoverXform; Xform* m_SelectedXform; diff --git a/Source/Fractorium/GLWidget.cpp b/Source/Fractorium/GLWidget.cpp index f713c23..21f56a7 100644 --- a/Source/Fractorium/GLWidget.cpp +++ b/Source/Fractorium/GLWidget.cpp @@ -894,10 +894,14 @@ void GLEmberController::MousePress(QMouseEvent* e) m_DragSrcTransform = Affine2D(m_AffineType == eAffineType::AffinePre ? m_SelectedXform->m_Affine : m_SelectedXform->m_Post);//Copy the affine of the xform that was selected. //The user has selected an xform by clicking on it, so update the main GUI by selecting this xform in the combo box. m_Fractorium->CurrentXform(xformIndex);//Must do this first so UpdateXform() below properly grabs the current plus any selected. - m_DragSrcTransforms.clear(); + m_DragSrcPreTransforms.clear(); + m_DragSrcPostTransforms.clear(); m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { - m_DragSrcTransforms.push_back(m_AffineType == eAffineType::AffinePre ? xform->m_Affine : xform->m_Post); + if (m_AffineType == eAffineType::AffinePre) + m_DragSrcPreTransforms[xfindex] = xform->m_Affine; + else + m_DragSrcPostTransforms[xfindex] = xform->m_Post; }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false);//Don't update renderer here. m_DragHandlePos = m_HoverHandlePos;//The location in local coordinates of the point selected on the spinner, x, y or center. m_DragState = eDragState::DragDragging; @@ -906,6 +910,8 @@ void GLEmberController::MousePress(QMouseEvent* e) else//Nothing was selected. { //m_SelectedXform = nullptr; + m_DragSrcPreTransforms.clear(); + m_DragSrcPostTransforms.clear(); m_DragState = eDragState::DragNone; } } @@ -1028,13 +1034,26 @@ void GLEmberController::MouseMove(QMouseEvent* e) int i = 0; m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { - QPointF cd(xform->m_Affine.C() * scale, xform->m_Affine.F() * scale); - bool b = qrf.contains(cd); - m_FractoriumEmberController->XformCheckboxAt(i, [&](QCheckBox * cb) + if (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)//Draw all pre affine if specified. { - cb->setChecked(b); - }); - i++; + QPointF cd(xform->m_Affine.C() * scale, xform->m_Affine.F() * scale); + bool b = qrf.contains(cd); + m_FractoriumEmberController->XformCheckboxAt(xfindex, [&](QCheckBox * cb) + { + cb->setChecked(b); + }); + } + + if (m_Fractorium->DrawAllPost() || xform == m_SelectedXform) + { + QPointF cd(xform->m_Post.C() * scale, xform->m_Post.F() * scale); + bool b = qrf.contains(cd); + m_FractoriumEmberController->XformCheckboxAt(xfindex, [&](QCheckBox * cb) + { + if (!cb->isChecked() && b) + cb->setChecked(b); + }); + } }, eXformUpdate::UPDATE_ALL, false); } else if (m_DragState == eDragState::DragPanning)//Translating the whole image. @@ -1984,20 +2003,46 @@ void GLEmberController::CalcDragXAxis() T angle = startAngle - endAngle; m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { - auto& affine = pre ? xform->m_Affine : xform->m_Post; - auto src = m_DragSrcTransforms[selIndex]; + auto it = m_DragSrcPreTransforms.find(xfindex); - if (GetAlt()) + if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) { - src.Rotate(angle); - affine.X(src.X()); + auto src = it->second; + auto& affine = xform->m_Affine; + + if (GetAlt()) + { + src.Rotate(angle); + affine.X(src.X()); + } + else + { + src.Rotate(angle); + affine = src; + } } - else + + it = m_DragSrcPostTransforms.find(xfindex); + + if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) { - src.Rotate(angle); - affine = src; + auto src = it->second; + auto& affine = xform->m_Post; + + if (GetAlt()) + { + src.Rotate(angle); + affine.X(src.X()); + } + else + { + src.Rotate(angle); + affine = src; + } } + auto& affine = pre ? xform->m_Affine : xform->m_Post; + if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T((affine.O() + affine.X()) * worldToAffineScale, 0); }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false);//Calling code will update renderer. @@ -2017,30 +2062,66 @@ void GLEmberController::CalcDragXAxis() T angle = startAngle - endAngle; m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { - auto& affine = pre ? xform->m_Affine : xform->m_Post; - auto src = m_DragSrcTransforms[selIndex]; + auto it = m_DragSrcPreTransforms.find(xfindex); - if (worldPivotShiftAlt) + if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) { - src.X(src.O() + src.X()); - src.O(v2T(0)); - src.Rotate(angle); - affine.X(src.X() - affine.O()); - } - else if (GetAlt()) - { - affine.X(v2T(relScaled));//Absolute, not ratio. - } - else - { - src.ScaleXY(newprc); + auto src = it->second; + auto& affine = xform->m_Affine; - if (m_Fractorium->m_Settings->RotateAndScale()) + if (worldPivotShiftAlt) + { + src.X(src.O() + src.X()); + src.O(v2T(0)); src.Rotate(angle); + affine.X(src.X() - affine.O()); + } + else if (GetAlt()) + { + affine.X(v2T(relScaled));//Absolute, not ratio. + } + else + { + src.ScaleXY(newprc); - affine = src; + if (m_Fractorium->m_Settings->RotateAndScale()) + src.Rotate(angle); + + affine = src; + } } + it = m_DragSrcPostTransforms.find(xfindex); + + if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + { + auto src = it->second; + auto& affine = xform->m_Post; + + if (worldPivotShiftAlt) + { + src.X(src.O() + src.X()); + src.O(v2T(0)); + src.Rotate(angle); + affine.X(src.X() - affine.O()); + } + else if (GetAlt()) + { + affine.X(v2T(relScaled));//Absolute, not ratio. + } + else + { + src.ScaleXY(newprc); + + if (m_Fractorium->m_Settings->RotateAndScale()) + src.Rotate(angle); + + affine = src; + } + } + + auto& affine = pre ? xform->m_Affine : xform->m_Post; + if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T((affine.O() + affine.X()) * worldToAffineScale, 0); }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false); @@ -2087,20 +2168,46 @@ void GLEmberController::CalcDragYAxis() T angle = startAngle - endAngle; m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { - auto& affine = pre ? xform->m_Affine : xform->m_Post; - auto src = m_DragSrcTransforms[selIndex]; + auto it = m_DragSrcPreTransforms.find(xfindex); - if (GetAlt()) + if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) { - src.Rotate(angle); - affine.Y(src.Y()); + auto src = it->second; + auto& affine = xform->m_Affine; + + if (GetAlt()) + { + src.Rotate(angle); + affine.Y(src.Y()); + } + else + { + src.Rotate(angle); + affine = src; + } } - else + + it = m_DragSrcPostTransforms.find(xfindex); + + if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) { - src.Rotate(angle); - affine = src; + auto src = it->second; + auto& affine = xform->m_Post; + + if (GetAlt()) + { + src.Rotate(angle); + affine.Y(src.Y()); + } + else + { + src.Rotate(angle); + affine = src; + } } + auto& affine = pre ? xform->m_Affine : xform->m_Post; + if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T((affine.O() + affine.Y()) * worldToAffineScale, 0); }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false);//Calling code will update renderer. @@ -2120,30 +2227,66 @@ void GLEmberController::CalcDragYAxis() T angle = startAngle - endAngle; m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { - auto& affine = pre ? xform->m_Affine : xform->m_Post; - auto src = m_DragSrcTransforms[selIndex]; + auto it = m_DragSrcPreTransforms.find(xfindex); - if (worldPivotShiftAlt) + if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) { - src.Y(src.O() + src.Y()); - src.O(v2T(0)); - src.Rotate(angle); - affine.Y(src.Y() - affine.O()); - } - else if (GetAlt()) - { - affine.Y(v2T(relScaled));//Absolute, not ratio. - } - else - { - src.ScaleXY(newprc); + auto src = it->second; + auto& affine = xform->m_Affine; - if (m_Fractorium->m_Settings->RotateAndScale()) + if (worldPivotShiftAlt) + { + src.Y(src.O() + src.Y()); + src.O(v2T(0)); src.Rotate(angle); + affine.Y(src.Y() - affine.O()); + } + else if (GetAlt()) + { + affine.Y(v2T(relScaled));//Absolute, not ratio. + } + else + { + src.ScaleXY(newprc); - affine = src; + if (m_Fractorium->m_Settings->RotateAndScale()) + src.Rotate(angle); + + affine = src; + } } + it = m_DragSrcPostTransforms.find(xfindex); + + if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + { + auto src = it->second; + auto& affine = xform->m_Post; + + if (worldPivotShiftAlt) + { + src.Y(src.O() + src.Y()); + src.O(v2T(0)); + src.Rotate(angle); + affine.Y(src.Y() - affine.O()); + } + else if (GetAlt()) + { + affine.Y(v2T(relScaled));//Absolute, not ratio. + } + else + { + src.ScaleXY(newprc); + + if (m_Fractorium->m_Settings->RotateAndScale()) + src.Rotate(angle); + + affine = src; + } + } + + auto& affine = pre ? xform->m_Affine : xform->m_Post; + if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T((affine.O() + affine.Y()) * worldToAffineScale, 0); }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false); @@ -2179,21 +2322,46 @@ void GLEmberController::CalcDragTranslation() T angle = startAngle - endAngle; m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { - auto& affine = pre ? xform->m_Affine : xform->m_Post; - auto srcRotated = m_DragSrcTransforms[selIndex]; - srcRotated.RotateTrans(angle); + auto it = m_DragSrcPreTransforms.find(xfindex); - if (worldPivotShift) + if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) { - srcRotated.Rotate(angle); - affine.X(srcRotated.X()); - affine.Y(srcRotated.Y()); + auto src = it->second; + auto& affine = xform->m_Affine; + src.RotateTrans(angle); + + if (worldPivotShift) + { + src.Rotate(angle); + affine.X(src.X()); + affine.Y(src.Y()); + } + + affine.O(src.O()); } - affine.O(srcRotated.O()); + it = m_DragSrcPostTransforms.find(xfindex); + + if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + { + auto src = it->second; + auto& affine = xform->m_Post; + src.RotateTrans(angle); + + if (worldPivotShift) + { + src.Rotate(angle); + affine.X(src.X()); + affine.Y(src.Y()); + } + + affine.O(src.O()); + } + + auto& affine = pre ? xform->m_Affine : xform->m_Post; if (xform == m_FractoriumEmberController->CurrentXform()) - m_DragHandlePos = v3T(srcRotated.O(), 0) * worldToAffineScale; + m_DragHandlePos = v3T(affine.O(), 0) * worldToAffineScale; }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false);//Calling code will update renderer. } else @@ -2204,10 +2372,29 @@ void GLEmberController::CalcDragTranslation() { m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { + auto it = m_DragSrcPreTransforms.find(xfindex); + + if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + { + auto& src = it->second; + auto& affine = xform->m_Affine; + auto offset = src.O() + (affineToWorldScale * v2T(diff)); + auto snapped = SnapToGrid(offset); + affine.O(v2T(snapped.x, snapped.y)); + } + + it = m_DragSrcPostTransforms.find(xfindex); + + if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + { + auto& src = it->second; + auto& affine = xform->m_Post; + auto offset = src.O() + (affineToWorldScale * v2T(diff)); + auto snapped = SnapToGrid(offset); + affine.O(v2T(snapped.x, snapped.y)); + } + auto& affine = pre ? xform->m_Affine : xform->m_Post; - auto offset = m_DragSrcTransforms[selIndex].O() + (affineToWorldScale * v2T(diff)); - auto snapped = SnapToGrid(offset); - affine.O(v2T(snapped.x, snapped.y)); if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T(affine.O(), 0) * worldToAffineScale; @@ -2217,8 +2404,25 @@ void GLEmberController::CalcDragTranslation() { m_FractoriumEmberController->UpdateXform([&](Xform* xform, size_t xfindex, size_t selIndex) { + auto it = m_DragSrcPreTransforms.find(xfindex); + + if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + { + auto& src = it->second; + auto& affine = xform->m_Affine; + affine.O(src.O() + (affineToWorldScale * v2T(diff))); + } + + it = m_DragSrcPostTransforms.find(xfindex); + + if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + { + auto& src = it->second; + auto& affine = xform->m_Post; + affine.O(src.O() + (affineToWorldScale * v2T(diff))); + } + auto& affine = pre ? xform->m_Affine : xform->m_Post; - affine.O(m_DragSrcTransforms[selIndex].O() + (affineToWorldScale * v2T(diff))); if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T(affine.O(), 0) * worldToAffineScale; diff --git a/Source/apoconv/Form1.cs b/Source/apoconv/Form1.cs index 7668132..f1b4777 100644 --- a/Source/apoconv/Form1.cs +++ b/Source/apoconv/Form1.cs @@ -23,7 +23,9 @@ namespace apoconv //{ "0.0", "0" }, { "0.5", "T(0.5)" }, { "1.0", "T(1.0)" }, + { "1.5", "T(1.5)" }, { "2.0", "T(2.0)" }, + { "3.0", "T(3.0)" }, { "0.1", "T(0.1)" }, { "0.01", "T(0.01)" }, { "0.001", "T(0.001)" }, @@ -38,7 +40,8 @@ namespace apoconv { "FPz", "helper.Out.z" }, { "VVAR", "m_Weight" }, { "floor(", "Floor(" }, - { "cel(", "std::ceil(" }, + { "ceil(", "std::ceil(" }, + { "round(", "std::round(" }, { "sin(", "std::sin(" }, { "sinh(", "std::sinh(" }, { "asin(", "std::asin(" }, @@ -58,11 +61,14 @@ namespace apoconv { "sqrt(", "std::sqrt(" }, { "pow(", "std::pow(" }, { "fabs(", "std::abs(" }, + { "abs(", "std::abs(" }, { "log(", "std::log(" }, { "exp(", "std::exp(" }, { "sqr(", "Sqr(" }, + { "random01()", "rand.Frand01()" }, + { "M_E", "T(M_E)" }, { "M_LOG2E", "T(M_LOG2E)" }, { "M_LOG10E", "T(M_LOG10E)" }, @@ -391,6 +397,11 @@ namespace apoconv final += "\t\tstring " + param.MemberName.Replace("m_", "").ToLower() + " = \"parVars[\" + ToUpper(m_Params[i++].Name()) + index;\r\n"; } + foreach (var param in m_StructParams) + { + final += "\t\tstring " + param.MemberName.Replace("m_", "").ToLower() + " = \"parVars[\" + ToUpper(m_Params[i++].Name()) + index;\r\n"; + } + final += "\t\tss << \"\\t{\\n\"\r\n"; foreach (var line in m_FinalCalcFuncLines) @@ -413,6 +424,7 @@ namespace apoconv Replace("std::abs", "fabs"). Replace("m_Weight", "\" << weight << \""). Replace("std::", ""). + Replace("rand.Frand01()", "MwcNext01(mwc)"). Replace("T(", "(real_t)(") ; From f095df99c99cd4fdf81b862d832a4186cec4aec6 Mon Sep 17 00:00:00 2001 From: Person Date: Thu, 20 Jun 2019 16:29:17 -0700 Subject: [PATCH 3/5] --Code changes -Change two if statements into an if/else if in Truchet_hex_fill. --- Source/Ember/Variations07.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Ember/Variations07.h b/Source/Ember/Variations07.h index 607604d..dafc4e2 100644 --- a/Source/Ember/Variations07.h +++ b/Source/Ember/Variations07.h @@ -1506,10 +1506,11 @@ public: bool add = true; if (m_Seed == 1) + { if (!(int(rx) & 1) && !(int(rz) & 1)) add = false; - - if (m_Seed >= 2) + } + else if (m_Seed >= 2) { T hash_f = std::sin(FX_h * T(12.9898) + FY_h * T(78.233) + m_Seed) * T(43758.5453); hash_f = hash_f - Floor(hash_f); @@ -1581,10 +1582,11 @@ public: << "\t\tbool add = true;\n" << "\n" << "\t\tif (" << seed << " == 1)\n" + << "\t\t{\n" << "\t\t if (!((int)rx & 1) && !((int)rz & 1))\n" << "\t\t add = false;\n" - << "\n" - << "\t\tif (" << seed << " >= 2)\n" + << "\t\t}\n" + << "\t\telse if (" << seed << " >= 2)\n" << "\t\t{\n" << "\t\t real_t hash_f = sin(fma(FX_h, (real_t)(12.9898), fma(FY_h, (real_t)(78.233), " << seed << "))) * (real_t)(43758.5453);\n" << "\t\t hash_f = hash_f - floor(hash_f);\n" From b0088e58bcfbfa7375914d6edd1fe847f00a8f99 Mon Sep 17 00:00:00 2001 From: Person Date: Fri, 21 Jun 2019 17:51:20 -0700 Subject: [PATCH 4/5] --User changes -Fix xform selection logic to prevent selecting hidden pre and post xforms. -Remove the "Current" visibility option for pre/post affines. Instead just have "Selected" and "All". If none are selected, show current. --- Source/Fractorium/Fractorium.cpp | 2 - Source/Fractorium/Fractorium.h | 2 - Source/Fractorium/Fractorium.ui | 25 +----- Source/Fractorium/FractoriumXformsAffine.cpp | 4 - Source/Fractorium/GLWidget.cpp | 82 +++++++++++--------- 5 files changed, 51 insertions(+), 64 deletions(-) diff --git a/Source/Fractorium/Fractorium.cpp b/Source/Fractorium/Fractorium.cpp index 10b8fa9..ebf0c73 100644 --- a/Source/Fractorium/Fractorium.cpp +++ b/Source/Fractorium/Fractorium.cpp @@ -911,7 +911,6 @@ void Fractorium::SetTabOrders() w = SetTabOrder(this, w, ui.PreScaleCombo); w = SetTabOrder(this, w, ui.PreScaleUpButton); w = SetTabOrder(this, w, ui.PreRandomButton); - w = SetTabOrder(this, w, ui.ShowPreAffineCurrentRadio); w = SetTabOrder(this, w, ui.ShowPreAffineSelectedRadio); w = SetTabOrder(this, w, ui.ShowPreAffineAllRadio); w = SetTabOrder(this, w, ui.SwapAffinesButton); @@ -941,7 +940,6 @@ void Fractorium::SetTabOrders() w = SetTabOrder(this, w, ui.PostScaleCombo); w = SetTabOrder(this, w, ui.PostScaleUpButton); w = SetTabOrder(this, w, ui.PostRandomButton); - w = SetTabOrder(this, w, ui.ShowPostAffineCurrentRadio); w = SetTabOrder(this, w, ui.ShowPostAffineSelectedRadio); w = SetTabOrder(this, w, ui.ShowPostAffineAllRadio); w = SetTabOrder(this, w, ui.PolarAffineCheckBox); diff --git a/Source/Fractorium/Fractorium.h b/Source/Fractorium/Fractorium.h index 7589722..9fcfa81 100644 --- a/Source/Fractorium/Fractorium.h +++ b/Source/Fractorium/Fractorium.h @@ -116,10 +116,8 @@ public: void CurrentXform(uint i); //Xforms Affine. - bool DrawCurrentPre(); bool DrawSelectedPre(); bool DrawAllPre(); - bool DrawCurrentPost(); bool DrawSelectedPost(); bool DrawAllPost(); bool LocalPivot(); diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui index 5773efd..68dc39f 100644 --- a/Source/Fractorium/Fractorium.ui +++ b/Source/Fractorium/Fractorium.ui @@ -3481,7 +3481,7 @@ QTabWidget::Triangular - 2 + 1 @@ -4902,13 +4902,6 @@ 6 - - - - Current - - - @@ -5784,24 +5777,14 @@ 6 - - - - true - - - Current - - - true - - - Selected + + true + diff --git a/Source/Fractorium/FractoriumXformsAffine.cpp b/Source/Fractorium/FractoriumXformsAffine.cpp index e2fb48d..07b95f5 100644 --- a/Source/Fractorium/FractoriumXformsAffine.cpp +++ b/Source/Fractorium/FractoriumXformsAffine.cpp @@ -97,10 +97,8 @@ void Fractorium::InitXformsAffineUI() connect(ui.PostAffineGroupBox, SIGNAL(toggled(bool)), this, SLOT(OnAffineGroupBoxToggled(bool)), Qt::QueuedConnection); connect(ui.SwapAffinesButton, SIGNAL(clicked(bool)), this, SLOT(OnSwapAffinesButtonClicked(bool)), Qt::QueuedConnection); connect(ui.ShowPreAffineAllRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); - connect(ui.ShowPreAffineCurrentRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); connect(ui.ShowPreAffineSelectedRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); connect(ui.ShowPostAffineAllRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); - connect(ui.ShowPostAffineCurrentRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); connect(ui.ShowPostAffineSelectedRadio, SIGNAL(toggled(bool)), this, SLOT(OnAffineDrawAllCurrentRadioButtonToggled(bool)), Qt::QueuedConnection); connect(ui.PolarAffineCheckBox, SIGNAL(stateChanged(int)), this, SLOT(OnPolarAffineCheckBoxStateChanged(int)), Qt::QueuedConnection); #ifndef _WIN32 @@ -796,10 +794,8 @@ void Fractorium::SetupAffineSpinner(QTableWidget* table, const QObject* receiver /// GUI wrapper functions, getters only. /// -bool Fractorium::DrawCurrentPre() { return !DrawAllPre() && !DrawSelectedPre(); } bool Fractorium::DrawSelectedPre() { return ui.ShowPreAffineSelectedRadio->isChecked(); } bool Fractorium::DrawAllPre() { return ui.ShowPreAffineAllRadio->isChecked(); } -bool Fractorium::DrawCurrentPost() { return !DrawAllPost() && !DrawSelectedPost(); } bool Fractorium::DrawSelectedPost() { return ui.ShowPostAffineSelectedRadio->isChecked(); } bool Fractorium::DrawAllPost() { return ui.ShowPostAffineAllRadio->isChecked(); } bool Fractorium::LocalPivot() { return ui.LocalPivotRadio->isChecked(); } diff --git a/Source/Fractorium/GLWidget.cpp b/Source/Fractorium/GLWidget.cpp index 21f56a7..2c23fc7 100644 --- a/Source/Fractorium/GLWidget.cpp +++ b/Source/Fractorium/GLWidget.cpp @@ -666,10 +666,20 @@ void GLEmberController::DrawAffines(bool pre, bool post) if (pre && m_Fractorium->DrawAllPre())//Draw all pre affine if specified. { size_t i = 0; + bool any = false; + + while (auto xform = ember->GetTotalXform(i, forceFinal)) + if (m_Fractorium->IsXformSelected(i++)) + { + any = true; + break; + } + + i = 0; while (auto xform = ember->GetTotalXform(i, forceFinal)) { - bool selected = m_Fractorium->IsXformSelected(i++) || m_SelectedXform == xform; + bool selected = m_Fractorium->IsXformSelected(i++) || (!any && m_SelectedXform == xform); DrawAffine(xform, true, selected, !dragging && (m_HoverXform == xform)); } } @@ -690,18 +700,24 @@ void GLEmberController::DrawAffines(bool pre, bool post) if (!any) DrawAffine(m_FractoriumEmberController->CurrentXform(), true, true, !dragging && (m_HoverXform == m_FractoriumEmberController->CurrentXform())); } - else if (pre)//Only draw current pre affine. - { - DrawAffine(m_SelectedXform, true, true, !dragging && (m_HoverXform == m_FractoriumEmberController->CurrentXform())); - } if (post && m_Fractorium->DrawAllPost())//Draw all post affine if specified. { size_t i = 0; + bool any = false; + + while (auto xform = ember->GetTotalXform(i, forceFinal)) + if (m_Fractorium->IsXformSelected(i++)) + { + any = true; + break; + } + + i = 0; while (auto xform = ember->GetTotalXform(i, forceFinal)) { - bool selected = m_Fractorium->IsXformSelected(i++) || m_SelectedXform == xform; + bool selected = m_Fractorium->IsXformSelected(i++) || (!any && m_SelectedXform == xform); DrawAffine(xform, false, selected, !dragging && (m_HoverXform == xform)); } } @@ -722,10 +738,6 @@ void GLEmberController::DrawAffines(bool pre, bool post) if (!any) DrawAffine(m_FractoriumEmberController->CurrentXform(), false, true, !dragging && (m_HoverXform == m_FractoriumEmberController->CurrentXform())); } - else if (post)//Only draw current post affine. - { - DrawAffine(m_SelectedXform, false, true, !dragging && (m_HoverXform == m_FractoriumEmberController->CurrentXform())); - } } if (dragging)//Draw large yellow dot on select or drag. @@ -902,7 +914,7 @@ void GLEmberController::MousePress(QMouseEvent* e) m_DragSrcPreTransforms[xfindex] = xform->m_Affine; else m_DragSrcPostTransforms[xfindex] = xform->m_Post; - }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false);//Don't update renderer here. + }, eXformUpdate::UPDATE_SELECTED, false);//Don't update renderer here. m_DragHandlePos = m_HoverHandlePos;//The location in local coordinates of the point selected on the spinner, x, y or center. m_DragState = eDragState::DragDragging; m_GL->repaint(); @@ -1038,7 +1050,7 @@ void GLEmberController::MouseMove(QMouseEvent* e) { QPointF cd(xform->m_Affine.C() * scale, xform->m_Affine.F() * scale); bool b = qrf.contains(cd); - m_FractoriumEmberController->XformCheckboxAt(xfindex, [&](QCheckBox * cb) + m_FractoriumEmberController->XformCheckboxAt(int(xfindex), [&](QCheckBox * cb) { cb->setChecked(b); }); @@ -1048,7 +1060,7 @@ void GLEmberController::MouseMove(QMouseEvent* e) { QPointF cd(xform->m_Post.C() * scale, xform->m_Post.F() * scale); bool b = qrf.contains(cd); - m_FractoriumEmberController->XformCheckboxAt(xfindex, [&](QCheckBox * cb) + m_FractoriumEmberController->XformCheckboxAt(int(xfindex), [&](QCheckBox * cb) { if (!cb->isChecked() && b) cb->setChecked(b); @@ -1799,8 +1811,8 @@ int GLEmberController::UpdateHover(v3T& glCoords) //is set to show current, and the user hovers over another xform, but doesn't select it, then moves the mouse //back over the hidden circle for the pre/post that was set to only show current. bool isSel = m_Fractorium->IsXformSelected(ember->GetTotalXformIndex(m_SelectedXform)); - bool checkPre = pre && (m_Fractorium->DrawAllPre() || (m_Fractorium->DrawSelectedPre() && isSel) || m_Fractorium->DrawCurrentPre()); - bool checkPost = post && (m_Fractorium->DrawAllPost() || (m_Fractorium->DrawSelectedPost() && isSel) || m_Fractorium->DrawCurrentPost()); + bool checkPre = pre && (m_Fractorium->DrawAllPre() || (m_Fractorium->DrawSelectedPre() && isSel)); + bool checkPost = post && (m_Fractorium->DrawAllPost() || (m_Fractorium->DrawSelectedPost() && isSel)); if (CheckXformHover(m_SelectedXform, glCoords, bestDist, checkPre, checkPost)) { @@ -2005,7 +2017,7 @@ void GLEmberController::CalcDragXAxis() { auto it = m_DragSrcPreTransforms.find(xfindex); - if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + if (it != m_DragSrcPreTransforms.end()) { auto src = it->second; auto& affine = xform->m_Affine; @@ -2024,7 +2036,7 @@ void GLEmberController::CalcDragXAxis() it = m_DragSrcPostTransforms.find(xfindex); - if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + if (it != m_DragSrcPostTransforms.end()) { auto src = it->second; auto& affine = xform->m_Post; @@ -2045,7 +2057,7 @@ void GLEmberController::CalcDragXAxis() if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T((affine.O() + affine.X()) * worldToAffineScale, 0); - }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false);//Calling code will update renderer. + }, eXformUpdate::UPDATE_SELECTED, false);//Calling code will update renderer. } else { @@ -2064,7 +2076,7 @@ void GLEmberController::CalcDragXAxis() { auto it = m_DragSrcPreTransforms.find(xfindex); - if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + if (it != m_DragSrcPreTransforms.end()) { auto src = it->second; auto& affine = xform->m_Affine; @@ -2093,7 +2105,7 @@ void GLEmberController::CalcDragXAxis() it = m_DragSrcPostTransforms.find(xfindex); - if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + if (it != m_DragSrcPostTransforms.end()) { auto src = it->second; auto& affine = xform->m_Post; @@ -2124,7 +2136,7 @@ void GLEmberController::CalcDragXAxis() if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T((affine.O() + affine.X()) * worldToAffineScale, 0); - }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false); + }, eXformUpdate::UPDATE_SELECTED, false); } } @@ -2170,7 +2182,7 @@ void GLEmberController::CalcDragYAxis() { auto it = m_DragSrcPreTransforms.find(xfindex); - if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + if (it != m_DragSrcPreTransforms.end()) { auto src = it->second; auto& affine = xform->m_Affine; @@ -2189,7 +2201,7 @@ void GLEmberController::CalcDragYAxis() it = m_DragSrcPostTransforms.find(xfindex); - if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + if (it != m_DragSrcPostTransforms.end()) { auto src = it->second; auto& affine = xform->m_Post; @@ -2210,7 +2222,7 @@ void GLEmberController::CalcDragYAxis() if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T((affine.O() + affine.Y()) * worldToAffineScale, 0); - }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false);//Calling code will update renderer. + }, eXformUpdate::UPDATE_SELECTED, false);//Calling code will update renderer. } else { @@ -2229,7 +2241,7 @@ void GLEmberController::CalcDragYAxis() { auto it = m_DragSrcPreTransforms.find(xfindex); - if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + if (it != m_DragSrcPreTransforms.end()) { auto src = it->second; auto& affine = xform->m_Affine; @@ -2258,7 +2270,7 @@ void GLEmberController::CalcDragYAxis() it = m_DragSrcPostTransforms.find(xfindex); - if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + if (it != m_DragSrcPostTransforms.end()) { auto src = it->second; auto& affine = xform->m_Post; @@ -2289,7 +2301,7 @@ void GLEmberController::CalcDragYAxis() if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T((affine.O() + affine.Y()) * worldToAffineScale, 0); - }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false); + }, eXformUpdate::UPDATE_SELECTED, false); } } @@ -2324,7 +2336,7 @@ void GLEmberController::CalcDragTranslation() { auto it = m_DragSrcPreTransforms.find(xfindex); - if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + if (it != m_DragSrcPreTransforms.end()) { auto src = it->second; auto& affine = xform->m_Affine; @@ -2342,7 +2354,7 @@ void GLEmberController::CalcDragTranslation() it = m_DragSrcPostTransforms.find(xfindex); - if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + if (it != m_DragSrcPostTransforms.end()) { auto src = it->second; auto& affine = xform->m_Post; @@ -2362,7 +2374,7 @@ void GLEmberController::CalcDragTranslation() if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T(affine.O(), 0) * worldToAffineScale; - }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false);//Calling code will update renderer. + }, eXformUpdate::UPDATE_SELECTED, false);//Calling code will update renderer. } else { @@ -2374,7 +2386,7 @@ void GLEmberController::CalcDragTranslation() { auto it = m_DragSrcPreTransforms.find(xfindex); - if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + if (it != m_DragSrcPreTransforms.end()) { auto& src = it->second; auto& affine = xform->m_Affine; @@ -2385,7 +2397,7 @@ void GLEmberController::CalcDragTranslation() it = m_DragSrcPostTransforms.find(xfindex); - if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + if (it != m_DragSrcPostTransforms.end()) { auto& src = it->second; auto& affine = xform->m_Post; @@ -2406,7 +2418,7 @@ void GLEmberController::CalcDragTranslation() { auto it = m_DragSrcPreTransforms.find(xfindex); - if (it != m_DragSrcPreTransforms.end() && (m_Fractorium->DrawAllPre() || xform == m_SelectedXform)) + if (it != m_DragSrcPreTransforms.end()) { auto& src = it->second; auto& affine = xform->m_Affine; @@ -2415,7 +2427,7 @@ void GLEmberController::CalcDragTranslation() it = m_DragSrcPostTransforms.find(xfindex); - if (it != m_DragSrcPostTransforms.end() && (m_Fractorium->DrawAllPost() || xform == m_SelectedXform)) + if (it != m_DragSrcPostTransforms.end()) { auto& src = it->second; auto& affine = xform->m_Post; @@ -2426,7 +2438,7 @@ void GLEmberController::CalcDragTranslation() if (xform == m_FractoriumEmberController->CurrentXform()) m_DragHandlePos = v3T(affine.O(), 0) * worldToAffineScale; - }, eXformUpdate::UPDATE_CURRENT_AND_SELECTED, false); + }, eXformUpdate::UPDATE_SELECTED, false); } } } From d234f635eae96f4d66528ea902251777c33fa373 Mon Sep 17 00:00:00 2001 From: Person Date: Fri, 21 Jun 2019 17:57:03 -0700 Subject: [PATCH 5/5] --Code changes -Affine tab default selection. --- Source/Fractorium/Fractorium.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui index 68dc39f..440b7d1 100644 --- a/Source/Fractorium/Fractorium.ui +++ b/Source/Fractorium/Fractorium.ui @@ -3481,7 +3481,7 @@ QTabWidget::Triangular - 1 + 2