From 79d611dd204d7e6c28d509631a24c62cf8d59a8a Mon Sep 17 00:00:00 2001 From: mfeemster Date: Sun, 31 Aug 2014 21:25:15 -0700 Subject: [PATCH] Initial VS2013, C++11 and linux commit. This most likely won't build and suffers from some compiler issues. More commits to follow. --- Builds/CB/Ember.cbp | 160 +++ Builds/CB/Ember.layout | 49 + Builds/CB/EmberAnimate.cbp | 182 +++ Builds/CB/EmberAnimate.layout | 4 + Builds/CB/EmberCL.cbp | 189 +++ Builds/CB/EmberCL.layout | 4 + Builds/CB/EmberGenome.cbp | 182 +++ Builds/CB/EmberGenome.layout | 4 + Builds/CB/EmberRender.cbp | 182 +++ Builds/CB/EmberRender.layout | 4 + Builds/CB/EmberTester.cbp | 179 +++ Builds/CB/EmberTester.layout | 4 + Builds/CB/Fractorium.cbp | 450 +++++++ Builds/CB/Fractorium.layout | 4 + Builds/CB/fractorium.workspace | 10 + Builds/CB/fractorium.workspace.layout | 5 + Builds/CB/zlib.props | 37 + .../Installer/FractoriumInstaller.wixproj | 74 ++ Builds/MSVC/Installer/Product.wxs | 189 +++ Builds/MSVC/VS2013/Ember.vcxproj | 328 +++++ Builds/MSVC/VS2013/Ember.vcxproj.filters | 131 ++ Builds/MSVC/VS2013/EmberAnimate.vcxproj | 351 +++++ .../MSVC/VS2013/EmberAnimate.vcxproj.filters | 62 + Builds/MSVC/VS2013/EmberCL.vcxproj | 320 +++++ Builds/MSVC/VS2013/EmberCL.vcxproj.filters | 69 + Builds/MSVC/VS2013/EmberGenome.vcxproj | 345 +++++ .../MSVC/VS2013/EmberGenome.vcxproj.filters | 62 + Builds/MSVC/VS2013/EmberRender.vcxproj | 353 ++++++ .../MSVC/VS2013/EmberRender.vcxproj.filters | 62 + Builds/MSVC/VS2013/EmberTester.vcxproj | 340 +++++ .../MSVC/VS2013/EmberTester.vcxproj.filters | 51 + Builds/MSVC/VS2013/Fractorium.sln | 1018 +++++++++++++++ Builds/MSVC/VS2013/Fractorium.vcxproj | 1125 +++++++++++++++++ Builds/MSVC/VS2013/Fractorium.vcxproj.filters | 338 +++++ Builds/MSVC/VS2013/zlib.props | 37 + Source/Ember/Affine2D.cpp | 128 +- Source/Ember/Affine2D.h | 100 +- Source/Ember/DensityFilter.h | 16 +- Source/Ember/DllMain.cpp | 2 + Source/Ember/Ember.cpp | 22 +- Source/Ember/EmberDefines.h | 30 +- Source/Ember/EmberPch.h | 14 +- Source/Ember/EmberToXml.h | 25 +- Source/Ember/Interpolate.h | 11 +- Source/Ember/Isaac.h | 4 +- Source/Ember/Iterator.h | 7 + Source/Ember/Point.h | 12 +- Source/Ember/Renderer.cpp | 54 +- Source/Ember/Renderer.h | 30 +- Source/Ember/SheepTools.h | 6 +- Source/Ember/SpatialFilter.h | 4 +- Source/Ember/TemporalFilter.h | 14 + Source/Ember/Timing.h | 54 +- Source/Ember/Utils.h | 103 +- Source/Ember/Variation.h | 246 ++-- Source/Ember/Variations01.h | 944 +++++++------- Source/Ember/Variations02.h | 632 ++++----- Source/Ember/Variations03.h | 476 +++---- Source/Ember/Variations04.h | 466 +++---- Source/Ember/Variations05.h | 250 ++-- Source/Ember/VariationsDC.h | 114 +- Source/Ember/Xform.h | 5 +- Source/Ember/XmlToEmber.h | 32 +- Source/EmberAnimate/EmberAnimate.rc | 8 +- Source/EmberCL/DllMain.cpp | 2 + Source/EmberCommon/JpegUtils.h | 2 +- Source/EmberGenome/EmberGenome.rc | 8 +- Source/EmberRender/EmberRender.rc | 8 +- Source/Fractorium/AboutDialog.ui | 2 +- Source/Fractorium/Fractorium.rc | Bin 4574 -> 4574 bytes 70 files changed, 8833 insertions(+), 1902 deletions(-) create mode 100644 Builds/CB/Ember.cbp create mode 100644 Builds/CB/Ember.layout create mode 100644 Builds/CB/EmberAnimate.cbp create mode 100644 Builds/CB/EmberAnimate.layout create mode 100644 Builds/CB/EmberCL.cbp create mode 100644 Builds/CB/EmberCL.layout create mode 100644 Builds/CB/EmberGenome.cbp create mode 100644 Builds/CB/EmberGenome.layout create mode 100644 Builds/CB/EmberRender.cbp create mode 100644 Builds/CB/EmberRender.layout create mode 100644 Builds/CB/EmberTester.cbp create mode 100644 Builds/CB/EmberTester.layout create mode 100644 Builds/CB/Fractorium.cbp create mode 100644 Builds/CB/Fractorium.layout create mode 100644 Builds/CB/fractorium.workspace create mode 100644 Builds/CB/fractorium.workspace.layout create mode 100644 Builds/CB/zlib.props create mode 100644 Builds/MSVC/Installer/FractoriumInstaller.wixproj create mode 100644 Builds/MSVC/Installer/Product.wxs create mode 100644 Builds/MSVC/VS2013/Ember.vcxproj create mode 100644 Builds/MSVC/VS2013/Ember.vcxproj.filters create mode 100644 Builds/MSVC/VS2013/EmberAnimate.vcxproj create mode 100644 Builds/MSVC/VS2013/EmberAnimate.vcxproj.filters create mode 100644 Builds/MSVC/VS2013/EmberCL.vcxproj create mode 100644 Builds/MSVC/VS2013/EmberCL.vcxproj.filters create mode 100644 Builds/MSVC/VS2013/EmberGenome.vcxproj create mode 100644 Builds/MSVC/VS2013/EmberGenome.vcxproj.filters create mode 100644 Builds/MSVC/VS2013/EmberRender.vcxproj create mode 100644 Builds/MSVC/VS2013/EmberRender.vcxproj.filters create mode 100644 Builds/MSVC/VS2013/EmberTester.vcxproj create mode 100644 Builds/MSVC/VS2013/EmberTester.vcxproj.filters create mode 100644 Builds/MSVC/VS2013/Fractorium.sln create mode 100644 Builds/MSVC/VS2013/Fractorium.vcxproj create mode 100644 Builds/MSVC/VS2013/Fractorium.vcxproj.filters create mode 100644 Builds/MSVC/VS2013/zlib.props diff --git a/Builds/CB/Ember.cbp b/Builds/CB/Ember.cbp new file mode 100644 index 0000000..3122619 --- /dev/null +++ b/Builds/CB/Ember.cbp @@ -0,0 +1,160 @@ + + + + + + diff --git a/Builds/CB/Ember.layout b/Builds/CB/Ember.layout new file mode 100644 index 0000000..beb05ec --- /dev/null +++ b/Builds/CB/Ember.layout @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Builds/CB/EmberAnimate.cbp b/Builds/CB/EmberAnimate.cbp new file mode 100644 index 0000000..27d1b8d --- /dev/null +++ b/Builds/CB/EmberAnimate.cbp @@ -0,0 +1,182 @@ + + + + + + diff --git a/Builds/CB/EmberAnimate.layout b/Builds/CB/EmberAnimate.layout new file mode 100644 index 0000000..ee1a61a --- /dev/null +++ b/Builds/CB/EmberAnimate.layout @@ -0,0 +1,4 @@ + + + + diff --git a/Builds/CB/EmberCL.cbp b/Builds/CB/EmberCL.cbp new file mode 100644 index 0000000..33e4bb3 --- /dev/null +++ b/Builds/CB/EmberCL.cbp @@ -0,0 +1,189 @@ + + + + + + diff --git a/Builds/CB/EmberCL.layout b/Builds/CB/EmberCL.layout new file mode 100644 index 0000000..ee1a61a --- /dev/null +++ b/Builds/CB/EmberCL.layout @@ -0,0 +1,4 @@ + + + + diff --git a/Builds/CB/EmberGenome.cbp b/Builds/CB/EmberGenome.cbp new file mode 100644 index 0000000..4a5823d --- /dev/null +++ b/Builds/CB/EmberGenome.cbp @@ -0,0 +1,182 @@ + + + + + + diff --git a/Builds/CB/EmberGenome.layout b/Builds/CB/EmberGenome.layout new file mode 100644 index 0000000..ee1a61a --- /dev/null +++ b/Builds/CB/EmberGenome.layout @@ -0,0 +1,4 @@ + + + + diff --git a/Builds/CB/EmberRender.cbp b/Builds/CB/EmberRender.cbp new file mode 100644 index 0000000..9c96d6d --- /dev/null +++ b/Builds/CB/EmberRender.cbp @@ -0,0 +1,182 @@ + + + + + + diff --git a/Builds/CB/EmberRender.layout b/Builds/CB/EmberRender.layout new file mode 100644 index 0000000..ee1a61a --- /dev/null +++ b/Builds/CB/EmberRender.layout @@ -0,0 +1,4 @@ + + + + diff --git a/Builds/CB/EmberTester.cbp b/Builds/CB/EmberTester.cbp new file mode 100644 index 0000000..37bb33b --- /dev/null +++ b/Builds/CB/EmberTester.cbp @@ -0,0 +1,179 @@ + + + + + + diff --git a/Builds/CB/EmberTester.layout b/Builds/CB/EmberTester.layout new file mode 100644 index 0000000..ee1a61a --- /dev/null +++ b/Builds/CB/EmberTester.layout @@ -0,0 +1,4 @@ + + + + diff --git a/Builds/CB/Fractorium.cbp b/Builds/CB/Fractorium.cbp new file mode 100644 index 0000000..ba1c589 --- /dev/null +++ b/Builds/CB/Fractorium.cbp @@ -0,0 +1,450 @@ + + + + + + diff --git a/Builds/CB/Fractorium.layout b/Builds/CB/Fractorium.layout new file mode 100644 index 0000000..ee1a61a --- /dev/null +++ b/Builds/CB/Fractorium.layout @@ -0,0 +1,4 @@ + + + + diff --git a/Builds/CB/fractorium.workspace b/Builds/CB/fractorium.workspace new file mode 100644 index 0000000..f2846db --- /dev/null +++ b/Builds/CB/fractorium.workspace @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Builds/CB/fractorium.workspace.layout b/Builds/CB/fractorium.workspace.layout new file mode 100644 index 0000000..284130f --- /dev/null +++ b/Builds/CB/fractorium.workspace.layout @@ -0,0 +1,5 @@ + + + + + diff --git a/Builds/CB/zlib.props b/Builds/CB/zlib.props new file mode 100644 index 0000000..25979fd --- /dev/null +++ b/Builds/CB/zlib.props @@ -0,0 +1,37 @@ + + + + + + + ..\..\..\..\zlib + + diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj new file mode 100644 index 0000000..87b6ffd --- /dev/null +++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj @@ -0,0 +1,74 @@ + + + + Debug + x86 + 3.7 + {c8096c47-e358-438c-a520-146d46b0637d} + 2.0 + Fractorium_Beta_0.4.1.3 + Package + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + + + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + obj\$(Configuration)\ + + + Debug + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + True + + + GpuType=AMD + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + True + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + GpuType=NVIDIA + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + + + + + $(WixExtDir)\WixUIExtension.dll + WixUIExtension + + + + + \ No newline at end of file diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs new file mode 100644 index 0000000..e9b69e8 --- /dev/null +++ b/Builds/MSVC/Installer/Product.wxs @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/Ember.vcxproj b/Builds/MSVC/VS2013/Ember.vcxproj new file mode 100644 index 0000000..1e15002 --- /dev/null +++ b/Builds/MSVC/VS2013/Ember.vcxproj @@ -0,0 +1,328 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + ReleaseNvidia + Win32 + + + ReleaseNvidia + x64 + + + Release + Win32 + + + Release + x64 + + + + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67} + Win32Proj + EmberNs + Ember + + + + DynamicLibrary + true + MultiByte + false + v120 + + + DynamicLibrary + true + MultiByte + false + v120 + + + DynamicLibrary + false + false + MultiByte + v120 + + + DynamicLibrary + false + false + MultiByte + v120 + + + DynamicLibrary + false + false + MultiByte + v120 + + + DynamicLibrary + false + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(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 + 4251;4661 + $(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\tbb\include + Default + EmberPch.h + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_EMBER;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\tbb\include + Default + EmberPch.h + Precise + /bigobj %(AdditionalOptions) + true + false + true + false + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBER;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\tbb\include + Speed + NotSet + EmberPch.h + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBER;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\tbb\include + Speed + NotSet + EmberPch.h + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBER;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\tbb\include + Speed + EmberPch.h + true + /bigobj %(AdditionalOptions) + Precise + true + false + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBER;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\tbb\include + Speed + EmberPch.h + true + /bigobj %(AdditionalOptions) + Precise + true + false + + + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + {1d6039f6-5078-416f-a3af-a36efc7e6a1c} + + + {f62787dd-1327-448b-9818-030062bcfaa5} + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/Ember.vcxproj.filters b/Builds/MSVC/VS2013/Ember.vcxproj.filters new file mode 100644 index 0000000..16ebec4 --- /dev/null +++ b/Builds/MSVC/VS2013/Ember.vcxproj.filters @@ -0,0 +1,131 @@ + + + + + {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} + + + + + + + + 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 + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/EmberAnimate.vcxproj b/Builds/MSVC/VS2013/EmberAnimate.vcxproj new file mode 100644 index 0000000..6b07c75 --- /dev/null +++ b/Builds/MSVC/VS2013/EmberAnimate.vcxproj @@ -0,0 +1,351 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + ReleaseNvidia + Win32 + + + ReleaseNvidia + x64 + + + Release + Win32 + + + Release + x64 + + + + {35285FCF-6FA8-410E-841B-70AE744D38B8} + Win32Proj + EmberAnimate + EmberAnimate + + + + Application + true + MultiByte + false + v120 + + + Application + true + MultiByte + false + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + false + true + false + + + Console + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + true + false + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(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;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + true + false + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + + + + + {019dbd2a-273d-4ba4-bf86-b5efe2ed76b1} + + + {d6973076-9317-4ef2-a0b8-b7a18ac0713e} + + + {1d6039f6-5078-416f-a3af-a36efc7e6a1c} + + + {f62787dd-1327-448b-9818-030062bcfaa5} + + + {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} + + + {f6a9102c-69a9-48fb-bc4b-49e49af43236} + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/EmberAnimate.vcxproj.filters b/Builds/MSVC/VS2013/EmberAnimate.vcxproj.filters new file mode 100644 index 0000000..dc3b4f5 --- /dev/null +++ b/Builds/MSVC/VS2013/EmberAnimate.vcxproj.filters @@ -0,0 +1,62 @@ + + + + + {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/VS2013/EmberCL.vcxproj b/Builds/MSVC/VS2013/EmberCL.vcxproj new file mode 100644 index 0000000..85cac41 --- /dev/null +++ b/Builds/MSVC/VS2013/EmberCL.vcxproj @@ -0,0 +1,320 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + ReleaseNvidia + Win32 + + + ReleaseNvidia + x64 + + + Release + Win32 + + + Release + x64 + + + + {F6A9102C-69A9-48FB-BC4B-49E49AF43236} + Win32Proj + EmberCLns + EmberCL + + + + DynamicLibrary + true + MultiByte + false + v120 + + + DynamicLibrary + true + MultiByte + false + v120 + + + DynamicLibrary + false + false + MultiByte + v120 + + + DynamicLibrary + false + false + MultiByte + v120 + + + DynamicLibrary + false + false + MultiByte + v120 + + + DynamicLibrary + false + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(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_EMBERCL;AMD_OS_WIN;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + Default + EmberCLPch.h + + + Windows + true + opencl.lib;Opengl32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_EMBERCL;AMD_OS_WIN;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + Default + EmberCLPch.h + true + false + true + false + + + Windows + true + opencl.lib;Opengl32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBERCL;AMD_OS_WIN;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + Speed + NotSet + EmberCLPch.h + + + Windows + true + true + true + opencl.lib;Opengl32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBERCL;AMD_OS_WIN;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + Speed + NotSet + EmberCLPch.h + + + Windows + true + true + true + opencl.lib;Opengl32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBERCL;AMD_OS_WIN;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(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 + + + Windows + true + true + true + opencl.lib;Opengl32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_EMBERCL;AMD_OS_WIN;%(PreprocessorDefinitions) + $(TargetDir)$(TargetName).pdb + 4251;4661 + $(ProjectDir)..\..\..\Source\Ember\;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libxml2\include;$(CUDA_PATH)include + Speed + EmberCLPch.h + /bigobj %(AdditionalOptions) + Precise + true + false + true + + + Windows + true + true + true + opencl.lib;Opengl32.lib;%(AdditionalDependencies) + $(CUDA_PATH)lib\$(PlatformName) + + + + + + + + {f62787dd-1327-448b-9818-030062bcfaa5} + + + {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} + true + true + false + true + false + + + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/EmberCL.vcxproj.filters b/Builds/MSVC/VS2013/EmberCL.vcxproj.filters new file mode 100644 index 0000000..bb0f844 --- /dev/null +++ b/Builds/MSVC/VS2013/EmberCL.vcxproj.filters @@ -0,0 +1,69 @@ + + + + + {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 + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Kernel Creators + + + Kernel Creators + + + Kernel Creators + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/EmberGenome.vcxproj b/Builds/MSVC/VS2013/EmberGenome.vcxproj new file mode 100644 index 0000000..f07adf5 --- /dev/null +++ b/Builds/MSVC/VS2013/EmberGenome.vcxproj @@ -0,0 +1,345 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + ReleaseNvidia + Win32 + + + ReleaseNvidia + x64 + + + Release + Win32 + + + Release + x64 + + + + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7} + Win32Proj + EmberGenome + EmberGenome + + + + Application + true + MultiByte + false + v120 + + + Application + true + MultiByte + false + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + false + true + false + + + Console + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + true + false + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(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;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + true + false + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + + + + + {1d6039f6-5078-416f-a3af-a36efc7e6a1c} + + + {f62787dd-1327-448b-9818-030062bcfaa5} + + + {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} + + + {f6a9102c-69a9-48fb-bc4b-49e49af43236} + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/EmberGenome.vcxproj.filters b/Builds/MSVC/VS2013/EmberGenome.vcxproj.filters new file mode 100644 index 0000000..5ae7193 --- /dev/null +++ b/Builds/MSVC/VS2013/EmberGenome.vcxproj.filters @@ -0,0 +1,62 @@ + + + + + {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/VS2013/EmberRender.vcxproj b/Builds/MSVC/VS2013/EmberRender.vcxproj new file mode 100644 index 0000000..6c8fc6c --- /dev/null +++ b/Builds/MSVC/VS2013/EmberRender.vcxproj @@ -0,0 +1,353 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + ReleaseNvidia + Win32 + + + ReleaseNvidia + x64 + + + Release + Win32 + + + Release + x64 + + + + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29} + Win32Proj + EmberRender + EmberRender + + + + Application + true + MultiByte + false + v120 + + + Application + true + MultiByte + false + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + false + true + false + + + Console + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + Precise + true + false + true + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(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;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + Precise + true + true + false + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + + + + + {019dbd2a-273d-4ba4-bf86-b5efe2ed76b1} + + + {d6973076-9317-4ef2-a0b8-b7a18ac0713e} + + + {1d6039f6-5078-416f-a3af-a36efc7e6a1c} + + + {f62787dd-1327-448b-9818-030062bcfaa5} + + + {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} + + + {f6a9102c-69a9-48fb-bc4b-49e49af43236} + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/EmberRender.vcxproj.filters b/Builds/MSVC/VS2013/EmberRender.vcxproj.filters new file mode 100644 index 0000000..38a8460 --- /dev/null +++ b/Builds/MSVC/VS2013/EmberRender.vcxproj.filters @@ -0,0 +1,62 @@ + + + + + {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/VS2013/EmberTester.vcxproj b/Builds/MSVC/VS2013/EmberTester.vcxproj new file mode 100644 index 0000000..fb81a1d --- /dev/null +++ b/Builds/MSVC/VS2013/EmberTester.vcxproj @@ -0,0 +1,340 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + ReleaseNvidia + Win32 + + + ReleaseNvidia + x64 + + + Release + Win32 + + + Release + x64 + + + + {320F611A-F9CE-4196-A8DC-FA24B2E8A320} + Win32Proj + EmberTester + EmberTester + + + + Application + true + MultiByte + false + v120 + + + Application + true + MultiByte + false + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + Application + false + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + false + $(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + false + true + false + + + Console + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(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;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + true + false + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(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;$(CUDA_PATH)include + 4251 + EmberCommonPch.h + true + true + false + + + Console + true + true + true + opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + $(CUDA_PATH)lib\$(PlatformName) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + + + + {1d6039f6-5078-416f-a3af-a36efc7e6a1c} + + + {f62787dd-1327-448b-9818-030062bcfaa5} + + + {2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67} + + + {f6a9102c-69a9-48fb-bc4b-49e49af43236} + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/EmberTester.vcxproj.filters b/Builds/MSVC/VS2013/EmberTester.vcxproj.filters new file mode 100644 index 0000000..f5ad239 --- /dev/null +++ b/Builds/MSVC/VS2013/EmberTester.vcxproj.filters @@ -0,0 +1,51 @@ + + + + + {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/VS2013/Fractorium.sln b/Builds/MSVC/VS2013/Fractorium.sln new file mode 100644 index 0000000..06ed50c --- /dev/null +++ b/Builds/MSVC/VS2013/Fractorium.sln @@ -0,0 +1,1018 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30723.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}" + ProjectSection(ProjectDependencies) = postProject + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fractorium", "Fractorium.vcxproj", "{6547D5FA-64CE-44BA-9D3C-B6E217456445}" + ProjectSection(ProjectDependencies) = postProject + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberRender", "EmberRender.vcxproj", "{4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}" + ProjectSection(ProjectDependencies) = postProject + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberAnimate", "EmberAnimate.vcxproj", "{35285FCF-6FA8-410E-841B-70AE744D38B8}" + ProjectSection(ProjectDependencies) = postProject + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberGenome", "EmberGenome.vcxproj", "{7930CAAC-9FC4-4202-B6A3-E760F73F88B7}" + ProjectSection(ProjectDependencies) = postProject + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberCL", "EmberCL.vcxproj", "{F6A9102C-69A9-48FB-BC4B-49E49AF43236}" + ProjectSection(ProjectDependencies) = postProject + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} = {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbb", "..\..\..\..\tbb\build\vs2010\tbb.vcxproj", "{F62787DD-1327-448B-9818-030062BCFAA5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\..\libpng\projects\vstudio\zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pnglibconf", "..\..\..\..\libpng\projects\vstudio\pnglibconf\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\..\..\libpng\projects\vstudio\libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}" + ProjectSection(ProjectDependencies) = postProject + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\..\..\..\libjpeg\jpeg.vcxproj", "{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\..\..\libxml2\win32\VC10\libxml2.vcxproj", "{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}" + ProjectSection(ProjectDependencies) = postProject + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + EndProjectSection +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "FractoriumInstaller", "..\Installer\FractoriumInstaller.wixproj", "{C8096C47-E358-438C-A520-146D46B0637D}" + ProjectSection(ProjectDependencies) = postProject + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} + {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} + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E} + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7} = {7930CAAC-9FC4-4202-B6A3-E760F73F88B7} + {35285FCF-6FA8-410E-841B-70AE744D38B8} = {35285FCF-6FA8-410E-841B-70AE744D38B8} + {F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5} + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} = {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} + {6547D5FA-64CE-44BA-9D3C-B6E217456445} = {6547D5FA-64CE-44BA-9D3C-B6E217456445} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Library|Mixed Platforms = Debug Library|Mixed Platforms + Debug Library|Win32 = Debug Library|Win32 + Debug Library|x64 = Debug Library|x64 + Debug Library|x86 = Debug Library|x86 + Debug MX|Mixed Platforms = Debug MX|Mixed Platforms + Debug MX|Win32 = Debug MX|Win32 + Debug MX|x64 = Debug MX|x64 + Debug MX|x86 = Debug MX|x86 + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Debug-MT|Mixed Platforms = Debug-MT|Mixed Platforms + Debug-MT|Win32 = Debug-MT|Win32 + Debug-MT|x64 = Debug-MT|x64 + Debug-MT|x86 = Debug-MT|x86 + Release Library|Mixed Platforms = Release Library|Mixed Platforms + Release Library|Win32 = Release Library|Win32 + Release Library|x64 = Release Library|x64 + Release Library|x86 = Release Library|x86 + Release MX|Mixed Platforms = Release MX|Mixed Platforms + Release MX|Win32 = Release MX|Win32 + Release MX|x64 = Release MX|x64 + Release MX|x86 = Release MX|x86 + Release|Mixed Platforms = Release|Mixed Platforms + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + Release-MT|Mixed Platforms = Release-MT|Mixed Platforms + Release-MT|Win32 = Release-MT|Win32 + Release-MT|x64 = Release-MT|x64 + Release-MT|x86 = Release-MT|x86 + ReleaseNvidia|Mixed Platforms = ReleaseNvidia|Mixed Platforms + ReleaseNvidia|Win32 = ReleaseNvidia|Win32 + ReleaseNvidia|x64 = ReleaseNvidia|x64 + ReleaseNvidia|x86 = ReleaseNvidia|x86 + ReleaseWithoutAsm|Mixed Platforms = ReleaseWithoutAsm|Mixed Platforms + ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32 + ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64 + ReleaseWithoutAsm|x86 = ReleaseWithoutAsm|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug Library|Mixed Platforms.Build.0 = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug Library|Win32.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug Library|x64.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug Library|x64.Build.0 = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug Library|x86.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug MX|Mixed Platforms.Build.0 = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug MX|Win32.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug MX|x64.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug MX|x64.Build.0 = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug MX|x86.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug|Win32.ActiveCfg = Debug|Win32 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug|Win32.Build.0 = Debug|Win32 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug-MT|Mixed Platforms.Build.0 = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug-MT|Win32.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug-MT|x64.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug-MT|x64.Build.0 = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Debug-MT|x86.ActiveCfg = Debug|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release Library|Mixed Platforms.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release Library|Mixed Platforms.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release Library|Win32.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release Library|x64.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release Library|x64.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release Library|x86.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release MX|Mixed Platforms.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release MX|Mixed Platforms.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release MX|Win32.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release MX|x64.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release MX|x64.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release MX|x86.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|Mixed Platforms.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|Win32.ActiveCfg = Release|Win32 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|Win32.Build.0 = Release|Win32 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|x64.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|x64.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release|x86.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release-MT|Mixed Platforms.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release-MT|Mixed Platforms.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release-MT|Win32.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release-MT|x64.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release-MT|x64.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.Release-MT|x86.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseNvidia|x64.ActiveCfg = ReleaseNvidia|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseNvidia|x64.Build.0 = ReleaseNvidia|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}.ReleaseWithoutAsm|x86.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug Library|Mixed Platforms.Build.0 = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug Library|Win32.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug Library|x64.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug Library|x64.Build.0 = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug Library|x86.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug MX|Mixed Platforms.Build.0 = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug MX|Win32.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug MX|x64.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug MX|x64.Build.0 = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug MX|x86.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug|Win32.ActiveCfg = Debug|Win32 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug|Win32.Build.0 = Debug|Win32 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug-MT|Mixed Platforms.Build.0 = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug-MT|Win32.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug-MT|x64.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug-MT|x64.Build.0 = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Debug-MT|x86.ActiveCfg = Debug|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release Library|Mixed Platforms.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release Library|Mixed Platforms.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release Library|Win32.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release Library|x64.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release Library|x64.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release Library|x86.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release MX|Mixed Platforms.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release MX|Mixed Platforms.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release MX|Win32.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release MX|x64.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release MX|x64.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release MX|x86.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release|Mixed Platforms.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release|Win32.ActiveCfg = Release|Win32 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release|Win32.Build.0 = Release|Win32 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release|x64.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release|x86.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release-MT|Mixed Platforms.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release-MT|Mixed Platforms.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release-MT|Win32.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release-MT|x64.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release-MT|x64.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.Release-MT|x86.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseNvidia|x64.ActiveCfg = ReleaseNvidia|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {320F611A-F9CE-4196-A8DC-FA24B2E8A320}.ReleaseWithoutAsm|x86.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug Library|Mixed Platforms.Build.0 = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug Library|Win32.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug Library|x64.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug Library|x64.Build.0 = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug Library|x86.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug MX|Mixed Platforms.Build.0 = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug MX|Win32.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug MX|x64.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug MX|x64.Build.0 = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug MX|x86.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug|Win32.ActiveCfg = Debug|Win32 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug|Win32.Build.0 = Debug|Win32 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug-MT|Mixed Platforms.Build.0 = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug-MT|Win32.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug-MT|x64.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug-MT|x64.Build.0 = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Debug-MT|x86.ActiveCfg = Debug|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release Library|Mixed Platforms.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release Library|Mixed Platforms.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release Library|Win32.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release Library|x64.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release Library|x64.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release Library|x86.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release MX|Mixed Platforms.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release MX|Mixed Platforms.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release MX|Win32.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release MX|x64.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release MX|x64.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release MX|x86.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|Mixed Platforms.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|Win32.ActiveCfg = Release|Win32 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|Win32.Build.0 = Release|Win32 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|x64.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|x64.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release|x86.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release-MT|Mixed Platforms.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release-MT|Mixed Platforms.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release-MT|Win32.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release-MT|x64.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release-MT|x64.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.Release-MT|x86.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseNvidia|x64.ActiveCfg = ReleaseNvidia|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseNvidia|x64.Build.0 = ReleaseNvidia|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {6547D5FA-64CE-44BA-9D3C-B6E217456445}.ReleaseWithoutAsm|x86.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug Library|Mixed Platforms.Build.0 = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug Library|Win32.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug Library|x64.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug Library|x64.Build.0 = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug Library|x86.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug MX|Mixed Platforms.Build.0 = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug MX|Win32.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug MX|x64.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug MX|x64.Build.0 = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug MX|x86.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug|Win32.Build.0 = Debug|Win32 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug-MT|Mixed Platforms.Build.0 = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug-MT|Win32.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug-MT|x64.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug-MT|x64.Build.0 = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Debug-MT|x86.ActiveCfg = Debug|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release Library|Mixed Platforms.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release Library|Mixed Platforms.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release Library|Win32.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release Library|x64.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release Library|x64.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release Library|x86.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release MX|Mixed Platforms.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release MX|Mixed Platforms.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release MX|Win32.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release MX|x64.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release MX|x64.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release MX|x86.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|Mixed Platforms.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|Win32.ActiveCfg = Release|Win32 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|Win32.Build.0 = Release|Win32 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|x64.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|x64.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release|x86.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release-MT|Mixed Platforms.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release-MT|Mixed Platforms.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release-MT|Win32.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release-MT|x64.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release-MT|x64.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.Release-MT|x86.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseNvidia|x64.ActiveCfg = ReleaseNvidia|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseNvidia|x64.Build.0 = ReleaseNvidia|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}.ReleaseWithoutAsm|x86.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug Library|Mixed Platforms.Build.0 = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug Library|Win32.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug Library|x64.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug Library|x64.Build.0 = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug Library|x86.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug MX|Mixed Platforms.Build.0 = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug MX|Win32.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug MX|x64.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug MX|x64.Build.0 = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug MX|x86.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug|Win32.ActiveCfg = Debug|Win32 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug|Win32.Build.0 = Debug|Win32 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug-MT|Mixed Platforms.Build.0 = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug-MT|Win32.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug-MT|x64.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug-MT|x64.Build.0 = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Debug-MT|x86.ActiveCfg = Debug|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release Library|Mixed Platforms.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release Library|Mixed Platforms.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release Library|Win32.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release Library|x64.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release Library|x64.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release Library|x86.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release MX|Mixed Platforms.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release MX|Mixed Platforms.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release MX|Win32.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release MX|x64.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release MX|x64.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release MX|x86.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|Mixed Platforms.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|Win32.ActiveCfg = Release|Win32 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|Win32.Build.0 = Release|Win32 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|x64.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|x64.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release|x86.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release-MT|Mixed Platforms.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release-MT|Mixed Platforms.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release-MT|Win32.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release-MT|x64.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release-MT|x64.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.Release-MT|x86.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseNvidia|x64.ActiveCfg = ReleaseNvidia|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseNvidia|x64.Build.0 = ReleaseNvidia|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {35285FCF-6FA8-410E-841B-70AE744D38B8}.ReleaseWithoutAsm|x86.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug Library|Mixed Platforms.Build.0 = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug Library|Win32.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug Library|x64.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug Library|x64.Build.0 = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug Library|x86.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug MX|Mixed Platforms.Build.0 = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug MX|Win32.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug MX|x64.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug MX|x64.Build.0 = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug MX|x86.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug|Win32.ActiveCfg = Debug|Win32 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug|Win32.Build.0 = Debug|Win32 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug-MT|Mixed Platforms.Build.0 = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug-MT|Win32.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug-MT|x64.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug-MT|x64.Build.0 = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Debug-MT|x86.ActiveCfg = Debug|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release Library|Mixed Platforms.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release Library|Mixed Platforms.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release Library|Win32.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release Library|x64.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release Library|x64.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release Library|x86.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release MX|Mixed Platforms.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release MX|Mixed Platforms.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release MX|Win32.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release MX|x64.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release MX|x64.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release MX|x86.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|Mixed Platforms.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|Win32.ActiveCfg = Release|Win32 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|Win32.Build.0 = Release|Win32 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|x64.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|x64.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release|x86.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release-MT|Mixed Platforms.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release-MT|Mixed Platforms.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release-MT|Win32.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release-MT|x64.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release-MT|x64.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.Release-MT|x86.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseNvidia|x64.ActiveCfg = ReleaseNvidia|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseNvidia|x64.Build.0 = ReleaseNvidia|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {7930CAAC-9FC4-4202-B6A3-E760F73F88B7}.ReleaseWithoutAsm|x86.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug Library|Mixed Platforms.Build.0 = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug Library|Win32.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug Library|x64.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug Library|x64.Build.0 = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug Library|x86.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug MX|Mixed Platforms.Build.0 = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug MX|Win32.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug MX|x64.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug MX|x64.Build.0 = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug MX|x86.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug|Win32.ActiveCfg = Debug|Win32 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug|Win32.Build.0 = Debug|Win32 + {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}.Debug|x86.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug-MT|Mixed Platforms.Build.0 = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug-MT|Win32.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug-MT|x64.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug-MT|x64.Build.0 = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Debug-MT|x86.ActiveCfg = Debug|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release Library|Mixed Platforms.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release Library|Mixed Platforms.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release Library|Win32.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release Library|x64.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release Library|x64.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release Library|x86.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release MX|Mixed Platforms.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release MX|Mixed Platforms.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release MX|Win32.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release MX|x64.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release MX|x64.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release MX|x86.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|Mixed Platforms.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|Win32.ActiveCfg = Release|Win32 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|Win32.Build.0 = Release|Win32 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|x64.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|x64.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release|x86.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release-MT|Mixed Platforms.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release-MT|Mixed Platforms.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release-MT|Win32.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release-MT|x64.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release-MT|x64.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.Release-MT|x86.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseNvidia|Mixed Platforms.ActiveCfg = ReleaseNvidia|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseNvidia|Mixed Platforms.Build.0 = ReleaseNvidia|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseNvidia|Win32.ActiveCfg = ReleaseNvidia|Win32 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseNvidia|Win32.Build.0 = ReleaseNvidia|Win32 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseNvidia|x64.ActiveCfg = ReleaseNvidia|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseNvidia|x64.Build.0 = ReleaseNvidia|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseNvidia|x86.ActiveCfg = ReleaseNvidia|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {F6A9102C-69A9-48FB-BC4B-49E49AF43236}.ReleaseWithoutAsm|x86.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug Library|Mixed Platforms.Build.0 = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug Library|Win32.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug Library|x64.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug Library|x64.Build.0 = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug Library|x86.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug MX|Mixed Platforms.Build.0 = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug MX|Win32.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug MX|x64.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug MX|x64.Build.0 = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug MX|x86.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.ActiveCfg = Debug|Win32 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.Build.0 = Debug|Win32 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.Build.0 = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x86.ActiveCfg = Debug|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug-MT|Mixed Platforms.ActiveCfg = Debug-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug-MT|Mixed Platforms.Build.0 = Debug-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug-MT|Win32.ActiveCfg = Debug-MT|Win32 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug-MT|Win32.Build.0 = Debug-MT|Win32 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug-MT|x64.ActiveCfg = Debug-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug-MT|x64.Build.0 = Debug-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Debug-MT|x86.ActiveCfg = Debug-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release Library|Mixed Platforms.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release Library|Mixed Platforms.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release Library|Win32.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release Library|x64.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release Library|x64.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release Library|x86.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release MX|Mixed Platforms.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release MX|Mixed Platforms.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release MX|Win32.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release MX|x64.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release MX|x64.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release MX|x86.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release|Mixed Platforms.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.ActiveCfg = Release|Win32 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.Build.0 = Release|Win32 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release|x86.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release-MT|Mixed Platforms.ActiveCfg = Release-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release-MT|Mixed Platforms.Build.0 = Release-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release-MT|Win32.ActiveCfg = Release-MT|Win32 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release-MT|Win32.Build.0 = Release-MT|Win32 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release-MT|x64.ActiveCfg = Release-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release-MT|x64.Build.0 = Release-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.Release-MT|x86.ActiveCfg = Release-MT|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseNvidia|x64.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseNvidia|x64.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {F62787DD-1327-448B-9818-030062BCFAA5}.ReleaseWithoutAsm|x86.ActiveCfg = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Mixed Platforms.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Mixed Platforms.Build.0 = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|x64.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|x86.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug MX|Mixed Platforms.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug MX|Mixed Platforms.Build.0 = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug MX|Win32.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug MX|Win32.Build.0 = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug MX|x64.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug MX|x86.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.ActiveCfg = Debug|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.Build.0 = Debug|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x86.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug-MT|Mixed Platforms.Build.0 = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug-MT|Win32.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug-MT|Win32.Build.0 = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug-MT|x64.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug-MT|x86.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Mixed Platforms.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Mixed Platforms.Build.0 = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.Build.0 = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|x64.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|x86.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release MX|Mixed Platforms.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release MX|Mixed Platforms.Build.0 = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release MX|Win32.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release MX|Win32.Build.0 = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release MX|x64.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release MX|x86.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Mixed Platforms.Build.0 = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.ActiveCfg = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.Build.0 = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x86.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release-MT|Mixed Platforms.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release-MT|Mixed Platforms.Build.0 = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release-MT|Win32.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release-MT|Win32.Build.0 = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release-MT|x64.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release-MT|x86.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseNvidia|x64.ActiveCfg = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseNvidia|x64.Build.0 = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.ReleaseWithoutAsm|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|x64.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug MX|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug MX|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug MX|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug MX|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug MX|x64.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug MX|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x64.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x64.Build.0 = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug-MT|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug-MT|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug-MT|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug-MT|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug-MT|x64.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug-MT|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|x64.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release MX|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release MX|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release MX|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release MX|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release MX|x64.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release MX|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|x64.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|x64.Build.0 = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release-MT|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release-MT|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release-MT|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release-MT|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release-MT|x64.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release-MT|x86.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseNvidia|x64.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseNvidia|x64.Build.0 = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.ReleaseWithoutAsm|x86.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Mixed Platforms.ActiveCfg = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Mixed Platforms.Build.0 = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|x64.ActiveCfg = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|x86.ActiveCfg = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug MX|Mixed Platforms.ActiveCfg = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug MX|Mixed Platforms.Build.0 = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug MX|Win32.ActiveCfg = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug MX|Win32.Build.0 = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug MX|x64.ActiveCfg = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug MX|x86.ActiveCfg = Debug Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x86.ActiveCfg = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug-MT|Mixed Platforms.Build.0 = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug-MT|Win32.ActiveCfg = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug-MT|Win32.Build.0 = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug-MT|x64.ActiveCfg = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug-MT|x86.ActiveCfg = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Mixed Platforms.ActiveCfg = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Mixed Platforms.Build.0 = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.ActiveCfg = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.Build.0 = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|x64.ActiveCfg = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|x86.ActiveCfg = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release MX|Mixed Platforms.ActiveCfg = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release MX|Mixed Platforms.Build.0 = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release MX|Win32.ActiveCfg = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release MX|Win32.Build.0 = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release MX|x64.ActiveCfg = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release MX|x86.ActiveCfg = Release Library|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Mixed Platforms.Build.0 = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x86.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release-MT|Mixed Platforms.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release-MT|Mixed Platforms.Build.0 = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release-MT|Win32.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release-MT|Win32.Build.0 = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release-MT|x64.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release-MT|x86.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseNvidia|x64.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseNvidia|x64.Build.0 = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.ReleaseWithoutAsm|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug Library|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug Library|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug Library|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug Library|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug Library|x64.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug Library|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug MX|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug MX|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug MX|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug MX|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug MX|x64.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug MX|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|x64.ActiveCfg = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|x64.Build.0 = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug-MT|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug-MT|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug-MT|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug-MT|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug-MT|x64.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug-MT|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release Library|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release Library|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release Library|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release Library|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release Library|x64.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release Library|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release MX|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release MX|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release MX|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release MX|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release MX|x64.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release MX|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|x64.ActiveCfg = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|x64.Build.0 = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release-MT|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release-MT|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release-MT|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release-MT|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release-MT|x64.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release-MT|x86.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseNvidia|x64.ActiveCfg = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseNvidia|x64.Build.0 = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.ReleaseWithoutAsm|x86.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug Library|Mixed Platforms.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug Library|Mixed Platforms.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug Library|Win32.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug Library|Win32.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug Library|x64.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug Library|x86.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug MX|Mixed Platforms.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug MX|Mixed Platforms.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug MX|Win32.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug MX|Win32.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug MX|x64.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug MX|x86.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.ActiveCfg = Debug|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.Build.0 = Debug|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x86.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug-MT|Mixed Platforms.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug-MT|Win32.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug-MT|Win32.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug-MT|x64.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug-MT|x86.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release Library|Mixed Platforms.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release Library|Mixed Platforms.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release Library|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release Library|Win32.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release Library|x64.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release Library|x86.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release MX|Mixed Platforms.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release MX|Mixed Platforms.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release MX|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release MX|Win32.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release MX|x64.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release MX|x86.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Mixed Platforms.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.ActiveCfg = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.Build.0 = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x86.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release-MT|Mixed Platforms.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release-MT|Mixed Platforms.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release-MT|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release-MT|Win32.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release-MT|x64.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release-MT|x86.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseNvidia|Mixed Platforms.ActiveCfg = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseNvidia|Mixed Platforms.Build.0 = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseNvidia|Win32.ActiveCfg = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseNvidia|x64.ActiveCfg = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseNvidia|x64.Build.0 = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseNvidia|x86.ActiveCfg = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.ReleaseWithoutAsm|x86.ActiveCfg = Release|Win32 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug Library|Mixed Platforms.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug Library|Mixed Platforms.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug Library|Win32.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug Library|Win32.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug Library|x64.ActiveCfg = Debug|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug Library|x64.Build.0 = Debug|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug Library|x86.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug Library|x86.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug MX|Mixed Platforms.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug MX|Mixed Platforms.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug MX|Win32.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug MX|Win32.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug MX|x64.ActiveCfg = Debug|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug MX|x64.Build.0 = Debug|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug MX|x86.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug MX|x86.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug|Win32.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug|Win32.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug|x64.ActiveCfg = Debug|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug|x64.Build.0 = Debug|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug|x86.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug|x86.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug-MT|Mixed Platforms.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug-MT|Mixed Platforms.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug-MT|Win32.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug-MT|Win32.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug-MT|x64.ActiveCfg = Debug|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug-MT|x64.Build.0 = Debug|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug-MT|x86.ActiveCfg = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Debug-MT|x86.Build.0 = Debug|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release Library|Mixed Platforms.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release Library|Mixed Platforms.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release Library|Win32.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release Library|Win32.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release Library|x64.ActiveCfg = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Release Library|x64.Build.0 = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Release Library|x86.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release Library|x86.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release MX|Mixed Platforms.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release MX|Mixed Platforms.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release MX|Win32.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release MX|Win32.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release MX|x64.ActiveCfg = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Release MX|x64.Build.0 = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Release MX|x86.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release MX|x86.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release|Mixed Platforms.Build.0 = Release|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release|Win32.ActiveCfg = Release|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release|Win32.Build.0 = Release|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release|x64.ActiveCfg = Release|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Release|x64.Build.0 = Release|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Release|x86.ActiveCfg = Release|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release|x86.Build.0 = Release|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release-MT|Mixed Platforms.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release-MT|Mixed Platforms.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release-MT|Win32.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release-MT|Win32.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release-MT|x64.ActiveCfg = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Release-MT|x64.Build.0 = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.Release-MT|x86.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.Release-MT|x86.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseNvidia|Mixed Platforms.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseNvidia|Mixed Platforms.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseNvidia|Win32.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseNvidia|Win32.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseNvidia|x64.ActiveCfg = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseNvidia|x64.Build.0 = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseNvidia|x86.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseNvidia|x86.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseWithoutAsm|Mixed Platforms.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseWithoutAsm|Mixed Platforms.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseNvidia|x64 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseWithoutAsm|x86.ActiveCfg = ReleaseNvidia|x86 + {C8096C47-E358-438C-A520-146D46B0637D}.ReleaseWithoutAsm|x86.Build.0 = ReleaseNvidia|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Builds/MSVC/VS2013/Fractorium.vcxproj b/Builds/MSVC/VS2013/Fractorium.vcxproj new file mode 100644 index 0000000..fe46e6f --- /dev/null +++ b/Builds/MSVC/VS2013/Fractorium.vcxproj @@ -0,0 +1,1125 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + ReleaseNvidia + Win32 + + + ReleaseNvidia + x64 + + + Release + Win32 + + + Release + x64 + + + + {6547D5FA-64CE-44BA-9D3C-B6E217456445} + Qt4VSv1.0 + + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + + + + + + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + $(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\ + + + + 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) + .;$(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)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\glew\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) + Disabled + ProgramDatabase + MultiThreadedDebugDLL + false + Use + FractoriumPch.h + $(IntDir)$(TargetName).pch + $(TargetDir)$(TargetName).pdb + 4661 + + + Windows + $(OutDir)\$(ProjectName).exe + $(QTDIR)\lib;$(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName);%(AdditionalLibraryDirectories) + true + qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5OpenGLd.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;%(AdditionalDependencies) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb_debug.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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) + .;$(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)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\glew\include;$(AMDAPPSDKROOT)\include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) + Disabled + ProgramDatabase + MultiThreadedDebugDLL + false + Use + FractoriumPch.h + $(IntDir)$(TargetName).pch + $(TargetDir)$(TargetName).pdb + 4661 + /bigobj -Zm150 %(AdditionalOptions) + true + true + false + + + Windows + $(OutDir)\$(ProjectName).exe + $(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;%(AdditionalDependencies) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb_debug.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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) + .;$(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)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\glew\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) + ProgramDatabase + MultiThreadedDLL + false + Use + FractoriumPch.h + $(IntDir)$(TargetName).pch + $(TargetDir)$(TargetName).pdb + 4661 + + + Windows + $(OutDir)\$(ProjectName).exe + $(QTDIR)\lib;$(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName);%(AdditionalLibraryDirectories) + true + qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgets.lib;Qt5Xml.lib;%(AdditionalDependencies) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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) + .;$(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)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\glew\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) + ProgramDatabase + MultiThreadedDLL + false + Use + FractoriumPch.h + $(IntDir)$(TargetName).pch + $(TargetDir)$(TargetName).pdb + 4661 + + + Windows + $(OutDir)\$(ProjectName).exe + $(QTDIR)\lib;$(AMDAPPSDKROOT)\lib\x86;$(CUDA_PATH)lib\$(PlatformName);%(AdditionalLibraryDirectories) + true + qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgets.lib;Qt5Xml.lib;%(AdditionalDependencies) + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(ProjectDir)..\..\..\..\tbb\build\vsproject\ia32\$(Configuration)\tbb.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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) + .;$(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)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\glew\include;$(AMDAPPSDKROOT)\include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) + ProgramDatabase + MultiThreadedDLL + false + Use + FractoriumPch.h + $(IntDir)$(TargetName).pch + $(TargetDir)$(TargetName).pdb + 4661 + true + true + false + + + Windows + $(OutDir)\$(ProjectName).exe + $(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;%(AdditionalDependencies) + 0.1 + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + 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) + .;$(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)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(ProjectDir)..\..\..\..\glew\include;$(CUDA_PATH)include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories) + ProgramDatabase + MultiThreadedDLL + false + Use + FractoriumPch.h + $(IntDir)$(TargetName).pch + $(TargetDir)$(TargetName).pdb + 4661 + true + true + false + + + Windows + $(OutDir)\$(ProjectName).exe + $(QTDIR)\lib;$(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;%(AdditionalDependencies) + 0.1 + + + xcopy /F /Y /R /D "$(SolutionDir)$(Platform)\$(Configuration)\*.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.dll" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)intel64\$(Configuration)\tbb.pdb" "$(OutDir)" +xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" + + + + + Create + Create + Create + Use + Use + Use + + + + + Use + Use + Use + Use + Use + Use + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + 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 + 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 + + + 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 + + + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing OptionsDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/OptionsDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + 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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/OptionsDialog.h" + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing OptionsDialog.h... + Moc%27ing OptionsDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/OptionsDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/OptionsDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing OptionsDialog.h... + Moc%27ing OptionsDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/OptionsDialog.h" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/OptionsDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing AboutDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/AboutDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + 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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/AboutDialog.h" + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing AboutDialog.h... + Moc%27ing AboutDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/AboutDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/AboutDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing AboutDialog.h... + Moc%27ing AboutDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/AboutDialog.h" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/AboutDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing FinalRenderDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FinalRenderDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + 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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FinalRenderDialog.h" + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing FinalRenderDialog.h... + Moc%27ing FinalRenderDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FinalRenderDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FinalRenderDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing FinalRenderDialog.h... + Moc%27ing FinalRenderDialog.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FinalRenderDialog.h" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FinalRenderDialog.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + %(AdditionalInputs) + + + + + + + %(AdditionalInputs) + + + + + + + %(AdditionalInputs) + %(AdditionalInputs) + + + + + + + + + + + + + %(AdditionalInputs) + %(AdditionalInputs) + + + + + + + + + + + + + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing FractoriumSettings.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FractoriumSettings.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FractoriumSettings.h" + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing FractoriumSettings.h... + Moc%27ing FractoriumSettings.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FractoriumSettings.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FractoriumSettings.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing FractoriumSettings.h... + Moc%27ing FractoriumSettings.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FractoriumSettings.h" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/FractoriumSettings.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing TwoButtonWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TwoButtonWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing TwoButtonWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TwoButtonWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing TwoButtonWidget.h... + Moc%27ing TwoButtonWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TwoButtonWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TwoButtonWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing TwoButtonWidget.h... + Moc%27ing TwoButtonWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TwoButtonWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TwoButtonWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + + + + + + + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing GLWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/GLWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + 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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/GLWidget.h" + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing GLWidget.h... + Moc%27ing GLWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/GLWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/GLWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing GLWidget.h... + Moc%27ing GLWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/GLWidget.h" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/GLWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing DoubleSpinBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + 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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBox.h" + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing DoubleSpinBox.h... + Moc%27ing DoubleSpinBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing DoubleSpinBox.h... + Moc%27ing DoubleSpinBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBox.h" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/DoubleSpinBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing SpinBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/SpinBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + 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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/SpinBox.h" + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing SpinBox.h... + Moc%27ing SpinBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/SpinBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/SpinBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing SpinBox.h... + Moc%27ing SpinBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/SpinBox.h" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/SpinBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing StealthComboBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/StealthComboBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing StealthComboBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/StealthComboBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing StealthComboBox.h... + Moc%27ing StealthComboBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/StealthComboBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/StealthComboBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing StealthComboBox.h... + Moc%27ing StealthComboBox.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/StealthComboBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/StealthComboBox.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + + %(AdditionalInputs) + + + + + + + %(AdditionalInputs) + + + + + + + %(AdditionalInputs) + %(AdditionalInputs) + + + + + + + + + + + + + %(AdditionalInputs) + %(AdditionalInputs) + + + + + + + + + + + + + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing TableWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TableWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing TableWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TableWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing TableWidget.h... + Moc%27ing TableWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TableWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TableWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing TableWidget.h... + Moc%27ing TableWidget.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TableWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/TableWidget.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing Fractorium.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/Fractorium.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + 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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/Fractorium.h" + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing Fractorium.h... + Moc%27ing Fractorium.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/Fractorium.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/Fractorium.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + $(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs) + Moc%27ing Fractorium.h... + Moc%27ing Fractorium.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(AMDAPPSDKROOT)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/Fractorium.h" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fFractoriumPch.h" "-f../../../../../Source/Fractorium/Fractorium.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$(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)..\..\..\..\glm" "-I$(ProjectDir)..\..\..\..\tbb\include" "-I$(ProjectDir)..\..\..\..\libjpeg" "-I$(ProjectDir)..\..\..\..\libpng" "-I$(ProjectDir)..\..\..\..\libxml2\include" "-I$(ProjectDir)..\..\..\..\glew\include" "-I$(CUDA_PATH)include" "-I.\GeneratedFiles\$(ConfigurationName)\." + + + + + + 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 + %(FullPath);%(AdditionalInputs) + %(FullPath);%(AdditionalInputs) + Rcc%27ing %(Identity)... + Rcc%27ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp + "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp + %(FullPath);%(AdditionalInputs) + %(FullPath);%(AdditionalInputs) + Rcc%27ing %(Identity)... + Rcc%27ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp + "$(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)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + Designer + + + + + {019dbd2a-273d-4ba4-bf86-b5efe2ed76b1} + + + {d6973076-9317-4ef2-a0b8-b7a18ac0713e} + + + {1d6039f6-5078-416f-a3af-a36efc7e6a1c} + + + {f62787dd-1327-448b-9818-030062bcfaa5} + + + {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)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(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)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(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) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/Fractorium.vcxproj.filters b/Builds/MSVC/VS2013/Fractorium.vcxproj.filters new file mode 100644 index 0000000..cdf1d0e --- /dev/null +++ b/Builds/MSVC/VS2013/Fractorium.vcxproj.filters @@ -0,0 +1,338 @@ + + + + + {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} + + + {52886ad8-fa57-4c60-b799-7c648147b7f1} + cpp;moc + False + + + + + Source Files + + + Generated Files + + + Source Files + + + Widgets + + + Widgets + + + Dialogs + + + Dialogs + + + Dialogs + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + MainWindows + + + Source Files + + + MainWindows + + + Controllers + + + Controllers + + + Controllers + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + Generated Files\Debug + + + Generated Files\Release + + + Generated Files\ReleaseNvidia + + + + + Generated Files + + + Glm + + + Header Files + + + Header Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Header Files + + + Controllers + + + Controllers + + + Controllers + + + Header Files + + + + + Resource Files + + + Form Files + + + Form Files + + + Form Files + + + Form Files + + + Widgets + + + Widgets + + + Widgets + + + Dialogs + + + Dialogs + + + Dialogs + + + Widgets + + + MainWindows + + + MainWindows + + + Widgets + + + Widgets + + + Header Files + + + Widgets + + + + + Resource Files + + + + + + \ No newline at end of file diff --git a/Builds/MSVC/VS2013/zlib.props b/Builds/MSVC/VS2013/zlib.props new file mode 100644 index 0000000..25979fd --- /dev/null +++ b/Builds/MSVC/VS2013/zlib.props @@ -0,0 +1,37 @@ + + + + + + + ..\..\..\..\zlib + + diff --git a/Source/Ember/Affine2D.cpp b/Source/Ember/Affine2D.cpp index 3023065..8661c08 100644 --- a/Source/Ember/Affine2D.cpp +++ b/Source/Ember/Affine2D.cpp @@ -8,10 +8,20 @@ namespace EmberNs /// template Affine2D::Affine2D() -{ +{ MakeID(); } +/// +/// Default copy constructor. +/// +/// The Affine2D object to copy +template +Affine2D::Affine2D(const Affine2D& affine) +{ + Affine2D::operator=(affine); +} + /// /// Constructor which takes each column of the affine as a separate parameter. /// @@ -62,6 +72,68 @@ Affine2D::Affine2D(m4T& mat) F(mat[1][3]); } +/// +/// Default assignment operator. +/// +/// The Affine2D object to copy +template +Affine2D& Affine2D::operator = (const Affine2D& affine) +{ + if (this != &affine) + Affine2D::operator=(affine); + + return *this; +} + +/// +/// == operator which tests if all fields are equal with another Affine2D. +/// +/// The Affine2D to compare to +/// True if all fields are equal, else false +template +bool Affine2D::operator == (const Affine2D& affine) +{ + return IsClose(A(), affine.A()) && + IsClose(B(), affine.B()) && + IsClose(C(), affine.C()) && + IsClose(D(), affine.D()) && + IsClose(E(), affine.E()) && + IsClose(F(), affine.F()); +} + +/// +/// * operator to multiply this affine transform by another and return the result. +/// +/// The Affine2D to multiply by +/// A new Affine2D which is the product of the multiplication +template +Affine2D& Affine2D::operator * (const Affine2D& affine) +{ + v2T x = affine.X(); + v2T y = affine.Y(); + v2T o = affine.O(); + v2T tx = TransformNormal(x); + v2T ty = TransformNormal(y); + v2T to = TransformNormal(o); + + X(tx); + Y(ty); + O(to); + + return *this; +} + +/// +/// * operator to multiply this affine transform by a vec2 and return the result as a vec2. +/// +/// The vec2 to multiply by +/// A new vec2 which is the product of the multiplication +template +typename v2T Affine2D::operator * (const v2T& v) +{ + return TransformVector(v); +} + /// /// Make this affine transform the identity matrix. /// A and E = 1, all else 0. @@ -251,48 +323,6 @@ typename m4T Affine2D::ToMat4RowMajor(bool center) const return mat; } -/// -/// == operator which tests if all fields are equal with another Affine2D. -/// -/// The Affine2D to compare to -/// True if all fields are equal, else false -template -bool Affine2D::operator == (const Affine2D& affine) -{ - return IsClose(A(), affine.A()) && - IsClose(B(), affine.B()) && - IsClose(C(), affine.C()) && - IsClose(D(), affine.D()) && - IsClose(E(), affine.E()) && - IsClose(F(), affine.F()); -} - -/// -/// * operator to multiply this affine transform by another and return the result. -/// -/// The Affine2D to multiply by -/// A new Affine2D which is the product of the multiplication -template -Affine2D& Affine2D::operator * (const Affine2D& affine) -{ - X(TransformNormal(affine.X())); - Y(TransformNormal(affine.Y())); - O(TransformVector(affine.O())); - - return *this; -} - -/// -/// * operator to multiply this affine transform by a vec2 and return the result as a vec2. -/// -/// The vec2 to multiply by -/// A new vec2 which is the product of the multiplication -template -typename v2T Affine2D::operator * (const v2T& v) -{ - return TransformVector(v); -} - /// /// Accessors. /// @@ -301,7 +331,7 @@ template T Affine2D::B() const { return m_Mat[0][1]; }//[1][0] template T Affine2D::C() const { return m_Mat[0][2]; }//[2][0] template T Affine2D::D() const { return m_Mat[1][0]; }//[0][1] template T Affine2D::E() const { return m_Mat[1][1]; }//[1][1] -template T Affine2D::F() const { return m_Mat[1][2]; }//[2][1] +template T Affine2D::F() const { return m_Mat[1][2]; }//[2][1] template void Affine2D::A(T a) { m_Mat[0][0] = a; } template void Affine2D::B(T b) { m_Mat[0][1] = b; } @@ -314,9 +344,9 @@ template typename v2T Affine2D::X() const { return v2T(A(), D()) template typename v2T Affine2D::Y() const { return v2T(B(), E()); }//Y Axis. template typename v2T Affine2D::O() const { return v2T(C(), F()); }//Translation. -template void Affine2D::X(v2T& x) { A(x.x); D(x.y); }//X Axis. -template void Affine2D::Y(v2T& y) { B(y.x); E(y.y); }//Y Axis. -template void Affine2D::O(v2T& t) { C(t.x); F(t.y); }//Translation. +template void Affine2D::X(const v2T& x) { A(x.x); D(x.y); }//X Axis. +template void Affine2D::Y(const v2T& y) { B(y.x); E(y.y); }//Y Axis. +template void Affine2D::O(const v2T& t) { C(t.x); F(t.y); }//Translation. /// /// Rotate and scale this affine transform and return as a copy. Orginal is unchanged. @@ -325,7 +355,7 @@ template void Affine2D::O(v2T& t) { C(t.x); F(t.y); }//Translati /// The ending point to rotate and scale to /// The newly rotated and scalled Affine2D template -Affine2D Affine2D::CalcRotateScale(v2T& from, v2T& to) +Affine2D Affine2D::CalcRotateScale(const v2T& from, const v2T& to) { T a, c; @@ -342,7 +372,7 @@ Affine2D Affine2D::CalcRotateScale(v2T& from, v2T& to) /// a /// c template -void Affine2D::CalcRSAC(v2T& from, v2T& to, T& a, T& c) +void Affine2D::CalcRSAC(const v2T& from, const v2T& to, T& a, T& c) { T lsq = from.x * from.x + from.y * from.y; diff --git a/Source/Ember/Affine2D.h b/Source/Ember/Affine2D.h index 8889762..6e0f54c 100644 --- a/Source/Ember/Affine2D.h +++ b/Source/Ember/Affine2D.h @@ -29,18 +29,12 @@ class EMBER_API Affine2D { public: Affine2D(); - - /// - /// Default copy constructor. - /// - /// The Affine2D object to copy - Affine2D(const Affine2D& affine) - { - Affine2D::operator=(affine); - } + Affine2D(const Affine2D& affine); /// /// Copy constructor to copy an Affine2D object of type U. + /// Special case that must be here in the header because it has + /// a second template parameter. /// /// The Affine2D object to copy template @@ -52,21 +46,12 @@ public: Affine2D(v2T& x, v2T& y, v2T& t); Affine2D(T xx, T xy, T yx, T yy, T tx, T ty); Affine2D(m4T& mat); - - /// - /// Default assignment operator. - /// - /// The Affine2D object to copy - Affine2D& operator = (const Affine2D& affine) - { - if (this != &affine) - Affine2D::operator=(affine); - - return *this; - } + Affine2D& operator = (const Affine2D& affine); /// /// Assignment operator to assign an Affine2D object of type U. + /// Special case that must be here in the header because it has + /// a second template parameter. /// /// The Affine2D object to copy. /// Reference to updated self @@ -83,50 +68,49 @@ public: return *this; } - inline void MakeID(); - inline bool IsID() const; - inline bool IsZero() const; - inline void Rotate(T angle); - inline void Translate(v2T& v); - inline void RotateScaleXTo(v2T& v); - inline void RotateScaleYTo(v2T& v); - inline Affine2D Inverse() const; - inline v2T TransformNormal(const v2T& v) const; - inline v2T TransformVector(const v2T& v) const; - inline m2T ToMat2ColMajor() const; - inline m2T ToMat2RowMajor() const; - inline m4T ToMat4ColMajor(bool center = false) const; - inline m4T ToMat4RowMajor(bool center = false) const; - bool operator == (const Affine2D& affine); Affine2D& operator * (const Affine2D& affine); v2T operator * (const v2T& v); - inline T A() const; - inline T B() const; - inline T C() const; - inline T D() const; - inline T E() const; - inline T F() const; - - inline void A(T a); - inline void B(T b); - inline void C(T c); - inline void D(T d); - inline void E(T e); - inline void F(T f); + void MakeID(); + bool IsID() const; + bool IsZero() const; + void Rotate(T angle); + void Translate(v2T& v); + void RotateScaleXTo(v2T& v); + void RotateScaleYTo(v2T& v); + Affine2D Inverse() const; + v2T TransformNormal(const v2T& v) const; + v2T TransformVector(const v2T& v) const; + m2T ToMat2ColMajor() const; + m2T ToMat2RowMajor() const; + m4T ToMat4ColMajor(bool center = false) const; + m4T ToMat4RowMajor(bool center = false) const; - inline v2T X() const; - inline v2T Y() const; - inline v2T O() const; + T A() const; + T B() const; + T C() const; + T D() const; + T E() const; + T F() const; - inline void X(v2T& x); - inline void Y(v2T& y); - inline void O(v2T& t); + void A(T a); + void B(T b); + void C(T c); + void D(T d); + void E(T e); + void F(T f); - //static Affine2D Identity();//Complains about inline. - static inline Affine2D CalcRotateScale(v2T& from, v2T& to); - static inline void CalcRSAC(v2T& from, v2T& to, T& a, T& c); + v2T X() const; + v2T Y() const; + v2T O() const; + + void X(const v2T& x); + void Y(const v2T& y); + void O(const v2T& t); + + static Affine2D CalcRotateScale(const v2T& from, const v2T& to); + static void CalcRSAC(const v2T& from, const v2T& to, T& a, T& c); m23T m_Mat; }; diff --git a/Source/Ember/DensityFilter.h b/Source/Ember/DensityFilter.h index 4bb2725..9ab3216 100644 --- a/Source/Ember/DensityFilter.h +++ b/Source/Ember/DensityFilter.h @@ -18,7 +18,7 @@ public: DensityFilterBase() { } virtual ~DensityFilterBase() { } - virtual int FilterWidth() { return 0; } + virtual int FilterWidth() const { return 0; } }; /// @@ -76,7 +76,7 @@ public: { if (this != &filter) { - m_MinRad = filter.m_MinRad; + m_MinRad = filter.m_MinRad; m_MaxRad = filter.m_MaxRad; m_Curve = filter.m_Curve; m_Supersample = filter.m_Supersample; @@ -93,7 +93,7 @@ public: /// /// Create the filter vector of up to 10M entries. - /// If more than that are requested, it isn't created and + /// If more than that are requested, it isn't created and /// false is returned. /// /// True if success, else false. @@ -118,7 +118,7 @@ public: // num filters = (de_max_width / de_min_width)^(1 / estimator_curve) // decFilterCount = pow(finalMaxRad / finalMinRad, T(1.0) / m_Curve); - + if (decFilterCount > 1e7)//Too many filters. return false; @@ -126,7 +126,7 @@ public: //Condense the smaller kernels to save space. if (intFilterCount > keepThresh) - { + { maxIndex = (int)ceil(DE_THRESH + pow(T(intFilterCount - DE_THRESH), m_Curve)) + 1; m_MaxFilteredCounts = (int)pow(T(maxIndex - DE_THRESH), T(1.0) / m_Curve) + DE_THRESH; } @@ -201,7 +201,7 @@ public: m_Coefs[coefIndex] = 0.0; else m_Coefs[coefIndex] = gaussianFilter.Filter(gaussianFilter.Support() * filterVal) / filterSum; - + coefIndex++; } } @@ -316,11 +316,11 @@ public: inline unsigned int KernelSize() const { return m_KernelSize; } inline unsigned int MaxFilterIndex() const { return m_MaxFilterIndex; } inline unsigned int MaxFilteredCounts() const { return m_MaxFilteredCounts; } - virtual int FilterWidth() const { return m_FilterWidth; } + virtual int FilterWidth() const override { return m_FilterWidth; } inline unsigned int BufferSize() const { return (unsigned int)m_Widths.size(); } inline unsigned int CoefsSizeBytes() const { return BufferSize() * m_KernelSize * sizeof(T); } inline unsigned int WidthsSizeBytes() const { return BufferSize() * sizeof(T); } - inline unsigned int CoefsIndicesSizeBytes() const { return unsigned int(m_CoefIndices.size() * sizeof(unsigned int)); } + inline unsigned int CoefsIndicesSizeBytes() const { return (unsigned int)(m_CoefIndices.size() * sizeof(unsigned int)); } inline const T* Coefs() const { return m_Coefs.data(); } inline const T* Widths() const { return m_Widths.data(); } inline const unsigned int* CoefIndices() const { return m_CoefIndices.data(); } diff --git a/Source/Ember/DllMain.cpp b/Source/Ember/DllMain.cpp index 7503d02..6aa3559 100644 --- a/Source/Ember/DllMain.cpp +++ b/Source/Ember/DllMain.cpp @@ -1,5 +1,6 @@ #include "EmberPch.h" +#ifdef WIN32 /// /// Generated by Visual Studio to make the DLL run properly. /// @@ -18,3 +19,4 @@ BOOL APIENTRY DllMain( HMODULE hModule, } return TRUE; } +#endif diff --git a/Source/Ember/Ember.cpp b/Source/Ember/Ember.cpp index 08a1f8f..60ad531 100644 --- a/Source/Ember/Ember.cpp +++ b/Source/Ember/Ember.cpp @@ -37,8 +37,7 @@ namespace EmberNs { bool Timing::m_TimingInit = false; int Timing::m_ProcessorCount; -LARGE_INTEGER Timing::m_Freq; -auto_ptr> QTIsaac::GlobalRand = auto_ptr>(new QTIsaac()); +template<> unique_ptr> QTIsaac::GlobalRand = unique_ptr>(new QTIsaac()); #define EXPORTPREPOSTREGVAR(varName, T) \ template EMBER_API class varName##Variation; \ @@ -47,8 +46,7 @@ auto_ptr> QTIsaac::GlobalR #define EXPORT_SINGLE_TYPE_EMBER(T) \ template EMBER_API class Point; \ - template EMBER_API class Color; \ - template EMBER_API class Affine2D; \ + template EMBER_API struct Color; \ template EMBER_API class Palette; \ template EMBER_API class PaletteList; \ template EMBER_API class Iterator; \ @@ -278,7 +276,6 @@ auto_ptr> QTIsaac::GlobalR EXPORTPREPOSTREGVAR(ZScale, T) \ EXPORTPREPOSTREGVAR(ZTranslate, T) \ EXPORTPREPOSTREGVAR(ZCone, T) \ - EXPORTPREPOSTREGVAR(Boarders2, T) \ EXPORTPREPOSTREGVAR(RotateX, T) \ EXPORTPREPOSTREGVAR(RotateY, T) \ EXPORTPREPOSTREGVAR(RotateZ, T) \ @@ -389,17 +386,16 @@ auto_ptr> QTIsaac::GlobalR template EMBER_API class CarToRas; \ template EMBER_API class XmlToEmber; \ template EMBER_API class EmberToXml; \ - bool PaletteList::m_Init = false; \ - vector> PaletteList::m_Palettes = vector>(); \ - bool XmlToEmber::m_Init = false; \ - vector XmlToEmber::m_FlattenNames = vector(); \ - vector> XmlToEmber::m_BadParamNames = vector>(); \ - vector, vector>> XmlToEmber::m_BadVariationNames = vector, vector>>(); + template<> bool PaletteList::m_Init = false; \ + template<> vector> PaletteList::m_Palettes = vector>(); \ + template<> bool XmlToEmber::m_Init = false; \ + template<> vector XmlToEmber::m_FlattenNames = vector(); \ + template<> vector> XmlToEmber::m_BadParamNames = vector>(); \ + template<> vector, vector>> XmlToEmber::m_BadVariationNames = vector, vector>>(); EXPORT_SINGLE_TYPE_EMBER(float) #define EXPORT_TWO_TYPE_EMBER(T, bucketT) \ - template EMBER_API class Renderer; \ template EMBER_API class SheepTools; EXPORT_TWO_TYPE_EMBER(float, float) @@ -408,4 +404,4 @@ EXPORT_TWO_TYPE_EMBER(float, float) EXPORT_SINGLE_TYPE_EMBER(double) EXPORT_TWO_TYPE_EMBER(double, double) #endif -} \ No newline at end of file +} diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index d7bfff6..aa3aabf 100644 --- a/Source/Ember/EmberDefines.h +++ b/Source/Ember/EmberDefines.h @@ -6,11 +6,21 @@ /// Basic #defines used throughout the library. /// -//MSVC specific? -#if defined(BUILDING_EMBER) -#define EMBER_API __declspec(dllexport) +#ifdef _WIN32 + #if defined(BUILDING_EMBER) + #define EMBER_API __declspec(dllexport) + #else + #define EMBER_API __declspec(dllimport) + #endif #else -#define EMBER_API __declspec(dllimport) + #define EMBER_API + #define fopen_s(pFile,filename,mode) ((*(pFile))=fopen((filename),(mode)))==NULL + #define _stat stat + #define _fstat fstat + #define _stricmp strcmp + #define sscanf_s sscanf + #define sprintf_s snprintf + typedef int errno_t; #endif #define RESTRICT __restrict//This might make things faster, unsure if it really does though. @@ -23,9 +33,10 @@ namespace EmberNs #define sincos(x, s, c) *(s)=sin(x); *(c)=cos(x); #else extern void sincos(double x, double *s, double *c); + extern void sincos(float x, float *s, float *c); #endif -#define EMBER_VERSION "0.4.1.2" +#define EMBER_VERSION "0.4.1.3" #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 @@ -51,14 +62,7 @@ namespace EmberNs #define CUBE(x) ((x) * (x) * (x)) #define TLOW std::numeric_limits::lowest() #define TMAX std::numeric_limits::max() - -#ifndef acosh -#define acosh(x) (log(x + sqrt(SQR(x) - 1)))//Remove this once you upgrade compilers to VS 2013 or later.//TODO -#endif - -#ifndef fma -#define fma(x, y, z) ((x * y) + z) -#endif +typedef std::chrono::high_resolution_clock Clock; #define DO_DOUBLE 1//Comment this out for shorter build times during development. Always uncomment for release. //#define ISAAC_FLAM3_DEBUG 1//This is almost never needed, but is very useful when troubleshooting difficult bugs. Enable it to do a side by side comparison with flam3. diff --git a/Source/Ember/EmberPch.h b/Source/Ember/EmberPch.h index c66ffda..739c56a 100644 --- a/Source/Ember/EmberPch.h +++ b/Source/Ember/EmberPch.h @@ -26,24 +26,33 @@ //Standard headers. #include +#include #include +#include #include #include +#include #include #include #include #include #include +#include #include #include #include -#include #include +#include +#include #include #include //Third party headers. -#include +#ifdef _WIN32 +#include "libxml/parser.h" +#else +#include "libxml2/libxml/parser.h" +#endif //Intel's Threading Building Blocks is what's used for all threading. #include "tbb/task_group.h" @@ -60,3 +69,4 @@ using namespace tbb; using namespace std; +using namespace std::chrono; diff --git a/Source/Ember/EmberToXml.h b/Source/Ember/EmberToXml.h index 766f52f..649ea06 100644 --- a/Source/Ember/EmberToXml.h +++ b/Source/Ember/EmberToXml.h @@ -127,6 +127,7 @@ public: string ToString(Ember& ember, string extraAttributes, unsigned int printEditDepth, bool doEdits, bool intPalette, bool hexPalette = true) { unsigned int i, j; + string s; ostringstream os; vector*> variations; @@ -296,7 +297,6 @@ public: char timeString[128]; char buffer[128]; char commentString[128]; - tm localt; time_t myTime; xmlDocPtr commentDoc = NULL; xmlDocPtr doc = xmlNewDoc(XC "1.0"); @@ -306,12 +306,19 @@ public: //Create the root node, called "edit". rootNode = xmlNewNode(NULL, XC "edit"); xmlDocSetRootElement(doc, rootNode); - + //Add the edit attributes. //Date. myTime = time(NULL); +#ifdef WIN32 + tm localt; localtime_s(&localt, &myTime); strftime(timeString, 128, "%a %b %d %H:%M:%S %z %Y", &localt);//XXX use standard time format including timezone. +#else + tm* localt; + localt = localtime(&myTime); + strftime(timeString, 128, "%a %b %d %H:%M:%S %z %Y", localt);//XXX use standard time format including timezone. +#endif xmlNewProp(rootNode, XC "date", XC timeString); //Nick. @@ -557,7 +564,9 @@ private: string ToString(xmlNodePtr editNode, unsigned int tabs, bool formatting, unsigned int printEditDepth) { bool indentPrinted = false; - char* tabString = " ", *attStr; + const char* tabString = " ", *attStr; + const char* editString = "edit"; + const char* sheepString = "sheep"; unsigned int ti, editOrSheep = 0; xmlAttrPtr attPtr = NULL, curAtt = NULL; xmlNodePtr childPtr = NULL, curChild = NULL; @@ -578,12 +587,12 @@ private: //This can either be an edit node or a sheep node. //If it's an edit node, add one to the tab. - if (!Compare(editNode->name, "edit")) + if (!Compare(editNode->name, editString)) { editOrSheep = 1; tabs++; } - else if (!Compare(editNode->name, "sheep")) + else if (!Compare(editNode->name, sheepString)) editOrSheep = 2; else editOrSheep = 0; @@ -595,7 +604,7 @@ private: { attStr = (char*)xmlGetProp(editNode, curAtt->name); os << " " << curAtt->name << "=\"" << attStr << "\""; - xmlFree(attStr); + xmlFree((void*)attStr); } //Does this node have children? @@ -623,9 +632,9 @@ private: for (curChild = childPtr; curChild; curChild = curChild->next) { - //If child is an element, indent first and then print it. + //If child is an element, indent first and then print it. if (curChild->type == XML_ELEMENT_NODE && - (!Compare(curChild->name, "edit") || !Compare(curChild->name, "sheep"))) + (!Compare(curChild->name, editString) || !Compare(curChild->name, sheepString))) { if (indentPrinted) { diff --git a/Source/Ember/Interpolate.h b/Source/Ember/Interpolate.h index 9ed0d92..b405673 100644 --- a/Source/Ember/Interpolate.h +++ b/Source/Ember/Interpolate.h @@ -1,6 +1,6 @@ #pragma once -#include "Variation.h" +#include "Ember.h" /// /// Interpolater class. @@ -8,6 +8,11 @@ namespace EmberNs { +/// +/// g++ needs a forward declaration here. +/// +template class Ember; + /// /// Contains many static functions for handling interpolation and other miscellaneous operations on /// embers and vectors of embers. This class is similar to, and used in conjunction with SheepTools. @@ -22,7 +27,7 @@ public: /// This is used to prepare embers before interpolating them. /// Alignment means that every ember in a list will have the same number of xforms. /// Each xform at a given position will have mostly the same variations as the xform - /// in the same position in the rest of the embers. However some + /// in the same position in the rest of the embers. However some /// intelligence is applied to add or remove variations that wouldn't look good with /// the others present. /// After this function completes, sourceEmbers will remain unchanged and destEmbers @@ -418,7 +423,7 @@ public: //To interpolate the xforms, make copies of the source embers //and ensure that they both have the same number of xforms before progressing. - if (embers[i1].m_Interp == INTERP_LINEAR) + if (embers[i1].m_Interp == EMBER_INTERP_LINEAR) { Align(&embers[i1], &localEmbers[0], 2); smoothFlag = false; diff --git a/Source/Ember/Isaac.h b/Source/Ember/Isaac.h index db3e810..dec05e7 100644 --- a/Source/Ember/Isaac.h +++ b/Source/Ember/Isaac.h @@ -35,7 +35,7 @@ typedef unsigned long int ISAAC_INT; const ISAAC_INT GOLDEN_RATIO = ISAAC_INT(0x9e3779b9); #else - typedef unsigned __int64 ISAAC_INT; + typedef uint64_t ISAAC_INT; const ISAAC_INT GOLDEN_RATIO = ISAAC_INT(0x9e3779b97f4a7c13); #endif @@ -55,7 +55,7 @@ public: /// Global ISAAC RNG to be used from anywhere. This is not thread safe, so take caution to only /// use it when no other threads are. /// - static auto_ptr> GlobalRand; + static unique_ptr> GlobalRand; /// /// The structure which holds all of the random information. diff --git a/Source/Ember/Iterator.h b/Source/Ember/Iterator.h index 4accb33..1efa3d3 100644 --- a/Source/Ember/Iterator.h +++ b/Source/Ember/Iterator.h @@ -11,6 +11,11 @@ namespace EmberNs { +#define ITERATORUSINGS \ + using Iterator::NextXformFromIndex; \ + using Iterator::DoFinalXform; \ + using Iterator::DoBadVals; + /// /// Iterator base class. /// Iterating is one loop level outside of the inner xform application loop so it's still very important @@ -255,6 +260,7 @@ protected: template class EMBER_API StandardIterator : public Iterator { +ITERATORUSINGS public: /// /// Empty constructor. @@ -375,6 +381,7 @@ public: template class EMBER_API XaosIterator : public Iterator { +ITERATORUSINGS public: /// /// Empty constructor. diff --git a/Source/Ember/Point.h b/Source/Ember/Point.h index 989282a..5febe09 100644 --- a/Source/Ember/Point.h +++ b/Source/Ember/Point.h @@ -129,8 +129,14 @@ static int SortPointByY(const Point& a, const Point& b) /// specific to color handling. /// template -class EMBER_API Color : public v4T +struct EMBER_API Color : public v4T { +#ifndef _WIN32 +using v4T::r; +using v4T::g; +using v4T::b; +using v4T::a; +#endif public: /// /// Constructor to set color values to zero, with full visibility. @@ -179,7 +185,11 @@ public: template Color& operator = (const Color& color) { +#ifdef _WIN32 v4T::operator=(color); +#else + v4T::template operator=(color); +#endif return *this; } diff --git a/Source/Ember/Renderer.cpp b/Source/Ember/Renderer.cpp index 8abfbab..d5a8087 100644 --- a/Source/Ember/Renderer.cpp +++ b/Source/Ember/Renderer.cpp @@ -364,7 +364,10 @@ eRenderStatus Renderer::Run(vector& finalImage, doubl bool resume = m_ProcessState != NONE; bool newFilterAlloc; unsigned int temporalSample, pass; + T deTime; eRenderStatus success = RENDER_OK; + //double iterationTime = 0; + //double accumulationTime = 0; //Timing it; //Reset timers and progress percent if: Beginning anew or only filtering and/or accumulating. @@ -455,14 +458,11 @@ eRenderStatus Renderer::Run(vector& finalImage, doubl if (!resume) ResetBuckets(true, false);//Only reset hist here and do accum when needed later on. - - double iterationTime = 0; - double accumulationTime = 0; //Passes, outermost loop 1. for (; (pass < Passes()) && !m_Abort;) { - T deTime = T(time) + m_TemporalFilter->Deltas()[pass * m_Ember.m_TemporalSamples]; + deTime = T(time) + m_TemporalFilter->Deltas()[pass * m_Ember.m_TemporalSamples]; //Interpolate and get an ember for DE purposes. //Additional interpolation will be done in the temporal samples loop. @@ -509,10 +509,10 @@ eRenderStatus Renderer::Run(vector& finalImage, doubl //The actual number of times to iterate. Each thread will get (totalIters / ThreadCount) iters to do. //This is based on zoom and scale calculated in ComputeCamera(). //Note that the iter count is based on the final image dimensions, and not the super sampled dimensions. - unsigned __int64 totalIterCount = TotalIterCount(); - unsigned __int64 itersPerTemporalSample = ItersPerTemporalSample();//The total number of iterations for this temporal sample in this pass without overrides. - unsigned __int64 sampleItersToDo;//The number of iterations to actually do in this sample in this pass, considering overrides. - + uint64_t totalIterCount = TotalIterCount(); + uint64_t itersPerTemporalSample = ItersPerTemporalSample();//The total number of iterations for this temporal sample in this pass without overrides. + uint64_t sampleItersToDo;//The number of iterations to actually do in this sample in this pass, considering overrides. + if (subBatchCountOverride > 0) sampleItersToDo = subBatchCountOverride * SubBatchSize() * ThreadCount();//Run a specific number of sub batches. else @@ -735,7 +735,7 @@ EmberImageComments Renderer::ImageComments(unsigned int printEditDep /// If true include the memory needed for the final output image, else don't. /// The memory required to render the current ember template -unsigned __int64 Renderer::MemoryRequired(bool includeFinal) +uint64_t Renderer::MemoryRequired(bool includeFinal) { bool newFilterAlloc = false; @@ -744,7 +744,7 @@ unsigned __int64 Renderer::MemoryRequired(bool includeFinal) ComputeBounds(); //Because ComputeBounds() was called, this includes gutter. - unsigned __int64 histSize = SuperSize() * sizeof(glm::detail::tvec4); + uint64_t histSize = SuperSize() * sizeof(glm::detail::tvec4); return (histSize * 2) + (includeFinal ? FinalBufferSize() : 0);//Multiply hist by 2 to account for the density filtering buffer which is the same size as the histogram. } @@ -758,9 +758,9 @@ unsigned __int64 Renderer::MemoryRequired(bool includeFinal) /// /// An unsigned 64-bit integer specifying how much memory is available template -unsigned __int64 Renderer::MemoryAvailable() +uint64_t Renderer::MemoryAvailable() { - unsigned __int64 memAvailable = 0; + uint64_t memAvailable = 0; #ifdef WIN32 @@ -1053,7 +1053,7 @@ void Renderer::Callback(RenderCallback* callback) template void Renderer::MakeDmap(T colorScalar) { - m_Ember.m_Palette.MakeDmap(m_Dmap, colorScalar); + m_Ember.m_Palette.template MakeDmap(m_Dmap, colorScalar); } /// @@ -1487,7 +1487,7 @@ eRenderStatus Renderer::AccumulatorToFinalImage(unsigned char* pixel p16[0] = (unsigned short)(Clamp(newBucket.r, 0, 255) * bucketT(256)); p16[1] = (unsigned short)(Clamp(newBucket.g, 0, 255) * bucketT(256)); p16[2] = (unsigned short)(Clamp(newBucket.b, 0, 255) * bucketT(256)); - + if (NumChannels() > 3) { if (Transparency()) @@ -1508,7 +1508,7 @@ eRenderStatus Renderer::AccumulatorToFinalImage(unsigned char* pixel pixels[pixelsRowStart] = (unsigned char)Clamp(newBucket.r, 0, 255); pixels[pixelsRowStart + 1] = (unsigned char)Clamp(newBucket.g, 0, 255); pixels[pixelsRowStart + 2] = (unsigned char)Clamp(newBucket.b, 0, 255); - + if (NumChannels() > 3) { if (Transparency()) @@ -1567,16 +1567,16 @@ eRenderStatus Renderer::AccumulatorToFinalImage(unsigned char* pixel /// The temporal sample within the current pass this is running for /// Rendering statistics template -EmberStats Renderer::Iterate(unsigned __int64 iterCount, unsigned int pass, unsigned int temporalSample) +EmberStats Renderer::Iterate(uint64_t iterCount, unsigned int pass, unsigned int temporalSample) { //Timing t2(4); m_IterTimer.Tic(); unsigned int fuse = EarlyClip() ? 100 : 15;//EarlyClip was one way of detecting a later version of flam3, so it used 100 which is a better value. - unsigned __int64 totalItersPerThread = (unsigned __int64)ceil((double)iterCount / (double)m_ThreadsToUse); + uint64_t totalItersPerThread = (uint64_t)ceil((double)iterCount / (double)m_ThreadsToUse); double percent, etaMs; EmberStats stats; -#ifdef TG +#ifdef TG unsigned int threadIndex; for (unsigned int i = 0; i < m_ThreadsToUse; i++) @@ -1588,7 +1588,7 @@ EmberStats Renderer::Iterate(unsigned __int64 iterCount, unsigned in { #endif Timing t; - unsigned __int64 subBatchSize = (unsigned int)min(totalItersPerThread, (unsigned __int64)m_SubBatchSize); + uint64_t subBatchSize = (unsigned int)min(totalItersPerThread, (uint64_t)m_SubBatchSize); m_BadVals[threadIndex] = 0; @@ -1610,7 +1610,7 @@ EmberStats Renderer::Iterate(unsigned __int64 iterCount, unsigned in //Finally, iterate. //t.Tic(); //Iterating, loop 4. - m_BadVals[threadIndex] += (unsigned __int64)m_Iterator->Iterate(m_Ember, (unsigned int)subBatchSize, fuse, m_Samples[threadIndex].data(), m_Rand[threadIndex]); + m_BadVals[threadIndex] += (uint64_t)m_Iterator->Iterate(m_Ember, (uint32_t)subBatchSize, fuse, m_Samples[threadIndex].data(), m_Rand[threadIndex]); //iterationTime += t.Toc(); if (m_LockAccum) @@ -1933,9 +1933,9 @@ void Renderer::PrepFinalAccumVals(Color& background, T& g, T& lin linRange = GammaThresh(); vibrancy /= vibGamCount; - background.r = (IsNearZero(m_Background.r) ? m_Ember.m_Background.r : m_Background.r) / (vibGamCount / T(256.0));//Background is [0, 1]. - background.g = (IsNearZero(m_Background.g) ? m_Ember.m_Background.g : m_Background.g) / (vibGamCount / T(256.0)); - background.b = (IsNearZero(m_Background.b) ? m_Ember.m_Background.b : m_Background.b) / (vibGamCount / T(256.0)); + background.x = (IsNearZero(m_Background.r) ? m_Ember.m_Background.r : m_Background.r) / (vibGamCount / T(256.0));//Background is [0, 1]. + background.y = (IsNearZero(m_Background.g) ? m_Ember.m_Background.g : m_Background.g) / (vibGamCount / T(256.0)); + background.z = (IsNearZero(m_Background.b) ? m_Ember.m_Background.b : m_Background.b) / (vibGamCount / T(256.0)); } /// @@ -2087,8 +2087,8 @@ void Renderer::GammaCorrection(glm::detail::tvec4(alpha, 0, 1); } - - Palette::CalcNewRgb(&bucket[0], ls, HighlightPower(), newRgb); + + Palette::template CalcNewRgb(&bucket[0], ls, HighlightPower(), newRgb); for (unsigned int rgbi = 0; rgbi < 3; rgbi++) { @@ -2189,8 +2189,8 @@ template double Renderer double Renderer::UpperRightY(bool gutter) const { return gutter ? m_CarToRas.CarUrY() : m_UpperRightY; } template T Renderer::K1() const { return m_K1; } template T Renderer::K2() const { return m_K2; } -template unsigned __int64 Renderer::TotalIterCount() const { return (unsigned __int64)((unsigned __int64)Round(m_ScaledQuality) * (unsigned __int64)FinalRasW() * (unsigned __int64)FinalRasH()); }//Use Round() because there can be some roundoff error when interpolating. -template unsigned __int64 Renderer::ItersPerTemporalSample() const { return (unsigned __int64)ceil(double(TotalIterCount()) / double(Passes() * TemporalSamples())); } +template uint64_t Renderer::TotalIterCount() const { return (uint64_t)((uint64_t)Round(m_ScaledQuality) * (uint64_t)FinalRasW() * (uint64_t)FinalRasH()); }//Use Round() because there can be some roundoff error when interpolating. +template uint64_t Renderer::ItersPerTemporalSample() const { return (uint64_t)ceil(double(TotalIterCount()) / double(Passes() * TemporalSamples())); } template eProcessState Renderer::ProcessState() const { return m_ProcessState; } template eProcessAction Renderer::ProcessAction() const { return m_ProcessAction; } template EmberStats Renderer::Stats() const { return m_Stats; } diff --git a/Source/Ember/Renderer.h b/Source/Ember/Renderer.h index ac0f202..0b41401 100644 --- a/Source/Ember/Renderer.h +++ b/Source/Ember/Renderer.h @@ -70,7 +70,7 @@ public: m_RenderMs = 0; } - unsigned __int64 m_Iters, m_Badvals; + uint64_t m_Iters, m_Badvals; double m_IterMs, m_RenderMs; }; @@ -133,8 +133,8 @@ public: virtual double LowerLeftY(bool gutter = true) const { return 0; } virtual double UpperRightX(bool gutter = true) const { return 0; } virtual double UpperRightY(bool gutter = true) const { return 0; } - virtual unsigned __int64 MemoryRequired(bool includeFinal) { return 0; } - virtual unsigned __int64 MemoryAvailable() { return 0; } + virtual uint64_t MemoryRequired(bool includeFinal) { return 0; } + virtual uint64_t MemoryAvailable() { return 0; } virtual bool PrepFinalAccumVector(vector& pixels) { return false; } virtual eProcessState ProcessState() const { return NONE; } virtual eProcessAction ProcessAction() const { return NOTHING; } @@ -190,7 +190,7 @@ public: virtual bool PrepFinalAccumVector(vector& pixels); virtual eRenderStatus Run(vector& finalImage, double time = 0, unsigned int subBatchCountOverride = 0, bool forceOutput = false, size_t finalOffset = 0); virtual EmberImageComments ImageComments(unsigned int printEditDepth = 0, bool intPalette = false, bool hexPalette = true); - virtual unsigned __int64 MemoryRequired(bool includeFinal); + virtual uint64_t MemoryRequired(bool includeFinal); //Virtual functions to be overriden in derived renderers that use the GPU. virtual unsigned __int64 MemoryAvailable(); @@ -200,7 +200,7 @@ public: virtual bool CreateSpatialFilter(bool& newAlloc); virtual unsigned int SubBatchSize() const; virtual void SubBatchSize(unsigned int sbs); - virtual unsigned int NumChannels() const; + virtual unsigned int NumChannels() const; virtual void NumChannels(unsigned int numChannels); virtual eRendererType RendererType() const; virtual unsigned int ThreadCount() const; @@ -216,7 +216,7 @@ protected: virtual eRenderStatus GaussianDensityFilter(); virtual eRenderStatus AccumulatorToFinalImage(vector& pixels, size_t finalOffset); virtual eRenderStatus AccumulatorToFinalImage(unsigned char* pixels, size_t finalOffset); - virtual EmberStats Iterate(unsigned __int64 iterCount, unsigned int pass, unsigned int temporalSample); + virtual EmberStats Iterate(uint64_t iterCount, unsigned int pass, unsigned int temporalSample); public: //Accessors for render properties. @@ -268,7 +268,7 @@ public: inline unsigned int SuperSize() const; virtual unsigned int FinalBufferSize() const; inline unsigned int FinalRowSize() const; - inline unsigned int FinalDimensions() const; + unsigned int FinalDimensions() const; inline unsigned int PixelSize() const; virtual unsigned int GutterWidth() const; inline unsigned int DensityFilterOffset() const; @@ -282,8 +282,8 @@ public: virtual double UpperRightY(bool gutter = true) const; inline T K1() const; inline T K2() const; - inline unsigned __int64 TotalIterCount() const; - inline unsigned __int64 ItersPerTemporalSample() const; + inline uint64_t TotalIterCount() const; + inline uint64_t ItersPerTemporalSample() const; virtual eProcessState ProcessState() const; virtual eProcessAction ProcessAction() const; virtual EmberStats Stats() const; @@ -295,9 +295,9 @@ public: virtual DensityFilter* GetDensityFilter(); //Ember wrappers, getters only. - inline bool XaosPresent(); - virtual inline unsigned int FinalRasW() const; - virtual inline unsigned int FinalRasH() const; + inline bool XaosPresent(); + unsigned int FinalRasW() const; + unsigned int FinalRasH() const; inline unsigned int Supersample() const; inline unsigned int Passes() const; inline unsigned int TemporalSamples() const; @@ -382,7 +382,7 @@ protected: unsigned int m_VibGamCount; unsigned int m_LastPass; unsigned int m_LastTemporalSample; - unsigned __int64 m_LastIter; + uint64_t m_LastIter; double m_LastIterPercent; eProcessAction m_ProcessAction; eProcessState m_ProcessState; @@ -404,8 +404,8 @@ protected: auto_ptr> m_TemporalFilter; auto_ptr> m_DensityFilter; vector>> m_Samples; - vector m_SubBatch; - vector m_BadVals; + vector m_SubBatch; + vector m_BadVals; vector> m_Rand; tbb::task_group m_TaskGroup; CriticalSection m_RenderingCs, m_AccumCs, m_FinalAccumCs, m_ResizeCs; diff --git a/Source/Ember/SheepTools.h b/Source/Ember/SheepTools.h index eaadedd..a41d05f 100644 --- a/Source/Ember/SheepTools.h +++ b/Source/Ember/SheepTools.h @@ -1280,7 +1280,7 @@ public: /// The bmin[0] and bmin[1] will be the minimum x and y values. /// The bmax[0] and bmax[1] will be the maximum x and y values. /// The number of iterations ran - unsigned __int64 EstimateBoundingBox(Ember& ember, T eps, unsigned int samples, T* bmin, T* bmax) + uint64_t EstimateBoundingBox(Ember& ember, T eps, unsigned int samples, T* bmin, T* bmax) { unsigned int i, lowTarget, highTarget; T min[2], max[2]; @@ -1293,8 +1293,8 @@ public: m_Iterator->InitDistributions(ember); m_Samples.resize(samples); - unsigned __int64 bv = m_Iterator->Iterate(ember, samples, 20, m_Samples.data(), m_Rand);//Use a special fuse of 20, all other calls to this will use 15, or 100. - + uint64_t bv = m_Iterator->Iterate(ember, samples, 20, m_Samples.data(), m_Rand);//Use a special fuse of 20, all other calls to this will use 15, or 100. + if (bv / T(samples) > eps) eps = 3 * bv / T(samples); diff --git a/Source/Ember/SpatialFilter.h b/Source/Ember/SpatialFilter.h index 213e208..65a4011 100644 --- a/Source/Ember/SpatialFilter.h +++ b/Source/Ember/SpatialFilter.h @@ -481,7 +481,7 @@ public: t = -t; if (t < 3) - return Sinc(t) * Sinc(t / 3); + return SpatialFilter::Sinc(t) * SpatialFilter::Sinc(t / 3); return 0; } @@ -515,7 +515,7 @@ public: t = -t; if (t < 2) - return Sinc(t) * Sinc(t / 2); + return SpatialFilter::Sinc(t) * SpatialFilter::Sinc(t / 2); return 0; } diff --git a/Source/Ember/TemporalFilter.h b/Source/Ember/TemporalFilter.h index 6785ebb..1c69190 100644 --- a/Source/Ember/TemporalFilter.h +++ b/Source/Ember/TemporalFilter.h @@ -18,6 +18,17 @@ enum eTemporalFilterType EXP_TEMPORAL_FILTER = 2 }; +/// +/// g++ needs a forward declaration here. +/// +template class TemporalFilterCreator; + +#define TEMPORALFILTERUSINGS \ + using TemporalFilter::m_Filter; \ + using TemporalFilter::m_FilterExp; \ + using TemporalFilter::Size; \ + using TemporalFilter::FinishFilter; + /// /// Temporal filter is for doing motion blur while rendering a series of frames for animation. /// The filter created is used as a vector of scalar values to multiply the time value by in between embers. @@ -178,6 +189,7 @@ protected: template class EMBER_API ExpTemporalFilter : public TemporalFilter { +TEMPORALFILTERUSINGS public: /// /// Constructor to create an Exp filter. @@ -220,6 +232,7 @@ public: template class EMBER_API GaussianTemporalFilter : public TemporalFilter { +TEMPORALFILTERUSINGS public: /// /// Constructor to create a Gaussian filter. @@ -255,6 +268,7 @@ public: template class EMBER_API BoxTemporalFilter : public TemporalFilter { +TEMPORALFILTERUSINGS public: /// /// Constructor to create a Box filter. diff --git a/Source/Ember/Timing.h b/Source/Ember/Timing.h index f3858cc..8790a96 100644 --- a/Source/Ember/Timing.h +++ b/Source/Ember/Timing.h @@ -32,13 +32,13 @@ public: /// /// Set the begin time. /// - /// The quad part of the begin time cast to a double + /// The begin time cast to a double double Tic() { - QueryPerformanceCounter(&m_BeginTime); + m_BeginTime = Clock::now(); return BeginTime(); } - + /// /// Set the end time and optionally output a string showing the elapsed time. /// @@ -47,7 +47,7 @@ public: /// The elapsed time in milliseconds as a double double Toc(const char* str = NULL, bool fullString = false) { - QueryPerformanceCounter(&m_EndTime); + m_EndTime = Clock::now(); double ms = ElapsedTime(); if (str != NULL) @@ -59,22 +59,27 @@ public: } /// - /// Return the quad part of the begin time as a double. + /// Return the begin time as a double. /// /// - double BeginTime() { return (double)m_BeginTime.QuadPart; } + double BeginTime() { return (double)m_BeginTime.time_since_epoch().count(); } /// - /// Return the quad part of the end time as a double. + /// Return the end time as a double. /// /// - double EndTime() { return (double)m_EndTime.QuadPart; } + double EndTime() { return (double)m_EndTime.time_since_epoch().count(); } /// /// Return the elapsed time in milliseconds. /// /// The elapsed time in milliseconds as a double - double ElapsedTime() { return double(m_EndTime.QuadPart - m_BeginTime.QuadPart) * 1000.0 / double(m_Freq.QuadPart); } + double ElapsedTime() + { + duration elapsed = duration_cast(m_EndTime - m_BeginTime); + + return elapsed.count() * 1000.0; + } /// /// Formats a specified milliseconds value as a string. @@ -87,7 +92,7 @@ public: string Format(double ms) { stringstream ss; - + double x = ms / 1000; double secs = fmod(x, 60); x /= 60; @@ -110,16 +115,6 @@ public: return ss.str(); } - /// - /// Return the frequency of the clock as a double. - /// - /// - static double Freq() - { - Init(); - return (double)m_Freq.QuadPart; - } - /// /// Return the number of cores in the system. /// @@ -140,21 +135,16 @@ private: { if (!m_TimingInit) { - SYSTEM_INFO sysinfo; - - QueryPerformanceFrequency(&m_Freq); - GetSystemInfo(&sysinfo); - m_ProcessorCount = sysinfo.dwNumberOfProcessors; + m_ProcessorCount = thread::hardware_concurrency(); m_TimingInit = true; } } int m_Precision;//How many digits after the decimal place to print for seconds. - LARGE_INTEGER m_BeginTime;//The start of the timing, set with Tic(). - LARGE_INTEGER m_EndTime;//The end of the timing, set with Toc(). + time_point m_BeginTime;//The start of the timing, set with Tic(). + time_point m_EndTime;//The end of the timing, set with Toc(). static bool m_TimingInit;//Whether the performance info has bee queried. static int m_ProcessorCount;//The number of cores on the system, set in Init(). - static LARGE_INTEGER m_Freq;//The clock frequency, set in Init(). }; /// @@ -162,9 +152,9 @@ private: /// class EMBER_API CriticalSection { -#ifdef _WIN32 - public: + +#ifdef _WIN32 /// /// Constructor which initialized the underlying CRITICAL_SECTION object. /// @@ -176,7 +166,7 @@ public: /// /// The spin count. CriticalSection(DWORD spinCount) { InitializeCriticalSectionAndSpinCount(&m_CriticalSection, spinCount); } - + /// /// Deletes the underlying CRITICAL_SECTION object. /// @@ -228,4 +218,4 @@ private: #endif }; -} \ No newline at end of file +} diff --git a/Source/Ember/Utils.h b/Source/Ember/Utils.h index 8f4ccb5..d509e9d 100644 --- a/Source/Ember/Utils.h +++ b/Source/Ember/Utils.h @@ -153,7 +153,12 @@ static bool ReadFile(const char* filename, string& buf, bool nullTerminate = tru if (f != NULL) { struct _stat statBuf; + +#ifdef _WIN32 int statResult = _fstat(f->_file, &statBuf);//Get data associated with file. +#else + int statResult = _fstat(f->_fileno, &statBuf);//Get data associated with file. +#endif if (statResult == 0)//Check if statistics are valid. { @@ -166,7 +171,7 @@ static bool ReadFile(const char* filename, string& buf, bool nullTerminate = tru if (bytesRead == statBuf.st_size)//Ensure the number of bytes read matched what was requested. { if (nullTerminate)//Optionally NULL terminate if they want to treat it as a string. - buf[buf.size() - 1] = NULL; + buf[buf.size() - 1] = 0; b = true;//Success. } @@ -247,6 +252,26 @@ static void RgbaToRgb(vector& rgba, vector& rgb, u } } +/// +/// System floor() extremely slow because it accounts for various error conditions. +/// This is a much faster version that works on data that is not NaN. +/// +/// The value to return the floor of +/// The floored value +template +static inline int Floor(T val) +{ + if (val >= 0) + { + return (int)val; + } + else + { + int i = (int)val;//Truncate. + return i - (i > val);//Convert trunc to floor. + } +} + /// /// Clamp and return a value to be greater than or equal to a specified minimum and less than /// or equal to a specified maximum. @@ -388,30 +413,10 @@ inline float LRint(float x) /// The rounded value inline double LRint(double x) { - __int64 temp = (x >= 0 ? (__int64)(x + 0.5) : (__int64)(x - 0.5)); + int64_t temp = (x >= 0 ? (int64_t)(x + 0.5) : (int64_t)(x - 0.5)); return (double)temp; } -/// -/// System floor() extremely slow because it accounts for various error conditions. -/// This is a much faster version that works on data that is not NaN. -/// -/// The value to return the floor of -/// The floored value -template -static inline int Floor(T val) -{ - if (val >= 0) - { - return (int)val; - } - else - { - int i = (int)val;//Truncate. - return i - (i > val);//Convert trunc to floor. - } -} - /// /// Never really understood what this did. /// @@ -421,7 +426,7 @@ template static inline T Round6(T r) { r *= 1e6; - + if (r < 0) r -= 1; @@ -632,7 +637,7 @@ static inline T LogMap(T x) /// The name of the tag of the to inspect /// The value compare against /// True if the comparison matched, else false -static inline bool Compare(const xmlChar* name, char* val) +static inline bool Compare(const xmlChar* name, const char* val) { return xmlStrcmp(name, XC val) != 0; } @@ -722,7 +727,7 @@ static inline string ToLower(string& str) /// /// The string to copy and make upper case /// The upper case string -static inline string ToUpper(string& str) +static inline string ToUpper(const string& str) { string upper; @@ -781,19 +786,29 @@ static T Arg(char* name, T def) /// The default value to return if the environment variable was not present /// The value of the specified environment variable if found, else default template <> -static int Arg(char* name, int def) +#ifdef _WIN32 +static +#endif +int Arg(char* name, int def) { char* ch; int returnVal; size_t len; +#ifdef WIN32 errno_t err = _dupenv_s(&ch, &len, name); +#else + int err = 1; + ch = getenv(name); +#endif if (err || !ch) returnVal = def; else returnVal = atoi(ch); +#ifdef WIN32 free(ch); +#endif return returnVal; } @@ -804,7 +819,10 @@ static int Arg(char* name, int def) /// The default value to return if the environment variable was not present /// The value of the specified environment variable if found, else default template <> -static unsigned int Arg(char* name, unsigned int def) +#ifdef _WIN32 +static +#endif +unsigned int Arg(char* name, unsigned int def) { return Arg(name, (int)def); } @@ -816,7 +834,10 @@ static unsigned int Arg(char* name, unsigned int def) /// The default value to return if the environment variable was not present /// The value of the specified environment variable if found, else default template <> -static bool Arg(char* name, bool def) +#ifdef _WIN32 +static +#endif +bool Arg(char* name, bool def) { return (Arg(name, -999) != -999) ? true : def; } @@ -828,19 +849,29 @@ static bool Arg(char* name, bool def) /// The default value to return if the environment variable was not present /// The value of the specified environment variable if found, else default template <> -static double Arg(char* name, double def) +#ifdef _WIN32 +static +#endif +double Arg(char* name, double def) { char* ch; double returnVal; size_t len; +#ifdef WIN32 errno_t err = _dupenv_s(&ch, &len, name); +#else + int err = 1; + ch = getenv(name); +#endif if (err || !ch) returnVal = def; else returnVal = atof(ch); +#ifdef WIN32 free(ch); +#endif return returnVal; } @@ -851,12 +882,20 @@ static double Arg(char* name, double def) /// The default value to return if the environment variable was not present /// The value of the specified environment variable if found, else default template <> -static string Arg(char* name, string def) +#ifdef _WIN32 +static +#endif +string Arg(char* name, string def) { char* ch; string returnVal; size_t len; +#ifdef WIN32 errno_t err = _dupenv_s(&ch, &len, name); +#else + int err = 1; + ch = getenv(name); +#endif if (err || !ch) { @@ -866,7 +905,9 @@ static string Arg(char* name, string def) else returnVal = string(ch); +#ifdef WIN32 free(ch); +#endif return returnVal; } @@ -905,7 +946,7 @@ unsigned int inline FindAndReplace(T& source, const T& find, const T& replace) /// /// Return a character pointer to a version string composed of the EMBER_OS and EMBER_VERSION values. /// -static char* EmberVersion() +static const char* EmberVersion() { return EMBER_OS "-" EMBER_VERSION; } diff --git a/Source/Ember/Variation.h b/Source/Ember/Variation.h index 1ea52c3..be292d8 100644 --- a/Source/Ember/Variation.h +++ b/Source/Ember/Variation.h @@ -1017,7 +1017,7 @@ public: m_NeedPrecalcAngles = needPrecalcAngles; m_NeedPrecalcAtanXY = needPrecalcAtanXY; m_NeedPrecalcAtanYX = needPrecalcAtanYX; - + //Make absolutely sure that flag logic makes sense. if (m_NeedPrecalcSqrtSumSquares) m_NeedPrecalcSumSquares = true; @@ -1027,7 +1027,7 @@ public: m_NeedPrecalcSumSquares = true; m_NeedPrecalcSqrtSumSquares = true; } - + m_AssignType = ASSIGNTYPE_SET; SetType(); } @@ -1100,7 +1100,7 @@ public: /// /// The helper to read values from in the case of pre, and store precalc values to in both cases. /// The point to read values from in the case of post, ignored for pre. - void Precalc(IteratorHelper& iteratorHelper, Point* point) + void PrecalcHelper(IteratorHelper& iteratorHelper, Point* point) { if (m_VarType == VARTYPE_PRE) { @@ -1122,7 +1122,7 @@ public: if (m_NeedPrecalcAtanXY) iteratorHelper.m_PrecalcAtanxy = atan2(iteratorHelper.m_TransX, iteratorHelper.m_TransY); - + if (m_NeedPrecalcAtanYX) iteratorHelper.m_PrecalcAtanyx = atan2(iteratorHelper.m_TransY, iteratorHelper.m_TransX); } @@ -1146,7 +1146,7 @@ public: if (m_NeedPrecalcAtanXY) iteratorHelper.m_PrecalcAtanxy = atan2(point->m_X, point->m_Y); - + if (m_NeedPrecalcAtanYX) iteratorHelper.m_PrecalcAtanyx = atan2(point->m_Y, point->m_X); } @@ -1180,7 +1180,7 @@ public: if (m_NeedPrecalcAtanXY) ss << "\tprecalcAtanxy = atan2(transX, transY);\n"; - + if (m_NeedPrecalcAtanYX) ss << "\tprecalcAtanyx = atan2(transY, transX);\n"; } @@ -1204,7 +1204,7 @@ public: if (m_NeedPrecalcAtanXY) ss << "\tprecalcAtanxy = atan2(outPoint->m_X, outPoint->m_Y);\n"; - + if (m_NeedPrecalcAtanYX) ss << "\tprecalcAtanyx = atan2(outPoint->m_Y, outPoint->m_X);\n"; } @@ -1266,7 +1266,7 @@ public: /// The point to store the result in /// The random number generator to use. virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) = 0; - + /// /// Return a string which performs the equivalent calculation in Func(), but on the GPU in OpenCL. /// Derived classes will implement this. @@ -1296,7 +1296,7 @@ public: { m_Weight = rand.Frand11(); } - + /// /// Returns the string prefix to be used with params and the variation name. /// @@ -1405,7 +1405,7 @@ public: { Init(NULL, "", 0, REAL, TLOW, TMAX); } - + /// /// Constructor for a precalc param that takes arguments. /// @@ -1543,7 +1543,7 @@ public: case INTEGER_NONZERO : { int vi = (int)max(min((T)Floor(val + T(0.5)), m_Max), m_Min); - + if (vi == 0) vi = (int)SignNz(val); @@ -1605,6 +1605,8 @@ private: template class EMBER_API ParametricVariation : public Variation { +using Variation::Precalc; + public: /// /// Constructor which takes arguments and just passes them to the base class. @@ -1657,7 +1659,7 @@ public: //to the addresses of its members and then assign values from var. m_Params.reserve(5); } - + /// /// Determine whether the params vector contains a parameter with the specified name. /// @@ -1724,7 +1726,7 @@ public: }); if (b) - Precalc(); + this->Precalc(); return b; } @@ -1743,21 +1745,26 @@ public: m_Params[index].Set(val); if (b) - Precalc(); + this->Precalc(); return b; } + /// + /// Severe hack to get g++ to compile this. + /// + virtual void Precalc() override { } + /// /// Place the parametric variation in a random state by setting all of the /// non-precalc params to values between -1 and 1; /// /// The rand. - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { Variation::Random(rand); ForEach(m_Params, [&](ParamWithName& param) { param.Set(rand.Frand11()); }); - Precalc(); + this->Precalc(); } /// @@ -1766,9 +1773,9 @@ public: void Clear() { ForEach(m_Params, [&](ParamWithName& param) { *(param.Param()) = 0; }); - Precalc(); + this->Precalc(); } - + /// /// Return a vector of all parameter names, optionally including precalcs. /// @@ -1825,7 +1832,7 @@ protected: if (!m_Params[i].IsPrecalc()) m_Params[i].Set(T(params[i].ParamVal())); - Precalc(); + this->Precalc(); } } @@ -1838,77 +1845,36 @@ protected: /// Defining assignment operators isn't really needed because Variations are always held as pointers. /// -#ifdef DO_DOUBLE -#define VARCOPY(name) \ - public: \ - name(const name& var) \ - : Variation(var) \ - { \ - } \ - \ - template \ - name(const name& var) \ - : Variation(var) \ - { \ - } \ - \ - virtual Variation* Copy() \ - { \ - return new name(*this); \ - } \ - \ - virtual void Copy(Variation*& var) const \ - { \ - if (var != NULL) \ - delete var; \ - \ - var = new name(*this); \ - } \ - \ - virtual void Copy(Variation*& var) const \ - { \ - if (var != NULL) \ - delete var; \ - \ - var = new name(*this); \ - } +#define VARUSINGS \ + using Variation::m_Weight; \ + using Variation::m_Xform; \ + using Variation::m_VariationId; \ + using Variation::m_Name; \ + using Variation::m_VarType; \ + using Variation::m_AssignType; \ + using Variation::SetType; \ + using Variation::IndexInXform; \ + using Variation::XformIndexInEmber; \ + using Variation::Prefix; -#define PREPOSTVARCOPY(name, base) \ - name(const name& var) \ - : base(var) \ - { \ - } \ - \ - template \ - name(const name& var) \ - : base(var) \ - { \ - } \ - \ - virtual Variation* Copy() \ - { \ - return new name(*this); \ - } \ - \ - virtual void Copy(Variation*& var) const \ - { \ - if (var != NULL) \ - delete var; \ - \ - var = new name(*this); \ - } \ - \ - virtual void Copy(Variation*& var) const \ + //using Variation::Precalc; \ + +#ifdef DO_DOUBLE +#define VARCOPYDOUBLE(name) \ + virtual void Copy(Variation*& var) const override \ { \ if (var != NULL) \ delete var; \ \ var = new name(*this); \ - } + } \ #else +#define VARCOPYDOUBLE(name) +#endif // DO_DOUBLE #define VARCOPY(name) \ + VARUSINGS \ public: \ name(const name& var) \ : Variation(var) \ @@ -1921,18 +1887,20 @@ protected: { \ } \ \ - virtual Variation* Copy() \ + virtual Variation* Copy() override \ { \ return new name(*this); \ } \ \ - virtual void Copy(Variation*& var) const \ + virtual void Copy(Variation*& var) const override \ { \ if (var != NULL) \ delete var; \ \ var = new name(*this); \ - } + } \ + \ + VARCOPYDOUBLE(name) \ #define PREPOSTVARCOPY(name, base) \ name(const name& var) \ @@ -1946,19 +1914,20 @@ protected: { \ } \ \ - virtual Variation* Copy() \ + virtual Variation* Copy() override \ { \ return new name(*this); \ } \ \ - virtual void Copy(Variation*& var) const \ + virtual void Copy(Variation*& var) const override \ { \ if (var != NULL) \ delete var; \ \ var = new name(*this); \ - } -#endif + } \ + \ + VARCOPYDOUBLE(name) \ /// /// Macro to create pre and post counterparts to a variation. @@ -1970,6 +1939,7 @@ protected: template \ class EMBER_API Pre##varName##Variation : public varName##Variation \ { \ + VARUSINGS \ public: \ Pre##varName##Variation(T weight = 1.0) : varName##Variation(weight) \ { \ @@ -1985,6 +1955,7 @@ protected: template \ class EMBER_API Post##varName##Variation : public varName##Variation \ { \ + VARUSINGS \ public:\ Post##varName##Variation(T weight = 1.0) : varName##Variation(weight) \ { \ @@ -2006,9 +1977,15 @@ protected: /// Instead, every class must define it as a non-virtual function and explicitly call it in its constructor. /// -#ifdef DO_DOUBLE +#define PARVARUSINGS \ + using ParametricVariation::m_Params; \ + using ParametricVariation::CopyParamVals; + + //using Variation::Precalc; \ #define PARVARCOPY(name) \ + VARUSINGS \ + PARVARUSINGS \ public: \ name(const name& var) \ : ParametricVariation(var) \ @@ -2025,12 +2002,12 @@ protected: CopyParamVals(var.ParamsVec()); /* Copy values from var's vector and precalc. */ \ } \ \ - virtual Variation* Copy() \ + virtual Variation* Copy() override \ { \ return new name(*this); \ } \ \ - virtual void Copy(Variation*& var) const \ + virtual void Copy(Variation*& var) const override \ { \ if (var != NULL) \ delete var; \ @@ -2038,13 +2015,7 @@ protected: var = new name(*this); \ } \ \ - virtual void Copy(Variation*& var) const \ - { \ - if (var != NULL) \ - delete var; \ - \ - var = new name(*this); \ - } + VARCOPYDOUBLE(name) \ #define PREPOSTPARVARCOPY(name, base) \ name(const name& var) \ @@ -2062,12 +2033,12 @@ protected: CopyParamVals(var.ParamsVec()); /* Copy values from var's vector and precalc. */ \ } \ \ - virtual Variation* Copy() \ + virtual Variation* Copy() override \ { \ return new name(*this); \ } \ \ - virtual void Copy(Variation*& var) const \ + virtual void Copy(Variation*& var) const override \ { \ if (var != NULL) \ delete var; \ @@ -2075,74 +2046,7 @@ protected: var = new name(*this); \ } \ \ - virtual void Copy(Variation*& var) const \ - { \ - if (var != NULL) \ - delete var; \ - \ - var = new name(*this); \ - } -#else - -#define PARVARCOPY(name) \ - public: \ - name(const name& var) \ - : ParametricVariation(var) \ - { \ - Init(); /* Assign the addresses of the members to the vector. */ \ - CopyParamVals(var.ParamsVec()); /* Copy values from var's vector and precalc. */ \ - } \ - \ - template \ - name(const name& var) \ - : ParametricVariation(var) \ - { \ - Init(); /* Assign the addresses of the members to the vector. */ \ - CopyParamVals(var.ParamsVec()); /* Copy values from var's vector and precalc. */ \ - } \ - \ - virtual Variation* Copy() \ - { \ - return new name(*this); \ - } \ - \ - virtual void Copy(Variation*& var) const \ - { \ - if (var != NULL) \ - delete var; \ - \ - var = new name(*this); \ - } - -#define PREPOSTPARVARCOPY(name, base) \ - name(const name& var) \ - : base(var) \ - { \ - Init(); /* Assign the addresses of the members to the vector. */ \ - CopyParamVals(var.ParamsVec()); /* Copy values from var's vector and precalc. */ \ - } \ - \ - template \ - name(const name& var) \ - : base(var) \ - { \ - Init(); /* Assign the addresses of the members to the vector. */ \ - CopyParamVals(var.ParamsVec()); /* Copy values from var's vector and precalc. */ \ - } \ - \ - virtual Variation* Copy() \ - { \ - return new name(*this); \ - } \ - \ - virtual void Copy(Variation*& var) const \ - { \ - if (var != NULL) \ - delete var; \ - \ - var = new name(*this); \ - } -#endif + VARCOPYDOUBLE(name) /// /// Macro to create pre and post counterparts to a parametric variation. @@ -2156,6 +2060,9 @@ protected: template \ class EMBER_API Pre##varName##Variation : public varName##Variation \ { \ + VARUSINGS \ + PARVARUSINGS \ + using varName##Variation::Init; \ public:\ Pre##varName##Variation(T weight = 1.0) : varName##Variation(weight) \ { \ @@ -2172,6 +2079,9 @@ protected: template \ class EMBER_API Post##varName##Variation : public varName##Variation \ { \ + VARUSINGS \ + PARVARUSINGS \ + using varName##Variation::Init; \ public:\ Post##varName##Variation(T weight = 1.0) : varName##Variation(weight) \ { \ @@ -2184,4 +2094,4 @@ protected: \ PREPOSTPARVARCOPY(Post##varName##Variation, varName##Variation) \ }; -} \ No newline at end of file +} diff --git a/Source/Ember/Variations01.h b/Source/Ember/Variations01.h index 14a6012..ec25f9e 100644 --- a/Source/Ember/Variations01.h +++ b/Source/Ember/Variations01.h @@ -19,14 +19,14 @@ public: VARCOPY(LinearVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * helper.In.x; helper.Out.y = m_Weight * helper.In.y; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -56,14 +56,14 @@ public: VARCOPY(SinusoidalVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * sin(helper.In.x); helper.Out.y = m_Weight * sin(helper.In.y); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -94,7 +94,7 @@ public: VARCOPY(SphericalVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r2 = m_Weight / Zeps(helper.m_PrecalcSumSquares); @@ -103,7 +103,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -138,7 +138,7 @@ public: VARCOPY(SwirlVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T c1, c2; @@ -148,7 +148,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -184,7 +184,7 @@ public: VARCOPY(HorseshoeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight / Zeps(helper.m_PrecalcSqrtSumSquares); @@ -193,7 +193,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -225,14 +225,14 @@ public: VARCOPY(PolarVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * (helper.m_PrecalcAtanxy * T(M_1_PI)); helper.Out.y = m_Weight * (helper.m_PrecalcSqrtSumSquares - 1); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -262,14 +262,14 @@ public: VARCOPY(HandkerchiefVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * helper.m_PrecalcSqrtSumSquares * sin(helper.m_PrecalcAtanxy + helper.m_PrecalcSqrtSumSquares); helper.Out.y = m_Weight * helper.m_PrecalcSqrtSumSquares * cos(helper.m_PrecalcAtanxy - helper.m_PrecalcSqrtSumSquares); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -300,7 +300,7 @@ public: VARCOPY(HeartVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcSqrtSumSquares * helper.m_PrecalcAtanxy; T r = m_Weight * helper.m_PrecalcSqrtSumSquares; @@ -310,7 +310,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -348,7 +348,7 @@ public: PARVARCOPY(DiscVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T val = T(M_PI) * helper.m_PrecalcSqrtSumSquares; T r = m_WeightByPI * helper.m_PrecalcAtanxy; @@ -358,7 +358,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -377,8 +377,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_WeightByPI = m_Weight * T(M_1_PI); } @@ -387,7 +387,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_WeightByPI, prefix + "disc_weight_by_pi"));//Precalcs only, no params. } @@ -411,7 +411,7 @@ public: VARCOPY(SpiralVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = Zeps(helper.m_PrecalcSqrtSumSquares); T r1 = m_Weight / r; @@ -421,7 +421,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -454,7 +454,7 @@ public: VARCOPY(HyperbolicVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = Zeps(helper.m_PrecalcSqrtSumSquares); @@ -463,7 +463,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -495,14 +495,14 @@ public: VARCOPY(DiamondVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * helper.m_PrecalcSina * cos(helper.m_PrecalcSqrtSumSquares); helper.Out.y = m_Weight * helper.m_PrecalcCosa * sin(helper.m_PrecalcSqrtSumSquares); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -536,7 +536,7 @@ public: VARCOPY(ExVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcAtanxy; T r = helper.m_PrecalcSqrtSumSquares; @@ -550,7 +550,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -590,7 +590,7 @@ public: VARCOPY(JuliaVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight * sqrt(helper.m_PrecalcSqrtSumSquares); T a = T(0.5) * helper.m_PrecalcAtanxy; @@ -603,7 +603,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -641,7 +641,7 @@ public: VARCOPY(BentVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T nx = helper.In.x < T(0.0) ? helper.In.x * 2 : helper.In.x; T ny = helper.In.y < T(0.0) ? helper.In.y / 2 : helper.In.y; @@ -651,7 +651,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -690,7 +690,7 @@ public: PARVARCOPY(WavesVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T c10 = m_Xform->m_Affine.B(); T c11 = m_Xform->m_Affine.E(); @@ -702,7 +702,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -725,7 +725,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { if (m_Xform)//If this variation exists by itself and hasn't been added to an xform yet, m_Xform will be NULL. { @@ -760,7 +760,7 @@ private: /// nx = r * cos(a); /// ny = r * sin(a); /// p[0] += weight * nx; -/// p[1] += weight * ny; +/// p[1] += weight * ny; /// template class EMBER_API FisheyeVariation : public Variation @@ -770,7 +770,7 @@ public: VARCOPY(FisheyeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = 2 * m_Weight / (helper.m_PrecalcSqrtSumSquares + 1); @@ -779,7 +779,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -813,7 +813,7 @@ public: VARCOPY(PopcornVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T dx = tan(3 * helper.In.y); T dy = tan(3 * helper.In.x); @@ -825,7 +825,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -862,7 +862,7 @@ public: VARCOPY(ExponentialVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T dx = m_Weight * exp(helper.In.x - 1); T dy = T(M_PI) * helper.In.y; @@ -872,7 +872,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -909,7 +909,7 @@ public: VARCOPY(PowerVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight * pow(helper.m_PrecalcSqrtSumSquares, helper.m_PrecalcSina); @@ -918,7 +918,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -950,7 +950,7 @@ public: VARCOPY(CosineVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.In.x * T(M_PI); T nx = cos(a) * cosh(helper.In.y); @@ -961,7 +961,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1000,7 +1000,7 @@ public: VARCOPY(RingsVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T dx = Zeps(m_Xform->m_Affine.C() * m_Xform->m_Affine.C()); T r = helper.m_PrecalcSqrtSumSquares; @@ -1011,7 +1011,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1042,7 +1042,7 @@ public: /// nx = cos(a) * r; /// ny = sin(a) * r; /// p[0] += weight * nx; -/// p[1] += weight * ny; +/// p[1] += weight * ny; /// template class EMBER_API FanVariation : public Variation @@ -1052,7 +1052,7 @@ public: VARCOPY(FanVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T dx = T(M_PI) * Zeps(m_Xform->m_Affine.C() * m_Xform->m_Affine.C()); T dy = m_Xform->m_Affine.F(); @@ -1066,7 +1066,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1094,7 +1094,7 @@ public: /// r = r * (bloblow + (blobhigh - bloblow) * (0.5 + 0.5 * sin(blobwaves * a))); /// nx = sin(a) * r; /// ny = cos(a) * r; -/// +/// /// p[0] += weight * nx; /// p[1] += weight * ny; /// @@ -1108,8 +1108,8 @@ public: } PARVARCOPY(BlobVariation) - - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = helper.m_PrecalcSqrtSumSquares * (m_BlobLow + m_BlobDiff * (T(0.5) + T(0.5) * sin(m_BlobWaves * helper.m_PrecalcAtanxy))); @@ -1118,7 +1118,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1139,13 +1139,13 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_BlobDiff = m_BlobHigh - m_BlobLow; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_BlobLow = T(0.2) + T(0.5) * rand.Frand01(); m_BlobHigh = T(0.8) + T(0.4) * rand.Frand01(); @@ -1156,7 +1156,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_BlobLow, prefix + "blob_low")); m_Params.push_back(ParamWithName(&m_BlobHigh, prefix + "blob_high", 1)); @@ -1177,7 +1177,7 @@ private: /// nx2 = sin(pdjc * tx); /// ny1 = sin(pdja * ty); /// ny2 = cos(pdjd * ty); -/// +/// /// p[0] += weight * (ny1 - nx1); /// p[1] += weight * (nx2 - ny2); /// @@ -1192,7 +1192,7 @@ public: PARVARCOPY(PdjVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T nx1 = cos(m_PdjB * helper.In.x); T nx2 = sin(m_PdjC * helper.In.x); @@ -1203,8 +1203,8 @@ public: helper.Out.y = m_Weight * (nx2 - ny2); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1229,7 +1229,7 @@ public: return ss.str(); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_PdjA = 3 * rand.Frand11(); m_PdjB = 3 * rand.Frand11(); @@ -1241,7 +1241,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_PdjA, prefix + "pdj_a")); m_Params.push_back(ParamWithName(&m_PdjB, prefix + "pdj_b")); @@ -1260,21 +1260,21 @@ private: /// Fan2: /// a = precalc_atan; /// r = precalc_sqrt; -/// +/// /// dy = fan2y; /// dx = M_PI * (fan2x * fan2x + EPS); /// dx2 = dx / 2.0; -/// +/// /// t = a + dy - dx * (int)((a + dy) / dx); -/// +/// /// if (t > dx2) /// a = a - dx2; /// else /// a = a + dx2; -/// +/// /// nx = sin(a) * r; /// ny = cos(a) * r; -/// +/// /// p[0] += weight * nx; /// p[1] += weight * ny; /// @@ -1289,7 +1289,7 @@ public: PARVARCOPY(Fan2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcAtanxy; T r = m_Weight * helper.m_PrecalcSqrtSumSquares; @@ -1304,8 +1304,8 @@ public: helper.Out.y = r * cos(a); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1315,7 +1315,7 @@ public: string fan2Y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string dx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string dx2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a = precalcAtanxy;\n" << "\t\treal_t r = xform->m_VariationWeights[" << varIndex << "] * precalcSqrtSumSquares;\n" @@ -1334,13 +1334,13 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Fan2Dx = T(M_PI) * Zeps(SQR(m_Fan2X)); m_Fan2Dx2 = T(0.5) * m_Fan2Dx; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Fan2X = rand.Frand11(); m_Fan2Y = rand.Frand11(); @@ -1350,7 +1350,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Fan2X, prefix + "fan2_x")); m_Params.push_back(ParamWithName(&m_Fan2Y, prefix + "fan2_y")); @@ -1386,7 +1386,7 @@ public: PARVARCOPY(Rings2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = helper.m_PrecalcSqrtSumSquares; @@ -1395,8 +1395,8 @@ public: helper.Out.y = m_Weight * helper.m_PrecalcCosa * r; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1417,12 +1417,12 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Rings2Val2 = Zeps(SQR(m_Rings2Val)); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Rings2Val = 2 * rand.Frand01(); } @@ -1431,7 +1431,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Rings2Val, prefix + "rings2_val", 1));//This differs from the original which used zero. Use 1 instead to avoid getting too close to dividing by zero. m_Params.push_back(ParamWithName(true, &m_Rings2Val2, prefix + "rings2_val2"));//Precalc. @@ -1456,7 +1456,7 @@ public: VARCOPY(EyefishVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = 2 * m_Weight / (helper.m_PrecalcSqrtSumSquares + 1); @@ -1465,7 +1465,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1493,7 +1493,7 @@ public: VARCOPY(BubbleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T denom = T(0.25) * helper.m_PrecalcSumSquares + 1; T r = m_Weight / denom; @@ -1503,7 +1503,7 @@ public: helper.Out.z = m_Weight * (2 / denom - 1); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1532,14 +1532,14 @@ public: VARCOPY(CylinderVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * sin(helper.In.x); helper.Out.y = m_Weight * helper.In.y; helper.Out.z = m_Weight * cos(helper.In.x); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1568,7 +1568,7 @@ public: PARVARCOPY(PerspectiveVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T d = Zeps(m_Dist - helper.In.y * m_Vsin); T t = 1 / d; @@ -1577,8 +1577,8 @@ public: helper.Out.y = m_Weight * m_VfCos * helper.In.y * t; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1601,7 +1601,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T angle = m_Angle * T(M_PI) / 2; @@ -1609,7 +1609,7 @@ public: m_VfCos = m_Dist * cos(angle); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Angle = rand.Frand01(); m_Dist = 2 * rand.Frand01() + 1; @@ -1619,7 +1619,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Angle, prefix + "perspective_angle"));//Params. m_Params.push_back(ParamWithName(&m_Dist, prefix + "perspective_dist")); @@ -1645,7 +1645,7 @@ public: VARCOPY(NoiseVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tempr = rand.Frand01() * M_2PI; T r = m_Weight * rand.Frand01(); @@ -1655,7 +1655,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1687,7 +1687,7 @@ public: PARVARCOPY(JuliaNGenericVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tempr = (helper.m_PrecalcAtanyx + M_2PI * rand.Rand((ISAAC_INT)m_Rn)) / m_Power; T r = m_Weight * pow(helper.m_PrecalcSumSquares, m_Cn); @@ -1696,8 +1696,8 @@ public: helper.Out.y = r * sin(tempr); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1721,14 +1721,14 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Power = Zeps(m_Power); m_Rn = fabs(m_Power); m_Cn = m_Dist / m_Power / 2; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Dist = 1; m_Power = (T)(int)(5 * rand.Frand01() + 2); @@ -1738,7 +1738,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Dist, prefix + "julian_dist", 1));//Params. m_Params.push_back(ParamWithName(&m_Power, prefix + "julian_power", 1, INTEGER_NONZERO)); @@ -1767,7 +1767,7 @@ public: PARVARCOPY(JuliaScopeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int rnd = (int)(m_Rn * rand.Frand01()); T tempr, r = m_Weight * pow(helper.m_PrecalcSumSquares, m_Cn); @@ -1794,8 +1794,8 @@ public: //helper.Out.x = r * cos(tempr); //helper.Out.y = r * sin(tempr); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1841,14 +1841,14 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Rn = fabs(m_Power); m_Cn = m_Dist / m_Power / 2; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Dist = 1; m_Power = (T)(int)(5 * rand.Frand01() + 2); @@ -1858,7 +1858,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Dist, prefix + "juliascope_dist", 1));//Params. m_Params.push_back(ParamWithName(&m_Power, prefix + "juliascope_power", 1)); @@ -1887,7 +1887,7 @@ public: VARCOPY(BlurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tempr = rand.Frand01() * M_2PI; T r = m_Weight * rand.Frand01(); @@ -1897,7 +1897,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1926,7 +1926,7 @@ public: VARCOPY(GaussianBlurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T angle = rand.Frand01() * M_2PI; T r = m_Weight * (rand.Frand01() + rand.Frand01() + rand.Frand01() + rand.Frand01() - 2); @@ -1936,7 +1936,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1968,7 +1968,7 @@ public: PARVARCOPY(RadialBlurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { //Get pseudo-gaussian. T rndG = m_Weight * (rand.Frand01() + rand.Frand01() @@ -1983,8 +1983,8 @@ public: helper.Out.y = ra * sin(tempa) + rz * helper.In.y; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2007,13 +2007,13 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { sincos(m_Angle * T(M_PI) / 2, &m_Spin, &m_Zoom); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Angle = (2 * rand.Frand01() - 1); } @@ -2022,7 +2022,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Angle, prefix + "radial_blur_angle"));//Params. m_Params.push_back(ParamWithName(true, &m_Spin, prefix + "radial_blur_spin"));//Precalc. @@ -2049,7 +2049,7 @@ public: PARVARCOPY(PieVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int sl = (int)(rand.Frand01() * m_Slices + T(0.5)); T a = m_Rotation + M_2PI * (sl + rand.Frand01() * m_Thickness) / m_Slices; @@ -2058,8 +2058,8 @@ public: helper.Out.x = r * cos(a); helper.Out.y = r * sin(a); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2081,8 +2081,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Params[0].Set(10 * rand.Frand01());//Slices. m_Params[1].Set(M_2PI * rand.Frand11());//Rotation. @@ -2093,7 +2093,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Slices, prefix + "pie_slices", 6, INTEGER_NONZERO, 1)); m_Params.push_back(ParamWithName(&m_Rotation, prefix + "pie_rotation", T(0.5), REAL_CYCLIC, 0, M_2PI)); @@ -2120,7 +2120,7 @@ public: PARVARCOPY(NgonVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T rFactor; @@ -2130,7 +2130,7 @@ public: rFactor = pow(helper.m_PrecalcSumSquares, m_CPower); T phi = helper.m_PrecalcAtanyx - m_CSides * Floor(helper.m_PrecalcAtanyx * m_CSidesInv); - + if (phi > T(0.5) * m_CSides) phi -= m_CSides; @@ -2140,8 +2140,8 @@ public: helper.Out.y = amp * helper.In.y; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2178,14 +2178,14 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_CPower = -T(0.5) * m_Power; m_CSides = 2 * T(M_PI) / m_Sides; m_CSidesInv = 1 / m_CSides; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Sides = (T)(int)(rand.Frand01() * 10 + 3); m_Power = 3 * rand.Frand01() + 1; @@ -2197,7 +2197,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Sides, prefix + "ngon_sides", 5, INTEGER_NONZERO)); m_Params.push_back(ParamWithName(&m_Power, prefix + "ngon_power", 3)); @@ -2235,7 +2235,7 @@ public: PARVARCOPY(CurlVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T re = 1 + m_C1 * helper.In.x + m_C2 * (SQR(helper.In.x) - SQR(helper.In.y)); T im = m_C1 * helper.In.y + m_C22 * helper.In.x * helper.In.y; @@ -2245,8 +2245,8 @@ public: helper.Out.y = (helper.In.y * re - helper.In.x * im) * r; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2268,13 +2268,13 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_C22 = 2 * m_C2; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_C1 = rand.Frand01(); m_C2 = rand.Frand01(); @@ -2284,13 +2284,13 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_C1, prefix + "curl_c1", 1)); m_Params.push_back(ParamWithName(&m_C2, prefix + "curl_c2")); m_Params.push_back(ParamWithName(true, &m_C22, prefix + "curl_c22"));//Precalc. } - + private: T m_C1; T m_C2; @@ -2311,7 +2311,7 @@ public: PARVARCOPY(RectanglesVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (m_X == 0) helper.Out.x = m_Weight * helper.In.x; @@ -2325,8 +2325,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2352,7 +2352,7 @@ public: return ss.str(); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_X = rand.Frand01(); m_Y = rand.Frand01(); @@ -2362,7 +2362,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "rectangles_x", 1)); m_Params.push_back(ParamWithName(&m_Y, prefix + "rectangles_y", 1)); @@ -2384,7 +2384,7 @@ public: VARCOPY(ArchVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T angle = rand.Frand01() * m_Weight * T(M_PI); T sinr, cosr; @@ -2395,7 +2395,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2425,14 +2425,14 @@ public: VARCOPY(TangentVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * sin(helper.In.x) / cos(helper.In.y); helper.Out.y = m_Weight * tan(helper.In.y); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2458,14 +2458,14 @@ public: VARCOPY(SquareVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * (rand.Frand01() - T(0.5)); helper.Out.y = m_Weight * (rand.Frand01() - T(0.5)); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2491,7 +2491,7 @@ public: VARCOPY(RaysVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T ang = m_Weight * rand.Frand01() * T(M_PI); T r = m_Weight / Zeps(helper.m_PrecalcSumSquares); @@ -2501,8 +2501,8 @@ public: helper.Out.y = tanr * sin(helper.In.y); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2532,7 +2532,7 @@ public: VARCOPY(BladeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = rand.Frand01() * m_Weight * helper.m_PrecalcSqrtSumSquares; T sinr, cosr; @@ -2543,7 +2543,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2573,14 +2573,14 @@ public: VARCOPY(Secant2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight * helper.m_PrecalcSqrtSumSquares; T cr = cos(r); T icr = 1 / cr; helper.Out.x = m_Weight * helper.In.x; - + if (cr < 0) helper.Out.y = m_Weight * (icr + 1); else @@ -2589,7 +2589,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2624,14 +2624,14 @@ public: VARCOPY(TwinTrianVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = rand.Frand01() * m_Weight * helper.m_PrecalcSqrtSumSquares; T sinr, cosr, diff; sincos(r, &sinr, &cosr); diff = log10(sinr * sinr) + cosr; - + if (BadVal(diff)) diff = -30.0; @@ -2639,8 +2639,8 @@ public: helper.Out.y = m_Weight * helper.In.x * (diff - sinr * T(M_PI)); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2674,16 +2674,16 @@ public: VARCOPY(CrossVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight / Zeps(fabs((helper.In.x - helper.In.y) * (helper.In.x + helper.In.y))); - + helper.Out.x = helper.In.x * r; helper.Out.y = helper.In.y * r; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2714,7 +2714,7 @@ public: PARVARCOPY(Disc2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r, t, sinr, cosr; @@ -2725,8 +2725,8 @@ public: helper.Out.y = (cosr + m_SinAdd) * r; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2751,8 +2751,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { T k, add = m_Twist; @@ -2775,7 +2775,7 @@ public: } } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Rot = T(0.5) * rand.Frand01(); m_Twist = T(0.5) * rand.Frand01(); @@ -2785,7 +2785,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Rot, prefix + "disc2_rot"));//Params. m_Params.push_back(ParamWithName(&m_Twist, prefix + "disc2_twist")); @@ -2816,25 +2816,25 @@ public: PARVARCOPY(SuperShapeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T theta = m_Pm4 * helper.m_PrecalcAtanyx + T(M_PI_4); - + T t1 = fabs(cos(theta)); t1 = pow(t1, m_N2); T t2 = fabs(sin(theta)); t2 = pow(t2, m_N3); - T r = m_Weight * ((m_Rnd * rand.Frand01() + (1 - m_Rnd) * helper.m_PrecalcSqrtSumSquares) - m_Holes) + T r = m_Weight * ((m_Rnd * rand.Frand01() + (1 - m_Rnd) * helper.m_PrecalcSqrtSumSquares) - m_Holes) * pow(t1 + t2, m_PNeg1N1) / helper.m_PrecalcSqrtSumSquares; helper.Out.x = r * helper.In.x; helper.Out.y = r * helper.In.y; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2865,13 +2865,13 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Pm4 = m_M / T(4.0); m_PNeg1N1 = T(-1.0) / m_N1; } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Rnd = rand.Frand01(); m_M = (T)(int)(rand.Frand01() * 6); @@ -2885,7 +2885,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_M, prefix + "super_shape_m"));//Params. m_Params.push_back(ParamWithName(&m_N1, prefix + "super_shape_n1", 1)); @@ -2922,7 +2922,7 @@ public: PARVARCOPY(FlowerVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T theta = helper.m_PrecalcAtanyx; T r = m_Weight * (rand.Frand01() - m_Holes) * cos(m_Petals * theta) / helper.m_PrecalcSqrtSumSquares; @@ -2931,8 +2931,8 @@ public: helper.Out.y = r * helper.In.y; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2953,7 +2953,7 @@ public: return ss.str(); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Petals = 4 * rand.Frand01(); m_Holes = rand.Frand01(); @@ -2963,12 +2963,12 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Petals, prefix + "flower_petals")); m_Params.push_back(ParamWithName(&m_Holes, prefix + "flower_holes")); } - + private: T m_Petals; T m_Holes; @@ -2988,18 +2988,18 @@ public: PARVARCOPY(ConicVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T ct = helper.In.x / helper.m_PrecalcSqrtSumSquares; - T r = m_Weight * (rand.Frand01() - m_Holes) * + T r = m_Weight * (rand.Frand01() - m_Holes) * m_Eccentricity / (1 + m_Eccentricity * ct) / helper.m_PrecalcSqrtSumSquares; helper.Out.x = r * helper.In.x; helper.Out.y = r * helper.In.y; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3019,8 +3019,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Eccentricity = rand.Frand01(); m_Holes = rand.Frand01(); @@ -3030,12 +3030,12 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Eccentricity, prefix + "conic_eccentricity", 1)); m_Params.push_back(ParamWithName(&m_Holes, prefix + "conic_holes")); } - + private: T m_Eccentricity; T m_Holes; @@ -3055,7 +3055,7 @@ public: PARVARCOPY(ParabolaVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sr, cr; @@ -3064,8 +3064,8 @@ public: helper.Out.y = m_Width * m_Weight * cr * rand.Frand01(); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3073,7 +3073,7 @@ public: string index = ss2.str(); string height = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string width = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t sr = sin(precalcSqrtSumSquares);\n" << "\t\treal_t cr = cos(precalcSqrtSumSquares);\n" @@ -3085,8 +3085,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Height = T(0.5) * rand.Frand01(); m_Width = T(0.5) * rand.Frand01(); @@ -3096,7 +3096,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Height, prefix + "parabola_height")); m_Params.push_back(ParamWithName(&m_Width, prefix + "parabola_width")); @@ -3121,7 +3121,7 @@ public: PARVARCOPY(Bent2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (helper.In.x >= 0) helper.Out.x = m_Weight * helper.In.x; @@ -3136,7 +3136,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3163,14 +3163,14 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Vx = m_X * m_Weight; m_Vy = m_Y * m_Weight; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_X = 3 * (T(-0.5) + rand.Frand01()); m_Y = 3 * (T(-0.5) + rand.Frand01()); @@ -3180,14 +3180,14 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "bent2_x", 1));//Params. m_Params.push_back(ParamWithName(&m_Y, prefix + "bent2_y", 1)); m_Params.push_back(ParamWithName(true, &m_Vx, prefix + "bent2_vx"));//Precalc. m_Params.push_back(ParamWithName(true, &m_Vy, prefix + "bent2_vy")); } - + private: T m_X;//Params. T m_Y; @@ -3209,13 +3209,13 @@ public: PARVARCOPY(BipolarVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const T x2y2 = helper.m_PrecalcSumSquares; const T t = x2y2 + 1; const T x2 = 2 * helper.In.x; T y = T(0.5) * atan2(2 * helper.In.y, x2y2 - 1) + m_S; - + if (y > T(M_PI_2)) y = -T(M_PI_2) + fmod(y + T(M_PI_2), T(M_PI)); else if (y < -T(M_PI_2)) @@ -3246,8 +3246,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3303,20 +3303,20 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_S = -T(M_PI_2) * m_Shift;; m_V = m_Weight * T(M_2_PI); m_V4 = m_Weight * T(0.25) * T(M_2_PI); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Shift = 2 * rand.Frand01() - 1; } - virtual bool SetParamVal(const char* name, T val) + virtual bool SetParamVal(const char* name, T val) override { if (!_stricmp(name, "bipolar_shift")) { @@ -3334,7 +3334,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Shift, prefix + "bipolar_shift"));//Params. m_Params.push_back(ParamWithName(true, &m_S, prefix + "bipolar_s"));//Precalc. @@ -3360,13 +3360,13 @@ public: VARCOPY(BoardersVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T roundX = Rint(helper.In.x); T roundY = Rint(helper.In.y); T offsetX = helper.In.x - roundX; T offsetY = helper.In.y - roundY; - + if (rand.Frand01() >= 0.75) { helper.Out.x = m_Weight * (offsetX * T(0.5) + roundX); @@ -3384,7 +3384,7 @@ public: else { helper.Out.x = m_Weight * (offsetX * T(0.5) + roundX - T(0.25)); - helper.Out.y = m_Weight * (offsetY * T(0.5) + roundY - T(0.25) * offsetY / offsetX); + helper.Out.y = m_Weight * (offsetY * T(0.5) + roundY - T(0.25) * offsetY / offsetX); } } else @@ -3405,7 +3405,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3469,18 +3469,18 @@ public: VARCOPY(ButterflyVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T wx = m_Weight * T(1.3029400317411197908970256609023);//This precision came from the original. T y2 = helper.In.y * 2; T r = wx * sqrt(fabs(helper.In.y * helper.In.x) / Zeps(SQR(helper.In.x) + SQR(y2))); - + helper.Out.x = r * helper.In.x; helper.Out.y = r * y2; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3513,14 +3513,14 @@ public: PARVARCOPY(CellVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T invCellSize = 1 / m_Size; T x = floor(helper.In.x * invCellSize);//Calculate input cell. Note that int cast is omitted here. See below. T y = floor(helper.In.y * invCellSize); T dx = helper.In.x - x * m_Size;//Offset from cell origin. T dy = helper.In.y - y * m_Size; - + //Interleave cells. if (y >= 0) { @@ -3548,19 +3548,19 @@ public: x = -(2 * x + 1); } } - + helper.Out.x = m_Weight * (dx + x * m_Size); helper.Out.y = -(m_Weight * (dy + y * m_Size)); helper.Out.z = m_Weight * helper.In.z; } - + /// /// Cell is very strange and will not run using integers. /// When using floats, it at least gives some output, however /// that output is slightly different than the CPU. But not by enough /// to change the shape of the final image. /// - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3615,8 +3615,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Size = 2 * rand.Frand01() + T(0.5); } @@ -3625,11 +3625,11 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Size, prefix + "cell_size", 1)); } - + private: T m_Size; }; @@ -3648,19 +3648,19 @@ public: PARVARCOPY(CpowVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcAtanyx; T lnr = T(0.5) * log(helper.m_PrecalcSumSquares); T angle = m_C * a + m_D * lnr + m_Ang * Floor(m_Power * rand.Frand01()); T m = m_Weight * exp(m_C * lnr - m_D * a); - + helper.Out.x = m * cos(angle); helper.Out.y = m * sin(angle); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3686,15 +3686,15 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_C = m_PowerR / m_Power; m_D = m_PowerI / m_Power; m_Ang = 2 * T(M_PI) / m_Power; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_PowerR = 3 * rand.Frand01(); m_PowerI = rand.Frand01() - T(0.5); @@ -3705,7 +3705,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_PowerR, prefix + "cpow_r", 1));//Params. m_Params.push_back(ParamWithName(&m_PowerI, prefix + "cpow_i")); @@ -3714,7 +3714,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_D, prefix + "cpow_d")); m_Params.push_back(ParamWithName(true, &m_Ang, prefix + "cpow_ang")); } - + private: T m_PowerR;//Params. T m_PowerI; @@ -3738,14 +3738,14 @@ public: PARVARCOPY(CurveVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * helper.In.x + m_XAmpV * exp(-helper.In.y * helper.In.y * m_XLengthV); helper.Out.y = m_Weight * helper.In.y + m_YAmpV * exp(-helper.In.x * helper.In.x * m_YLengthV); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3768,8 +3768,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_XAmpV = m_Weight * m_XAmp; m_YAmpV = m_Weight * m_YAmp; @@ -3777,7 +3777,7 @@ public: m_YLengthV = 1 / max(SQR(m_YLength), T(1e-20)); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_XAmp = 5 * (rand.Frand01() - T(0.5)); m_YAmp = 4 * (rand.Frand01() - T(0.5)); @@ -3789,7 +3789,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_XAmp, prefix + "curve_xamp"));//Params. m_Params.push_back(ParamWithName(&m_YAmp, prefix + "curve_yamp")); @@ -3800,7 +3800,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_XLengthV, prefix + "curve_xlenv")); m_Params.push_back(ParamWithName(true, &m_YLengthV, prefix + "curve_ylenv")); } - + private: T m_XAmp;//Params. T m_YAmp; @@ -3823,7 +3823,7 @@ public: VARCOPY(EdiscVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T tmp2 = 2 * helper.In.x; @@ -3834,21 +3834,21 @@ public: T a2 = -acos(Clamp(helper.In.x / xmax, -1, 1)); T w = m_Weight / T(11.57034632);//This is an interesting magic number. T snv, csv, snhu, cshu; - + sincos(a1, &snv, &csv); - + snhu = sinh(a2); cshu = cosh(a2); - + if (helper.In.y > 0.0) snv = -snv; - + helper.Out.x = w * cshu * csv; helper.Out.y = w * snhu * snv; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3866,7 +3866,7 @@ public: << "\t\treal_t csv = cos(a1);\n" << "\t\treal_t snhu = sinh(a2);\n" << "\t\treal_t cshu = cosh(a2);\n" - + << "\t\tif (vIn.y > 0)\n" << "\t\t snv = -snv;\n" @@ -3893,7 +3893,7 @@ public: PARVARCOPY(EllipticVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T x2 = 2 * helper.In.x; @@ -3907,14 +3907,14 @@ public: b = 0; else b = sqrt(b); - + if (ssx < 0) ssx = 0; else ssx = sqrt(ssx); - + helper.Out.x = w * atan2(a, b); - + if (helper.In.y > 0) helper.Out.y = w * log(xmax + ssx); else @@ -3923,7 +3923,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3962,8 +3962,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_WeightDivPiDiv2 = m_Weight / T(M_PI_2); } @@ -3972,11 +3972,11 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_WeightDivPiDiv2, prefix + "elliptic_weight_div_pi_div_2"));//Precalc. } - + private: T m_WeightDivPiDiv2;//Precalc. }; @@ -3995,19 +3995,19 @@ public: PARVARCOPY(EscherVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcAtanyx; T lnr = T(0.5) * log(helper.m_PrecalcSumSquares); T m = m_Weight * exp(m_C * lnr - m_D * a); T n = m_C * a + m_D * lnr; - + helper.Out.x = m * cos(n); helper.Out.y = m * sin(n); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4016,7 +4016,7 @@ public: string beta = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string d = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a = precalcAtanyx;\n" << "\t\treal_t lnr = 0.5 * log(precalcSumSquares);\n" @@ -4030,20 +4030,20 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { sincos(m_Beta, &m_D, &m_C); m_C = T(0.5) * (1 + m_C); m_D = T(0.5) * m_D; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { SetParamVal("escher_beta", T(M_PI) * rand.Frand01()); } - virtual bool SetParamVal(const char* name, T val) + virtual bool SetParamVal(const char* name, T val) override { if (!_stricmp(name, "escher_beta")) { @@ -4059,13 +4059,13 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Beta, prefix + "escher_beta"));//Params. m_Params.push_back(ParamWithName(true, &m_C, prefix + "escher_beta_c"));//Precalc. m_Params.push_back(ParamWithName(true, &m_D, prefix + "escher_beta_d")); } - + private: T m_Beta;//Params. T m_C;//Precalc. @@ -4083,12 +4083,12 @@ public: VARCOPY(FociVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T expx = exp(helper.In.x) * T(0.5); T expnx = T(0.25) / expx; T sn, cn, tmp; - + sincos(helper.In.y, &sn, &cn); tmp = m_Weight / Zeps(expx + expnx - cn); @@ -4098,7 +4098,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -4135,31 +4135,31 @@ public: PARVARCOPY(LazySusanVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = helper.In.x - m_X; T y = helper.In.y + m_Y; T r = sqrt(x * x + y * y); - + if (r < m_Weight) { T a = atan2(y, x) + m_Spin + m_Twist * (m_Weight - r); - + helper.Out.x = m_Weight * (r * cos(a) + m_X);//Fix to make it colapse to 0 when weight is 0.//SMOULDER helper.Out.y = m_Weight * (r * sin(a) - m_Y); } else { r = 1 + m_Space / Zeps(r); - + helper.Out.x = m_Weight * (r * x + m_X);//Fix to make it colapse to 0 when weight is 0.//SMOULDER helper.Out.y = m_Weight * (r * y - m_Y); } helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4196,20 +4196,20 @@ public: return ss.str(); } - - virtual bool SetParamVal(const char* name, T val) + + virtual bool SetParamVal(const char* name, T val) override { if (!_stricmp(name, "lazysusan_spin")) { m_Spin = Fabsmod(val / T(M_2PI)) * T(M_2PI); - Precalc(); + this->Precalc(); return true; } return ParametricVariation::SetParamVal(name, val); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_X = 2 * rand.Frand11(); m_Y = 2 * rand.Frand11(); @@ -4222,7 +4222,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Spin, prefix + "lazysusan_spin", T(M_PI))); m_Params.push_back(ParamWithName(&m_Space, prefix + "lazysusan_space")); @@ -4230,7 +4230,7 @@ protected: m_Params.push_back(ParamWithName(&m_X, prefix + "lazysusan_x")); m_Params.push_back(ParamWithName(&m_Y, prefix + "lazysusan_y")); } - + private: T m_Spin; T m_Space; @@ -4253,7 +4253,7 @@ public: PARVARCOPY(LoonieVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (helper.m_PrecalcSumSquares < m_W2 && helper.m_PrecalcSumSquares != 0) { @@ -4271,7 +4271,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4297,8 +4297,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_W2 = SQR(m_Weight); } @@ -4307,11 +4307,11 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_W2, prefix + "loonie_w2"));//Precalc. } - + private: T m_W2;//Precalc. }; @@ -4330,7 +4330,7 @@ public: PARVARCOPY(ModulusVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (helper.In.x > m_X) helper.Out.x = m_Weight * (-m_X + fmod(helper.In.x + m_X, m_XRange)); @@ -4338,7 +4338,7 @@ public: helper.Out.x = m_Weight * ( m_X - fmod(m_X - helper.In.x, m_XRange)); else helper.Out.x = m_Weight * helper.In.x; - + if (helper.In.y > m_Y) helper.Out.y = m_Weight * (-m_Y + fmod(helper.In.y + m_Y, m_YRange)); else if (helper.In.y < -m_Y) @@ -4348,8 +4348,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4367,7 +4367,7 @@ public: << "\t\t vOut.x = xform->m_VariationWeights[" << varIndex << "] * ( " << x << " - fmod(" << x << " - vIn.x, " << xr << "));\n" << "\t\telse\n" << "\t\t vOut.x = xform->m_VariationWeights[" << varIndex << "] * vIn.x;\n" - << "\n" + << "\n" << "\t\tif (vIn.y > " << y << ")\n" << "\t\t vOut.y = xform->m_VariationWeights[" << varIndex << "] * (-" << y << " + fmod(vIn.y + " << y << ", " << yr << "));\n" << "\t\telse if (vIn.y < -" << y << ")\n" @@ -4380,14 +4380,14 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_XRange = 2 * m_X; m_YRange = 2 * m_Y; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_X = rand.Frand11(); m_Y = rand.Frand11(); @@ -4397,14 +4397,14 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "modulus_x", 1));//Params. m_Params.push_back(ParamWithName(&m_Y, prefix + "modulus_y", 1)); m_Params.push_back(ParamWithName(true, &m_XRange, prefix + "modulus_xrange"));//Precalc. m_Params.push_back(ParamWithName(true, &m_YRange, prefix + "modulus_yrange")); } - + private: T m_X;//Params. T m_Y; @@ -4426,7 +4426,7 @@ public: PARVARCOPY(OscilloscopeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t; @@ -4434,7 +4434,7 @@ public: t = m_Amplitude * cos(m_2PiFreq * helper.In.x) + m_Separation; else t = m_Amplitude * exp(-fabs(helper.In.x) * m_Damping) * cos(m_2PiFreq * helper.In.x) + m_Separation; - + if (fabs(helper.In.y) <= t) { helper.Out.x = m_Weight * helper.In.x; @@ -4448,8 +4448,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4485,13 +4485,13 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_2PiFreq = m_Frequency * T(M_2PI); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Separation = 1 + rand.Frand11(); m_Frequency = T(M_PI) * rand.Frand11(); @@ -4503,7 +4503,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Separation, prefix + "oscilloscope_separation", 1));//Params. m_Params.push_back(ParamWithName(&m_Frequency, prefix + "oscilloscope_frequency", T(M_PI))); @@ -4511,7 +4511,7 @@ protected: m_Params.push_back(ParamWithName(&m_Damping, prefix + "oscilloscope_damping")); m_Params.push_back(ParamWithName(true, &m_2PiFreq, prefix + "oscilloscope_2pifreq"));//Precalc. } - + private: T m_Separation;//Params. T m_Frequency; @@ -4534,14 +4534,14 @@ public: PARVARCOPY(Polar2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Vvar * helper.m_PrecalcAtanxy; helper.Out.y = m_Vvar2 * log(helper.m_PrecalcSumSquares); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4559,7 +4559,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Vvar = m_Weight / T(M_PI); m_Vvar2 = m_Vvar * T(0.5); @@ -4569,7 +4569,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_Vvar, prefix + "polar2_vvar"));//Precalc. m_Params.push_back(ParamWithName(true, &m_Vvar2, prefix + "polar2_vvar2")); @@ -4594,14 +4594,14 @@ public: PARVARCOPY(Popcorn2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * (helper.In.x + m_X * sin(tan(helper.In.y * m_C))); helper.Out.y = m_Weight * (helper.In.y + m_Y * sin(tan(helper.In.x * m_C))); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4619,8 +4619,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_X = T(0.2) + rand.Frand01(); m_Y = T(0.2) * rand.Frand01(); @@ -4631,13 +4631,13 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "popcorn2_x", T(0.1))); m_Params.push_back(ParamWithName(&m_Y, prefix + "popcorn2_y", T(0.1))); m_Params.push_back(ParamWithName(&m_C, prefix + "popcorn2_c", 3)); } - + private: T m_X; T m_Y; @@ -4661,7 +4661,7 @@ public: PARVARCOPY(ScryVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t = helper.m_PrecalcSumSquares; T r = 1 / Zeps(helper.m_PrecalcSqrtSumSquares * (t + m_InvWeight)); @@ -4671,7 +4671,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4690,8 +4690,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_InvWeight = 1 / Zeps(m_Weight); } @@ -4700,11 +4700,11 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_InvWeight, prefix + "scry_inv_weight"));//Precalcs only, no params. } - + private: T m_InvWeight;//Precalcs only, no params. }; @@ -4723,13 +4723,13 @@ public: PARVARCOPY(SeparationVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (helper.In.x > 0.0) helper.Out.x = m_Weight * (sqrt(SQR(helper.In.x) + m_XX) - helper.In.x * m_XInside); else helper.Out.x = -(m_Weight * (sqrt(SQR(helper.In.x) + m_XX) + helper.In.x * m_XInside)); - + if (helper.In.y > 0.0) helper.Out.y = m_Weight * (sqrt(SQR(helper.In.y) + m_YY) - helper.In.y * m_YInside); else @@ -4737,8 +4737,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4752,29 +4752,29 @@ public: string yy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; ss << "\t{\n" - << "\t\tif (vIn.x > 0.0)\n" - << "\t\t vOut.x = xform->m_VariationWeights[" << varIndex << "] * (sqrt(vIn.x * vIn.x + " << xx << ") - vIn.x * " << xInside << ");\n" - << "\t\telse\n" - << "\t\t vOut.x = -(xform->m_VariationWeights[" << varIndex << "] * (sqrt(vIn.x * vIn.x + " << xx << ") + vIn.x * " << xInside << "));\n" - << "\n" - << "\t\tif (vIn.y > 0.0)\n" - << "\t\t vOut.y = xform->m_VariationWeights[" << varIndex << "] * (sqrt(vIn.y * vIn.y + " << yy << ") - vIn.y * " << yInside << ");\n" - << "\t\telse\n" - << "\t\t vOut.y = -(xform->m_VariationWeights[" << varIndex << "] * (sqrt(vIn.y * vIn.y + " << yy << ") + vIn.y * " << yInside << "));\n" + << "\t\tif (vIn.x > 0.0)\n" + << "\t\t vOut.x = xform->m_VariationWeights[" << varIndex << "] * (sqrt(vIn.x * vIn.x + " << xx << ") - vIn.x * " << xInside << ");\n" + << "\t\telse\n" + << "\t\t vOut.x = -(xform->m_VariationWeights[" << varIndex << "] * (sqrt(vIn.x * vIn.x + " << xx << ") + vIn.x * " << xInside << "));\n" + << "\n" + << "\t\tif (vIn.y > 0.0)\n" + << "\t\t vOut.y = xform->m_VariationWeights[" << varIndex << "] * (sqrt(vIn.y * vIn.y + " << yy << ") - vIn.y * " << yInside << ");\n" + << "\t\telse\n" + << "\t\t vOut.y = -(xform->m_VariationWeights[" << varIndex << "] * (sqrt(vIn.y * vIn.y + " << yy << ") + vIn.y * " << yInside << "));\n" << "\n" << "\t\tvOut.z = xform->m_VariationWeights[" << varIndex << "] * vIn.z;\n" << "\t}\n"; return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_XX = SQR(m_X); m_YY = SQR(m_Y); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_X = 1 + rand.Frand11(); m_XInside = 1 + rand.Frand11(); @@ -4786,7 +4786,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "separation_x", 1));//Params. m_Params.push_back(ParamWithName(&m_XInside, prefix + "separation_xinside")); @@ -4795,7 +4795,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_XX, prefix + "separation_xx"));//Precalc. m_Params.push_back(ParamWithName(true, &m_YY, prefix + "separation_yy")); } - + private: T m_X;//Params. T m_XInside; @@ -4819,7 +4819,7 @@ public: PARVARCOPY(SplitVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (cos(helper.In.y * m_YAng) >= 0) helper.Out.x = m_Weight * helper.In.x; @@ -4833,8 +4833,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4844,7 +4844,7 @@ public: string ySize = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string xAng = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string yAng = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tif (cos(vIn.y * " << yAng << ") >= 0)\n" << "\t\t vOut.x = xform->m_VariationWeights[" << varIndex << "] * vIn.x;\n" @@ -4861,14 +4861,14 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_XAng = T(M_PI) * m_XSize; m_YAng = T(M_PI) * m_YSize; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_XSize = rand.Frand11(); m_YSize = rand.Frand11(); @@ -4878,14 +4878,14 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_XSize, prefix + "split_xsize", T(0.5)));//Params. m_Params.push_back(ParamWithName(&m_YSize, prefix + "split_ysize", T(0.5))); m_Params.push_back(ParamWithName(true, &m_XAng, prefix + "split_xang"));//Precalc. m_Params.push_back(ParamWithName(true, &m_YAng, prefix + "split_yang")); } - + private: T m_XSize;//Params. T m_YSize; @@ -4907,13 +4907,13 @@ public: PARVARCOPY(SplitsVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (helper.In.x >= 0) helper.Out.x = m_Weight * (helper.In.x + m_X); else helper.Out.x = m_Weight * (helper.In.x - m_X); - + if (helper.In.y >= 0) helper.Out.y = m_Weight * (helper.In.y + m_Y); else @@ -4921,8 +4921,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4930,7 +4930,7 @@ public: string index = ss2.str(); string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tif (vIn.x >= 0)\n" << "\t\t vOut.x = xform->m_VariationWeights[" << varIndex << "] * (vIn.x + " << x << ");\n" @@ -4947,8 +4947,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_X = rand.Frand11(); m_Y = rand.Frand11(); @@ -4958,12 +4958,12 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "splits_x")); m_Params.push_back(ParamWithName(&m_Y, prefix + "splits_y")); } - + private: T m_X; T m_Y; @@ -4983,7 +4983,7 @@ public: PARVARCOPY(StripesVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T roundx = (T)(int)(helper.In.x >= 0 ? (helper.In.x + T(0.5)) : (helper.In.x - T(0.5))); T offsetx = helper.In.x - roundx; @@ -4992,8 +4992,8 @@ public: helper.Out.y = m_Weight * (helper.In.y + offsetx * offsetx * m_Warp); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5001,7 +5001,7 @@ public: string index = ss2.str(); string space = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string warp = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t roundx = (real_t)(int)(vIn.x >= 0 ? (vIn.x + 0.5) : (vIn.x - 0.5));\n" << "\t\treal_t offsetx = vIn.x - roundx;\n" @@ -5013,8 +5013,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Params[0].Set(rand.Frand01());//Space. m_Params[1].Set(5 * rand.Frand01());//Warp. @@ -5024,12 +5024,12 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Space, prefix + "stripes_space", T(0.5), REAL, T(0.5), 5)); m_Params.push_back(ParamWithName(&m_Warp, prefix + "stripes_warp")); } - + private: T m_Space; T m_Warp; @@ -5049,7 +5049,7 @@ public: PARVARCOPY(WedgeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = helper.m_PrecalcSqrtSumSquares; T a = helper.m_PrecalcAtanyx + m_Swirl * r; @@ -5061,8 +5061,8 @@ public: helper.Out.y = r * sin(a); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5088,13 +5088,13 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_CompFac = 1 - m_Angle * m_Count * T(M_1_PI) * T(0.5); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Angle = T(M_PI) * rand.Frand01(); m_Hole = T(0.5) * rand.Frand11(); @@ -5106,7 +5106,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Angle, prefix + "wedge_angle", T(M_PI_2)));//Params. m_Params.push_back(ParamWithName(&m_Hole, prefix + "wedge_hole")); @@ -5114,7 +5114,7 @@ protected: m_Params.push_back(ParamWithName(&m_Swirl, prefix + "wedge_swirl")); m_Params.push_back(ParamWithName(true, &m_CompFac, prefix + "wedge_compfac"));//Precalc. } - + private: T m_Angle;//Params. T m_Hole; @@ -5137,7 +5137,7 @@ public: PARVARCOPY(WedgeJuliaVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight * pow(helper.m_PrecalcSumSquares, m_Cn); int tRand = (int)(m_Rn * rand.Frand01()); @@ -5149,8 +5149,8 @@ public: helper.Out.y = r * sin(a); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5178,15 +5178,15 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Cf = 1 - m_Angle * m_Count * T(M_1_PI) * T(0.5); m_Rn = fabs(m_Power); m_Cn = m_Dist / m_Power / 2; } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Power = (T)(int)(5 * rand.Frand01() + 2); m_Dist = 1; @@ -5198,7 +5198,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Angle, prefix + "wedge_julia_angle"));//Params. m_Params.push_back(ParamWithName(&m_Count, prefix + "wedge_julia_count", 1)); @@ -5233,7 +5233,7 @@ public: PARVARCOPY(WedgeSphVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = 1 / Zeps(helper.m_PrecalcSqrtSumSquares); T a = helper.m_PrecalcAtanyx + m_Swirl * r; @@ -5246,8 +5246,8 @@ public: helper.Out.y = r * sin(a); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5274,7 +5274,7 @@ public: return ss.str(); } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_Angle = T(M_PI) * rand.Frand01(); m_Count = (T)Floor(5 * rand.Frand01()) + 1; @@ -5286,14 +5286,14 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Angle, prefix + "wedge_sph_angle")); m_Params.push_back(ParamWithName(&m_Count, prefix + "wedge_sph_hole", 1)); m_Params.push_back(ParamWithName(&m_Hole, prefix + "wedge_sph_count")); m_Params.push_back(ParamWithName(&m_Swirl, prefix + "wedge_sph_swirl")); } - + private: T m_Angle; T m_Count; @@ -5315,7 +5315,7 @@ public: PARVARCOPY(WhorlVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a, r = helper.m_PrecalcSqrtSumSquares; @@ -5328,8 +5328,8 @@ public: helper.Out.y = m_Weight * r * sin(a); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5337,7 +5337,7 @@ public: string index = ss2.str(); string inside = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string outside = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a;\n" << "\t\treal_t r = precalcSqrtSumSquares;\n" @@ -5354,8 +5354,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Inside = rand.Frand01(); m_Outside = rand.Frand01(); @@ -5365,12 +5365,12 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Inside, prefix + "whorl_inside", 1)); m_Params.push_back(ParamWithName(&m_Outside, prefix + "whorl_outside", 1)); } - + private: T m_Inside; T m_Outside; @@ -5390,14 +5390,14 @@ public: PARVARCOPY(Waves2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * (helper.In.x + m_ScaleX * sin(helper.In.y * m_FreqX)); helper.Out.y = m_Weight * (helper.In.y + m_ScaleY * sin(helper.In.x * m_FreqY)); helper.Out.z = m_Weight * (helper.In.z + m_ScaleZ * sin(helper.m_PrecalcSqrtSumSquares * m_FreqZ)); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5418,9 +5418,9 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) - { + + virtual void Random(QTIsaac& rand) override + { m_FreqX = 4 * rand.Frand01(); m_ScaleX = T(0.5) + rand.Frand01(); m_FreqY = 4 * rand.Frand01(); @@ -5433,7 +5433,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_FreqX, prefix + "waves2_freqx", 2)); m_Params.push_back(ParamWithName(&m_ScaleX, prefix + "waves2_scalex")); @@ -5442,7 +5442,7 @@ protected: m_Params.push_back(ParamWithName(&m_FreqZ, prefix + "waves2_freqz")); m_Params.push_back(ParamWithName(&m_ScaleZ, prefix + "waves2_scalez")); } - + private: T m_FreqX; T m_ScaleX; @@ -5463,7 +5463,7 @@ public: VARCOPY(ExpVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T expe = m_Weight * exp(helper.In.x); @@ -5472,7 +5472,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5503,14 +5503,14 @@ public: PARVARCOPY(LogVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * log(helper.m_PrecalcSumSquares) * m_Denom; helper.Out.y = m_Weight * helper.m_PrecalcAtanyx; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5527,8 +5527,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Denom = T(0.5) / log(m_Base); } @@ -5537,12 +5537,12 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Base, prefix + "log_base", T(M_E), REAL, EPS, TMAX)); m_Params.push_back(ParamWithName(true, &m_Denom, prefix + "log_denom"));//Precalc. } - + private: T m_Base; T m_Denom;//Precalc. @@ -5559,14 +5559,14 @@ public: VARCOPY(SinVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * sin(helper.In.x) * cosh(helper.In.y); helper.Out.y = m_Weight * cos(helper.In.x) * sinh(helper.In.y); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5592,7 +5592,7 @@ public: VARCOPY(CosVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { //clamp fabs x and y to 7.104760e+002 for cosh, and |x| 7.104760e+002 for sinh helper.Out.x = m_Weight * cos(helper.In.x) * cosh(helper.In.y); @@ -5600,7 +5600,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5626,7 +5626,7 @@ public: VARCOPY(TanVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tansin, tancos, tansinh, tancosh, tanden; @@ -5639,7 +5639,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5671,7 +5671,7 @@ public: VARCOPY(SecVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T secsin, seccos, secsinh, seccosh, secden; @@ -5684,7 +5684,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5716,7 +5716,7 @@ public: VARCOPY(CscVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T cscsin, csccos, cscsinh, csccosh, cscden; @@ -5729,7 +5729,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5761,7 +5761,7 @@ public: VARCOPY(CotVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T cotsin, cotcos, cotsinh, cotcosh, cotden; @@ -5774,7 +5774,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5806,7 +5806,7 @@ public: VARCOPY(SinhVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sinhsin, sinhcos, sinhsinh, sinhcosh; @@ -5818,7 +5818,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5849,7 +5849,7 @@ public: VARCOPY(CoshVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T coshsin,coshcos,coshsinh,coshcosh; @@ -5861,7 +5861,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5892,7 +5892,7 @@ public: VARCOPY(TanhVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tanhsin, tanhcos, tanhsinh, tanhcosh, tanhden; @@ -5905,7 +5905,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5937,7 +5937,7 @@ public: VARCOPY(SechVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sechsin, sechcos, sechsinh, sechcosh, sechden; @@ -5950,7 +5950,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5982,7 +5982,7 @@ public: VARCOPY(CschVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T cschsin, cschcos, cschsinh, cschcosh, cschden; @@ -5995,7 +5995,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -6027,7 +6027,7 @@ public: VARCOPY(CothVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T cothsin, cothcos, cothsinh, cothcosh, cothden; @@ -6040,7 +6040,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -6075,7 +6075,7 @@ public: PARVARCOPY(AugerVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T s = sin(m_Freq * helper.In.x); T t = sin(m_Freq * helper.In.y); @@ -6086,8 +6086,8 @@ public: helper.Out.y = m_Weight * dy; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -6111,9 +6111,9 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) - { + + virtual void Random(QTIsaac& rand) override + { m_Symmetry = 0; m_AugerWeight = T(0.5) + rand.Frand01() / 2; m_Freq = (T)Floor(5 * rand.Frand01()) + 1; @@ -6124,14 +6124,14 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Symmetry, prefix + "auger_sym")); m_Params.push_back(ParamWithName(&m_AugerWeight, prefix + "auger_weight", T(0.5))); m_Params.push_back(ParamWithName(&m_Freq, prefix + "auger_freq", 5)); m_Params.push_back(ParamWithName(&m_Scale, prefix + "auger_scale", T(0.1))); } - + private: T m_Symmetry; T m_AugerWeight; @@ -6153,7 +6153,7 @@ public: PARVARCOPY(FluxVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T xpw = helper.In.x + m_Weight; T xmw = helper.In.x - m_Weight; @@ -6171,8 +6171,8 @@ public: helper.Out.z = helper.In.z; //helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -6180,7 +6180,7 @@ public: string index = ss2.str(); string spread = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string spr = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t xpw = vIn.x + xform->m_VariationWeights[" << varIndex << "];\n" << "\t\treal_t xmw = vIn.x - xform->m_VariationWeights[" << varIndex << "];\n" @@ -6200,14 +6200,14 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Spr = 2 + m_Spread; } - virtual void Random(QTIsaac& rand) - { + virtual void Random(QTIsaac& rand) override + { m_Spread = T(0.5) + rand.Frand01() / 2; } @@ -6215,12 +6215,12 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Spread, prefix + "flux_spread"));//Params. m_Params.push_back(ParamWithName(true, &m_Spr, prefix + "flux_spr"));//Precalc. } - + private: T m_Spread;//Params. T m_Spr;//Precalc. @@ -6323,4 +6323,4 @@ MAKEPREPOSTVAR(Csch, csch, CSCH) MAKEPREPOSTVAR(Coth, coth, COTH) MAKEPREPOSTPARVAR(Auger, auger, AUGER) MAKEPREPOSTPARVAR(Flux, flux, FLUX) -} \ No newline at end of file +} diff --git a/Source/Ember/Variations02.h b/Source/Ember/Variations02.h index 619df4a..b6cd24a 100644 --- a/Source/Ember/Variations02.h +++ b/Source/Ember/Variations02.h @@ -15,7 +15,7 @@ public: VARCOPY(HemisphereVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t = m_Weight / sqrt(helper.m_PrecalcSumSquares + 1); @@ -24,7 +24,7 @@ public: helper.Out.z = t; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -55,7 +55,7 @@ public: PARVARCOPY(EpispiralVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T theta = helper.m_PrecalcAtanyx; T t = (rand.Frand01() * m_Thickness) * (1 / cos(m_N * theta)) - m_Holes; @@ -73,8 +73,8 @@ public: helper.Out.z = 0; } } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -109,7 +109,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_N, prefix + "epispiral_n", 6)); m_Params.push_back(ParamWithName(&m_Thickness, prefix + "epispiral_thickness")); @@ -137,7 +137,7 @@ public: PARVARCOPY(BwrapsVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (m_BwrapsCellsize == 0) { @@ -164,7 +164,7 @@ public: ly *= m_G2; T r = m_Rfactor / ((SQR(lx) + SQR(ly)) / 4 + 1); - + lx *= r; ly *= r; r = (SQR(lx) + SQR(ly)) / m_R2; @@ -175,7 +175,7 @@ public: vx = cx + c * lx + s * ly; vy = cy - s * lx + c * ly; - + helper.Out.x = m_Weight * vx; helper.Out.y = m_Weight * vy; } @@ -183,8 +183,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -247,13 +247,13 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { T radius = T(0.5) * (m_BwrapsCellsize / (1 + SQR(m_BwrapsSpace))); m_G2 = Zeps(SQR(m_BwrapsGain) / Zeps(radius)); T maxBubble = m_G2 * radius; - + if (maxBubble > 2) maxBubble = 1; else @@ -267,7 +267,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_BwrapsCellsize, prefix + "bwraps_cellsize", 1)); m_Params.push_back(ParamWithName(&m_BwrapsSpace, prefix + "bwraps_space")); @@ -278,7 +278,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_R2, prefix + "bwraps_r2")); m_Params.push_back(ParamWithName(true, &m_Rfactor, prefix + "bwraps_rfactor")); } - + private: T m_BwrapsCellsize; T m_BwrapsSpace; @@ -301,7 +301,7 @@ public: VARCOPY(BlurCircleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = 2 * rand.Frand01() - 1; T y = 2 * rand.Frand01() - 1; @@ -321,7 +321,7 @@ public: perimeter = absx + y; else perimeter = 5 * absx - y; - + side = absx; } else @@ -330,7 +330,7 @@ public: perimeter = 3 * absy - x; else perimeter = 7 * absy + x; - + side = absy; } @@ -343,8 +343,8 @@ public: helper.Out.y = r * sina; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -411,7 +411,7 @@ public: PARVARCOPY(BlurZoomVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T z = 1 + m_BlurZoomLength * rand.Frand01(); @@ -419,8 +419,8 @@ public: helper.Out.y = m_Weight * ((helper.In.y - m_BlurZoomY) * z - m_BlurZoomY); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -445,7 +445,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_BlurZoomLength, prefix + "blur_zoom_length")); m_Params.push_back(ParamWithName(&m_BlurZoomX, prefix + "blur_zoom_x")); @@ -455,7 +455,7 @@ protected: private: T m_BlurZoomLength; T m_BlurZoomX; - T m_BlurZoomY; + T m_BlurZoomY; }; /// @@ -472,7 +472,7 @@ public: PARVARCOPY(BlurPixelizeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = (T)Floor(helper.In.x * m_InvSize); T y = (T)Floor(helper.In.y * m_InvSize); @@ -481,8 +481,8 @@ public: helper.Out.y = m_V * (y + m_BlurPixelizeScale * (rand.Frand01() - T(0.5)) + T(0.5)); helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -504,8 +504,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_V = m_Weight * m_BlurPixelizeSize; m_InvSize = 1 / m_BlurPixelizeSize; @@ -515,14 +515,14 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_BlurPixelizeSize, prefix + "blur_pixelize_size", T(0.1), REAL, EPS)); m_Params.push_back(ParamWithName(&m_BlurPixelizeScale, prefix + "blur_pixelize_scale", 1)); m_Params.push_back(ParamWithName(true, &m_V, prefix + "blur_pixelize_v"));//Precalc. m_Params.push_back(ParamWithName(true, &m_InvSize, prefix + "blur_pixelize_inv_size")); } - + private: T m_BlurPixelizeSize; T m_BlurPixelizeScale; @@ -544,11 +544,11 @@ public: PARVARCOPY(CropVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = helper.In.x; T y = helper.In.y; - + if (((x < m_X0_) || (x > m_X1_) || (y < m_Y0_) || (y > m_Y1_)) && m_Z != 0) { x = 0; @@ -571,8 +571,8 @@ public: helper.Out.y = m_Weight * y; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -620,8 +620,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { if (m_X0 < m_X1) { @@ -653,7 +653,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X0, prefix + "crop_left", -1)); m_Params.push_back(ParamWithName(&m_Y0, prefix + "crop_top", -1)); @@ -668,7 +668,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_W, prefix + "crop_w")); m_Params.push_back(ParamWithName(true, &m_H, prefix + "crop_h")); } - + private: T m_X0; T m_Y0; @@ -698,7 +698,7 @@ public: PARVARCOPY(BCircleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if ((helper.In.x == 0) && (helper.In.y == 0)) return; @@ -706,7 +706,7 @@ public: T x = helper.In.x * m_Scale; T y = helper.In.y * m_Scale; T r = sqrt(SQR(x) + SQR(y)); - + if (r <= 1) { helper.Out.x = m_Weight * x; @@ -716,7 +716,7 @@ public: { if (m_Bcbw != 0) { - T ang = atan2(y, x); + T ang = atan2(y, x); T omega = (T(0.2) * m_Bcbw * rand.Frand01()) + 1; T px = omega * cos(ang); T py = omega * sin(ang); @@ -727,8 +727,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -770,8 +770,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Bcbw = fabs(m_BorderWidth); } @@ -780,13 +780,13 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Scale, prefix + "bcircle_scale", 1)); m_Params.push_back(ParamWithName(&m_BorderWidth, prefix + "bcircle_borderwidth")); m_Params.push_back(ParamWithName(true, &m_Bcbw, prefix + "bcircle_bcbw"));//Precalc. } - + private: T m_Scale; T m_BorderWidth; @@ -807,7 +807,7 @@ public: PARVARCOPY(BlurLinearVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_BlurLinearLength * rand.Frand01(); @@ -816,7 +816,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -838,7 +838,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { sincos(m_BlurLinearAngle, &m_S, &m_C); } @@ -847,7 +847,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_BlurLinearLength, prefix + "blur_linear_length")); m_Params.push_back(ParamWithName(&m_BlurLinearAngle, prefix + "blur_linear_angle", 0, REAL_CYCLIC, 0, T(M_2PI))); @@ -876,21 +876,21 @@ public: PARVARCOPY(BlurSquareVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_V * (rand.Frand01() - T(0.5)); helper.Out.y = m_V * (rand.Frand01() - T(0.5)); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string v = "parVars[" + ToUpper(m_Params[i++].Name()) + index;//Precalcs only, no params. - + ss << "\t{\n" << "\t\tvOut.x = " << v << " * (MwcNext01(mwc) - 0.5);\n" << "\t\tvOut.y = " << v << " * (MwcNext01(mwc) - 0.5);\n" @@ -900,7 +900,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_V = m_Weight * 2; } @@ -909,7 +909,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_V, prefix + "blur_square_v"));//Precalcs only, no params. } @@ -930,7 +930,7 @@ public: VARCOPY(FlattenVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (m_VarType == VARTYPE_REG)//Rare and different usage of in/out. { @@ -945,7 +945,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; @@ -964,7 +964,7 @@ public: << "\t\tvOut.x = vIn.x;\n" << "\t\tvOut.y = vIn.y;\n" << "\t\tvOut.z = 0;\n" - << "\t}\n"; + << "\t}\n"; } return ss.str(); @@ -983,13 +983,13 @@ public: VARCOPY(ZblurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = helper.Out.y = 0; helper.Out.z = m_Weight * (rand.Frand01() + rand.Frand01() + rand.Frand01() + rand.Frand01() - 2); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1015,13 +1015,13 @@ public: VARCOPY(ZScaleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = helper.Out.y = 0; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1047,13 +1047,13 @@ public: VARCOPY(ZTranslateVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = helper.Out.y = 0; helper.Out.z = m_Weight; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1079,7 +1079,7 @@ public: VARCOPY(ZConeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (m_VarType == VARTYPE_REG)//Rare and different usage of in/out. { @@ -1094,7 +1094,7 @@ public: helper.Out.z = m_Weight * helper.m_PrecalcSqrtSumSquares; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1129,7 +1129,7 @@ public: VARCOPY(Blur3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T angle = rand.Frand01() * M_2PI; T r = m_Weight * (rand.Frand01() + rand.Frand01() + rand.Frand01() + rand.Frand01() - 2); @@ -1144,7 +1144,7 @@ public: helper.Out.z = r * cosb; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1178,7 +1178,7 @@ public: VARCOPY(Spherical3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r2 = m_Weight / Zeps(helper.m_PrecalcSumSquares + SQR(helper.In.z)); @@ -1187,7 +1187,7 @@ public: helper.Out.z = r2 * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1218,7 +1218,7 @@ public: PARVARCOPY(Curl3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r2 = helper.m_PrecalcSumSquares + SQR(helper.In.z); T r = m_Weight / Zeps(r2 * m_C2 + m_C2x * helper.In.x - m_C2y * helper.In.y + m_C2z * helper.In.z + 1); @@ -1228,7 +1228,7 @@ public: helper.Out.z = r * (helper.In.z + m_Cz * r2); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1254,7 +1254,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_C2x = 2 * m_Cx; m_C2y = 2 * m_Cy; @@ -1266,7 +1266,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Cx, prefix + "curl3D_cx")); m_Params.push_back(ParamWithName(&m_Cy, prefix + "curl3D_cy")); @@ -1301,7 +1301,7 @@ public: PARVARCOPY(Disc3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = helper.m_PrecalcSqrtSumSquares; T temp = r * m_Pi; @@ -1314,7 +1314,7 @@ public: helper.Out.z = vv * (r * cos(helper.In.z)); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1341,7 +1341,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Pi, prefix + "disc3d_pi", T(M_PI))); } @@ -1364,7 +1364,7 @@ public: PARVARCOPY(Boarders2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T roundX = (T)(int)(helper.In.x >= 0 ? (int)(helper.In.x + T(0.5)) : (int)(helper.In.x - T(0.5))); T roundY = (T)(int)(helper.In.y >= 0 ? (int)(helper.In.y + T(0.5)) : (int)(helper.In.y - T(0.5))); @@ -1409,7 +1409,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1469,7 +1469,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T c = Zeps(fabs(m_C)); T cl = Zeps(fabs(m_Left)); @@ -1484,7 +1484,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_C, prefix + "boarders2_c", T(0.5))); m_Params.push_back(ParamWithName(&m_Left, prefix + "boarders2_left", T(0.5))); @@ -1517,23 +1517,23 @@ public: PARVARCOPY(CardioidVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight * sqrt(helper.m_PrecalcSumSquares + sin(helper.m_PrecalcAtanyx * m_A) + 1); - + helper.Out.x = r * helper.m_PrecalcCosa; helper.Out.y = r * helper.m_PrecalcSina; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string a = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r = xform->m_VariationWeights[" << varIndex << "] * sqrt(precalcSumSquares + sin(precalcAtanyx * " << a << ") + 1);\n" << "\n" @@ -1549,7 +1549,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_A, prefix + "cardioid_a", 1)); } @@ -1572,7 +1572,7 @@ public: PARVARCOPY(ChecksVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T dx, dy; T rnx = m_Rnd * rand.Frand01(); @@ -1590,13 +1590,13 @@ public: dx = m_Cx; dy = m_Cy + rny; } - + helper.Out.x = m_Weight * (helper.In.x + dx); helper.Out.y = m_Weight * (helper.In.y + dy); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1638,7 +1638,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Cs = 1 / Zeps(m_Size); m_Cx = m_X; @@ -1651,7 +1651,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "checks_x", T(0.5))); m_Params.push_back(ParamWithName(&m_Y, prefix + "checks_y", T(0.5))); @@ -1663,7 +1663,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_Ncx, prefix + "checks_ncx")); m_Params.push_back(ParamWithName(true, &m_Ncy, prefix + "checks_ncy")); } - + private: T m_X; T m_Y; @@ -1690,7 +1690,7 @@ public: PARVARCOPY(CirclizeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T side; T perimeter; @@ -1724,7 +1724,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1769,7 +1769,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Vvar4Pi = m_Weight / T(M_PI_4); } @@ -1778,7 +1778,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Hole, prefix + "circlize_hole")); m_Params.push_back(ParamWithName(true, &m_Vvar4Pi, prefix + "circlize_vvar4pi"));//Precalc. @@ -1803,7 +1803,7 @@ public: PARVARCOPY(Circlize2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T side; T perimeter; @@ -1837,7 +1837,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1880,12 +1880,12 @@ public: return ss.str(); } - + protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Hole, prefix + "circlize2_hole")); } @@ -1908,7 +1908,7 @@ public: PARVARCOPY(CosWrapVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = T(0.5) * helper.In.x + T(0.5); T y = T(0.5) * helper.In.y + T(0.5); @@ -1922,7 +1922,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1956,7 +1956,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Ax = M_2PI * fabs(m_AmountX); m_Ay = M_2PI * fabs(m_AmountY); @@ -1970,7 +1970,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Repeat, prefix + "coswrap_repeat", 1, INTEGER_NONZERO)); m_Params.push_back(ParamWithName(&m_AmountX, prefix + "coswrap_amount_x")); @@ -2013,7 +2013,7 @@ public: VARCOPY(DeltaAVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T s, c; T avgr = m_Weight * (sqrt(SQR(helper.In.y) + SQR(helper.In.x + 1)) / sqrt(SQR(helper.In.y) + SQR(helper.In.x - 1))); @@ -2025,7 +2025,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2059,7 +2059,7 @@ public: PARVARCOPY(ExpoVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T expor = exp(helper.In.x * m_K - helper.In.y * m_T); T temp = helper.In.x * m_T + helper.In.y * m_K; @@ -2071,7 +2071,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2081,7 +2081,7 @@ public: string imag = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string k = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string t = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t expor = exp(vIn.x * " << k << " - vIn.y * " << t << ");\n" << "\t\treal_t temp = vIn.x * " << t << " + vIn.y * " << k << ";\n" @@ -2096,7 +2096,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_K = T(0.5) * log(Zeps(SQR(m_Real) + SQR(m_Imag)));//Original used 1e-300, which isn't representable with a float. m_T = atan2(m_Imag, m_Real); @@ -2106,7 +2106,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Real, prefix + "expo_real", -1)); m_Params.push_back(ParamWithName(&m_Imag, prefix + "expo_imaginary", 1)); @@ -2135,7 +2135,7 @@ public: PARVARCOPY(ExtrudeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (m_VarType == VARTYPE_REG) { @@ -2150,7 +2150,7 @@ public: { helper.Out.x = helper.In.x; helper.Out.y = helper.In.y; - + if (rand.Frand01() < m_RootFace) helper.Out.z = ClampGte0(m_Weight); else @@ -2158,14 +2158,14 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string rootFace = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + if (m_VarType == VARTYPE_REG) { ss << "\t{\n" @@ -2192,12 +2192,12 @@ public: return ss.str(); } - + protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_RootFace, prefix + "extrude_root_face", T(0.5))); } @@ -2217,7 +2217,7 @@ public: VARCOPY(FDiscVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T c, s; T a = M_2PI / (helper.m_PrecalcSqrtSumSquares + 1); @@ -2229,7 +2229,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2263,7 +2263,7 @@ public: PARVARCOPY(FibonacciVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T snum1, cnum1, snum2, cnum2; T temp = helper.In.y * m_NatLog; @@ -2280,7 +2280,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2307,7 +2307,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Five = 1 / SQRT5; m_NatLog = log(M_PHI); @@ -2317,7 +2317,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_Five, prefix + "fibonacci_five"));//Precalcs only, no params. m_Params.push_back(ParamWithName(true, &m_NatLog, prefix + "fibonacci_nat_log")); @@ -2342,7 +2342,7 @@ public: PARVARCOPY(Fibonacci2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T snum1, cnum1, snum2, cnum2; T temp = helper.In.y * m_NatLog; @@ -2359,7 +2359,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2388,7 +2388,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Five = 1 / SQRT5; m_NatLog = log(M_PHI); @@ -2398,7 +2398,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Sc, prefix + "fibonacci2_sc", 1)); m_Params.push_back(ParamWithName(&m_Sc2, prefix + "fibonacci2_sc2", 1)); @@ -2427,7 +2427,7 @@ public: PARVARCOPY(GlynniaVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T d, r = helper.m_PrecalcSqrtSumSquares; @@ -2467,7 +2467,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2517,7 +2517,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_V2 = m_Weight * sqrt(T(2)) / 2; } @@ -2526,7 +2526,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_V2, prefix + "glynnia_v2"));//Precalcs only, no params. } @@ -2546,7 +2546,7 @@ public: VARCOPY(GridOutVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = LRint(helper.In.x); T y = LRint(helper.In.y); @@ -2613,7 +2613,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2702,21 +2702,21 @@ public: PARVARCOPY(HoleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r, delta = pow(helper.m_PrecalcAtanyx / T(M_PI) + 1, m_A); - + if (m_Inside != 0) r = m_Weight * delta / (helper.m_PrecalcSqrtSumSquares + delta); else r = m_Weight * helper.m_PrecalcSqrtSumSquares + delta; - + helper.Out.x = r * helper.m_PrecalcCosa; helper.Out.y = r * helper.m_PrecalcSina; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2724,7 +2724,7 @@ public: string index = ss2.str(); string a = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string inside = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r, delta = pow(precalcAtanyx / M_PI + 1, " << a << ");\n" << "\n" @@ -2745,7 +2745,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_A, prefix + "hole_a", 1)); m_Params.push_back(ParamWithName(&m_Inside, prefix + "hole_inside", 0, INTEGER, 0, 1)); @@ -2770,7 +2770,7 @@ public: PARVARCOPY(HypertileVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.In.x + m_Real; T b = helper.In.y - m_Imag; @@ -2783,7 +2783,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2794,7 +2794,7 @@ public: string n = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string real = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string imag = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a = vIn.x + " << real << ";\n" << "\t\treal_t b = vIn.y - " << imag << ";\n" @@ -2810,7 +2810,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T pa = 2 * T(M_PI) / m_P; T qa = 2 * T(M_PI) / m_Q; @@ -2830,7 +2830,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_P, prefix + "hypertile_p", 3, INTEGER, 3, T(0x7fffffff))); m_Params.push_back(ParamWithName(&m_Q, prefix + "hypertile_q", 7, INTEGER, 3, T(0x7fffffff))); @@ -2861,7 +2861,7 @@ public: PARVARCOPY(Hypertile1Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T temp = rand.Rand() * m_Pa; T sina = sin(temp); @@ -2879,7 +2879,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2889,7 +2889,7 @@ public: string q = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string pa = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string r = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t temp = MwcNext(mwc) * " << pa << ";\n" << "\t\treal_t sina = sin(temp);\n" @@ -2910,7 +2910,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T r2 = 1 - (cos(2 * T(M_PI) / m_P) - 1) / (cos(2 * T(M_PI) / m_P) + cos(2 * T(M_PI) / m_Q)); @@ -2927,7 +2927,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_P, prefix + "hypertile1_p", 3, INTEGER, 3, T(0x7fffffff))); m_Params.push_back(ParamWithName(&m_Q, prefix + "hypertile1_q", 7, INTEGER, 3, T(0x7fffffff))); @@ -2956,7 +2956,7 @@ public: PARVARCOPY(Hypertile2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.In.x + m_R; T b = helper.In.y; @@ -2974,7 +2974,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2984,7 +2984,7 @@ public: string q = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string pa = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string r = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a = vIn.x + " << r << ";\n" << "\t\treal_t b = vIn.y;\n" @@ -3005,7 +3005,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T r2 = 1 - (cos(2 * T(M_PI) / m_P) - 1) / (cos(2 * T(M_PI) / m_P) + cos(2 * T(M_PI) / m_Q)); @@ -3022,7 +3022,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_P, prefix + "hypertile2_p", 3, INTEGER, 3, T(0x7fffffff))); m_Params.push_back(ParamWithName(&m_Q, prefix + "hypertile2_q", 7, INTEGER, 3, T(0x7fffffff))); @@ -3051,7 +3051,7 @@ public: PARVARCOPY(Hypertile3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r2 = helper.m_PrecalcSumSquares + helper.In.z; T x2cx = m_C2x * helper.In.x; @@ -3063,7 +3063,7 @@ public: helper.Out.z = d * (helper.In.z * m_S2z); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3082,7 +3082,7 @@ public: string c2y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c2z = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r2 = precalcSumSquares + vIn.z;\n" << "\t\treal_t x2cx = " << c2x << " * vIn.x;\n" @@ -3097,7 +3097,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T pa = 2 * T(M_PI) / m_P; T qa = 2 * T(M_PI) / m_Q; @@ -3123,7 +3123,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_P, prefix + "hypertile3D_p", 3, INTEGER, 3, T(0x7fffffff))); m_Params.push_back(ParamWithName(&m_Q, prefix + "hypertile3D_q", 7, INTEGER, 3, T(0x7fffffff))); @@ -3170,7 +3170,7 @@ public: PARVARCOPY(Hypertile3D1Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T temp = rand.Rand() * m_Pa; T cx = m_R * cos(temp); @@ -3187,7 +3187,7 @@ public: helper.Out.z = d * (helper.In.z * m_S2z); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3199,7 +3199,7 @@ public: string r = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string s2z = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t temp = MwcNext(mwc) * " << pa << ";\n" << "\t\treal_t cx = " << r << " * cos(temp);\n" @@ -3219,7 +3219,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T pa = M_2PI / m_P; T qa = M_2PI / m_Q; @@ -3240,7 +3240,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_P, prefix + "hypertile3D1_p", 3, INTEGER, 3, T(0x7fffffff))); m_Params.push_back(ParamWithName(&m_Q, prefix + "hypertile3D1_q", 7, INTEGER, 3, T(0x7fffffff))); @@ -3273,7 +3273,7 @@ public: PARVARCOPY(Hypertile3D2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r2 = helper.m_PrecalcSumSquares + SQR(helper.In.z); T x2cx = m_C2x * helper.In.x; @@ -3289,7 +3289,7 @@ public: helper.Out.z = vr * (helper.In.z * m_S2z); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3304,7 +3304,7 @@ public: string s2x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string s2y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string s2z = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r2 = precalcSumSquares + SQR(vIn.z);\n" << "\t\treal_t x2cx = " << c2x << " * vIn.x;\n" @@ -3323,7 +3323,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T pa = M_2PI / m_P; T qa = M_2PI / m_Q; @@ -3347,7 +3347,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_P, prefix + "hypertile3D2_p", 3, INTEGER, 3, T(0x7fffffff))); m_Params.push_back(ParamWithName(&m_Q, prefix + "hypertile3D2_q", 7, INTEGER, 3, T(0x7fffffff))); @@ -3386,7 +3386,7 @@ public: PARVARCOPY(IDiscVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = T(M_PI) / (helper.m_PrecalcSqrtSumSquares + 1); T s = sin(a); @@ -3398,7 +3398,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3420,7 +3420,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_V = m_Weight * T(M_1_PI); } @@ -3429,7 +3429,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_V, prefix + "idisc_v"));//Precalcs only, no params. } @@ -3452,7 +3452,7 @@ public: PARVARCOPY(Julian2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = m_A * helper.In.x + m_B * helper.In.y + m_E; T y = m_C * helper.In.x + m_D * helper.In.y + m_F; @@ -3466,7 +3466,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3482,7 +3482,7 @@ public: string dist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string absn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x = " << a << " * vIn.x + " << b << " * vIn.y + " << e << ";\n" << "\t\treal_t y = " << c << " * vIn.x + " << d << " * vIn.y + " << f << ";\n" @@ -3499,7 +3499,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { if (m_Power == 0) m_Power = 2; @@ -3512,7 +3512,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_A, prefix + "julian2_a", 1)); m_Params.push_back(ParamWithName(&m_B, prefix + "julian2_b")); @@ -3553,7 +3553,7 @@ public: PARVARCOPY(JuliaQVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcAtanyx * m_InvPower + rand.Rand() * m_InvPower2pi; T sina = sin(a); @@ -3565,7 +3565,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3576,7 +3576,7 @@ public: string halfInvPower = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invPower = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invPower2Pi = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a = precalcAtanyx * " << invPower << " + MwcNext(mwc) * " << invPower2Pi << ";\n" << "\t\treal_t sina = sin(a);\n" @@ -3591,7 +3591,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_HalfInvPower = T(0.5) * m_Divisor / m_Power; m_InvPower = m_Divisor / m_Power; @@ -3602,7 +3602,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Power, prefix + "juliaq_power", 3, INTEGER_NONZERO)); m_Params.push_back(ParamWithName(&m_Divisor, prefix + "juliaq_divisor", 2, INTEGER_NONZERO)); @@ -3633,7 +3633,7 @@ public: PARVARCOPY(MurlVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T angle = helper.m_PrecalcAtanyx * m_Power; T sina = sin(angle); @@ -3648,7 +3648,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3659,7 +3659,7 @@ public: string cp = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string p2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string vp = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t angle = precalcAtanyx * " << power << ";\n" << "\t\treal_t sina = sin(angle);\n" @@ -3677,7 +3677,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { if (m_Power != 1) m_Cp = m_C / (m_Power - 1); @@ -3692,7 +3692,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_C, prefix + "murl_c")); m_Params.push_back(ParamWithName(&m_Power, prefix + "murl_power", 2, INTEGER, 2, T(0x7fffffff))); @@ -3723,7 +3723,7 @@ public: PARVARCOPY(Murl2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T angle = helper.m_PrecalcAtanyx * m_Power; T sina = sin(angle); @@ -3740,13 +3740,13 @@ public: im = r * sina; T r1 = m_Vp / SQR(r); - + helper.Out.x = r1 * (helper.In.x * re + helper.In.y * im); helper.Out.y = r1 * (helper.In.y * re - helper.In.x * im); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3758,7 +3758,7 @@ public: string invp = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invp2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string vp = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t angle = precalcAtanyx * " << power << ";\n" << "\t\treal_t sina = sin(angle);\n" @@ -3784,7 +3784,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_P2 = m_Power / 2; m_InvP = 1 / m_Power; @@ -3800,7 +3800,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_C, prefix + "murl2_c", 0, REAL, -1, 1)); m_Params.push_back(ParamWithName(&m_Power, prefix + "murl2_power", 1, INTEGER_NONZERO)); @@ -3833,7 +3833,7 @@ public: PARVARCOPY(NPolarVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = (m_IsOdd != 0) ? helper.In.x : m_Vvar * helper.m_PrecalcAtanxy; T y = (m_IsOdd != 0) ? helper.In.y : m_Vvar2 * log(helper.m_PrecalcSumSquares); @@ -3849,7 +3849,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3863,7 +3863,7 @@ public: string absn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string isOdd = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x = (" << isOdd << " != 0) ? vIn.x : " << vvar << " * precalcAtanxy;\n" << "\t\treal_t y = (" << isOdd << " != 0) ? vIn.y : " << vvar2 << " * log(precalcSumSquares);\n" @@ -3882,7 +3882,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Nnz = (m_N == 0) ? 1 : m_N; m_Vvar = m_Weight / T(M_PI); @@ -3896,7 +3896,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Parity, prefix + "npolar_parity", 0, INTEGER)); m_Params.push_back(ParamWithName(&m_N, prefix + "npolar_n", 1, INTEGER)); @@ -3933,7 +3933,7 @@ public: PARVARCOPY(OrthoVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r, a; T xo; @@ -3941,19 +3941,19 @@ public: T c,s; T x, y, tc, ts; T theta; - + r = helper.m_PrecalcSumSquares; - + if (r < 1) { if (helper.In.x >= 0) { xo = (r + 1) / (2 * helper.In.x); ro = sqrt(SQR(helper.In.x - xo) + SQR(helper.In.y)); - theta = atan2(1, ro); + theta = atan2(T(1), ro); a = fmod(m_In * theta + atan2(helper.In.y, xo - helper.In.x) + theta, 2 * theta) - theta; sincos(a, &s, &c); - + helper.Out.x = m_Weight * (xo - c * ro); helper.Out.y = m_Weight * s * ro; } @@ -3961,7 +3961,7 @@ public: { xo = - (r + 1) / (2 * helper.In.x); ro = sqrt(SQR(-helper.In.x - xo) + SQR(helper.In.y)); - theta = atan2(1 , ro); + theta = atan2(T(1), ro); a = fmod(m_In * theta + atan2(helper.In.y, xo + helper.In.x) + theta, 2 * theta) - theta; sincos(a, &s, &c); @@ -3976,12 +3976,12 @@ public: tc = cos(helper.m_PrecalcAtanyx); x = r * tc; y = r * ts; - + if (x >= 0) { xo = (SQR(x) + SQR(y) + 1) / (2 * x); ro = sqrt(SQR(x - xo) + SQR(y)); - theta = atan2(1 , ro); + theta = atan2(T(1), ro); a = fmod(m_Out * theta + atan2(y, xo - x) + theta, 2 * theta) - theta; sincos(a, &s, &c); @@ -3998,7 +3998,7 @@ public: { xo = - (SQR(x) + SQR(y) + 1) / (2 * x); ro = sqrt(SQR(-x - xo) + SQR(y)); - theta = atan2(1 , ro); + theta = atan2(T(1), ro); a = fmod(m_Out * theta + atan2(y, xo + x) + theta, 2 * theta) - theta; sincos(a, &s, &c); @@ -4016,7 +4016,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4024,7 +4024,7 @@ public: string index = ss2.str(); string in = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string out = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r, a;\n" << "\t\treal_t xo;\n" @@ -4120,7 +4120,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_In, prefix + "ortho_in", 0, REAL_CYCLIC, T(-M_PI), T(M_PI))); m_Params.push_back(ParamWithName(&m_Out, prefix + "ortho_out", 0, REAL_CYCLIC, T(-M_PI), T(M_PI))); @@ -4145,17 +4145,17 @@ public: PARVARCOPY(PoincareVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = m_C1x + (SQR(m_C1r) * (helper.In.x - m_C1x)) / (SQR(helper.In.x - m_C1x) + SQR(helper.In.y - m_C1y)); T y = m_C1y + (SQR(m_C1r) * (helper.In.y - m_C1y)) / (SQR(helper.In.x - m_C1x) + SQR(helper.In.y - m_C1y)); - + helper.Out.x = m_C2x + (SQR(m_C2r) * (x - m_C2x)) / (SQR(x - m_C2x) + SQR(y - m_C2y)); helper.Out.y = m_C2y + (SQR(m_C2r) * (y - m_C2y)) / (SQR(x - m_C2x) + SQR(y - m_C2y)); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4171,7 +4171,7 @@ public: string c2y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c1d = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c2d = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x = " << c1x << " + (SQR(" << c1r << ") * (vIn.x - " << c1x << ")) / (SQR(vIn.x - " << c1x << ") + SQR(vIn.y - " << c1y << "));\n" << "\t\treal_t y = " << c1y << " + (SQR(" << c1r << ") * (vIn.y - " << c1y << ")) / (SQR(vIn.x - " << c1x << ") + SQR(vIn.y - " << c1y << "));\n" @@ -4184,7 +4184,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_C1d = sqrt(1 + SQR(m_C1r)); m_C2d = sqrt(1 + SQR(m_C2r)); @@ -4199,7 +4199,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_C1r, prefix + "poincare_c1r", 1)); m_Params.push_back(ParamWithName(&m_C1a, prefix + "poincare_c1a", -1, REAL_CYCLIC, T(-M_PI), T(M_PI))); @@ -4212,7 +4212,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_C1d, prefix + "poincare_c1d")); m_Params.push_back(ParamWithName(true, &m_C2d, prefix + "poincare_c2d")); } - + private: T m_C1r; T m_C1a; @@ -4240,7 +4240,7 @@ public: PARVARCOPY(Poincare3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r2 = helper.m_PrecalcSumSquares + SQR(helper.In.z); T x2cx = m_C2x * helper.In.x; @@ -4254,7 +4254,7 @@ public: helper.Out.z = d * (helper.In.z * m_S2z + m_Cz * (y2cy + x2cx - r2 - 1)); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4273,7 +4273,7 @@ public: string s2x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string s2y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string s2z = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r2 = precalcSumSquares + SQR(vIn.z);\n" << "\t\treal_t x2cx = " << c2x << " * vIn.x;\n" @@ -4290,7 +4290,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Cx = -m_R * cos(m_A * T(M_PI_2)) * cos(m_B * T(M_PI_2)); m_Cy = m_R * sin(m_A * T(M_PI_2)) * cos(m_B * T(M_PI_2)); @@ -4311,7 +4311,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_R, prefix + "poincare3D_r")); m_Params.push_back(ParamWithName(&m_A, prefix + "poincare3D_a")); @@ -4327,7 +4327,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_S2y, prefix + "poincare3D_s2y")); m_Params.push_back(ParamWithName(true, &m_S2z, prefix + "poincare3D_s2z")); } - + private: T m_R; T m_A; @@ -4358,7 +4358,7 @@ public: PARVARCOPY(PolynomialVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T xp = pow(fabs(m_Weight) * fabs(helper.In.x), m_Powx);//Original did not fabs. T yp = pow(fabs(m_Weight) * fabs(helper.In.y), m_Powy); @@ -4367,8 +4367,8 @@ public: helper.Out.y = yp * Sign(helper.In.y) + m_Lcy * helper.In.y + m_Scy; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4380,7 +4380,7 @@ public: string lcy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t xp = pow(fabs(xform->m_VariationWeights[" << varIndex << "]) * fabs(vIn.x), " << powx << ");\n" << "\t\treal_t yp = pow(fabs(xform->m_VariationWeights[" << varIndex << "]) * fabs(vIn.y), " << powy << ");\n" @@ -4398,7 +4398,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Powx, prefix + "polynomial_powx", 1)); m_Params.push_back(ParamWithName(&m_Powy, prefix + "polynomial_powy", 1)); @@ -4431,7 +4431,7 @@ public: PARVARCOPY(PSphereVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T c0 = helper.In.x * m_Vpi; T c1 = helper.In.y * m_Vpi; @@ -4440,13 +4440,13 @@ public: sincos(c0, &sinc0, &cosc0); sincos(c1, &sinc1, &cosc1); - + helper.Out.x = cosc0 * -sinc1; helper.Out.y = sinc0 * cosc1; helper.Out.z = cosc1 * m_ZScale; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4454,7 +4454,7 @@ public: string index = ss2.str(); string zscale = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string vpi = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t c0 = vIn.x * " << vpi << ";\n" << "\t\treal_t c1 = vIn.y * " << vpi << ";\n" @@ -4473,7 +4473,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Vpi = m_Weight * T(M_PI); } @@ -4482,7 +4482,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_ZScale, prefix + "psphere_zscale")); m_Params.push_back(ParamWithName(true, &m_Vpi, prefix + "psphere_vpi"));//Precalc. @@ -4507,7 +4507,7 @@ public: PARVARCOPY(Rational3Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T xsqr = helper.In.x * helper.In.x; T ysqr = helper.In.y * helper.In.y; @@ -4527,7 +4527,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4541,7 +4541,7 @@ public: string b2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string b1 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string bc = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t xsqr = vIn.x * vIn.x;\n" << "\t\treal_t ysqr = vIn.y * vIn.y;\n" @@ -4568,7 +4568,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_T3, prefix + "rational3_t3", 1)); m_Params.push_back(ParamWithName(&m_T2, prefix + "rational3_t2")); @@ -4605,20 +4605,20 @@ public: PARVARCOPY(RippleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { //Align input x, y to given center and multiply with scale. T x = (helper.In.x * m_S) - m_CenterX; T y = (helper.In.y * m_S) + m_CenterY; - + //Calculate distance from center but constrain it to EPS. T d = max(EPS, sqrt(SQR(x) * SQR(y))); - + //Normalize x and y. T nx = x / d; T ny = y / d; - //Calculate cosine wave with given frequency, velocity + //Calculate cosine wave with given frequency, velocity //and phase based on the distance to center. T wave = cos(m_F * d - m_Vxp); @@ -4639,7 +4639,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4660,7 +4660,7 @@ public: string vxp = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string pxa = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string pixa = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x = (vIn.x * " << s << ") - " << centerx << ";\n" << "\t\treal_t y = (vIn.y * " << s << ") + " << centery << ";\n" @@ -4688,14 +4688,14 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_F = m_Frequency * 5; m_A = m_Amplitude * T(0.01); m_P = m_Phase * M_2PI - T(M_PI); m_S = Zeps(m_Scale);//Scale must not be zero. m_Is = 1 / m_S;//Need the inverse scale. - + //Pre-multiply velocity + phase, phase + amplitude and (PI - phase) + amplitude. m_Vxp = m_Velocity * m_P; m_Pxa = m_P * m_A; @@ -4706,7 +4706,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Frequency, prefix + "ripple_frequency", 2)); m_Params.push_back(ParamWithName(&m_Velocity, prefix + "ripple_velocity", 1)); @@ -4757,19 +4757,19 @@ public: PARVARCOPY(SigmoidVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T c0 = m_Ax / (1 + exp(m_Sx * helper.In.x)); T c1 = m_Ay / (1 + exp(m_Sy * helper.In.y)); T x = (2 * (c0 - T(0.5))); T y = (2 * (c1 - T(0.5))); - + helper.Out.x = m_Vv * x; helper.Out.y = m_Vv * y; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4782,7 +4782,7 @@ public: string ax = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string ay = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string vv = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t c0 = " << ax << " / (1 + exp(" << sx << " * vIn.x));\n" << "\t\treal_t c1 = " << ay << " / (1 + exp(" << sy << " * vIn.y));\n" @@ -4797,7 +4797,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Sx = m_ShiftX; m_Sy = m_ShiftY; @@ -4831,10 +4831,10 @@ public: m_Sy = 1 / m_Sy; } } - + m_Sx *= -5; m_Sy *= -5; - + m_Vv = fabs(m_Weight); } @@ -4842,7 +4842,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_ShiftX, prefix + "sigmoid_shiftx", 1)); m_Params.push_back(ParamWithName(&m_ShiftY, prefix + "sigmoid_shifty", 1)); @@ -4877,7 +4877,7 @@ public: PARVARCOPY(SinusGridVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = helper.In.x; T y = helper.In.y; @@ -4891,7 +4891,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4905,7 +4905,7 @@ public: string fy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string ax = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string ay = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x = vIn.x;\n" << "\t\treal_t y = vIn.y;\n" @@ -4923,7 +4923,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Ax = m_AmpX; m_Ay = m_AmpY; @@ -4935,7 +4935,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_AmpX, prefix + "sinusgrid_ampx", T(0.5))); m_Params.push_back(ParamWithName(&m_AmpY, prefix + "sinusgrid_ampy", T(0.5))); @@ -4972,7 +4972,7 @@ public: PARVARCOPY(StwinVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const T multiplier = T(0.05); T x = helper.In.x * m_Weight * multiplier; @@ -4987,22 +4987,22 @@ public: if (x2Plusy2 != 0) divident = x2Plusy2; - + result /= divident; - + helper.Out.x = m_Weight * helper.In.x + result; helper.Out.y = m_Weight * helper.In.y + result; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string distort = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x = vIn.x * xform->m_VariationWeights[" << varIndex << "] * 0.05;\n" << "\t\treal_t y = vIn.y * xform->m_VariationWeights[" << varIndex << "] * 0.05;\n" @@ -5031,7 +5031,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Distort, prefix + "stwin_distort", 1));//Original had a misspelling of swtin, which is incompatible with Ember's design. } @@ -5051,7 +5051,7 @@ public: VARCOPY(TwoFaceVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight; @@ -5063,7 +5063,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5097,25 +5097,25 @@ public: PARVARCOPY(UnpolarVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = exp(helper.In.y); T s = sin(helper.In.x); T c = cos(helper.In.x); - + helper.Out.x = m_Vvar2 * r * s; helper.Out.y = m_Vvar2 * r * c; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string vvar2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index;//Precalcs only, no params. - + ss << "\t{\n" << "\t\treal_t r = exp(vIn.y);\n" << "\t\treal_t s = sin(vIn.x);\n" @@ -5129,7 +5129,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Vvar2 = (m_Weight / T(M_PI)) * T(0.5); } @@ -5138,7 +5138,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_Vvar2, prefix + "unpolar_vvar_2"));//Precalcs only, no params. } @@ -5161,7 +5161,7 @@ public: PARVARCOPY(WavesNVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T angle = (helper.m_PrecalcAtanyx + M_2PI * rand.Rand((int)m_AbsN)) / m_Power; T r = m_Weight * pow(helper.m_PrecalcSumSquares, m_Cn); @@ -5173,13 +5173,13 @@ public: T sinx = sin(m_FreqY * xn); T dx = xn + T(0.5) * (m_ScaleX * siny + fabs(xn) * m_IncX * siny); T dy = yn + T(0.5) * (m_ScaleY * sinx + fabs(yn) * m_IncY * sinx); - + helper.Out.x = m_Weight * dx; helper.Out.y = m_Weight * dy; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5194,7 +5194,7 @@ public: string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string absn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t angle = (precalcAtanyx + M_2PI * MwcNextRange(mwc, (uint)" << absn << ")) / " << power << ";\n" << "\t\treal_t r = xform->m_VariationWeights[" << varIndex << "] * pow(precalcSumSquares, " << cn << ");\n" @@ -5215,7 +5215,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { if (m_Power == 0) m_Power = 2; @@ -5229,7 +5229,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_FreqX, prefix + "wavesn_freqx", 2)); m_Params.push_back(ParamWithName(&m_FreqY, prefix + "wavesn_freqy", 2)); @@ -5268,18 +5268,18 @@ public: PARVARCOPY(XHeartVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r2_4 = helper.m_PrecalcSumSquares + 4; - + if (r2_4 == 0) r2_4 = 1; - + T bx = 4 / r2_4; T by = m_Rat / r2_4; T x = m_Cosa * (bx * helper.In.x) - m_Sina * (by * helper.In.y); T y = m_Sina * (bx * helper.In.x) + m_Cosa * (by *helper.In.y); - + if (x > 0) { helper.Out.x = m_Weight * x; @@ -5294,7 +5294,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5305,7 +5305,7 @@ public: string cosa = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string sina = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string rat = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r2_4 = precalcSumSquares + 4;\n" << "\n" @@ -5334,7 +5334,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T ang = T(M_PI_4) + (T(0.5) * T(M_PI_4) * m_Angle); @@ -5346,7 +5346,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Angle, prefix + "xheart_angle")); m_Params.push_back(ParamWithName(&m_Ratio, prefix + "xheart_ratio")); @@ -5377,7 +5377,7 @@ public: PARVARCOPY(BarycentroidVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { //Compute dot products. T dot00 = SQR(m_A) + SQR(m_B);//v0 * v0. @@ -5385,15 +5385,15 @@ public: T dot02 = m_A * helper.In.x + m_B * helper.In.y;//v0 * v2. T dot11 = SQR(m_C) + SQR(m_D);//v1 * v1. T dot12 = m_C * helper.In.x + m_D * helper.In.y;//v1 * v2. - + //Compute inverse denomiator. T invDenom = 1 / (dot00 * dot11 - dot01 * dot01); - - //Now we can pull [u,v] as the barycentric coordinates of the point + + //Now we can pull [u,v] as the barycentric coordinates of the point //P in the triangle [A, B, C]. T u = (dot11 * dot02 - dot01 * dot12) * invDenom; T v = (dot00 * dot12 - dot01 * dot02) * invDenom; - + // now combine with input T um = sqrt(SQR(u) + SQR(helper.In.x)) * Sign(u); T vm = sqrt(SQR(v) + SQR(helper.In.y)) * Sign(v); @@ -5403,7 +5403,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5413,7 +5413,7 @@ public: string b = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string d = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t dot00 = SQR(" << a << ") + SQR(" << b << ");\n" << "\t\treal_t dot01 = " << a << " * " << c << " + " << b << " * " << d << ";\n" @@ -5438,7 +5438,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_A, prefix + "barycentroid_a", 1)); m_Params.push_back(ParamWithName(&m_B, prefix + "barycentroid_b")); @@ -5467,21 +5467,21 @@ public: PARVARCOPY(BiSplitVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight01 / tan(helper.In.x) * cos(helper.In.y); helper.Out.y = m_Weight01 / sin(helper.In.x) * (-helper.In.y); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string weight01 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tvOut.x = " << weight01 << " / tan(vIn.x) * cos(vIn.y);\n" << "\t\tvOut.y = " << weight01 << " / sin(vIn.x) * (-vIn.y);\n" @@ -5490,8 +5490,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Weight01 = m_Weight * T(0.1); } @@ -5500,7 +5500,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_Weight01, prefix + "bisplit_weight01"));//Precalc only. } @@ -5520,14 +5520,14 @@ public: VARCOPY(CrescentsVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * sin(helper.In.x) * (cosh(helper.In.y) + 1) * Sqr(sin(helper.In.x)); helper.Out.y = m_Weight * cos(helper.In.x) * (cosh(helper.In.y) + 1) * Sqr(sin(helper.In.x)); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5553,7 +5553,7 @@ public: VARCOPY(MaskVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T d = m_Weight / helper.m_PrecalcSumSquares; @@ -5562,7 +5562,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5593,7 +5593,7 @@ public: PARVARCOPY(Cpow2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcAtanyx; int n = rand.Rand((unsigned int)m_Spread); @@ -5615,7 +5615,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5632,7 +5632,7 @@ public: string ang = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invSpread = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string fullSpread = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a = precalcAtanyx;\n" << "\t\tint n = MwcNextRange(mwc, (uint)" << spread << ");\n" @@ -5657,7 +5657,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Ang = M_2PI / m_Divisor; m_C = m_R * cos(T(M_PI) / 2 * m_A) / m_Divisor; @@ -5672,7 +5672,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_R, prefix + "cpow2_r", 1)); m_Params.push_back(ParamWithName(&m_A, prefix + "cpow2_a")); diff --git a/Source/Ember/Variations03.h b/Source/Ember/Variations03.h index 4e4ebe4..3dbab5c 100644 --- a/Source/Ember/Variations03.h +++ b/Source/Ember/Variations03.h @@ -18,7 +18,7 @@ public: PARVARCOPY(FunnelVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T temp = 1 / Zeps(cos(helper.In.y)) + m_Effect * T(M_PI); @@ -27,14 +27,14 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string effect = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t temp = 1 / Zeps(cos(vIn.y)) + " << effect << " * M_PI;\n" << "\n" @@ -50,7 +50,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Effect, prefix + "funnel_effect", 8, INTEGER)); } @@ -70,14 +70,14 @@ public: VARCOPY(Linear3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * helper.In.x; helper.Out.y = m_Weight * helper.In.y; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -106,7 +106,7 @@ public: PARVARCOPY(PowBlockVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r2 = pow(helper.m_PrecalcSumSquares, m_Power * T(0.5)) * m_Weight; T ran = (helper.m_PrecalcAtanyx / Zeps(m_Denominator) + (m_Root * M_2PI * Floor(rand.Frand01() * m_Denominator) / Zeps(m_Denominator))) * m_Numerator; @@ -116,7 +116,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -128,7 +128,7 @@ public: string correctN = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string correctD = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r2 = pow(precalcSumSquares, " << power << " * 0.5) * xform->m_VariationWeights[" << varIndex << "];\n" << "\t\treal_t ran = (precalcAtanyx / Zeps(" << denominator << ") + (" << root << " * M_2PI * floor(MwcNext01(mwc) * " << denominator << ") / Zeps(" << denominator << "))) * " << numerator << ";\n" @@ -141,7 +141,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Power = m_Numerator / Zeps(m_Denominator * m_Correctn * (1 / m_Correctd)); } @@ -183,7 +183,7 @@ public: PARVARCOPY(SquirrelVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T u = sqrt(ClampGte0(Zeps(m_A) * SQR(helper.In.x) + Zeps(m_B) * SQR(helper.In.y)));//Original did not clamp. @@ -192,7 +192,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -200,7 +200,7 @@ public: string index = ss2.str(); string a = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string b = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t u = sqrt(ClampGte(Zeps(" << a << ") * SQR(vIn.x) + Zeps(" << b << ") * SQR(vIn.y), 0.0));\n" << "\n" @@ -238,14 +238,14 @@ public: VARCOPY(EnnepersVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * (helper.In.x - ((SQR(helper.In.x) * helper.In.x) / 3)) + helper.In.x * SQR(helper.In.y); helper.Out.y = m_Weight * (helper.In.y - ((SQR(helper.In.y) * helper.In.y) / 3)) + helper.In.y * SQR(helper.In.x); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -274,20 +274,20 @@ public: PARVARCOPY(SphericalNVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = Zeps(pow(helper.m_PrecalcSqrtSumSquares, m_Dist)); int n = Floor(m_Power * rand.Frand01()); T alpha = helper.m_PrecalcAtanyx + n * M_2PI / Zeps((T)Floor(m_Power)); T sina = sin(alpha); T cosa = cos(alpha); - + helper.Out.x = m_Weight * cosa / r; helper.Out.y = m_Weight * sina / r; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -295,7 +295,7 @@ public: string index = ss2.str(); string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string dist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r = Zeps(pow(precalcSqrtSumSquares, " << dist << "));\n" << "\t\tint n = floor(" << power << " * MwcNext01(mwc));\n" @@ -320,7 +320,7 @@ protected: m_Params.push_back(ParamWithName(&m_Power, prefix + "SphericalN_Power", 1)); m_Params.push_back(ParamWithName(&m_Dist, prefix + "SphericalN_Dist", 1)); } - + private: T m_Power; T m_Dist; @@ -340,7 +340,7 @@ public: PARVARCOPY(KaleidoscopeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sin45 = sin(45 * DEG_2_RAD_T);//Was 45 radians? They probably meant to convert this from degrees. T cos45 = cos(45 * DEG_2_RAD_T); @@ -355,8 +355,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -367,7 +367,7 @@ public: string lineUp = "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; - + ss << "\t{\n" << "\t\treal_t sin45 = sin(45 * DEG_2_RAD);\n" << "\t\treal_t cos45 = cos(45 * DEG_2_RAD);\n" @@ -397,7 +397,7 @@ protected: m_Params.push_back(ParamWithName(&m_X, prefix + "Kaleidoscope_x")); m_Params.push_back(ParamWithName(&m_Y, prefix + "Kaleidoscope_y")); } - + private: T m_Pull;//Pulls apart the 2 sections of the plugin. T m_Rotate;//Rotates both halves of the plugin. @@ -420,12 +420,12 @@ public: PARVARCOPY(GlynnSim1Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x, y, z; if (helper.m_PrecalcSqrtSumSquares < m_Radius)//Object generation. - { + { Circle(rand, &x, &y); helper.Out.x = m_Weight * x; helper.Out.y = m_Weight * y; @@ -462,8 +462,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -477,7 +477,7 @@ public: string pow = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string x1 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y1 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x, y, z;\n" << "\n" @@ -539,7 +539,7 @@ public: "\n"; } - virtual void Precalc() + virtual void Precalc() override { T val = DEG_2_RAD_T * m_Phi1; T sinPhi1 = sin(val); @@ -565,7 +565,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_X1, prefix + "GlynnSim1_x1"));//Precalc. m_Params.push_back(ParamWithName(true, &m_Y1, prefix + "GlynnSim1_y1")); } - + private: void Circle(QTIsaac& rand, T* x, T* y) { @@ -602,7 +602,7 @@ public: PARVARCOPY(GlynnSim2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x, y; @@ -630,8 +630,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -647,7 +647,7 @@ public: string phi20 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string gamma = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string delta = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x, y;\n" << "\n" @@ -695,7 +695,7 @@ public: "\n"; } - virtual void Precalc() + virtual void Precalc() override { m_Pow = fabs(m_Pow); m_Phi10 = T(M_PI) * m_Phi1 / 180; @@ -721,7 +721,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_Gamma, prefix + "GlynnSim2_Gamma")); m_Params.push_back(ParamWithName(true, &m_Delta, prefix + "GlynnSim2_Delta")); } - + private: void Circle(QTIsaac& rand, T* x, T* y) { @@ -760,12 +760,12 @@ public: PARVARCOPY(GlynnSim3Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x, y; if (helper.m_PrecalcSqrtSumSquares < m_Radius1) - { + { Circle(rand, &x,&y); helper.Out.x = m_Weight * x; helper.Out.y = m_Weight * y; @@ -788,8 +788,8 @@ public: helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -803,7 +803,7 @@ public: string radius1 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string radius2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string gamma = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x, y;\n" << "\n" @@ -856,7 +856,7 @@ public: "\n"; } - virtual void Precalc() + virtual void Precalc() override { m_Radius1 = m_Radius + m_Thickness; m_Radius2 = SQR(m_Radius) / Zeps(m_Radius1); @@ -878,7 +878,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_Radius2, prefix + "GlynnSim3_radius2")); m_Params.push_back(ParamWithName(true, &m_Gamma, prefix + "GlynnSim3_Gamma")); } - + private: void Circle(QTIsaac& rand, T* x, T* y) { @@ -920,7 +920,7 @@ public: PARVARCOPY(StarblurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T f = rand.Frand01() * m_Power * 2; T angle = (T)(int)(f); @@ -944,7 +944,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -954,7 +954,7 @@ public: string range = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string length = "parVars[" + ToUpper(m_Params[i++].Name()) + index; 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" @@ -981,7 +981,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Alpha = T(M_PI) / m_Power; m_Length = sqrt(1 + SQR(m_Range) - 2 * m_Range * cos(m_Alpha)); @@ -1021,7 +1021,7 @@ public: PARVARCOPY(SineblurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T ang = rand.Frand01() * M_2PI; T s = sin(ang); @@ -1033,14 +1033,14 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t ang = MwcNext01(mwc) * M_2PI;\n" << "\t\treal_t s = sin(ang);\n" @@ -1079,17 +1079,17 @@ public: VARCOPY(CircleblurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T rad = sqrt(rand.Frand01()); T temp = rand.Frand01() * M_2PI; - + helper.Out.x = m_Weight * cos(temp) * rad; helper.Out.y = m_Weight * sin(temp) * rad; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1121,7 +1121,7 @@ public: PARVARCOPY(DepthVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T coeff = fabs(helper.In.z); @@ -1133,14 +1133,14 @@ public: helper.Out.z = m_Weight * (helper.m_TransZ + helper.In.z * coeff); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t coeff = fabs(vIn.z);\n" << "\n" @@ -1182,7 +1182,7 @@ public: PARVARCOPY(CropNVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T xang = (helper.m_PrecalcAtanyx + T(M_PI)) / m_Alpha; @@ -1214,7 +1214,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1226,7 +1226,7 @@ public: string zero = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string workPower = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string alpha = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t xang = (precalcAtanyx + M_PI) / " << alpha << ";\n" << "\n" @@ -1261,7 +1261,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { bool mode = m_Power > 0; @@ -1307,17 +1307,17 @@ public: PARVARCOPY(ShredRadVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T xang = (helper.m_PrecalcAtanyx + M_3PI + m_Alpha / 2) / m_Alpha; T zang = ((xang - (int)xang) * m_Width + (int)xang) * m_Alpha - T(M_PI) - m_Alpha / 2 * m_Width; - + helper.Out.x = m_Weight * helper.m_PrecalcSqrtSumSquares * cos(zang); helper.Out.y = m_Weight * helper.m_PrecalcSqrtSumSquares * sin(zang); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1326,7 +1326,7 @@ public: string n = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string width = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string alpha = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t xang = (precalcAtanyx + M_3PI + " << alpha << " / 2) / " << alpha << ";\n" << "\t\treal_t zang = ((xang - (int)xang) * " << width << " + (int)xang) * " << alpha << " - M_PI - " << alpha << " / 2 * " << width << ";\n" @@ -1339,7 +1339,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Alpha = M_2PI / m_N; } @@ -1375,7 +1375,7 @@ public: PARVARCOPY(Blob2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (helper.m_PrecalcSqrtSumSquares < m_Radius) { @@ -1391,7 +1391,7 @@ public: delta = exp(m_Prescale * log(delta * positive)) * m_Postscale * m_Mode; else delta = exp(m_Prescale * log(delta * positive)) * m_Postscale * positive; - + T rad = m_Radius + (helper.m_PrecalcSqrtSumSquares - m_Radius) * delta; helper.Out.x = m_Weight * rad * cos(helper.m_PrecalcAtanyx); @@ -1401,7 +1401,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1415,7 +1415,7 @@ public: string symmetry = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string comp = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string dataHelp = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tif (precalcSqrtSumSquares < " << radius << ")\n" << "\t\t{\n" @@ -1444,7 +1444,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_DeltaHelp = 1 + m_Compensation * m_Symmetry * (1 - (m_Symmetry < 0) * 2); } @@ -1490,7 +1490,7 @@ public: PARVARCOPY(Julia3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T z = helper.In.z / m_AbsN; T r = m_Weight * pow(helper.m_PrecalcSumSquares + SQR(z), m_Cn); @@ -1502,7 +1502,7 @@ public: helper.Out.z = r * z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1511,7 +1511,7 @@ public: string n = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string absn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t z = vIn.z / " << absn << ";\n" << "\t\treal_t r = xform->m_VariationWeights[" << varIndex << "] * pow(precalcSumSquares + SQR(z), " << cn << ");\n" @@ -1526,13 +1526,13 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_AbsN = fabs(m_N); m_Cn = (1 / m_N - 1) / 2; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_N = T(rand.Rand(5) + 2); @@ -1571,7 +1571,7 @@ public: PARVARCOPY(Julia3DzVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight * pow(helper.m_PrecalcSumSquares, m_Cn); T temp = (helper.m_PrecalcAtanyx + M_2PI * rand.Rand((unsigned int)m_AbsN)) / m_N; @@ -1581,7 +1581,7 @@ public: helper.Out.z = r * helper.In.z / (helper.m_PrecalcSqrtSumSquares * m_AbsN); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1590,7 +1590,7 @@ public: string n = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string absn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r = xform->m_VariationWeights[" << varIndex << "] * pow(precalcSumSquares, " << cn << ");\n" << "\t\treal_t temp = (precalcAtanyx + M_2PI * MwcNextRange(mwc, (uint)" << absn << ")) / " << n << ";\n" @@ -1603,13 +1603,13 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_AbsN = fabs(m_N); m_Cn = 1 / m_N / 2; } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_N = T(rand.Rand(5) + 2); @@ -1648,14 +1648,14 @@ public: PARVARCOPY(LinearTVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = SignNz(helper.In.x) * pow(fabs(helper.In.x), m_PowX) * m_Weight; helper.Out.y = SignNz(helper.In.y) * pow(fabs(helper.In.y), m_PowY) * m_Weight; helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1663,7 +1663,7 @@ public: string index = ss2.str(); string powx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string powy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tvOut.x = SignNz(vIn.x) * pow(fabs(vIn.x), " << powx << ") * xform->m_VariationWeights[" << varIndex << "];\n" << "\t\tvOut.y = SignNz(vIn.y) * pow(fabs(vIn.y), " << powy << ") * xform->m_VariationWeights[" << varIndex << "];\n" @@ -1702,14 +1702,14 @@ public: PARVARCOPY(LinearT3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = T(helper.In.x < 0 ? -1 : 1) * pow(fabs(helper.In.x), m_PowX) * m_Weight; helper.Out.y = T(helper.In.y < 0 ? -1 : 1) * pow(fabs(helper.In.y), m_PowY) * m_Weight; helper.Out.z = T(helper.In.z < 0 ? -1 : 1) * pow(fabs(helper.In.z), m_PowZ) * m_Weight; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1718,7 +1718,7 @@ public: string powx = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string powy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string powz = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tvOut.x = (real_t)(vIn.x < 0 ? -1 : 1) * pow(fabs(vIn.x), " << powx << ") * xform->m_VariationWeights[" << varIndex << "];\n" << "\t\tvOut.y = (real_t)(vIn.y < 0 ? -1 : 1) * pow(fabs(vIn.y), " << powy << ") * xform->m_VariationWeights[" << varIndex << "];\n" @@ -1759,7 +1759,7 @@ public: PARVARCOPY(OvoidVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight / Zeps(helper.m_PrecalcSumSquares); @@ -1768,7 +1768,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1776,7 +1776,7 @@ public: string index = ss2.str(); string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r = xform->m_VariationWeights[" << varIndex << "] / Zeps(precalcSumSquares);\n" << "\n" @@ -1817,7 +1817,7 @@ public: PARVARCOPY(Ovoid3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight / Zeps(helper.m_PrecalcSumSquares + SQR(helper.In.z)); @@ -1826,7 +1826,7 @@ public: helper.Out.z = helper.In.z * r * m_Z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1835,7 +1835,7 @@ public: string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string z = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r = xform->m_VariationWeights[" << varIndex << "] / Zeps(precalcSumSquares + SQR(vIn.z));\n" << "\n" @@ -1878,7 +1878,7 @@ public: PARVARCOPY(SpirographVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t = (m_TMax - m_TMin) * rand.Frand01() + m_TMin; T y = (m_YMax - m_YMin) * rand.Frand01() + m_YMin; @@ -1890,7 +1890,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1905,7 +1905,7 @@ public: string ymax = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c1 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string c2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t t = (" << tmax << " - " << tmin << ") * MwcNext01(mwc) + " << tmin << ";\n" << "\t\treal_t y = (" << ymax << " - " << ymin << ") * MwcNext01(mwc) + " << ymin << ";\n" @@ -1960,7 +1960,7 @@ public: VARCOPY(PetalVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sinX = sin(helper.In.x); T cosX = cos(helper.In.x); @@ -1974,7 +1974,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2007,16 +2007,16 @@ public: VARCOPY(RoundSpherVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T e = 1 / helper.m_PrecalcSumSquares + SQR(T(M_2_PI)); - + helper.Out.x = m_Weight * (m_Weight / helper.m_PrecalcSumSquares * helper.In.x / e); helper.Out.y = m_Weight * (m_Weight / helper.m_PrecalcSumSquares * helper.In.y / e); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2044,7 +2044,7 @@ public: VARCOPY(RoundSpher3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T inZ, otherZ, tempTz, tempPz; inZ = helper.In.z; @@ -2053,7 +2053,7 @@ public: otherZ = helper.m_TransZ; else otherZ = outPoint.m_Z; - + if (inZ == 0) tempTz = cos(helper.m_PrecalcSqrtSumSquares); else @@ -2082,15 +2082,15 @@ public: } } - T d = helper.m_PrecalcSumSquares + SQR(tempTz); + T d = helper.m_PrecalcSumSquares + SQR(tempTz); T e = 1 / d + SQR(T(M_2_PI)); - + helper.Out.x = m_Weight * (m_Weight / d * helper.In.x / e); helper.Out.y = m_Weight * (m_Weight / d * helper.In.y / e); helper.Out.z = tempPz + m_Weight * (m_Weight / d * tempTz / e); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2165,7 +2165,7 @@ public: VARCOPY(SpiralWingVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T d = Zeps(helper.m_PrecalcSumSquares); T c1 = Zeps(SQR(helper.In.x)); @@ -2176,7 +2176,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2206,7 +2206,7 @@ public: VARCOPY(SquarizeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcAtanyx; @@ -2214,7 +2214,7 @@ public: a += M_2PI; T p = 4 * helper.m_PrecalcSqrtSumSquares * a * T(M_1_PI); - + if (p <= 1 * helper.m_PrecalcSqrtSumSquares) { helper.Out.x = m_Weight * helper.m_PrecalcSqrtSumSquares; @@ -2244,7 +2244,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2304,7 +2304,7 @@ public: PARVARCOPY(SschecksVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T dx, dy, r = m_Weight / (helper.m_PrecalcSumSquares + EPS); int isXY = int(LRint(helper.In.x * m_InvSize) + LRint(helper.In.y * m_InvSize)); @@ -2325,7 +2325,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2336,7 +2336,7 @@ public: string size = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string rand = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invSize = "parVars[" + ToUpper(m_Params[i++].Name()) + index;//Precalc. - + ss << "\t{\n" << "\t\treal_t dx, dy, r = xform->m_VariationWeights[" << varIndex << "] / (precalcSumSquares + EPS);\n" << "\t\tint isXY = LRint(vIn.x * " << invSize << ") + LRint(vIn.y * " << invSize << ");\n" @@ -2360,7 +2360,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_InvSize = 1 / (m_Size + EPS); } @@ -2400,19 +2400,19 @@ public: PARVARCOPY(PhoenixJuliaVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T preX = helper.In.x * (m_XDistort + 1); T preY = helper.In.y * (m_YDistort + 1); T temp = atan2(preY, preX) * m_InvN + rand.Rand() * m_Inv2PiN; T r = m_Weight * pow(helper.m_PrecalcSumSquares, m_Cn); - + helper.Out.x = r * cos(temp); helper.Out.y = r * sin(temp); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2425,7 +2425,7 @@ public: string cN = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invN = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string inv2PiN = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t preX = vIn.x * (" << xDistort << " + 1);\n" << "\t\treal_t preY = vIn.y * (" << yDistort << " + 1);\n" @@ -2440,7 +2440,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_InvN = m_Dist / m_Power; m_Inv2PiN = M_2PI / m_Power; @@ -2486,7 +2486,7 @@ public: PARVARCOPY(MobiusVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T uRe = m_Re_A * helper.In.x - m_Im_A * helper.In.y + m_Re_B; T uIm = m_Re_A * helper.In.y + m_Im_A * helper.In.x + m_Im_B; @@ -2499,7 +2499,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2513,7 +2513,7 @@ public: string imC = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string reD = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string imD = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t uRe = " << reA << " * vIn.x - " << imA << " * vIn.y + " << reB << ";\n" << "\t\treal_t uIm = " << reA << " * vIn.y + " << imA << " * vIn.x + " << imB << ";\n" @@ -2570,7 +2570,7 @@ public: PARVARCOPY(MobiusNVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int n; @@ -2598,7 +2598,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2614,7 +2614,7 @@ public: string imD = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string dist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tint n;\n" << "\n" @@ -2645,7 +2645,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { if (fabs(m_Power) < 1) m_Power = 1; @@ -2698,7 +2698,7 @@ public: PARVARCOPY(MobiusStripVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T s, t, mx, my, mz, rx, ry, rz; T deltaT, deltaS; @@ -2752,7 +2752,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2768,7 +2768,7 @@ public: string rotxCos = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string rotySin = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string rotyCos = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t s, t, mx, my, mz, rx, ry, rz;\n" << "\t\treal_t deltaT, deltaS;\n" @@ -2819,7 +2819,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_RotxSin = sin(m_RotateX * M_2PI); m_RotxCos = cos(m_RotateX * M_2PI); @@ -2872,7 +2872,7 @@ public: PARVARCOPY(LissajousVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t = (m_Max - m_Min) * rand.Frand01() + m_Min; T y = rand.Frand01() - T(0.5); @@ -2884,7 +2884,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2897,7 +2897,7 @@ public: string c = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string d = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string e = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t t = (" << max << " - " << min << ") * MwcNext01(mwc) + " << min << ";\n" << "\t\treal_t y = MwcNext01(mwc) - 0.5;\n" @@ -2951,7 +2951,7 @@ public: PARVARCOPY(SvfVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T cn = cos(m_N * helper.In.y); T sx = sin(helper.In.x); @@ -2964,14 +2964,14 @@ public: helper.Out.z = m_Weight * (sy * cn); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string n = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t cn = cos(" << n << " * vIn.y);\n" << "\t\treal_t sx = sin(vIn.x);\n" @@ -3014,27 +3014,27 @@ public: PARVARCOPY(TargetVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = helper.m_PrecalcAtanyx; T t = log(helper.m_PrecalcSqrtSumSquares); if (t < 0) t -= m_SizeDiv2; - + t = fmod(fabs(t), m_Size); - + if (t < m_SizeDiv2) a += m_Even; else a += m_Odd; - + helper.Out.x = helper.m_PrecalcSqrtSumSquares * cos(a); helper.Out.y = helper.m_PrecalcSqrtSumSquares * sin(a); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3044,7 +3044,7 @@ public: string odd = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string size = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string sizeDiv2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a = precalcAtanyx;\n" << "\t\treal_t t = log(precalcSqrtSumSquares);\n" @@ -3067,7 +3067,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_SizeDiv2 = m_Size * T(0.5); } @@ -3105,7 +3105,7 @@ public: PARVARCOPY(TaurusVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sx = sin(helper.In.x); T cx = cos(helper.In.x); @@ -3118,7 +3118,7 @@ public: helper.Out.z = m_Weight * (m_Sor * cy) + (m_1MinusSor * helper.In.y); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3131,7 +3131,7 @@ public: string invTimesR = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string oneMinusInv = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string oneMinusSor = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t sx = sin(vIn.x);\n" << "\t\treal_t cx = cos(vIn.x);\n" @@ -3147,7 +3147,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_InvTimesR = m_Inv * m_R; m_1MinusInv = 1 - m_Inv; @@ -3193,9 +3193,9 @@ public: PARVARCOPY(CollideoscopeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { - int alt; + int alt; T a = helper.m_PrecalcAtanyx; T r = m_Weight * helper.m_PrecalcSqrtSumSquares; @@ -3216,14 +3216,14 @@ public: a = -(alt * m_PiKn + fmod(-m_KaKn - a, m_PiKn)); else a = -(alt * m_PiKn + fmod(m_KaKn - a, m_PiKn)); - } + } helper.Out.x = r * cos(a); helper.Out.y = r * sin(a); helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3235,7 +3235,7 @@ public: string knpi = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string kakn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string pikn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tint alt;\n" << "\t\treal_t a = precalcAtanyx;\n" @@ -3268,7 +3268,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Num = Zeps(m_Num); m_KnPi = m_Num * T(M_1_PI); @@ -3314,11 +3314,11 @@ public: PARVARCOPY(BModVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tau = T(0.5) * (log(Sqr(helper.In.x + 1) + SQR(helper.In.y)) - log(Sqr(helper.In.x - 1) + SQR(helper.In.y))); T sigma = T(M_PI) - atan2(helper.In.y, helper.In.x + 1) - atan2(helper.In.y, 1 - helper.In.x); - + if (tau < m_Radius && -tau < m_Radius) tau = fmod(tau + m_Radius + m_Distance * m_Radius, 2 * m_Radius) - m_Radius; @@ -3329,7 +3329,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3337,7 +3337,7 @@ public: string index = ss2.str(); string radius = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string dist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tau = 0.5 * (log(Sqr(vIn.x + 1.0) + SQR(vIn.y)) - log(Sqr(vIn.x - 1.0) + SQR(vIn.y)));\n" << "\t\treal_t sigma = M_PI - atan2(vIn.y, vIn.x + 1.0) - atan2(vIn.y, 1.0 - vIn.x);\n" @@ -3384,11 +3384,11 @@ public: PARVARCOPY(BSwirlVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tau = T(0.5) * (log(Sqr(helper.In.x + 1) + SQR(helper.In.y)) - log(Sqr(helper.In.x - 1) + SQR(helper.In.y))); T sigma = T(M_PI) - atan2(helper.In.y, helper.In.x + 1) - atan2(helper.In.y, 1 - helper.In.x); - + sigma = sigma + tau * m_Out + m_In / tau; T temp = cosh(tau) - cos(sigma); @@ -3398,7 +3398,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3406,7 +3406,7 @@ public: string index = ss2.str(); string in = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string out = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tau = 0.5 * (log(Sqr(vIn.x + 1.0) + SQR(vIn.y)) - log(Sqr(vIn.x - 1.0) + SQR(vIn.y)));\n" << "\t\treal_t sigma = M_PI - atan2(vIn.y, vIn.x + 1.0) - atan2(vIn.y, 1.0 - vIn.x);\n" @@ -3452,18 +3452,18 @@ public: PARVARCOPY(BTransformVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { - T tau = T(0.5) * (log(Sqr(helper.In.x + 1) + SQR(helper.In.y)) - log(Sqr(helper.In.x - 1) + SQR(helper.In.y))) / m_Power + m_Move; + T tau = T(0.5) * (log(Sqr(helper.In.x + 1) + SQR(helper.In.y)) - log(Sqr(helper.In.x - 1) + SQR(helper.In.y))) / m_Power + m_Move; T sigma = T(M_PI) - atan2(helper.In.y, helper.In.x + 1) - atan2(helper.In.y, 1 - helper.In.x) + m_Rotate; - + sigma = sigma / m_Power + M_2PI / m_Power * Floor(rand.Frand01() * m_Power); if (helper.In.x >= 0) tau += m_Split; else tau -= m_Split; - + T temp = cosh(tau) - cos(sigma); helper.Out.x = m_Weight * sinh(tau) / temp; @@ -3471,7 +3471,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3481,7 +3481,7 @@ public: string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string move = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string split = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tau = 0.5 * (log(Sqr(vIn.x + 1.0) + SQR(vIn.y)) - log(Sqr(vIn.x - 1.0) + SQR(vIn.y))) / " << power << " + " << move << ";\n" << "\t\treal_t sigma = M_PI - atan2(vIn.y, vIn.x + 1.0) - atan2(vIn.y, 1.0 - vIn.x) + " << rotate << ";\n" @@ -3536,9 +3536,9 @@ public: PARVARCOPY(BCollideVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { - T tau = T(0.5) * (log(Sqr(helper.In.x + 1) + SQR(helper.In.y)) - log(Sqr(helper.In.x - 1) + SQR(helper.In.y))); + T tau = T(0.5) * (log(Sqr(helper.In.x + 1) + SQR(helper.In.y)) - log(Sqr(helper.In.x - 1) + SQR(helper.In.y))); T sigma = T(M_PI) - atan2(helper.In.y, helper.In.x + 1) - atan2(helper.In.y, 1 - helper.In.x); int alt = (int)(sigma * m_CnPi); @@ -3546,7 +3546,7 @@ public: sigma = alt * m_PiCn + fmod(sigma + m_CaCn, m_PiCn); else sigma = alt * m_PiCn + fmod(sigma - m_CaCn, m_PiCn); - + T temp = cosh(tau) - cos(sigma); helper.Out.x = m_Weight * sinh(tau) / temp; @@ -3554,7 +3554,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3566,7 +3566,7 @@ public: string cnPi = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string caCn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string piCn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tau = 0.5 * (log(Sqr(vIn.x + 1.0) + SQR(vIn.y)) - log(Sqr(vIn.x - 1.0) + SQR(vIn.y)));\n" << "\t\treal_t sigma = M_PI - atan2(vIn.y, vIn.x + 1.0) - atan2(vIn.y, 1.0 - vIn.x);\n" @@ -3587,7 +3587,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_CnPi = m_Num * T(M_1_PI); m_PiCn = T(M_PI) / m_Num; @@ -3632,10 +3632,10 @@ public: PARVARCOPY(EclipseVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x, c2; - + if (fabs(helper.In.y) <= m_Weight) { c2 = sqrt(SQR(m_Weight) - SQR(helper.In.y)); @@ -3665,14 +3665,14 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string shift = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x, c2;\n" << "\n" @@ -3735,7 +3735,7 @@ public: PARVARCOPY(FlipCircleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * helper.In.x; @@ -3747,14 +3747,14 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string ww = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tvOut.x = xform->m_VariationWeights[" << varIndex << "] * vIn.x;\n" << "\n" @@ -3769,7 +3769,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_WeightSquared = SQR(m_Weight); } @@ -3798,7 +3798,7 @@ public: VARCOPY(FlipYVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * helper.In.x; @@ -3810,7 +3810,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3844,7 +3844,7 @@ public: PARVARCOPY(ECollideVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T tmp2 = 2 * helper.In.x; @@ -3855,7 +3855,7 @@ public: xmax = 1; T nu = acos(Clamp(helper.In.x / xmax, -1, 1)); // -Pi < nu < Pi - + if (helper.In.y > 0) { alt = (int)(nu * m_CnPi); @@ -3873,7 +3873,7 @@ public: nu = alt * m_PiCn + fmod(nu + m_CaCn, m_PiCn); else nu = alt * m_PiCn + fmod(nu - m_CaCn, m_PiCn); - + nu *= -1; } @@ -3882,7 +3882,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3894,7 +3894,7 @@ public: string cnPi = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string caCn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string piCn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tmp = precalcSumSquares + 1;\n" << "\t\treal_t tmp2 = 2 * vIn.x;\n" @@ -3935,7 +3935,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_CnPi = m_Num * T(M_1_PI); m_PiCn = T(M_PI) / m_Num; @@ -3980,32 +3980,32 @@ public: PARVARCOPY(EJuliaVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x, r2 = helper.m_PrecalcSumSquares; if (m_Sign == 1) { - x = helper.In.x; + x = helper.In.x; } else { r2 = 1 / r2; x = helper.In.x * r2; } - + T tmp = r2 + 1; T tmp2 = 2 * x; T xmax = (SafeSqrt(tmp + tmp2) + SafeSqrt(tmp - tmp2)) * T(0.5); - + ClampGteRef(xmax, 1); T mu = acosh(xmax); T nu = acos(Clamp(x / xmax, -1, 1));//-Pi < nu < Pi. - + if (helper.In.y < 0) nu *= -1; - + nu = nu / m_Power + M_2PI / m_Power * Floor(rand.Frand01() * m_Power); mu /= m_Power; @@ -4014,7 +4014,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4060,7 +4060,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Sign = 1; @@ -4097,20 +4097,20 @@ public: PARVARCOPY(EModVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T tmp2 = 2 * helper.In.x; T xmax = (SafeSqrt(tmp + tmp2) + SafeSqrt(tmp - tmp2)) * T(0.5); - + ClampGteRef(xmax, 1); - + T mu = acosh(xmax); T nu = acos(Clamp(helper.In.x / xmax, -1, 1));//-Pi < nu < Pi. - + if (helper.In.y < 0) nu *= -1; - + if (mu < m_Radius && -mu < m_Radius) { if (nu > 0) @@ -4124,7 +4124,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4132,7 +4132,7 @@ public: string index = ss2.str(); string radius = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string dist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tmp = precalcSumSquares + 1;\n" << "\t\treal_t tmp2 = 2 * vIn.x;\n" @@ -4192,20 +4192,20 @@ public: PARVARCOPY(EMotionVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T tmp2 = 2 * helper.In.x; T xmax = (SafeSqrt(tmp + tmp2) + SafeSqrt(tmp - tmp2)) * T(0.5); - + ClampGteRef(xmax, 1); - + T mu = acosh(xmax); T nu = acos(Clamp(helper.In.x / xmax, -1, 1));//-Pi < nu < Pi. - + if (helper.In.y < 0) nu *= -1; - + if (nu < 0) mu += m_Move; else @@ -4216,7 +4216,7 @@ public: mu *= -1; nu *= -1; } - + nu += m_Rotate; helper.Out.x = m_Weight * cosh(mu) * cos(nu); @@ -4224,7 +4224,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4232,7 +4232,7 @@ public: string index = ss2.str(); string move = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string rotate = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tmp = precalcSumSquares + 1;\n" << "\t\treal_t tmp2 = 2 * vIn.x;\n" @@ -4297,20 +4297,20 @@ public: PARVARCOPY(EPushVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T tmp2 = 2 * helper.In.x; T xmax = (SafeSqrt(tmp + tmp2) + SafeSqrt(tmp - tmp2)) * T(0.5); - + ClampGteRef(xmax, 1); - + T mu = acosh(xmax); T nu = acos(Clamp(helper.In.x / xmax, -1, 1));//-Pi < nu < Pi. - + if (helper.In.y < 0) nu *= -1; - + nu += m_Rotate; mu *= m_Dist; mu += m_Push; @@ -4320,7 +4320,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4329,7 +4329,7 @@ public: string push = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string dist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string rotate = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tmp = precalcSumSquares + 1;\n" << "\t\treal_t tmp2 = 2 * vIn.x;\n" @@ -4387,20 +4387,20 @@ public: PARVARCOPY(ERotateVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T tmp2 = 2 * helper.In.x; T xmax = (SafeSqrt(tmp + tmp2) + SafeSqrt(tmp - tmp2)) * T(0.5); - + if (xmax < 1) xmax = 1; T nu = acos(Clamp(helper.In.x / xmax, -1, 1));//-Pi < nu < Pi. - + if (helper.In.y < 0) nu *= -1; - + nu = fmod(nu + m_Rotate + T(M_PI), M_2PI) - T(M_PI); helper.Out.x = m_Weight * xmax * cos(nu); @@ -4408,14 +4408,14 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string rotate = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tmp = precalcSumSquares + 1;\n" << "\t\treal_t tmp2 = 2 * vIn.x;\n" @@ -4466,23 +4466,23 @@ public: PARVARCOPY(EScaleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T tmp2 = 2 * helper.In.x; T xmax = (SafeSqrt(tmp + tmp2) + SafeSqrt(tmp - tmp2)) * T(0.5); - + ClampGteRef(xmax, 1); - + T mu = acosh(xmax); T nu = acos(Clamp(helper.In.x / xmax, -1, 1));//-Pi < nu < Pi. - + if (helper.In.y < 0) nu *= -1; - + mu *= m_Scale; nu = fmod(fmod(m_Scale * (nu + T(M_PI) + m_Angle), M_2PI * m_Scale) - m_Angle - m_Scale * T(M_PI), M_2PI); - + if (nu > T(M_PI)) nu -= M_2PI; @@ -4494,7 +4494,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4502,7 +4502,7 @@ public: string index = ss2.str(); string scale = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string angle = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tmp = precalcSumSquares + 1;\n" << "\t\treal_t tmp2 = 2 * vIn.x;\n" @@ -4602,4 +4602,4 @@ MAKEPREPOSTPARVAR(EMotion, eMotion, EMOTION) MAKEPREPOSTPARVAR(EPush, ePush, EPUSH) MAKEPREPOSTPARVAR(ERotate, eRotate, EROTATE) MAKEPREPOSTPARVAR(EScale, eScale, ESCALE) -} \ No newline at end of file +} diff --git a/Source/Ember/Variations04.h b/Source/Ember/Variations04.h index 5eaaff9..26ca9cd 100644 --- a/Source/Ember/Variations04.h +++ b/Source/Ember/Variations04.h @@ -18,20 +18,20 @@ public: PARVARCOPY(ESwirlVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T tmp = helper.m_PrecalcSumSquares + 1; T tmp2 = 2 * helper.In.x; T xmax = (SafeSqrt(tmp + tmp2) + SafeSqrt(tmp - tmp2)) * T(0.5); - + ClampGteRef(xmax, -1); T mu = acosh(xmax); T nu = acos(Clamp(helper.In.x / xmax, -1, 1));//-Pi < nu < Pi. - + if (helper.In.y < 0) nu *= -1; - + nu = nu + mu * m_Out + m_In / mu; helper.Out.x = m_Weight * cosh(mu) * cos(nu); @@ -39,7 +39,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -47,7 +47,7 @@ public: string index = ss2.str(); string in = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string out = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t tmp = precalcSumSquares + 1;\n" << "\t\treal_t tmp2 = 2 * vIn.x;\n" @@ -101,7 +101,7 @@ public: PARVARCOPY(LazyTravisVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = fabs(helper.In.x); T y = fabs(helper.In.y); @@ -165,7 +165,7 @@ public: if (x > y) { s = x; - + if (helper.In.x > 0) p = s + helper.In.y + s * m_In4; else @@ -180,9 +180,9 @@ public: else p = 7 * s + helper.In.x + s * m_In4; } - + p = fmod(p, s * 8); - + if (p <= 2 * s) { helper.Out.x = m_Weight * s; @@ -208,7 +208,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -219,7 +219,7 @@ public: string space = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string in4 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string out4 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x = fabs(vIn.x);\n" << "\t\treal_t y = fabs(vIn.y);\n" @@ -329,7 +329,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_In4 = 4 * m_SpinIn; m_Out4 = 4 * m_SpinOut; @@ -370,7 +370,7 @@ public: PARVARCOPY(SquishVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = fabs(helper.In.x); T y = fabs(helper.In.y); @@ -427,7 +427,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -435,7 +435,7 @@ public: string index = ss2.str(); string power = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invPower = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t x = fabs(vIn.x);\n" << "\t\treal_t y = fabs(vIn.y);\n" @@ -495,7 +495,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_InvPower = 1 / m_Power; } @@ -529,21 +529,21 @@ public: PARVARCOPY(CircusVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = helper.m_PrecalcSqrtSumSquares; - + if (r <= 1) r *= m_Scale; else r *= m_InvScale; - + helper.Out.x = m_Weight * r * helper.m_PrecalcCosa; helper.Out.y = m_Weight * r * helper.m_PrecalcSina; helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -551,7 +551,7 @@ public: string index = ss2.str(); string scale = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invScale = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r = precalcSqrtSumSquares;\n" << "\n" @@ -568,7 +568,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_InvScale = 1 / m_Scale; } @@ -599,7 +599,7 @@ public: VARCOPY(TancosVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T d = Zeps(helper.m_PrecalcSumSquares); @@ -608,7 +608,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -636,7 +636,7 @@ public: VARCOPY(RippledVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T d = Zeps(helper.m_PrecalcSumSquares); @@ -645,7 +645,7 @@ public: helper.Out.z = m_Weight * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -677,7 +677,7 @@ public: PARVARCOPY(RotateXVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T z = m_RxCos * helper.In.z - m_RxSin * helper.In.y; @@ -694,8 +694,8 @@ public: helper.Out.y = m_RxSin * helper.In.z + m_RxCos * helper.In.y; helper.Out.z = z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -726,8 +726,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_RxSin = sin(m_Weight * T(M_PI_2)); m_RxCos = cos(m_Weight * T(M_PI_2)); @@ -763,7 +763,7 @@ public: PARVARCOPY(RotateYVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_RyCos * helper.In.x - m_RySin * helper.In.z; @@ -779,8 +779,8 @@ public: helper.Out.z = m_RySin * helper.In.x + m_RyCos * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -809,8 +809,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_RySin = sin(m_Weight * T(M_PI_2)); m_RyCos = cos(m_Weight * T(M_PI_2)); @@ -846,11 +846,11 @@ public: PARVARCOPY(RotateZVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_RzSin * helper.In.y + m_RzCos * helper.In.x; helper.Out.y = m_RzCos * helper.In.y - m_RzSin * helper.In.x; - + if (m_VarType == VARTYPE_REG) { helper.Out.z = 0; @@ -861,8 +861,8 @@ public: helper.Out.z = helper.In.z; } } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -891,8 +891,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_RzSin = sin(m_Weight * T(M_PI_2)); m_RzCos = cos(m_Weight * T(M_PI_2)); @@ -925,12 +925,12 @@ public: VARCOPY(MirrorXVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (m_VarType == VARTYPE_REG) { helper.Out.x = fabs(outPoint.m_X); - + if (rand.RandBit()) helper.Out.x = -helper.Out.x; @@ -941,7 +941,7 @@ public: else { helper.Out.x = fabs(helper.In.x); - + if (rand.RandBit()) helper.Out.x = -helper.Out.x; @@ -950,7 +950,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; @@ -998,12 +998,12 @@ public: VARCOPY(MirrorYVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (m_VarType == VARTYPE_REG) { helper.Out.y = fabs(outPoint.m_Y); - + if (rand.RandBit()) helper.Out.y = -helper.Out.y; @@ -1014,7 +1014,7 @@ public: else { helper.Out.y = fabs(helper.In.y); - + if (rand.RandBit()) helper.Out.y = -helper.Out.y; @@ -1023,7 +1023,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; @@ -1071,12 +1071,12 @@ public: VARCOPY(MirrorZVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (m_VarType == VARTYPE_REG) { helper.Out.z = fabs(outPoint.m_Z); - + if (rand.RandBit()) helper.Out.z = -helper.Out.z; @@ -1087,7 +1087,7 @@ public: else { helper.Out.z = fabs(helper.In.z); - + if (rand.RandBit()) helper.Out.z = -helper.Out.z; @@ -1096,10 +1096,10 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; - + ss << "\t{\n"; if (m_VarType == VARTYPE_REG) @@ -1146,7 +1146,7 @@ public: PARVARCOPY(RBlurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sx = helper.In.x - m_CenterX; T sy = helper.In.y - m_CenterY; @@ -1159,7 +1159,7 @@ public: helper.Out.y = m_Weight * (helper.In.y + (rand.Frand01() - T(0.5)) * r); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1170,7 +1170,7 @@ public: string centerX = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string centerY = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string s2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t sx = vIn.x - " << centerX << ";\n" << "\t\treal_t sy = vIn.y - " << centerY << ";\n" @@ -1187,7 +1187,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_S2 = 2 * m_Strength; } @@ -1204,7 +1204,7 @@ protected: m_Params.push_back(ParamWithName(&m_CenterY, prefix + "rblur_center_y")); m_Params.push_back(ParamWithName(true, &m_S2, prefix + "rblur_s2"));//Precalc. } - + private: T m_Strength; T m_Offset; @@ -1227,7 +1227,7 @@ public: PARVARCOPY(JuliaNabVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T jun = Zeps(fabs(m_N)); @@ -1239,7 +1239,7 @@ public: helper.Out.z = m_Weight * helper.In.z;//Original did not multiply by weight. Do it here to be consistent with others. } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1251,7 +1251,7 @@ public: string sep = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string absN = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t jun = Zeps(fabs(" << n << "));\n" << "\n" @@ -1266,7 +1266,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T jun = Zeps(fabs(m_N)); @@ -1287,7 +1287,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_AbsN, prefix + "juliaNab_absn"));//Precalc. m_Params.push_back(ParamWithName(true, &m_Cn, prefix + "juliaNab_cn")); } - + private: T m_N; T m_A; @@ -1311,7 +1311,7 @@ public: PARVARCOPY(SintrangeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sqX = SQR(helper.In.x); T sqY = SQR(helper.In.y); @@ -1322,14 +1322,14 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string w = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t sqX = SQR(vIn.x);\n" << "\t\treal_t sqY = SQR(vIn.y);\n" @@ -1351,7 +1351,7 @@ protected: m_Params.clear(); m_Params.push_back(ParamWithName(&m_W, prefix + "sintrange_w", 1)); } - + private: T m_W; }; @@ -1370,7 +1370,7 @@ public: PARVARCOPY(VoronVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int i, j, l, k, m, m1, n, n1; T r, rMin, offsetX, offsetY, x0 = 0, y0 = 0, x, y; @@ -1395,7 +1395,7 @@ public: offsetX = helper.In.x - x; offsetY = helper.In.y - y; r = sqrt(SQR(offsetX) + SQR(offsetY)); - + if (r < rMin) { rMin = r; @@ -1410,8 +1410,8 @@ public: helper.Out.y = m_Weight * (m_K * (helper.In.y - y0) + y0); helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1422,7 +1422,7 @@ public: string num = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string xSeed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string ySeed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tint i, j, l, k, m, m1, n, n1;\n" << "\t\treal_t r, rMin, offsetX, offsetY, x0 = 0.0, y0 = 0.0, x, y;\n" @@ -1493,7 +1493,7 @@ protected: m_Params.push_back(ParamWithName(&m_XSeed, prefix + "Voron_XSeed", 3, INTEGER)); m_Params.push_back(ParamWithName(&m_YSeed, prefix + "Voron_YSeed", 7, INTEGER)); } - + private: T DiscreteNoise(int x) { @@ -1526,7 +1526,7 @@ public: PARVARCOPY(WaffleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = 0, r = 0; @@ -1559,7 +1559,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1571,7 +1571,7 @@ public: string rotation = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string sinr = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cosr = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t a = 0, r = 0;\n" << "\n" @@ -1607,7 +1607,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_SinR = sin(m_Rotation); m_CosR = cos(m_Rotation); @@ -1626,7 +1626,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_SinR, prefix + "waffle_sinr")); m_Params.push_back(ParamWithName(true, &m_CosR, prefix + "waffle_cosr")); } - + private: T m_Slices; T m_XThickness; @@ -1647,14 +1647,14 @@ public: VARCOPY(Square3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * (rand.Frand01() - T(0.5)); helper.Out.y = m_Weight * (rand.Frand01() - T(0.5)); helper.Out.z = m_Weight * (rand.Frand01() - T(0.5)); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1683,7 +1683,7 @@ public: PARVARCOPY(SuperShape3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T pr1, r1, pr2, r2, rho1, phi1, sinr, sinp, cosr, cosp, msinr, msinp, mcosr, mcosp, temp; @@ -1695,10 +1695,10 @@ public: sinr = sin(rho1); cosr = cos(rho1); - + sinp = sin(phi1); cosp = cos(phi1); - + temp = m_M4_1 * rho1; msinr = sin(temp); mcosr = cos(temp); @@ -1711,7 +1711,7 @@ public: pr2 = m_An2_2 * pow(fabs(mcosp), m_N2_2) + m_Bn3_2 * pow(fabs(msinp), m_N3_2); r1 = pow(fabs(pr1), m_N1_1) + m_Spiral * rho1; r2 = pow(fabs(pr2), m_N1_2); - + if ((int)m_Toroidmap == 1) { helper.Out.x = m_Weight * cosr * (r1 + r2 * cosp); @@ -1726,7 +1726,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1758,7 +1758,7 @@ public: string m4_2 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string rho2pi = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string phi2pi = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t pr1, r1, pr2, r2, rho1, phi1, sinr, sinp, cosr, cosp, msinr, msinp, mcosr, mcosp, temp;\n" << "\n" @@ -1804,7 +1804,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_N1n_1 = (-1 / m_N1_1); m_N1n_2 = (-1 / m_N1_2); @@ -1851,7 +1851,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_Rho2Pi, prefix + "SuperShape3D_rho2pi")); m_Params.push_back(ParamWithName(true, &m_Phi2Pi, prefix + "SuperShape3D_phi2pi")); } - + private: T m_Rho; T m_Phi; @@ -1895,17 +1895,17 @@ public: PARVARCOPY(Sphyp3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t, rX, rY, rZ; - + t = Zeps(helper.m_PrecalcSumSquares + SQR(helper.In.z)); rX = m_Weight / pow(t, m_StretchX); rY = m_Weight / pow(t, m_StretchY); - + helper.Out.x = helper.In.x * rX; helper.Out.y = helper.In.y * rY; - + //Optional 3D calculation. if ((int)m_ZOn == 1) { @@ -1914,7 +1914,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1924,7 +1924,7 @@ public: string stretchY = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string stretchZ = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string zOn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t t, rX, rY, rZ;\n" << "\n" @@ -1957,7 +1957,7 @@ protected: m_Params.push_back(ParamWithName(&m_StretchZ, prefix + "sphyp3D_stretchZ", 1)); m_Params.push_back(ParamWithName(&m_ZOn, prefix + "sphyp3D_zOn", 1, INTEGER, 0, 1)); } - + private: T m_StretchX; T m_StretchY; @@ -1979,7 +1979,7 @@ public: PARVARCOPY(CirclecropVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T xi = helper.In.x - m_X;//Original altered the input pointed to for reg, but not for pre/post. Don't do that here. T yi = helper.In.y - m_Y; @@ -2023,7 +2023,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2035,7 +2035,7 @@ public: string scatterArea = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string zero = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string ca = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t xi = vIn.x - " << x << ";\n" << "\t\treal_t yi = vIn.y - " << y << ";\n" @@ -2084,7 +2084,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Ca = Clamp(m_ScatterArea, -1, 1); } @@ -2102,7 +2102,7 @@ protected: m_Params.push_back(ParamWithName(&m_Zero, prefix + "circlecrop_zero", 1, INTEGER, 0, 1)); m_Params.push_back(ParamWithName(true, &m_Ca, prefix + "circlecrop_ca")); } - + private: T m_Radius; T m_X; @@ -2126,7 +2126,7 @@ public: PARVARCOPY(Julian3DxVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const T z = helper.In.z / m_AbsN; const T radiusOut = m_Weight * pow(helper.m_PrecalcSumSquares + z * z, m_Cn); @@ -2141,7 +2141,7 @@ public: helper.Out.z = radiusOut * z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2175,7 +2175,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_AbsN = fabs(m_Power); m_Cn = (m_Dist / m_Power - 1) / 2; @@ -2226,7 +2226,7 @@ public: PARVARCOPY(FourthVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { if (helper.In.x > 0 && helper.In.y > 0)//Quadrant IV: spherical. { @@ -2282,7 +2282,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2353,7 +2353,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_SqrWeight = SQR(m_Weight); } @@ -2395,7 +2395,7 @@ public: PARVARCOPY(MobiqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const T t1 = m_At; const T t2 = helper.In.x; @@ -2432,7 +2432,7 @@ public: helper.Out.z = (ny * dt - nt * dy - nz * dx + nx * dz) * ni; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2551,7 +2551,7 @@ public: PARVARCOPY(SpherivoidVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const T zr = Hypot(helper.In.z, helper.m_PrecalcSqrtSumSquares); const T phi = acos(Clamp(helper.In.z / zr, -1, 1)); @@ -2563,7 +2563,7 @@ public: helper.Out.z = m_Weight * pc * (zr + m_Radius); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2612,7 +2612,7 @@ public: PARVARCOPY(FarblurVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight * (Sqr(helper.In.x - m_XOrigin) + Sqr(helper.In.y - m_YOrigin) + @@ -2630,7 +2630,7 @@ public: helper.Out.z = m_Z * r * cv; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2700,7 +2700,7 @@ public: PARVARCOPY(CurlSPVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const T x = Powq4c(helper.In.x, m_Power); const T y = Powq4c(helper.In.y, m_Power); @@ -2717,7 +2717,7 @@ public: outPoint.m_ColorX = Clamp(outPoint.m_ColorX + m_DcAdjust * c, 0, 1); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2753,7 +2753,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_C2x2 = 2 * m_C2; m_DcAdjust = T(0.1) * m_Dc; @@ -2804,12 +2804,12 @@ public: PARVARCOPY(HeatVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = sqrt(fabs(helper.m_PrecalcSumSquares + helper.In.z)); r += m_Ar * sin(fma(m_Br, r, m_Cr)); - + if (r == 0) r = EPS; @@ -2821,13 +2821,13 @@ public: T sp = sin(temp); T cp = cos(temp); - + helper.Out.x = r * ct * sp; helper.Out.y = r * st * sp; helper.Out.z = r * cp; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2877,7 +2877,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { T tx = m_ThetaPeriod == 0 ? 0 : (1 / m_ThetaPeriod); T px = m_PhiPeriod == 0 ? 0 : (1 / m_PhiPeriod); @@ -2955,7 +2955,7 @@ public: PARVARCOPY(Interference2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T fp1x; T fp1y; @@ -3007,7 +3007,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3077,7 +3077,7 @@ public: return ss.str(); } - + virtual string OpenCLFuncsString() { return @@ -3155,7 +3155,7 @@ public: VARCOPY(SinqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T s = sin(helper.In.x); @@ -3169,7 +3169,7 @@ public: helper.Out.z = d * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3202,7 +3202,7 @@ public: VARCOPY(SinhqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T s = sin(absV); @@ -3216,7 +3216,7 @@ public: helper.Out.z = d * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3249,7 +3249,7 @@ public: VARCOPY(SecqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T ni = m_Weight / (helper.m_PrecalcSumSquares + SQR(helper.In.z)); @@ -3264,7 +3264,7 @@ public: helper.Out.z = -(d * helper.In.z); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3298,7 +3298,7 @@ public: VARCOPY(SechqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T ni = m_Weight / (helper.m_PrecalcSumSquares + SQR(helper.In.z)); @@ -3313,7 +3313,7 @@ public: helper.Out.z = -(d * helper.In.z); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3347,7 +3347,7 @@ public: VARCOPY(TanqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sysz = SQR(helper.In.y) + SQR(helper.In.z); T absV = sqrt(sysz); @@ -3367,7 +3367,7 @@ public: helper.Out.z = (nstcv * b * helper.In.z + d * helper.In.z * ctcv) * ni; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3406,7 +3406,7 @@ public: VARCOPY(TanhqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sysz = SQR(helper.In.y) + SQR(helper.In.z); T absV = sqrt(sysz); @@ -3426,7 +3426,7 @@ public: helper.Out.z = (nstcv * b * helper.In.z + d * helper.In.z * ctcv) * ni; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3465,7 +3465,7 @@ public: VARCOPY(CosqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T s = sin(helper.In.x); @@ -3479,7 +3479,7 @@ public: helper.Out.z = d * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3512,7 +3512,7 @@ public: VARCOPY(CoshqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T s = sin(absV); @@ -3526,7 +3526,7 @@ public: helper.Out.z = d * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3559,7 +3559,7 @@ public: VARCOPY(CotqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sysz = SQR(helper.In.y) + SQR(helper.In.z); T absV = sqrt(sysz); @@ -3579,7 +3579,7 @@ public: helper.Out.z = -(nstcv * b * helper.In.z + d * helper.In.z * ctcv) * ni; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3618,7 +3618,7 @@ public: VARCOPY(CothqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sysz = SQR(helper.In.y) + SQR(helper.In.z); T absV = sqrt(sysz); @@ -3638,7 +3638,7 @@ public: helper.Out.z = -(nstcv * b * helper.In.z + d * helper.In.z * ctcv) * ni; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3677,7 +3677,7 @@ public: VARCOPY(CscqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T ni = m_Weight / (helper.m_PrecalcSumSquares + SQR(helper.In.z)); @@ -3692,7 +3692,7 @@ public: helper.Out.z = -(d * helper.In.z); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3726,7 +3726,7 @@ public: VARCOPY(CschqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T ni = m_Weight / (helper.m_PrecalcSumSquares + SQR(helper.In.z)); @@ -3741,7 +3741,7 @@ public: helper.Out.z = -(d * helper.In.z); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3775,7 +3775,7 @@ public: VARCOPY(EstiqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T e = exp(helper.In.x); @@ -3788,7 +3788,7 @@ public: helper.Out.z = m_Weight * a * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3823,7 +3823,7 @@ public: PARVARCOPY(LoqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T absV = Hypot(helper.In.y, helper.In.z); T c = m_Weight * atan2(absV, helper.In.x) / absV; @@ -3833,7 +3833,7 @@ public: helper.Out.z = c * helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3853,8 +3853,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Denom = T(0.5) / log(m_Base); } @@ -3863,7 +3863,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Base, prefix + "loq_base", T(M_E), REAL, EPS, TMAX)); m_Params.push_back(ParamWithName(true, &m_Denom, prefix + "loq_denom"));//Precalc. @@ -3885,14 +3885,14 @@ public: VARCOPY(CurvatureVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight / Zeps(helper.m_PrecalcSqrtSumSquares); helper.Out.y = helper.m_PrecalcAtanyx; helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -3921,20 +3921,20 @@ public: PARVARCOPY(QodeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T sqx = SQR(helper.In.x); T sqy = SQR(helper.In.y); T xy = helper.In.x * helper.In.y; - helper.Out.x = (m_Q01 + m_Weight * m_Q02 * helper.In.x + m_Q03 * sqx) + + helper.Out.x = (m_Q01 + m_Weight * m_Q02 * helper.In.x + m_Q03 * sqx) + (m_Q04 * xy + m_Q05 * helper.In.y + m_Q06 * sqy); - helper.Out.y = (m_Q07 + m_Q08 * helper.In.x + m_Q09 * sqx) + + helper.Out.y = (m_Q07 + m_Q08 * helper.In.x + m_Q09 * sqx) + (m_Q10 * xy + m_Weight * m_Q11 * helper.In.y + m_Q12 * sqy); helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -3972,7 +3972,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Q01, prefix + "q_ode01", 1)); m_Params.push_back(ParamWithName(&m_Q02, prefix + "q_ode02", -1)); @@ -4017,16 +4017,16 @@ public: PARVARCOPY(BlurHeartVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T xx = (rand.Frand01() - T(0.5)) * 2; T yy = (rand.Frand01() - T(0.5)) * 2; T k = SignNz(yy); T yymax = ((m_A * pow(fabs(xx), m_P) + k * m_B * sqrt(fabs(1 - SQR(xx)))) - m_A); - + //The function must be in a range 0-1 to work properly. yymax /= Zeps(fabs(m_A) + fabs(m_B)); - + //Quick and dirty way to force y to be in range without altering the density. if (k > 0) { @@ -4038,13 +4038,13 @@ public: if (yy < yymax) yy = yymax; } - + helper.Out.x = xx * m_Weight; helper.Out.y = yy * m_Weight; helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4085,7 +4085,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_P, prefix + "blur_heart_p", T(0.5))); m_Params.push_back(ParamWithName(&m_A, prefix + "blur_heart_a", T(-0.6))); @@ -4112,7 +4112,7 @@ public: PARVARCOPY(TruchetVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int extended = (int)m_Extended; T seed = m_AbsSeed; @@ -4130,24 +4130,24 @@ public: int intx = (int)Round(x); int inty = (int)Round(y); int randiter; - + r = x - intx; if (r < 0) x = 1 + r; else x = r; - + r = y - inty; if (r < 0) y = 1 + r; else y = r; - + //Calculate the tile type. if (seed == 0) - tileType = 0; + tileType = 0; else if (seed == 1) tileType = 1; else @@ -4168,7 +4168,7 @@ public: int xrand = (int)Round(helper.In.x); int yrand = (int)Round(helper.In.y); - seed = (T)Floor(seed); + seed = (T)Floor(seed); niter = (T)abs(xrand + yrand + xrand * yrand); randInt = seed + niter; randiter = 0; @@ -4187,7 +4187,7 @@ public: if (extended == 0)//Fast drawmode { if (tileType < 1) - { + { r0 = pow((pow(fabs(x ), m_Exponent) + pow(fabs(y ), m_Exponent)), m_OneOverEx); r1 = pow((pow(fabs(x - 1), m_Exponent) + pow(fabs(y - 1), m_Exponent)), m_OneOverEx); } @@ -4195,9 +4195,9 @@ public: { r0 = pow((pow(fabs(x - 1), m_Exponent) + pow(fabs(y ), m_Exponent)), m_OneOverEx); r1 = pow((pow(fabs(x ), m_Exponent) + pow(fabs(y - 1), m_Exponent)), m_OneOverEx); - } - } - else//Slow drawmode + } + } + else//Slow drawmode { if (tileType == 1) { @@ -4223,7 +4223,7 @@ public: helper.Out.x = 0;//Needed because of possible sum below. helper.Out.y = 0; } - + r = fabs(r1 - T(0.5)) * m_OneOverRmax; if (r < 1) @@ -4235,7 +4235,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4376,7 +4376,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_OneOverEx = 1 / m_Exponent; m_AbsSeed = fabs(m_Seed); @@ -4389,7 +4389,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Extended, prefix + "Truchet_extended", 0, INTEGER, 0, 1)); m_Params.push_back(ParamWithName(&m_Exponent, prefix + "Truchet_exponent", 2, REAL_CYCLIC, T(0.001), 2)); @@ -4432,7 +4432,7 @@ public: PARVARCOPY(GdoffsVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T oscX = GdoffsFosc(m_Dx, 1); T oscY = GdoffsFosc(m_Dy, 1); @@ -4451,13 +4451,13 @@ public: outX = GdoffsFlip(GdoffsFlip(inX, GdoffsFosc(inX, 4), oscX), GdoffsFosc(GdoffsFclp(m_B * inX), 4), oscX); outY = GdoffsFlip(GdoffsFlip(inY, GdoffsFosc(inY, 4), oscY), GdoffsFosc(GdoffsFclp(m_B * inY), 4), oscY); } - + helper.Out.x = m_Weight * outX; helper.Out.y = m_Weight * outY; helper.Out.z = m_Weight * helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4478,7 +4478,7 @@ public: string ay = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string b = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t oscX = GdoffsFosc(" << dx << ", 1);\n" << "\t\treal_t oscY = GdoffsFosc(" << dy << ", 1);\n" @@ -4517,7 +4517,7 @@ public: "\n"; } - virtual void Precalc() + virtual void Precalc() override { const T agdod = T(0.1); const T agdoa = 2; @@ -4554,12 +4554,12 @@ protected: m_Params.push_back(ParamWithName(true, &m_Cy, prefix + "gdoffs_cy")); m_Params.push_back(ParamWithName(true, &m_B, prefix + "gdoffs_b")); } - + private: static inline T GdoffsFcip(T a) { return (T)((a < 0) ? -((int)(fabs(a)) + 1) : 0) + ((a > 1) ? ((int)(a)) : 0); } - static inline T GdoffsFclp(T a) { return ((a < 0) ? -(fmod(fabs(a), 1)) : fmod(fabs(a), 1)); } + static inline T GdoffsFclp(T a) { return ((a < 0) ? -(fmod(fabs(a), T(1))) : fmod(fabs(a), T(1))); } static inline T GdoffsFscl(T a) { return GdoffsFclp((a + 1) / 2); } - static inline T GdoffsFosc(T p, T a) { return GdoffsFscl(-1 * cos(p * a * M_2PI)); } + static inline T GdoffsFosc(T p, T a) { return GdoffsFscl(-1 * cos(p * a * M_2PI)); } static inline T GdoffsFlip(T a, T b, T c) { return (c * (b - a) + a); } T m_DeltaX;//Params. @@ -4593,7 +4593,7 @@ public: PARVARCOPY(OctagonVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = m_Weight / Zeps((SQR(SQR(helper.In.x)) + SQR(helper.In.z) + SQR(SQR(helper.In.y)) + SQR(helper.In.z))); @@ -4608,7 +4608,7 @@ public: helper.Out.x = m_Weight * helper.In.x; helper.Out.y = m_Weight * helper.In.y; helper.Out.z = m_Weight * helper.In.z; - + T t = m_Weight / Zeps((sqrt(SQR(helper.In.x)) + sqrt(helper.In.z) + sqrt(SQR(helper.In.y)) + sqrt(helper.In.z))); if (r >= 0) @@ -4641,7 +4641,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4705,7 +4705,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "octagon_x"));//Original used a prefix of octa_, which is incompatible with Ember's design. m_Params.push_back(ParamWithName(&m_Y, prefix + "octagon_y")); @@ -4732,10 +4732,10 @@ public: PARVARCOPY(TradeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r, temp, c1mx; - + if (helper.In.x > 0) { c1mx = m_C1 - helper.In.x; @@ -4745,21 +4745,21 @@ public: { r *= m_R2 / m_R1; temp = atan2(helper.In.y, c1mx); - + helper.Out.x = m_Weight * (r * cos(temp) - m_C2); helper.Out.y = m_Weight * r * sin(temp); - } + } else { helper.Out.x = m_Weight * helper.In.x; helper.Out.y = m_Weight * helper.In.y; - } + } } else { c1mx = -m_C2 - helper.In.x; r = sqrt(SQR(c1mx) + SQR(helper.In.y)); - + if (r <= m_R2) { r *= m_R1 / m_R2; @@ -4772,13 +4772,13 @@ public: { helper.Out.x = m_Weight * helper.In.x; helper.Out.y = m_Weight * helper.In.y; - } + } } helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4839,7 +4839,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_C1 = m_R1 + m_D1; m_C2 = m_R2 + m_D2; @@ -4849,7 +4849,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_R1, prefix + "trade_r1", 1, REAL, EPS, TMAX)); m_Params.push_back(ParamWithName(&m_D1, prefix + "trade_d1", 1, REAL, 0, TMAX)); @@ -4882,19 +4882,19 @@ public: PARVARCOPY(JuliacVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T arg = helper.m_PrecalcAtanyx + fmod(T(rand.Rand()), T(1 / m_ReInv)) * M_2PI; T lnmod = m_Dist * T(0.5) * log(helper.m_PrecalcSumSquares); T temp = arg * m_ReInv + lnmod * m_Im100; T mod2 = exp(lnmod * m_ReInv - arg * m_Im100); - + helper.Out.x = m_Weight * mod2 * cos(temp); helper.Out.y = m_Weight * mod2 * sin(temp); helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -4920,7 +4920,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_ReInv = 1 / Zeps(m_Re); m_Im100 = m_Im * T(0.01); @@ -4930,7 +4930,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Re, prefix + "Juliac_re", 2)); m_Params.push_back(ParamWithName(&m_Im, prefix + "Juliac_im", 1)); @@ -4958,7 +4958,7 @@ public: VARCOPY(Blade3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = rand.Frand01() * m_Weight * helper.m_PrecalcSqrtSumSquares; T sinr, cosr; @@ -4969,7 +4969,7 @@ public: helper.Out.z = m_Weight * helper.In.z * (sinr - cosr); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -5001,8 +5001,8 @@ public: } PARVARCOPY(Blob3DVariation) - - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = helper.m_PrecalcSqrtSumSquares * (m_BlobLow + m_BlobDiff * (T(0.5) + T(0.5) * sin(m_BlobWaves * helper.m_PrecalcAtanxy))); @@ -5011,7 +5011,7 @@ public: helper.Out.z = m_Weight * sin(m_BlobWaves * helper.m_PrecalcAtanxy) * r; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5032,13 +5032,13 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_BlobDiff = m_BlobHigh - m_BlobLow; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_BlobLow = T(0.2) + T(0.5) * rand.Frand01(); m_BlobHigh = T(0.8) + T(0.4) * rand.Frand01(); @@ -5049,7 +5049,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_BlobLow, prefix + "blob3D_low")); m_Params.push_back(ParamWithName(&m_BlobHigh, prefix + "blob3D_high", 1)); @@ -5077,8 +5077,8 @@ public: } PARVARCOPY(BlockyVariation) - - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t = Zeps((cos(helper.In.x) + cos(helper.In.y)) / m_Mp + 1); T r = m_Weight / t; @@ -5091,7 +5091,7 @@ public: T b = SafeSqrt(1 - SQR(a)); helper.Out.x = m_Vx * atan2(a, b) * r; - + a = helper.In.y / Zeps(ymax); b = SafeSqrt(1 - SQR(a)); @@ -5099,7 +5099,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -5134,8 +5134,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_V = m_Weight / T(M_PI_2); m_Vx = m_V * m_X; @@ -5146,7 +5146,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "blocky_x", 1)); m_Params.push_back(ParamWithName(&m_Y, prefix + "blocky_y", 1)); @@ -5232,13 +5232,13 @@ MAKEPREPOSTPARVAR(Blocky, blocky, BLOCKY) // // VARCOPY(LinearXZVariation) // -// void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) +// virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override // { // helper.Out.x = m_Weight * helper.In.x; // helper.Out.z = m_Weight * helper.In.z; // } // -// virtual string OpenCLString() +// virtual string OpenCLString() override // { // ostringstream ss; // int varIndex = IndexInXform(); @@ -5263,13 +5263,13 @@ MAKEPREPOSTPARVAR(Blocky, blocky, BLOCKY) // // VARCOPY(LinearYZVariation) // -// void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) +// virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override // { // helper.Out.y = m_Weight * helper.In.y; // helper.Out.z = m_Weight * helper.In.z; // } // -// virtual string OpenCLString() +// virtual string OpenCLString() override // { // ostringstream ss; // int varIndex = IndexInXform(); @@ -5282,4 +5282,4 @@ MAKEPREPOSTPARVAR(Blocky, blocky, BLOCKY) // return ss.str(); // } //}; -} \ No newline at end of file +} diff --git a/Source/Ember/Variations05.h b/Source/Ember/Variations05.h index c414fc0..34e026c 100644 --- a/Source/Ember/Variations05.h +++ b/Source/Ember/Variations05.h @@ -17,8 +17,8 @@ public: } PARVARCOPY(Bubble2Variation) - - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t = T(0.25) * (helper.m_PrecalcSumSquares + SQR(helper.In.z)) + 1; T r = m_Weight / t; @@ -34,7 +34,7 @@ public: helper.Out.z += helper.In.z * r * m_Z;//The += is intentional. } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -66,7 +66,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "bubble2_x", 1));//Original used a prefix of bubble_, which is incompatible with Ember's design. m_Params.push_back(ParamWithName(&m_Y, prefix + "bubble2_y", 1)); @@ -93,7 +93,7 @@ public: PARVARCOPY(CircleLinearVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int m = Floor(T(0.5) * helper.In.x / m_Sc); int n = Floor(T(0.5) * helper.In.y / m_Sc); @@ -141,8 +141,8 @@ public: helper.Out.y = m_Weight * (y + (n * 2 + 1) * m_Sc); helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -156,7 +156,7 @@ public: string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string seed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tint m = (int)floor(0.5 * vIn.x / " << sc << ");\n" << "\t\tint n = (int)floor(0.5 * vIn.y / " << sc << ");\n" @@ -238,7 +238,7 @@ protected: m_Params.push_back(ParamWithName(&m_Y, prefix + "CircleLinear_Y", 10)); m_Params.push_back(ParamWithName(&m_Seed, prefix + "CircleLinear_Seed", 0, INTEGER)); } - + private: T DiscreteNoise2(int x, int y) { @@ -275,7 +275,7 @@ public: PARVARCOPY(CircleRandVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int m, n, iters = 0; T x, y, u; @@ -299,8 +299,8 @@ public: helper.Out.y = m_Weight * (y + (n * 2 + 1) * m_Sc); helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -311,7 +311,7 @@ public: string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string seed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tint m, n, iters = 0;\n" << "\t\treal_t x, y, u;\n" @@ -366,7 +366,7 @@ protected: m_Params.push_back(ParamWithName(&m_Y, prefix + "CircleRand_Y", 10)); m_Params.push_back(ParamWithName(&m_Seed, prefix + "CircleRand_Seed", 0, INTEGER)); } - + private: T DiscreteNoise2(int x, int y) { @@ -400,7 +400,7 @@ public: PARVARCOPY(CircleTrans1Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T ux, uy, u, x, y; @@ -427,8 +427,8 @@ public: helper.Out.y = m_Weight * uy; helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -439,7 +439,7 @@ public: string x = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string seed = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t ux, uy, u, x, y;\n" << "\n" @@ -528,7 +528,7 @@ protected: m_Params.push_back(ParamWithName(&m_Y, prefix + "CircleTrans1_Y", 10)); m_Params.push_back(ParamWithName(&m_Seed, prefix + "CircleTrans1_Seed", 0, INTEGER)); } - + private: T DiscreteNoise2(int x, int y) { @@ -561,12 +561,12 @@ private: u = T(0.3) + T(0.7) * DiscreteNoise2(m + 10, n + 3); x = u * cos(alpha); y = u * sin(alpha); - + if (++iters > 10) break; } while (DiscreteNoise2((int)(m + m_Seed), n) > m_Dens); - + *ux = x + (m * 2 + 1) * m_Sc; *vy = y + (n * 2 + 1) * m_Sc; } @@ -591,8 +591,8 @@ public: } PARVARCOPY(Cubic3DVariation) - - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int useNode = rand.Rand() & 7;//Faster than % 8. T exnze, wynze, znxy; @@ -665,7 +665,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -693,7 +693,7 @@ public: if (m_VarType == VARTYPE_PRE) { - ss << + ss << "\t\tpx = vIn.x;\n" "\t\tpy = vIn.y;\n" "\t\tpz = vIn.z;\n"; @@ -754,8 +754,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { if (fabs(m_Xpand) <= 1) m_Fill = m_Xpand * T(0.5); @@ -784,7 +784,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Xpand, prefix + "cubic3D_xpand", T(0.25))); m_Params.push_back(ParamWithName(&m_Style, prefix + "cubic3D_style")); @@ -814,8 +814,8 @@ public: } PARVARCOPY(CubicLattice3DVariation) - - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int useNode = rand.Rand() & 7;//Faster than % 8. T exnze, wynze, znxy, px, py, pz, lattd = m_Weight; @@ -825,7 +825,7 @@ public: exnze = cos(atan2(helper.In.x, helper.In.z)); wynze = sin(atan2(helper.In.y, helper.In.z)); znxy = (exnze + wynze) * T(0.5); - } + } else { exnze = 1; @@ -895,7 +895,7 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -924,7 +924,7 @@ public: if (m_VarType == VARTYPE_PRE) { - ss << + ss << "\t\tpx = vIn.x;\n" "\t\tpy = vIn.y;\n" "\t\tpz = vIn.z;\n"; @@ -989,7 +989,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { if (fabs(m_Xpand) <= 1) m_Fill = m_Xpand * T(0.5); @@ -1001,7 +1001,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Xpand, prefix + "cubicLattice_3D_xpand", T(0.2)));//Original used a prefix of cubic3D_, which is incompatible with Ember's design. m_Params.push_back(ParamWithName(&m_Style, prefix + "cubicLattice_3D_style", 1, INTEGER, 1, 2)); @@ -1025,7 +1025,7 @@ public: VARCOPY(Foci3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T expx = exp(helper.In.x) * T(0.5); T expnx = T(0.25) / expx; @@ -1037,7 +1037,7 @@ public: helper.Out.z = sin(boot) * tmp; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1070,8 +1070,8 @@ public: } PARVARCOPY(HoVariation) - - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T uu = SQR(helper.In.x); T vv = SQR(helper.In.y); @@ -1094,7 +1094,7 @@ public: helper.Out.z = m_Weight * z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1133,7 +1133,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_XPow, prefix + "ho_xpow", 3)); m_Params.push_back(ParamWithName(&m_YPow, prefix + "ho_ypow", 3)); @@ -1160,7 +1160,7 @@ public: PARVARCOPY(Julia3DqVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T temp = helper.m_PrecalcAtanyx * m_InvPower + rand.Rand() * m_InvPower2pi; T sina = sin(temp); @@ -1175,7 +1175,7 @@ public: helper.Out.z = r * z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1187,7 +1187,7 @@ public: string absInvPower = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string halfInvPower = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string invPower2pi = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t temp = precalcAtanyx * " << invPower << " + MwcNext(mwc) * " << invPower2pi << ";\n" << "\t\treal_t sina = sin(temp);\n" @@ -1205,7 +1205,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_InvPower = m_Divisor / m_Power; m_AbsInvPower = fabs(m_InvPower); @@ -1250,7 +1250,7 @@ public: PARVARCOPY(LineVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = rand.Frand01() * m_Weight; @@ -1259,7 +1259,7 @@ public: helper.Out.z = m_Uz * r; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1270,7 +1270,7 @@ public: string ux = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string uy = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string uz = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t r = MwcNext01(mwc) * xform->m_VariationWeights[" << varIndex << "];\n" << "\n" @@ -1282,7 +1282,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { //Unit vector of the line. m_Ux = cos(m_Delta * T(M_PI)) * cos(m_Phi * T(M_PI)); @@ -1332,7 +1332,7 @@ public: PARVARCOPY(Loonie3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T rmod = rand.Frand01() * T(0.5) + T(0.125); T kikr = helper.m_PrecalcAtanyx; @@ -1355,14 +1355,14 @@ public: } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); ss2 << "_" << XformIndexInEmber() << "]"; string index = ss2.str(); string vv = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t rmod = MwcNext01(mwc) * 0.5 + 0.125;\n" << "\t\treal_t kikr = precalcAtanyx;\n" @@ -1388,7 +1388,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Vv = SQR(m_Weight); } @@ -1420,7 +1420,7 @@ public: PARVARCOPY(McarpetVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t = helper.m_PrecalcSumSquares * T(0.25) + 1; T r = m_Weight / t; @@ -1432,7 +1432,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1442,7 +1442,7 @@ public: string y = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string twist = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string tilt = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t t = precalcSumSquares * 0.25 + 1;\n" << "\t\treal_t r = xform->m_VariationWeights[" << varIndex << "] / t;\n" @@ -1493,7 +1493,7 @@ public: PARVARCOPY(Waves23DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T avgxy = (helper.In.x + helper.In.y) * T(0.5); @@ -1502,7 +1502,7 @@ public: helper.Out.z = m_Weight * (helper.In.z + m_Scale * sin(avgxy * m_Freq));//Averages the XY to get Z. } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1510,7 +1510,7 @@ public: string index = ss2.str(); string freq = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string scale = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\treal_t avgxy = (vIn.x + vIn.y) * 0.5;\n" << "\n" @@ -1551,7 +1551,7 @@ public: PARVARCOPY(Pie3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int sl = (int)(rand.Frand01() * m_Slices + T(0.5)); T a = m_Rotation + M_2PI * (sl + rand.Frand01() * m_Thickness) / m_Slices; @@ -1561,8 +1561,8 @@ public: helper.Out.y = r * sin(a); helper.Out.z = m_Weight * sin(r); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1584,8 +1584,8 @@ public: return ss.str(); } - - virtual void Random(QTIsaac& rand) + + virtual void Random(QTIsaac& rand) override { m_Params[0].Set((int)10 * rand.Frand01());//Slices. m_Params[1].Set(M_2PI * rand.Frand11());//Rotation. @@ -1596,7 +1596,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Slices, prefix + "pie3D_slices", 6, INTEGER_NONZERO, 1)); m_Params.push_back(ParamWithName(&m_Rotation, prefix + "pie3D_rotation", T(0.5), REAL_CYCLIC, 0, M_2PI)); @@ -1623,7 +1623,7 @@ public: PARVARCOPY(Popcorn23DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T otherZ, tempPZ = 0; T tempTZ = helper.In.z == 0 ? m_Vv * m_SinTanC * helper.m_PrecalcAtanyx : helper.In.z; @@ -1634,14 +1634,14 @@ public: otherZ = outPoint.m_Z; if (otherZ == 0) - tempPZ = m_Vv * m_SinTanC * helper.m_PrecalcAtanyx; + tempPZ = m_Vv * m_SinTanC * helper.m_PrecalcAtanyx; helper.Out.x = m_HalfWeight * (helper.In.x + m_X * sin(tan(m_C * helper.In.y))); helper.Out.y = m_HalfWeight * (helper.In.y + m_Y * sin(tan(m_C * helper.In.x))); helper.Out.z = tempPZ + m_Vv * (m_Z * m_SinTanC * tempTZ); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1674,8 +1674,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_SinTanC = sin(tan(m_C)); m_HalfWeight = m_Weight * T(0.5); @@ -1686,7 +1686,7 @@ public: m_Vv = m_Weight; } - virtual void Random(QTIsaac& rand) + virtual void Random(QTIsaac& rand) override { m_X = T(0.2) + rand.Frand01(); m_Y = T(0.2) * rand.Frand01(); @@ -1698,7 +1698,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "popcorn2_3D_x", T(0.1))); m_Params.push_back(ParamWithName(&m_Y, prefix + "popcorn2_3D_y", T(0.1))); @@ -1708,7 +1708,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_HalfWeight, prefix + "popcorn2_3D_half_weight")); m_Params.push_back(ParamWithName(true, &m_Vv, prefix + "popcorn2_3D_vv")); } - + private: T m_X; T m_Y; @@ -1730,14 +1730,14 @@ public: VARCOPY(Sinusoidal3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * sin(helper.In.x); helper.Out.y = m_Weight * sin(helper.In.y); helper.Out.z = m_Weight * (atan2(SQR(helper.In.x), SQR(helper.In.y)) * cos(helper.In.z)); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -1766,7 +1766,7 @@ public: PARVARCOPY(Scry3DVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T t = helper.m_PrecalcSumSquares + SQR(helper.In.z); T r = 1 / (sqrt(t) * (t + m_InvWeight)); @@ -1777,7 +1777,7 @@ public: helper.Out.z = z * r; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1797,8 +1797,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_InvWeight = 1 / Zeps(m_Weight); } @@ -1807,11 +1807,11 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(true, &m_InvWeight, prefix + "scry_3D_inv_weight"));//Precalcs only, no params. } - + private: T m_InvWeight;//Precalcs only, no params. }; @@ -1830,7 +1830,7 @@ public: PARVARCOPY(ShredlinVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const int xpos = helper.In.x < 0; const int ypos = helper.In.y < 0; @@ -1843,8 +1843,8 @@ public: //outPoint.m_X = 0; //outPoint.m_Y = 0; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -1873,7 +1873,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_Xw = m_Weight * m_XDistance; m_Yw = m_Weight * m_YDistance; @@ -1885,7 +1885,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_XDistance, prefix + "shredlin_xdistance", 1, REAL_NONZERO)); m_Params.push_back(ParamWithName(&m_XWidth, prefix + "shredlin_xwidth", T(0.5), REAL, -1, 1)); @@ -1922,7 +1922,7 @@ public: PARVARCOPY(SplitBrdrVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T b = m_Weight / (helper.m_PrecalcSumSquares * T(0.25) + 1); T roundX = Rint(helper.In.x); @@ -1932,7 +1932,7 @@ public: helper.Out.x = helper.In.x * b; helper.Out.y = helper.In.y * b; - + if (rand.Frand01() >= T(0.75)) { helper.Out.x += m_Weight * (offsetX * T(0.5) + roundX); @@ -1950,7 +1950,7 @@ public: else { helper.Out.x += m_Weight * (offsetX * T(0.5) + roundX - m_Y); - helper.Out.y += m_Weight * (offsetY * T(0.5) + roundY - m_Y * offsetY / offsetX); + helper.Out.y += m_Weight * (offsetY * T(0.5) + roundY - m_Y * offsetY / offsetX); } } else @@ -1972,8 +1972,8 @@ public: helper.Out.y += helper.In.y * m_Py; helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2041,7 +2041,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X, prefix + "SplitBrdr_x", T(0.25)));//Original used a prefix of splitb_, which is incompatible with Ember's design. m_Params.push_back(ParamWithName(&m_Y, prefix + "SplitBrdr_y", T(0.25))); @@ -2067,11 +2067,11 @@ public: VARCOPY(WdiscVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T a = T(M_PI) / (helper.m_PrecalcSqrtSumSquares + 1); T r = helper.m_PrecalcAtanyx * T(M_1_PI); - + if (r > 0) a = T(M_PI) - a; @@ -2080,7 +2080,7 @@ public: helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -2115,7 +2115,7 @@ public: PARVARCOPY(FalloffVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const T ax = rand.Frand(T(-0.5), T(0.5)); const T ay = rand.Frand(T(-0.5), T(0.5)); @@ -2157,8 +2157,8 @@ public: break; } } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2222,7 +2222,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_InternalScatter = T(0.04) * m_Scatter; } @@ -2231,7 +2231,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Scatter, prefix + "falloff_scatter", 1, REAL, EPS, TMAX)); m_Params.push_back(ParamWithName(&m_MinDist, prefix + "falloff_mindist", T(0.5), REAL, 0, TMAX)); @@ -2276,7 +2276,7 @@ public: PARVARCOPY(Falloff2Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const v4T random(rand.Frand(T(-0.5), T(0.5)), rand.Frand(T(-0.5), T(0.5)), rand.Frand(T(-0.5), T(0.5)), rand.Frand(T(-0.5), T(0.5))); const T distA = sqrt(Sqr(helper.In.x - m_X0) + Sqr(helper.In.y - m_Y0) + Sqr(helper.In.z - m_Z0)); @@ -2290,7 +2290,7 @@ public: helper.Out.x = helper.In.x + m_MulX * random.x * dist; helper.Out.y = helper.In.y + m_MulY * random.y * dist; helper.Out.z = helper.In.z + m_MulZ * random.z * dist; - outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, 1)); + outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, T(1))); } break; case 1://Radial. @@ -2314,7 +2314,7 @@ public: helper.Out.x = r * sigmac * phic; helper.Out.y = r * sigmac * phis; helper.Out.z = r * sigmas; - outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, 1)); + outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, T(1))); } break; case 2://Gaussian. @@ -2330,13 +2330,13 @@ public: helper.Out.x = helper.In.x + m_MulX * rad * sigmac * phic; helper.Out.y = helper.In.y + m_MulY * rad * sigmac * phis; helper.Out.z = helper.In.z + m_MulZ * rad * sigmas; - outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, 1)); + outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, T(1))); } break; } } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2418,7 +2418,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_RMax = T(0.04) * m_Scatter; } @@ -2427,7 +2427,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Scatter, prefix + "falloff2_scatter", 1, REAL, EPS, TMAX)); m_Params.push_back(ParamWithName(&m_MinDist, prefix + "falloff2_mindist", T(0.5), REAL, 0, TMAX)); @@ -2472,7 +2472,7 @@ public: PARVARCOPY(Falloff3Variation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { const v4T random(rand.Frand(T(-0.5), T(0.5)), rand.Frand(T(-0.5), T(0.5)), rand.Frand(T(-0.5), T(0.5)), rand.Frand(T(-0.5), T(0.5))); T radius; @@ -2504,7 +2504,7 @@ public: helper.Out.x = helper.In.x + m_MulX * rad * sigmac * phic; helper.Out.y = helper.In.y + m_MulY * rad * sigmac * phis; helper.Out.z = helper.In.z + m_MulZ * rad * sigmas; - outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, 1)); + outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, T(1))); } break; case 1://Radial. @@ -2528,7 +2528,7 @@ public: helper.Out.x = r * sigmac * phic; helper.Out.y = r * sigmac * phis; helper.Out.z = r * sigmas; - outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, 1)); + outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + m_MulC * random.w * dist, T(1))); } break; case 2://Log. @@ -2538,13 +2538,13 @@ public: helper.Out.x = helper.In.x + LogMap(m_MulX) * LogScale(random.x) * coeff, helper.Out.y = helper.In.y + LogMap(m_MulY) * LogScale(random.y) * coeff, helper.Out.z = helper.In.z + LogMap(m_MulZ) * LogScale(random.z) * coeff, - outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + LogMap(m_MulC) * LogScale(random.w) * coeff, 1)); + outPoint.m_ColorX = fabs(fmod(outPoint.m_ColorX + LogMap(m_MulC) * LogScale(random.w) * coeff, T(1))); } break; } } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2642,7 +2642,7 @@ public: return ss.str(); } - virtual void Precalc() + virtual void Precalc() override { m_RMax = T(0.04) * m_BlurStrength; } @@ -2700,7 +2700,7 @@ public: PARVARCOPY(XtrbVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int m, n; T alpha, beta, offsetAl, offsetBe, offsetGa, x, y; @@ -2736,8 +2736,8 @@ public: helper.Out.y = m_Weight * y; helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -2771,7 +2771,7 @@ public: string width3 = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string absN = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string cn = "parVars[" + ToUpper(m_Params[i++].Name()) + index; - + ss << "\t{\n" << "\t\tint m, n;\n" << "\t\treal_t alpha, beta, offsetAl, offsetBe, offsetGa, x, y;\n" @@ -2995,7 +2995,7 @@ public: ; } - virtual void Precalc() + virtual void Precalc() override { T s2, sinA2, cosA2, sinB2, cosB2, sinC2, cosC2; T br = T(0.047) + m_A; @@ -3078,7 +3078,7 @@ protected: m_Params.push_back(ParamWithName(true, &m_AbsN, prefix + "xtrb_absn")); m_Params.push_back(ParamWithName(true, &m_Cn, prefix + "xtrb_cn")); } - + private: inline void DirectTrilinear(T x, T y, T& al, T& be) { @@ -3096,7 +3096,7 @@ private: x = r * cos(angle); y = r * sin(angle); } - + void Hex(T al, T be, T ga, T& al1, T& be1, QTIsaac& rand) { T ga1, de1, r = rand.Frand01(); @@ -3133,7 +3133,7 @@ private: de1 = m_Width1 * be + m_Width2 * m_Hb * be / ga; ga1 = m_Width1 * ga + m_Width2 * m_S2ac * (3 - be / ga); } - + al1 = m_S2a - m_Ba * de1 - m_Ca * ga1; be1 = de1; } @@ -3166,7 +3166,7 @@ private: ga1 = m_Width1 * ga + m_Width2 * m_Hc * ga / al; de1 = m_Width1 * al + m_Width2 * m_S2ab * (3 - ga / al); } - + be1 = m_S2b - m_Ab * de1 - m_Cb * ga1; al1 = de1; } @@ -3184,7 +3184,7 @@ private: de1 = m_Width1 * al + m_Width2 * m_Ha * al / ga; ga1 = m_Width1 * ga + m_Width2 * m_S2bc * (3 - al / ga); } - + be1 = m_S2b - m_Ab * de1 - m_Cb * ga1; al1 = de1; } diff --git a/Source/Ember/VariationsDC.h b/Source/Ember/VariationsDC.h index f370638..571b221 100644 --- a/Source/Ember/VariationsDC.h +++ b/Source/Ember/VariationsDC.h @@ -20,7 +20,7 @@ public: PARVARCOPY(DCBubbleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T r = helper.m_PrecalcSumSquares; T r4_1 = Zeps(r / 4 + 1); @@ -35,8 +35,8 @@ public: outPoint.m_ColorX = fmod(fabs(m_Bdcs * (Sqr(tempX + m_CenterX) + Sqr(tempY + m_CenterY))), T(1.0)); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -64,8 +64,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Bdcs = 1 / (m_Scale == 0 ? T(10E-6) : m_Scale); } @@ -74,7 +74,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_CenterX, prefix + "dc_bubble_centerx"));//Params. m_Params.push_back(ParamWithName(&m_CenterY, prefix + "dc_bubble_centery")); @@ -103,7 +103,7 @@ public: PARVARCOPY(DCCarpetVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { int x0 = rand.RandBit() ? -1 : 1; int y0 = rand.RandBit() ? -1 : 1; @@ -111,14 +111,14 @@ public: T y = helper.In.y + y0; T x0_xor_y0 = T(x0 ^ y0); T h = -m_H + (1 - x0_xor_y0) * m_H; - - helper.Out.x = m_Weight * (m_Xform->m_Affine.A() * x + m_Xform->m_Affine.B() * y + m_Xform->m_Affine.E()); + + helper.Out.x = m_Weight * (m_Xform->m_Affine.A() * x + m_Xform->m_Affine.B() * y + m_Xform->m_Affine.E()); helper.Out.y = m_Weight * (m_Xform->m_Affine.C() * x + m_Xform->m_Affine.D() * y + m_Xform->m_Affine.F()); helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z; outPoint.m_ColorX = fmod(fabs(outPoint.m_ColorX * T(0.5) * (1 + h) + x0_xor_y0 * (1 - h) * T(0.5)), T(1.0)); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -143,8 +143,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_H = T(0.1) * m_Origin; } @@ -153,7 +153,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Origin, prefix + "dc_carpet_origin"));//Params. m_Params.push_back(ParamWithName(true, &m_H, prefix + "dc_carpet_h"));//Precalc. @@ -178,14 +178,14 @@ public: PARVARCOPY(DCCubeVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x, y, z; T p = 2 * rand.Frand01() - 1; T q = 2 * rand.Frand01() - 1; unsigned int i = rand.Rand(3); unsigned int j = rand.RandBit(); - + switch (i) { case 0: @@ -197,7 +197,7 @@ public: outPoint.m_ColorX = m_ClampC1; else outPoint.m_ColorX = m_ClampC2; - + break; case 1: x = m_Weight * p; @@ -208,18 +208,18 @@ public: outPoint.m_ColorX = m_ClampC3; else outPoint.m_ColorX = m_ClampC4; - + break; case 2: x = m_Weight * p; y = m_Weight * q; z = m_Weight * (j ? -1 : 1); - + if (j) outPoint.m_ColorX = m_ClampC5; else outPoint.m_ColorX = m_ClampC6; - + break; } @@ -227,8 +227,8 @@ public: helper.Out.y = y * m_DcCubeY; helper.Out.z = z * m_DcCubeZ; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -301,8 +301,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_ClampC1 = Clamp(m_DcCubeC1, 0, 1); m_ClampC2 = Clamp(m_DcCubeC2, 0, 1); @@ -316,7 +316,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_DcCubeC1, prefix + "dc_cube_c1"));//Params. m_Params.push_back(ParamWithName(&m_DcCubeC2, prefix + "dc_cube_c2")); @@ -369,7 +369,7 @@ public: PARVARCOPY(DCCylinderVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T temp = rand.Frand01() * M_2PI; T sr = sin(temp); @@ -385,8 +385,8 @@ public: outPoint.m_ColorX = fmod(fabs(T(0.5) * (m_Ldcs * ((m_Cosa * tempX + m_Sina * tempY + m_Offset)) + 1)), T(1.0)); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -420,8 +420,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { sincos(m_Angle, &m_Sina, &m_Cosa); m_Ldcs = 1 / (m_Scale == 0.0 ? T(10E-6) : m_Scale); @@ -432,7 +432,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Offset, prefix + "dc_cylinder_offset"));//Params. m_Params.push_back(ParamWithName(&m_Angle, prefix + "dc_cylinder_angle"));//Original used a prefix of dc_cyl_, which is incompatible with Ember's design. @@ -470,7 +470,7 @@ public: VARCOPY(DCGridOutVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T x = LRint(helper.In.x); T y = LRint(helper.In.y); @@ -547,7 +547,7 @@ public: outPoint.m_ColorX = fmod(c, T(1.0)); } - virtual string OpenCLString() + virtual string OpenCLString() override { ostringstream ss; int varIndex = IndexInXform(); @@ -648,7 +648,7 @@ public: PARVARCOPY(DCLinearVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { helper.Out.x = m_Weight * helper.In.x; helper.Out.y = m_Weight * helper.In.y; @@ -659,8 +659,8 @@ public: outPoint.m_ColorX = fmod(fabs(T(0.5) * (m_Ldcs * ((m_Cosa * tempX + m_Sina * tempY + m_Offset)) + T(1.0))), T(1.0)); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -687,8 +687,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_Ldcs = 1 / (m_Scale == 0 ? T(10E-6) : m_Scale); m_Ldca = m_Offset * T(M_PI); @@ -699,7 +699,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_Offset, prefix + "dc_linear_offset"));//Params. m_Params.push_back(ParamWithName(&m_Angle, prefix + "dc_linear_angle")); @@ -734,32 +734,32 @@ public: PARVARCOPY(DCTriangleVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { // set up triangle - const T + const T xx = m_Xform->m_Affine.A(), xy = m_Xform->m_Affine.B(), // X yx = m_Xform->m_Affine.C() * -1, yy = m_Xform->m_Affine.D() * -1, // Y ox = m_Xform->m_Affine.E(), oy = m_Xform->m_Affine.F(), // O px = helper.In.x - ox, py = helper.In.y - oy; // P - + // calculate dot products const T dot00 = xx * xx + xy * xy; // X * X const T dot01 = xx * yx + xy * yy; // X * Y const T dot02 = xx * px + xy * py; // X * P const T dot11 = yx * yx + yy * yy; // Y * Y const T dot12 = yx * px + yy * py; // Y * P - + // calculate barycentric coordinates const T denom = (dot00 * dot11 - dot01 * dot01); const T num_u = (dot11 * dot02 - dot01 * dot12); const T num_v = (dot00 * dot12 - dot01 * dot02); - + // u, v must not be constant T u = num_u / denom; T v = num_v / denom; int inside = 0, f = 1; - + // case A - point escapes edge XY if (u + v > 1) { @@ -785,7 +785,7 @@ public: { inside = 1;// case C - point is in triangle } - + // handle outside points if (m_ZeroEdges && !inside) { @@ -820,8 +820,8 @@ public: helper.Out.z = m_Weight * helper.In.z; outPoint.m_ColorX = fmod(fabs(u + v), T(1.0)); } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -911,8 +911,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_A = Clamp(m_ScatterArea, -1, 1); } @@ -921,7 +921,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_ScatterArea, prefix + "dc_triangle_scatter_area", 0, REAL, -1, 1));//Params. m_Params.push_back(ParamWithName(&m_ZeroEdges, prefix + "dc_triangle_zero_edges", 0, INTEGER, 0, 1)); @@ -950,7 +950,7 @@ public: PARVARCOPY(DCZTranslVariation) - void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) + virtual void Func(IteratorHelper& helper, Point& outPoint, QTIsaac& rand) override { T zf = m_Factor * (outPoint.m_ColorX - m_X0_) / m_X1_m_x0; @@ -965,8 +965,8 @@ public: else helper.Out.z = m_Weight * zf; } - - virtual string OpenCLString() + + virtual string OpenCLString() override { ostringstream ss, ss2; int i = 0, varIndex = IndexInXform(); @@ -998,8 +998,8 @@ public: return ss.str(); } - - virtual void Precalc() + + virtual void Precalc() override { m_X0_ = m_X0 < m_X1 ? m_X0 : m_X1; m_X1_ = m_X0 > m_X1 ? m_X0 : m_X1; @@ -1010,7 +1010,7 @@ protected: void Init() { string prefix = Prefix(); - + m_Params.clear(); m_Params.push_back(ParamWithName(&m_X0, prefix + "dc_ztransl_x0", 0, REAL, 0, 1));//Params. m_Params.push_back(ParamWithName(&m_X1, prefix + "dc_ztransl_x1", 1, REAL, 0, 1)); diff --git a/Source/Ember/Xform.h b/Source/Ember/Xform.h index f027bb9..623c319 100644 --- a/Source/Ember/Xform.h +++ b/Source/Ember/Xform.h @@ -1,6 +1,7 @@ #pragma once #include "VariationList.h" +#include "Interpolate.h" /// /// Xform class. @@ -600,7 +601,7 @@ public: iterHelper.In.x = iterHelper.m_TransX;//Read must be done before every pre variation because transX/Y are changing. iterHelper.In.y = iterHelper.m_TransY; iterHelper.In.z = iterHelper.m_TransZ; - m_PreVariations[i]->Precalc(iterHelper, inPoint);//Apply per-variation precalc, the second parameter is unused for pre variations. + m_PreVariations[i]->PrecalcHelper(iterHelper, inPoint);//Apply per-variation precalc, the second parameter is unused for pre variations. m_PreVariations[i]->Func(iterHelper, *outPoint, rand); WritePre(iterHelper, m_PreVariations[i]->AssignType()); } @@ -652,7 +653,7 @@ public: iterHelper.In.x = outPoint->m_X;//Read must be done before every post variation because the out point is changing. iterHelper.In.y = outPoint->m_Y; iterHelper.In.z = outPoint->m_Z; - m_PostVariations[i]->Precalc(iterHelper, outPoint);//Apply per-variation precalc. + m_PostVariations[i]->PrecalcHelper(iterHelper, outPoint);//Apply per-variation precalc. m_PostVariations[i]->Func(iterHelper, *outPoint, rand); WritePost(iterHelper, *outPoint, m_PostVariations[i]->AssignType()); } diff --git a/Source/Ember/XmlToEmber.h b/Source/Ember/XmlToEmber.h index 60423c6..73eb750 100644 --- a/Source/Ember/XmlToEmber.h +++ b/Source/Ember/XmlToEmber.h @@ -275,7 +275,7 @@ public: rootnode = xmlDocGetRootElement(doc); //Scan for nodes, starting with this node. - bn = basename(filename); + bn = basename((char*)filename); ScanForEmberNodes(rootnode, bn, embers); xmlFreeDoc(doc); emberSize = (unsigned int)embers.size(); @@ -358,7 +358,7 @@ public: /// The string to convert /// The converted value /// True if success, else false. - bool Atof(char* str, T& val) + bool Atof(const char* str, T& val) { bool b = true; char* endp; @@ -393,7 +393,7 @@ public: /// The string to convert /// The converted unsigned integer value /// True if success, else false. - bool Atoi(char* str, unsigned int& val) + bool Atoi(const char* str, unsigned int& val) { return Atoi(str, (int&)val); } @@ -405,7 +405,7 @@ public: /// The string to convert /// The converted unsigned integer value /// True if success, else false. - bool Atoi(char* str, int& val) + bool Atoi(const char* str, int& val) { bool b = true; char* endp; @@ -444,7 +444,11 @@ public: { char ch[16]; +#ifdef WIN32 _itoa_s(i, ch, 16, radix); +#else + sprintf(ch, "%d", i); +#endif return string(ch); } @@ -455,11 +459,15 @@ public: /// The unsigned 64-bit integer to convert /// The radix of the integer. Default: 10. /// The converted string - static string Itos64(unsigned __int64 i, int radix = 10) + static string Itos64(uint64_t i, int radix = 10) { char ch[64]; +#ifdef WIN32 _ui64toa_s(i, ch, 64, radix); +#else + sprintf(ch, "%lu", i); +#endif return string(ch); } @@ -1393,8 +1401,12 @@ private: colorCount++; } while (colorCount < numColors && colorCount < ember.m_Palette.m_Entries.size()); - - if (sscanf_s(&(colstr[colorIndex]),"%1s", tmps, sizeof(tmps)) > 0) + +#ifdef WIN32 + if (sscanf_s(&(colstr[colorIndex]),"%1s", tmps, sizeof(tmps)) > 0)//Really need to migrate all of this parsing to C++.//TODO +#else + if (sscanf_s(&(colstr[colorIndex]),"%1s", tmps) > 0) +#endif { m_ErrorReport.push_back(string(loc) + " : Extra data at end of hex color data " + string(&(colstr[colorIndex]))); ok = false; @@ -1457,7 +1469,7 @@ private: /// The parsed value /// Bitwise ANDed with true if name matched str and the call to Atof() succeeded, else false. Used for keeping a running value between successive calls. /// True if the tag was matched, else false - bool ParseAndAssignFloat(const xmlChar* name, char* attStr, char* str, T& val, bool& b) + bool ParseAndAssignFloat(const xmlChar* name, const char* attStr, const char* str, T& val, bool& b) { bool ret = false; @@ -1479,7 +1491,7 @@ private: /// The parsed value /// Bitwise ANDed with true if name matched str and the call to Atoi() succeeded, else false. Used for keeping a running value between successive calls. /// True if the tag was matched, else false - bool ParseAndAssignInt(const xmlChar* name, char* attStr, char* str, unsigned int& val, bool& b) + bool ParseAndAssignInt(const xmlChar* name, const char* attStr, const char* str, unsigned int& val, bool& b) { return ParseAndAssignInt(name, attStr, str, (int&)val, b); } @@ -1493,7 +1505,7 @@ private: /// The parsed value /// Bitwise ANDed with true if name matched str and the call to Atoi() succeeded, else false. Used for keeping a running value between successive calls. /// True if the tag was matched, else false - bool ParseAndAssignInt(const xmlChar* name, char* attStr, char* str, int& val, bool& b) + bool ParseAndAssignInt(const xmlChar* name, const char* attStr, const char* str, int& val, bool& b) { bool ret = false; T fval = 0; diff --git a/Source/EmberAnimate/EmberAnimate.rc b/Source/EmberAnimate/EmberAnimate.rc index 1ed1ed6..8dcb8de 100644 --- a/Source/EmberAnimate/EmberAnimate.rc +++ b/Source/EmberAnimate/EmberAnimate.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,1,2 - PRODUCTVERSION 0,4,1,2 + FILEVERSION 0,4,1,3 + PRODUCTVERSION 0,4,1,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as animations with motion blur" - VALUE "FileVersion", "0.4.1.2" + VALUE "FileVersion", "0.4.1.3" VALUE "InternalName", "EmberAnimate.rc" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3" VALUE "OriginalFilename", "EmberAnimate.rc" VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "0.4.1.2" + VALUE "ProductVersion", "0.4.1.3" END END BLOCK "VarFileInfo" diff --git a/Source/EmberCL/DllMain.cpp b/Source/EmberCL/DllMain.cpp index 3b3e62c..443e6be 100644 --- a/Source/EmberCL/DllMain.cpp +++ b/Source/EmberCL/DllMain.cpp @@ -1,5 +1,6 @@ #include "EmberCLPch.h" +#ifdef _WIN32 /// /// Generated by Visual Studio to make the DLL run properly. /// @@ -18,3 +19,4 @@ BOOL APIENTRY DllMain( HMODULE hModule, } return TRUE; } +#endif \ No newline at end of file diff --git a/Source/EmberCommon/JpegUtils.h b/Source/EmberCommon/JpegUtils.h index e3494cf..a0e974c 100644 --- a/Source/EmberCommon/JpegUtils.h +++ b/Source/EmberCommon/JpegUtils.h @@ -151,7 +151,7 @@ static bool WritePng(const char* filename, unsigned char* image, unsigned int wi text[0].compression = PNG_TEXT_COMPRESSION_NONE; text[0].key = "flam3_version"; - text[0].text = EmberVersion(); + text[0].text = (png_charp)EmberVersion(); text[1].compression = PNG_TEXT_COMPRESSION_NONE; text[1].key = "flam3_nickname"; diff --git a/Source/EmberGenome/EmberGenome.rc b/Source/EmberGenome/EmberGenome.rc index 593cad0..b14d08d 100644 --- a/Source/EmberGenome/EmberGenome.rc +++ b/Source/EmberGenome/EmberGenome.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,1,2 - PRODUCTVERSION 0,4,1,2 + FILEVERSION 0,4,1,3 + PRODUCTVERSION 0,4,1,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Manipulates fractal flames parameter files" - VALUE "FileVersion", "0.4.1.2" + VALUE "FileVersion", "0.4.1.3" VALUE "InternalName", "EmberGenome.rc" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3" VALUE "OriginalFilename", "EmberGenome.rc" VALUE "ProductName", "Ember Genome" - VALUE "ProductVersion", "0.4.1.2" + VALUE "ProductVersion", "0.4.1.3" END END BLOCK "VarFileInfo" diff --git a/Source/EmberRender/EmberRender.rc b/Source/EmberRender/EmberRender.rc index 530af1f..41b75a6 100644 --- a/Source/EmberRender/EmberRender.rc +++ b/Source/EmberRender/EmberRender.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,1,2 - PRODUCTVERSION 0,4,1,2 + FILEVERSION 0,4,1,3 + PRODUCTVERSION 0,4,1,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as single images" - VALUE "FileVersion", "0.4.1.2" + VALUE "FileVersion", "0.4.1.3" VALUE "InternalName", "EmberRender.rc" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3" VALUE "OriginalFilename", "EmberRender.rc" VALUE "ProductName", "Ember Render" - VALUE "ProductVersion", "0.4.1.2" + VALUE "ProductVersion", "0.4.1.3" END END BLOCK "VarFileInfo" diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index c14ff39..0ec6449 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -52,7 +52,7 @@ - <html><head/><body><p align="center"><br/><span style=" font-size:12pt;">Fractorium 0.4.1.2 Beta</span></p><p align="center"><span style=" font-size:10pt;"><br/>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"><span style=" font-size:10pt;">Matt Feemster</span></p></body></html> + <html><head/><body><p align="center"><br/><span style=" font-size:12pt;">Fractorium 0.4.1.3 Beta</span></p><p align="center"><span style=" font-size:10pt;"><br/>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"><span style=" font-size:10pt;">Matt Feemster</span></p></body></html> Qt::RichText diff --git a/Source/Fractorium/Fractorium.rc b/Source/Fractorium/Fractorium.rc index 788b6ac0da11bb11f36c1ad437724877611c99b4..fe3d5b5eb325267161783435a9a3a5b750b0dbd3 100644 GIT binary patch delta 46 wcmcbod{23U7YC#9WN!{bM&r%39PG?Mjv|-%WC32W&6~KHm>}HEXLyBJ04_}nv;Y7A delta 46 wcmcbod{23U7YC!!WN!{bMx)KO9PG?Mjv|-%WC32W&6~KHm>}HEXLyBJ04?MTumAu6