mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -05:00
de613404de
--Add support for Exr files which use 32-bit floats for each RGBA channel. Seems to come out too washed out. --Allow for clearing an individual color curve. --Allow for saving multiple image types in EmberRender and EmberAnimate. All writes are threaded. --Remove --bpc command line argument. Add format png16 as a replacement. --Remove --enable_jpg_comments and --enable_png_comments command line arguments, and replace them with --enable_comments which applies to jpg, png and exr. --Add menu items to variations and affine spinners which allow for easy entry of specific numeric values like pi. --Make final render dialog be wider rather than so tall. Bug fixes: --Fix some OpenCL compile errors on Mac. --Remove ability to save bitmap files on all platforms but Windows. Code changes: --New dependency on OpenEXR. --Allow Curves class to interact with objects of a different template type. --Make m_Curves member of Ember always use float as template type. --Set the length of the curves array to always be 2^17 which should offer enough precision with new 32-bit float pixel types. --Set pixel types to always be 32-bit float. This results in a major reduction of code in the final accumulation part of Renderer.h/cpp. --Remove corresponding code from RendererCL and FinalAccumOpenCLKernelCreator. --Remove Transparency, NumChannels and BytesPerPixel setters from Renderer.h/cpp. --Add new global functions to format final image buffers and place all alpha calculation and scaling code in them. --Blending is no longer needed in OpenGLWidget because of the new pixel type. --Make new class, AffineDoubleSpinBox. --Attempt to make file save dialog code work the same on all OSes. --Remove some unused functions.
262 lines
14 KiB
XML
262 lines
14 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||
<?define ProductVersion="1.0.0.5" ?>
|
||
<?define ProductName="Fractorium $(var.ProductVersion) ($(var.GpuType))" ?>
|
||
<?define UpgradeCode="{4714cd15-bfba-44f6-8059-9e1466ebfa6e}"?>
|
||
<?define Manufacturer="Fractorium"?>
|
||
|
||
<!--
|
||
Original GUID,
|
||
<?define ProductCode="{703001af-6255-4671-9a69-571198b4c0dd}"?>
|
||
-->
|
||
|
||
<!--
|
||
Change this for every release.
|
||
-->
|
||
<?define ProductCode="{290BBFDC-BD1C-45F7-80AC-DE59BA4378F0}"?>
|
||
|
||
<Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
|
||
<Package
|
||
Keywords="Installer"
|
||
Platform="x64"
|
||
Description="$(var.Manufacturer)"
|
||
Comments="$(var.Manufacturer)"
|
||
Manufacturer="$(var.Manufacturer)"
|
||
InstallScope="perUser"
|
||
InstallerVersion="400"
|
||
InstallPrivileges="limited"
|
||
Compressed="yes"
|
||
Languages="1033"
|
||
SummaryCodepage="1252"
|
||
/>
|
||
|
||
<Upgrade Id="$(var.UpgradeCode)">
|
||
<UpgradeVersion Minimum="0.0.0"
|
||
IncludeMinimum="no"
|
||
OnlyDetect="no"
|
||
Maximum="$(var.ProductVersion)"
|
||
IncludeMaximum="no"
|
||
Property="PREVIOUSFOUND" />
|
||
</Upgrade>
|
||
|
||
<InstallExecuteSequence>
|
||
<RemoveExistingProducts After="InstallInitialize"/>
|
||
</InstallExecuteSequence>
|
||
|
||
<MediaTemplate EmbedCab="yes" />
|
||
|
||
<Icon Id="AddRemoveProgramsIcon" SourceFile="$(var.SolutionDir)..\..\..\Source\Fractorium\Icons\Fractorium.ico"/>
|
||
<Property Id="ARPPRODUCTICON" Value="AddRemoveProgramsIcon" />
|
||
<Feature Id="MainApplication" Title="Main Application" Level="1">
|
||
<ComponentGroupRef Id="ProductComponents" />
|
||
<ComponentGroupRef Id="PlatformComponents" />
|
||
<ComponentRef Id="FractoriumStartMenuShortcut"/>
|
||
<ComponentRef Id="FractoriumDesktopShortcut"/>
|
||
</Feature>
|
||
|
||
<WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)..\..\..\Data\gplv3.rtf" />
|
||
<WixVariable Id="WixUIBannerBmp" Value="$(var.SolutionDir)..\..\..\Source\Fractorium\Icons\banner.bmp" /><!--493 x 58 pixels -->
|
||
<WixVariable Id="WixUIDialogBmp" Value="$(var.SolutionDir)..\..\..\Source\Fractorium\Icons\dialog.bmp" /><!--493 × 312 pixels -->
|
||
|
||
<Property Id="MSIUSEREALADMINDETECTION" Value="1" />
|
||
<Property Id="MSIFASTINSTALL" Value="1" />
|
||
|
||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
|
||
<UIRef Id="WixUI_InstallDir" />
|
||
<UIRef Id="WixUI_ErrorProgressText" />
|
||
</Product>
|
||
|
||
<Fragment>
|
||
<Directory Id="TARGETDIR" Name="SourceDir" >
|
||
<!-- Doing this requires admin access, so we don't do it.
|
||
<Directory Id="ProgramFiles64Folder" >
|
||
<Directory Id="INSTALLFOLDER" Name="Fractorium" >
|
||
<Directory Id="INSTALLFOLDERPLATFORMS" Name="platforms" />
|
||
</Directory>
|
||
</Directory>
|
||
-->
|
||
|
||
<!-- Doing this doesn't require admin access.
|
||
It reports a ton of errors, but oddly enough, an MSI is still created with the errors.
|
||
-->
|
||
<Directory Id="AppDataFolder" >
|
||
<Directory Id="INSTALLFOLDER" Name="Fractorium" >
|
||
<Directory Id="INSTALLFOLDERPLATFORMS" Name="platforms" />
|
||
</Directory>
|
||
</Directory>
|
||
|
||
<!-- Shortcut folders-->
|
||
<Directory Id="ProgramMenuFolder" Name="Programs">
|
||
<Directory Id="ProgramMenuDirLevel1" Name="Fractorium" />
|
||
</Directory>
|
||
<Directory Id="DesktopFolder" Name="Desktop" />
|
||
</Directory>
|
||
</Fragment>
|
||
|
||
<Fragment>
|
||
<Component Id="FractoriumStartMenuShortcut" Directory="ProgramMenuDirLevel1" Guid="f1eaf3ba-9b61-48b6-8994-49ebc6b405aa">
|
||
<Shortcut Id="FractoriumStartMenuShortcut"
|
||
Directory="ProgramMenuDirLevel1"
|
||
Name="Fractorium"
|
||
Target="[INSTALLFOLDER]\Fractorium.exe"
|
||
WorkingDirectory="INSTALLFOLDER"
|
||
Icon="AddRemoveProgramsIcon"
|
||
/>
|
||
<Condition>1</Condition>
|
||
<RemoveFolder Id="FractoriumStartMenuShortcut" On="uninstall" />
|
||
<RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
|
||
</Component>
|
||
<Component Id="FractoriumDesktopShortcut" Directory="DesktopFolder" Guid="b73ff21c-08ac-47ad-a510-b3ce90e43979">
|
||
<Shortcut Id="FractoriumDesktopShortcut"
|
||
Directory="DesktopFolder"
|
||
Name="Fractorium"
|
||
Target="[INSTALLFOLDER]\Fractorium.exe"
|
||
WorkingDirectory="INSTALLFOLDER"
|
||
Icon="AddRemoveProgramsIcon"
|
||
/>
|
||
<RemoveFolder Id="FractoriumDesktopShortcut" On="uninstall" />
|
||
<Condition>1</Condition>
|
||
<RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
|
||
</Component>
|
||
</Fragment>
|
||
|
||
<Fragment>
|
||
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
|
||
<Component Id="Fractorium.exe" Guid="ccc04ca4-c747-4330-8cfd-bdd943b185c0">
|
||
<File Id="Fractorium.exe" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\$(var.Configuration)\Fractorium.exe" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="EmberRender.exe" Guid="12d49219-9269-495a-b8e4-3d33cb32d280">
|
||
<File Id="EmberRender.exe" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\$(var.Configuration)\EmberRender.exe" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="EmberAnimate.exe" Guid="ae362704-93a3-48dc-a13b-7c4eabd87ee1">
|
||
<File Id="EmberAnimate.exe" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\$(var.Configuration)\EmberAnimate.exe" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="EmberGenome.exe" Guid="7a93f079-216a-4d1c-9b02-8ca93a6a8daa">
|
||
<File Id="EmberGenome.exe" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\$(var.Configuration)\EmberGenome.exe" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="Ember.dll" Guid="c0f80dee-7a16-4d6a-b7ed-d6cd162154eb">
|
||
<File Id="Ember.dll" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\$(var.Configuration)\Ember.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="EmberCL.dll" Guid="21c0e372-c605-4e0d-9ba8-94e38949833b">
|
||
<File Id="EmberCL.dll" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\$(var.Configuration)\EmberCL.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="libxml2.dll" Guid="bb3aa687-7a3d-4d16-a27c-28529b472754">
|
||
<File Id="libxml2.dll" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\Release\libxml2.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="tbb.dll" Guid="ffa1b2ec-32d5-41aa-9380-fb04d8139103">
|
||
<File Id="tbb.dll" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\Release\tbb.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="msvcp140.dll" Guid="8f1ffde7-c1bd-45fb-8bc8-26dde552eafd">
|
||
<File Id="msvcp140.dll" Source="$(env.VS140COMNTOOLS)..\..\VC\redist\x64\Microsoft.VC140.CRT\msvcp140.dll" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="vcruntime140.dll" Guid="50c9bc27-c547-4a03-9f6c-cd416f449dd8">
|
||
<File Id="vcruntime140.dll" Source="$(env.VS140COMNTOOLS)..\..\VC\redist\x64\Microsoft.VC140.CRT\vcruntime140.dll" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="vccorlib140.dll" Guid="affe33e7-1e64-4bb0-a062-2b56f77459b4">
|
||
<File Id="vccorlib140.dll" Source="$(env.VS140COMNTOOLS)..\..\VC\redist\x64\Microsoft.VC140.CRT\vccorlib140.dll" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="concrt140.dll" Guid="7fb716a1-1b4f-42fb-89c7-4d216ebd6e2e">
|
||
<File Id="concrt140.dll" Source="$(env.VS140COMNTOOLS)..\..\VC\redist\x64\Microsoft.VC140.CRT\concrt140.dll" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
<Component Id="flam3palettes.xml" Guid="d3adb0bb-14ef-4923-99d9-a5784b7ef04e">
|
||
<File Id="flam3palettes.xml" Source="$(var.SolutionDir)..\..\..\Data\flam3-palettes.xml" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="userpalettes.xml" Guid="53e1e43e-b01e-4159-94fa-bdf6e8fd1d57">
|
||
<File Id="userpalettes.xml" Source="$(var.SolutionDir)..\..\..\Data\user-palettes.xml" KeyPath="yes" Checksum="yes" />
|
||
</Component>
|
||
|
||
<Component Id="boxtail_pack_02.gradient" Guid="f9bd8f21-6a61-4e4a-a7e6-bc50f2633dd6">
|
||
<File Id="boxtail_pack_02.gradient" Source="$(var.SolutionDir)..\..\..\Data\boxtail_pack_02.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="boxtail_pack_03_triangle.gradient" Guid="19d4957a-7ce7-4afd-b74b-5049265dffa2">
|
||
<File Id="boxtail_pack_03_triangle.gradient" Source="$(var.SolutionDir)..\..\..\Data\boxtail_pack_03_triangle.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="boxtail_pack_04_mineshack.gradient" Guid="2f144d87-97bd-4fe6-8000-f0a9e62f770f">
|
||
<File Id="boxtail_pack_04_mineshack.gradient" Source="$(var.SolutionDir)..\..\..\Data\boxtail_pack_04_mineshack.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="fardareismai_pack_01_variety_number_128.gradient" Guid="9ee0a298-b35b-4501-9beb-c0cdca41ca25">
|
||
<File Id="fardareismai_pack_01_variety_number_128.gradient" Source="$(var.SolutionDir)..\..\..\Data\fardareismai_pack_01_variety_number_128.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="fardareismai_pack_02_b_sides.gradient" Guid="69e0c7d9-283b-4161-a924-b015eb658e8d">
|
||
<File Id="fardareismai_pack_02_b_sides.gradient" Source="$(var.SolutionDir)..\..\..\Data\fardareismai_pack_02_b_sides.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="fardareismai_pack_03_old_and_new.gradient" Guid="1059241b-67e7-4a36-878d-675f3282c530">
|
||
<File Id="fardareismai_pack_03_old_and_new.gradient" Source="$(var.SolutionDir)..\..\..\Data\fardareismai_pack_03_old_and_new.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="fardareismai_pack_04_hoard.gradient" Guid="c611ee88-e0f4-493b-84f5-c65f899d43f3">
|
||
<File Id="fardareismai_pack_04_hoard.gradient" Source="$(var.SolutionDir)..\..\..\Data\fardareismai_pack_04_hoard.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="fractaldesire_pack_01.gradient" Guid="9f0885ab-920f-420d-a962-9bc515986701">
|
||
<File Id="fractaldesire_pack_01.gradient" Source="$(var.SolutionDir)..\..\..\Data\fractaldesire_pack_01.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="rce_ordinary_pack_01_colornation.gradient" Guid="8eb62cb8-279b-4518-9098-c0fec5830493">
|
||
<File Id="rce_ordinary_pack_01_colornation.gradient" Source="$(var.SolutionDir)..\..\..\Data\rce_ordinary_pack_01_colornation.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="tatasz_pack_01.gradient" Guid="967c9577-74d1-4bc0-aa52-2fb78507b572">
|
||
<File Id="tatasz_pack_01.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_01.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="tatasz_pack_02_colder.gradient" Guid="304976a2-8ae7-47eb-bf1f-c6f3cbe380b8">
|
||
<File Id="tatasz_pack_02_colder.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_02_colder.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="tatasz_pack_02_dark.gradient" Guid="05ed49cf-364c-4547-a107-2bd46afc6664">
|
||
<File Id="tatasz_pack_02_dark.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_02_dark.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="tatasz_pack_02_warmer.gradient" Guid="62282580-0ae3-484e-98ba-38ec7bbf80e2">
|
||
<File Id="tatasz_pack_02_warmer.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_02_warmer.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="tatasz_pack_03.gradient" Guid="7e5b5ef3-45be-4807-a88f-a8b773663e77">
|
||
<File Id="tatasz_pack_03.gradient" Source="$(var.SolutionDir)..\..\..\Data\tatasz_pack_03.gradient" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="dark_windows.qss" Guid="c120ace3-5fab-416f-b7f1-a8d9e3e0f061">
|
||
<File Id="dark_windows.qss" Source="$(var.SolutionDir)..\..\..\Data\dark_windows.qss" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="dark_linux.qss" Guid="65384f40-50cd-4064-ad4d-dbe5365a8deb">
|
||
<File Id="dark_linux.qss" Source="$(var.SolutionDir)..\..\..\Data\dark_linux.qss" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="dark_mac.qss" Guid="561e3a5d-c330-45b0-ab65-32d7ea2ed6d2">
|
||
<File Id="dark_mac.qss" Source="$(var.SolutionDir)..\..\..\Data\dark_mac.qss" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="VersionHistory.txt" Guid="8b031217-9e7d-4700-9ab8-2593a4e002b6">
|
||
<File Id="VersionHistory.txt" Source="$(var.SolutionDir)..\..\..\Data\Version History.txt" KeyPath="yes" Checksum="yes" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="Qt5Core.dll" Guid="0198dd4b-9bbb-4ea2-86e3-6ea0f4f6ac51">
|
||
<File Id="Qt5Core.dll" Source="$(env.QTDIR)\bin\Qt5Core.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="Qt5Gui.dll" Guid="7f93dcc2-55db-4920-83d7-e06c23f7719a">
|
||
<File Id="Qt5Gui.dll" Source="$(env.QTDIR)\bin\Qt5Gui.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
|
||
<Component Id="Qt5Widgets.dll" Guid="006bb2f1-7a38-426f-ba2c-5196d1d6c24d">
|
||
<File Id="Qt5Widgets.dll" Source="$(env.QTDIR)\bin\Qt5Widgets.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
</ComponentGroup>
|
||
</Fragment>
|
||
|
||
<Fragment>
|
||
<ComponentGroup Id="PlatformComponents" Directory="INSTALLFOLDERPLATFORMS">
|
||
<Component Id="qwindows.dll" Guid="627b7f5a-8fa6-4c78-a6b7-81fcdd8fdd63">
|
||
<File Id="qwindows.dll" Source="$(env.QTDIR)\plugins\platforms\qwindows.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64" ReadOnly="yes"/>
|
||
</Component>
|
||
</ComponentGroup>
|
||
</Fragment>
|
||
</Wix> |