mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -05:00
330074cfb2
-Add new variations: bubbleT3D, crob, hexaplay3D, hexcrop, hexes, hexnix3D, loonie2, loonie3, nBlur, octapol and synth. -Allow for pre/post versions of dc_bubble, dc_cylinder and dc_linear whereas before they were omitted. -When saving a file with multiple embers in it, detect if time values are all the same and if so, start them at zero and increment by 1 for each ember. -Allow for numerous quality increases to be coalesced into one. It will pick up at the end of the current render. -Show selection highlight on variations tree in response to mouse hover. This makes it easier to see for which variation or param the current mouse wheel action will apply. -Make default temporal samples be 100, whereas before it was 1000 which was overkill. -Require the shift key to be held with delete for deleting an ember to prevent it from triggering when the user enters delete in the edit box. -This wasn't otherwise fixable without writing a lot more code. --Bug fixes -EmberGenome was crashing when generating a sequence from a source file with more than 2 embers in it. -EmberGenome was improperly handling the first frame of a merge after the last frame of the loop. -These bugs were due to a previous commit. Revert parts of that commit. -Prevent a zoom value of less than 0 when reading from xml. -Slight optimization of the crescents, and mask variations, if the compiler wasn't doing it already. -Unique file naming was broken because it was looking for _# and the default names ended with -#. -Disallow renaming of an ember in the library tree to an empty string. -Severe bug that prevented some variations from being read correctly from params generated outside this program. -Severe OpenCL randomization bug. The first x coordinates of the first points in the first kernel call of the first ember of a render since the OpenCL renderer object was created were not random and were mostly -1. -Severe bug when populating xform selection distributions that could sometimes cause a crash due to roundoff error. Fix by using double. -Limit the max number of variations in a random ember to MAX_CL_VARS, which is 8. This ensures they'll look the same on CPU and GPU. -Prevent user from saving stylesheet to default.qss, it's a special reserved filename. --Code changes -Generalize using the running sum output point inside of a variation for all cases: pre, reg and post. -Allow for array variables in variations where the address of each element is stored in m_Params. -Qualify all math functions with std:: -No longer use our own Clamp() in OpenCL, instead use the standard clamp(). -Redesign how functions are used in the variations OpenCL code. -Add tests to EmberTester to verify some of the new functionality. -Place more const and override qualifiers on functions where appropriate. -Add a global rand with a lock to be used very sparingly. -Use a map instead of a vector for bad param names in Xml parsing. -Prefix affine interpolation mode defines with "AFFINE_" to make their purpose more clear. -Allow for variations that change state during iteration by sending a separate copy of the ember to each rendering thread. -Implement this same functionality with a local struct in OpenCL. It's members are the total of all variables that need to change state within an ember. -Add Contains() function to Utils.h. -EmberRender: print names of kernels being printed with --dump_kernel option. -Clean up EmberTester to handle some of the recent changes. -Fix various casts. -Replace % 2 with & 1, even though the compiler was likely doing this already. -Add new file Variations06.h to accommodate new variations. -General cleanup.
192 lines
10 KiB
XML
192 lines
10 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||
<?define ProductVersion="0.9.9.2" ?>
|
||
<?define ProductName="Fractorium Beta $(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="{96EEC105-DB40-4453-AD22-ABA8BC03267D}"?>
|
||
|
||
<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" />
|
||
</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" />
|
||
</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" />
|
||
</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" />
|
||
</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"/>
|
||
</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"/>
|
||
</Component>
|
||
<Component Id="libpng16.dll" Guid="0a1605f8-e041-45a3-956b-10efdfa9da20">
|
||
<File Id="libpng16.dll" Source="$(var.SolutionDir)..\..\..\Bin\$(var.Platform)\Release\libpng16.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64"/>
|
||
</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"/>
|
||
</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"/>
|
||
</Component>
|
||
<Component Id="msvcp120.dll" Guid="8f1ffde7-c1bd-45fb-8bc8-26dde552eafd">
|
||
<File Id="msvcp120.dll" Source="$(env.VS120COMNTOOLS)..\..\VC\redist\x64\Microsoft.VC120.CRT\msvcp120.dll" KeyPath="yes" Checksum="yes" />
|
||
</Component>
|
||
<Component Id="msvcr120.dll" Guid="50c9bc27-c547-4a03-9f6c-cd416f449dd8">
|
||
<File Id="msvcr120.dll" Source="$(env.VS120COMNTOOLS)..\..\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" KeyPath="yes" Checksum="yes" />
|
||
</Component>
|
||
<Component Id="vccorlib120.dll" Guid="affe33e7-1e64-4bb0-a062-2b56f77459b4">
|
||
<File Id="vccorlib120.dll" Source="$(env.VS120COMNTOOLS)..\..\VC\redist\x64\Microsoft.VC120.CRT\vccorlib120.dll" KeyPath="yes" Checksum="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" />
|
||
</Component>
|
||
<Component Id="dark.qss" Guid="c120ace3-5fab-416f-b7f1-a8d9e3e0f061">
|
||
<File Id="dark.qss" Source="$(var.SolutionDir)..\..\..\Data\dark.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" />
|
||
</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"/>
|
||
</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"/>
|
||
</Component>
|
||
<Component Id="Qt5OpenGL.dll" Guid="dad0a1ca-366c-4df8-aaa1-ae0de31f157a">
|
||
<File Id="Qt5OpenGL.dll" Source="$(env.QTDIR)\bin\Qt5OpenGL.dll" KeyPath="yes" Checksum="yes" ProcessorArchitecture="x64"/>
|
||
</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"/>
|
||
</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"/>
|
||
</Component>
|
||
</ComponentGroup>
|
||
</Fragment>
|
||
</Wix> |