mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -05:00
90ec5b8246
-Show common folder locations such as documents, downloads, pictures in the sidebar in all file dialogs. -Warning message about exceeding memory in final render dialog now suggests strips as the solution to the problem. -Strips now has a tooltip explaining what it does. -Allow more digits in the spinners on the color section the flame tab. -Add manually adjustable size spinners in the final render dialog. Percentage scale and absolute size are fully synced. -Default prefix in final render is now the filename when doing animations (coming from sequence section of the library tab). -Changed the elliptic variation back to using a less precise version for float, and a more precise version for double. The last release had it always using double. -New applied xaos table that shows a read-only view of actual weights by taking the base xform weights and multiplying them by the xaos values. -New table in the xaos tab that gives a graphical representation of the probability that each xform is chosen, with and without xaos. -Add button to transpose the xaos rows and columns. -Add support for importing .chaos files from Chaotica. --Pasting back to Chaotica will work for most, but not all, variations due to incompatible parameter names in some. -Curves are now splines instead of Bezier. This adds compatibility with Chaotica, but breaks it for Apophysis. Xmls are still pastable, but the color curves will look different. --The curve editor on the palette tab can now add points by clicking on the lines and remove points by clicking on the points themselves, just like Chaotica. --Splines are saved in four new xml fields: overall_curve, red_curve, green_curve and blue_curve. -Allow for specifying the percentage of a sub batch each thread should iterate through per kernel call when running with OpenCL. This gives a roughly 1% performance increase due to having to make less kernel calls while iterating. --This field is present for interactive editing (where it's not very useful) and in the final render dialog. --On the command line, this is specified as --sbpctth for EmberRender and EmberAnimate. -Allow double clicking to toggle the supersample field in the flame tab between 1 and 2 for easily checking the effect of the field. -When showing affine values as polar coordinates, show angles normalized to 360 to match Chaotica. -Fuse Count spinner now toggles between 15 and 100 when double clicking for easily checking the effect of the field. -Added field for limiting the range in the x and y direction that the initial points are chosen from. -Added a field called K2 which is an alternative way to set brightness, ignored when zero. --This has no effect for many variations, but hs a noticeable effect for some. -Added new variations: arcsech arcsech2 arcsinh arctanh asteria block bwraps_rand circlecrop2 coth_spiral crackle2 depth_blur depth_blur2 depth_gaussian depth_gaussian2 depth_ngon depth_ngon2 depth_sine depth_sine2 dragonfire dspherical dust excinis exp2 flipx flowerdb foci_p gaussian glynnia2 glynnsim4 glynnsim5 henon henon hex_rand hex_truchet hypershift lazyjess lens lozi lozi modulusx modulusy oscilloscope2 point_symmetry pointsymmetry projective pulse rotate scry2 shift smartshape spher squares starblur2 swirl3 swirl3r tanh_spiral target0 target2 tile_hlp truchet_glyph truchet_inv truchet_knot unicorngaloshen vibration vibration2 --hex_truchet, hex_rand should always use double. They are extremely sensitive. --Bug fixes: -Bounds sign was flipped for x coordinate of world space when center was not zero. -Right clicking and dragging spinner showed menu on mouse up, even if it was very far away. -Text boxes for size in final render dialog were hard to type in. Same bug as xform weight used to be so fix the same way. -Fix spelling to be plural in toggle color speed box. -Stop using the blank user palette to generate flames. Either put colored palettes in it, or exclude it from randoms. -Clicking the random palette button for a palette file with only one palette in it would freeze the program. -Clicking none scale in final render did not re-render the preview. -Use less precision on random xaos. No need for 12 decimal places. -The term sub batch is overloaded in the options dialog. Change the naming and tooltip of those settings for cpu and opencl. --Also made clear in the tooltip for the default opencl quality setting that the value is per device. -The arrows spinner in palette editor appears like a read-only label. Made it look like a spinner. -Fix border colors for various spin boxes and table headers in the style sheet. Requires reload. -Fix a bug in the bwraps variation which would produce different results than Chaotica and Apophysis. -Synth was allowed to be selected for random flame generation when using an Nvidia card but it shouldn't have been because Nvidia has a hard time compiling synth. -A casting bug in the OpenCL kernels for log scaling and density filtering was preventing successful compilations on Intel iGPUs. Fixed even though we don't support anything other than AMD and Nvidia. -Palette rotation (click and drag) position was not being reset when loading a new flame. -When the xform circles were hidden, opening and closing the options dialog would improperly reshow them. -Double click toggle was broken on integer spin boxes. -Fixed tab order of some controls. -Creating a palette from a jpg in the palette editor only produced a single color. --Needed to package imageformats/qjpeg.dll with the Windows installer. -The basic memory benchmark test flame was not really testing memory. Make it more spread out. -Remove the temporal samples field from the flame tab, it was never used because it's only an animation parameter which is specified in the final render dialog or on the command line with EmberAnimate. --Code changes: -Add IsEmpty() to Palette to determine if a palette is all black. -Attempt to avoid selecting a blank palette in PaletteList::GetRandomPalette(). -Add function ScanForChaosNodes() and some associated helper functions in XmlToEmber. -Make variation param name correction be case insensitive in XmlToEmber. -Report error when assigning a variation param value in XmlToEmber. -Add SubBatchPercentPerThread() method to RendererCL. -Override enterEvent() and leaveEvent() in DoubleSpinBox and SpinBox to prevent the context menu from showing up on right mouse up after already leaving the spinner. -Filtering the mouse wheel event in TableWidget no longer appears to be needed. It was probably an old Qt bug that has been fixed. -Gui/ember syncing code in the final render dialog needed to be reworked to accommodate absolute sizes.
300 lines
9.5 KiB
Plaintext
300 lines
9.5 KiB
Plaintext
VERSION = 1.0.0.15
|
|
win32:CONFIG += skip_target_version_ext
|
|
CONFIG += c++14
|
|
|
|
#message(PWD: $$absolute_path($$PWD))
|
|
|
|
#1) Declare the root of all files in this project, everything else will be
|
|
# defined in terms of this.
|
|
EMBER_ROOT = ./../..
|
|
|
|
# When compiling from project root
|
|
autobuild {
|
|
# EMBER_ROOT = $$(PWD)/../..
|
|
}
|
|
|
|
#2) Declare where dependency folders are.
|
|
# Point to local copy of OpenCL includes to ensure we have the right ones.
|
|
LOCAL_INCLUDE_DIR = $$absolute_path($$EMBER_ROOT/Builds/include/vendor)
|
|
# Parent folders for third party dependencies and their compiled outputs.
|
|
win32: {
|
|
EXTERNAL_DIR = $$absolute_path($$EMBER_ROOT/..)
|
|
EXTERNAL_LIB = $$absolute_path($$EMBER_ROOT/Deps)
|
|
}
|
|
|
|
#3) Declare where our source, data and resource files are.
|
|
SRC_DIR = $$EMBER_ROOT/Source
|
|
SRC_COMMON_DIR = $$absolute_path($$EMBER_ROOT/Source/EmberCommon)
|
|
ASSETS_DIR = $$absolute_path($$EMBER_ROOT/Data)
|
|
QTCREATOR_DIR = $$absolute_path($$EMBER_ROOT/Builds/QtCreator)
|
|
win32:RCPATH=$$absolute_path($$QTCREATOR_DIR/../MSVC/VS2017)
|
|
|
|
#4) Add up all include paths.
|
|
INCLUDEPATH += $$LOCAL_INCLUDE_DIR
|
|
INCLUDEPATH += $$absolute_path($$SRC_DIR/Ember)
|
|
INCLUDEPATH += $$absolute_path($$SRC_DIR/EmberCL)
|
|
INCLUDEPATH += $$absolute_path($$SRC_DIR/EmberCommon)
|
|
|
|
win32 {
|
|
INCLUDEPATH += $$EXTERNAL_DIR/glm
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libjpeg
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libpng
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libxml2/include
|
|
INCLUDEPATH += $$EXTERNAL_DIR/tbb/include
|
|
INCLUDEPATH += $$EXTERNAL_DIR/zlib
|
|
INCLUDEPATH += $$absolute_path($$EXTERNAL_LIB)/include/OpenEXR
|
|
}
|
|
|
|
!win32 {
|
|
#If your global includes are stored elsewhere, add them here.
|
|
#INCLUDEPATH += /usr/include
|
|
INCLUDEPATH += /usr/local/include
|
|
INCLUDEPATH += /usr/include/GL
|
|
INCLUDEPATH += /usr/local/include/GL
|
|
INCLUDEPATH += /usr/include/glm
|
|
INCLUDEPATH += /usr/include/tbb
|
|
INCLUDEPATH += /usr/include/OpenEXR
|
|
|
|
unix:!macx {
|
|
INCLUDEPATH += /usr/include/libxml2
|
|
}
|
|
else {
|
|
INCLUDEPATH += /usr/local/opt/libxml2/include/libxml2
|
|
}
|
|
|
|
#libjpeg and libpng aren't in separate folders, so nothing to add here for them.
|
|
}
|
|
|
|
#5) Add up all library paths. Ember and EmberCL don't need libjpeb, libpng or zlib and
|
|
# Ember doesn't need OpenCL. But just place them all here in the common file for ease of maintenance.
|
|
# Unneeded libs will just be ignored.
|
|
win32 {
|
|
LIBS = ""
|
|
LIBS += OpenGL32.lib
|
|
LIBS += WS2_32.lib
|
|
_AMDAPPSDK = $$(AMDAPPSDKROOT)
|
|
|
|
isEmpty(_AMDAPPSDK) {
|
|
LIBS += $$(CUDA_PATH)/lib/x64/OpenCL.lib
|
|
}
|
|
else {
|
|
LIBS += $$(AMDAPPSDKROOT)/lib/x86_64/OpenCL.lib
|
|
}
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libjpeg.lib
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libpng.lib
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libxml2.lib
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/tbb.lib
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/zlib.lib
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/Half-2_3.lib
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex-2_3.lib
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/IlmImf-2_3.lib
|
|
}
|
|
|
|
!win32 {
|
|
LIBS += -ljpeg
|
|
LIBS += -lpng
|
|
LIBS += -ltbb
|
|
LIBS += -lpthread
|
|
LIBS += -lHalf
|
|
LIBS += -lIex
|
|
LIBS += -lIlmImf
|
|
|
|
unix:!macx {
|
|
LIBS += -lxml2
|
|
}
|
|
else {
|
|
LIBS += -L/usr/local/opt/libxml2/lib -lxml2
|
|
}
|
|
}
|
|
|
|
macx {
|
|
LIBS += -framework OpenGL
|
|
LIBS += -framework OpenCL
|
|
LIBS += -L/usr/local/lib# homebrew installs into /usr/local
|
|
}
|
|
|
|
unix:!macx {
|
|
LIBS += -lGL
|
|
LIBS += -lOpenCL
|
|
}
|
|
|
|
#6) Declare intermediate paths.
|
|
|
|
|
|
|
|
#7) Declare output paths for each configuration.
|
|
CONFIG(release, debug|release) {
|
|
CONFIG += warn_off
|
|
DESTDIR = $$absolute_path($$EMBER_ROOT/Bin/release)
|
|
}
|
|
|
|
CONFIG(debug, debug|release) {
|
|
DESTDIR = $$absolute_path($$EMBER_ROOT/Bin/debug)
|
|
}
|
|
|
|
#8) Set compiler options.
|
|
QMAKE_CXXFLAGS_RELEASE += -O2
|
|
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
|
|
QMAKE_CXXFLAGS += -D_M_X64
|
|
QMAKE_CXXFLAGS += -D_CONSOLE
|
|
QMAKE_CXXFLAGS += -D_USRDLL
|
|
|
|
win32 {
|
|
QMAKE_CXXFLAGS += -bigobj #Allow for very large object files.
|
|
QMAKE_CXXFLAGS += /MP #Enable multi-processor compilation.
|
|
QMAKE_CXXFLAGS += /Zc:wchar_t #Treat wchar_t as builtin type (we don't use wchar_t anyway).
|
|
QMAKE_CXXFLAGS += /Zi #Debug information format: program database.
|
|
QMAKE_CXXFLAGS += /Gm- #Disable minimal rebuild, needed to allow /MP.
|
|
QMAKE_CXXFLAGS += /fp:precise #Precise floating point model.
|
|
QMAKE_CXXFLAGS += /fp:except- #Disable floating point exceptions.
|
|
QMAKE_CXXFLAGS += /D "WIN32"
|
|
QMAKE_CXXFLAGS += /D "_WINDOWS"
|
|
QMAKE_CXXFLAGS += /D "_USRDLL"
|
|
QMAKE_CXXFLAGS += /D "_WINDLL" #Build as a DLL.
|
|
QMAKE_CXXFLAGS += /D "_MBCS" #Use multi-byte character set.
|
|
QMAKE_CXXFLAGS += /errorReport:prompt #Internal compiler error reporting, prompt immediately.
|
|
QMAKE_CXXFLAGS += /GF #Enable string pooling.
|
|
QMAKE_CXXFLAGS += /WX- #Don't treat warnings as errors.
|
|
QMAKE_CXXFLAGS += /Zc:forScope #Force conformance in for loop scope.
|
|
QMAKE_CXXFLAGS += /Gd #Calling convention: __cdecl.
|
|
QMAKE_CXXFLAGS += /EHsc #Enable C++ exceptions.
|
|
QMAKE_CXXFLAGS += /nologo #Suppress compiler startup banner.
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += /GS- #Disable security check.
|
|
QMAKE_CXXFLAGS_RELEASE += /MD #Link to multi-threaded DLL.
|
|
QMAKE_CXXFLAGS_RELEASE += /Gy #Enable function level linking.
|
|
QMAKE_CXXFLAGS_RELEASE += /O2 #Maximize speed.
|
|
QMAKE_CXXFLAGS_RELEASE += /Ot #Favor fast code.
|
|
QMAKE_CXXFLAGS_RELEASE += /D "NDEBUG" #Release mode.
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += /W3 #Error warning level to 3.
|
|
QMAKE_CXXFLAGS_DEBUG += /GS #Enable security check.
|
|
QMAKE_CXXFLAGS_DEBUG += /MDd #Link to multi-threaded debug DLL.
|
|
QMAKE_CXXFLAGS_DEBUG += /Od #Optimization disabled.
|
|
QMAKE_CXXFLAGS_DEBUG += /D "_DEBUG" #Debug mode.
|
|
QMAKE_CXXFLAGS_DEBUG += /RTC1 #Basic runtime checks: stack frames and uninitialized variables.
|
|
QMAKE_CXXFLAGS_DEBUG += /Ob2 #Inline function expansion: any suitable.
|
|
}
|
|
|
|
!win32 {
|
|
native {
|
|
QMAKE_CXXFLAGS += -march=native
|
|
} else {
|
|
QMAKE_CXXFLAGS += -march=k8
|
|
}
|
|
|
|
CMAKE_CXXFLAGS += -DCL_USE_DEPRECATED_OPENCL_1_1_APIS # Not sure if this is needed. We remove it if all systems we build on support 1.2.
|
|
QMAKE_CXXFLAGS_RELEASE += -fomit-frame-pointer
|
|
QMAKE_CXXFLAGS += -fPIC
|
|
QMAKE_CXXFLAGS += -fpermissive
|
|
QMAKE_CXXFLAGS += -pedantic
|
|
QMAKE_CXXFLAGS += -std=c++14
|
|
QMAKE_CXXFLAGS += -Wnon-virtual-dtor
|
|
QMAKE_CXXFLAGS += -Wshadow
|
|
QMAKE_CXXFLAGS += -Winit-self
|
|
QMAKE_CXXFLAGS += -Wredundant-decls
|
|
QMAKE_CXXFLAGS += -Wcast-align
|
|
QMAKE_CXXFLAGS += -Winline
|
|
QMAKE_CXXFLAGS += -Wunreachable-code
|
|
QMAKE_CXXFLAGS += -Wswitch-enum
|
|
QMAKE_CXXFLAGS += -Wswitch-default
|
|
QMAKE_CXXFLAGS += -Wmain
|
|
QMAKE_CXXFLAGS += -Wfatal-errors
|
|
QMAKE_CXXFLAGS += -Wall -fpermissive
|
|
QMAKE_CXXFLAGS += -Wold-style-cast
|
|
QMAKE_CXXFLAGS += -Wno-unused-parameter
|
|
QMAKE_CXXFLAGS += -Wno-unused-function
|
|
QMAKE_CXXFLAGS += -Wold-style-cast
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += -Wmissing-include-dirs
|
|
QMAKE_CXXFLAGS_DEBUG += -Wzero-as-null-pointer-constant
|
|
# NOTE: last path will be the first to search. gcc -I and -L appends to the
|
|
# beginning of the path list.
|
|
|
|
# NOTE: qmake will resolve symlinks. If /usr/local/include/CL is a symlink to
|
|
# /usr/include/nvidia-352/CL, qmake will generate Makefiles using the latter.
|
|
}
|
|
|
|
macx {
|
|
QMAKE_MAC_SDK = macosx10.11
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
|
QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64
|
|
QMAKE_CXXFLAGS += -stdlib=libc++
|
|
}
|
|
|
|
unix {
|
|
CONFIG += precompile_header
|
|
QMAKE_LFLAGS_RELEASE += -s
|
|
}
|
|
|
|
#9) Declare !win32 install dirs.
|
|
win32 {#For Windows, the install folder is just the output folder.
|
|
LIB_INSTALL_DIR = $$DESTDIR
|
|
BIN_INSTALL_DIR = $$DESTDIR
|
|
SHARE_INSTALL_DIR = $$DESTDIR
|
|
LAUNCHER_INSTALL_DIR = $$DESTDIR
|
|
}
|
|
|
|
!win32 {
|
|
LIB_INSTALL_DIR = /usr/lib
|
|
BIN_INSTALL_DIR = /usr/bin
|
|
SHARE_INSTALL_DIR = /usr/share/fractorium
|
|
LAUNCHER_INSTALL_DIR = /usr/share/applications
|
|
}
|
|
|
|
#10) Add third party libraries to install dir.
|
|
win32 {
|
|
libxml.path = $$BIN_INSTALL_DIR
|
|
libxml.files = $$absolute_path($$EMBER_ROOT/Deps/libxml2.dll)
|
|
INSTALLS += libxml
|
|
|
|
tbb.path = $$BIN_INSTALL_DIR
|
|
tbb.files = $$absolute_path($$EMBER_ROOT/Deps/tbb.dll)
|
|
INSTALLS += tbb
|
|
|
|
half.path = $$BIN_INSTALL_DIR
|
|
half.files = $$absolute_path($$EMBER_ROOT/Deps/Half-2_3.dll)
|
|
INSTALLS += half
|
|
|
|
iex.path = $$BIN_INSTALL_DIR
|
|
iex.files = $$absolute_path($$EMBER_ROOT/Deps/Iex-2_3.dll)
|
|
INSTALLS += iex
|
|
|
|
imath.path = $$BIN_INSTALL_DIR
|
|
imath.files = $$absolute_path($$EMBER_ROOT/Deps/Imath-2_3.dll)
|
|
INSTALLS += imath
|
|
|
|
ilmthread.path = $$BIN_INSTALL_DIR
|
|
ilmthread.files = $$absolute_path($$EMBER_ROOT/Deps/IlmThread-2_3.dll)
|
|
INSTALLS += ilmthread
|
|
|
|
ilmimf.path = $$BIN_INSTALL_DIR
|
|
ilmimf.files = $$absolute_path($$EMBER_ROOT/Deps/IlmImf-2_3.dll)
|
|
INSTALLS += ilmimf
|
|
}
|
|
|
|
#11) Print values of relevant variables for debugging.
|
|
#message(CONFIG: $(CONFIG))
|
|
#message(EMBER_ROOT: $$absolute_path($$EMBER_ROOT))
|
|
#message(EXTERNAL_DIR: $$absolute_path($$EXTERNAL_DIR))
|
|
#message(EXTERNAL_LIB: $$absolute_path($$EXTERNAL_LIB))
|
|
#message(SRC_DIR: $$absolute_path($$SRC_DIR))
|
|
#message(SRC_COMMON_DIR: $$SRC_COMMON_DIR)
|
|
#message(ASSETS_DIR: $$absolute_path($$ASSETS_DIR))
|
|
#message(LOCAL_INCLUDE_DIR: $$absolute_path($$LOCAL_INCLUDE_DIR))
|
|
#message(QTCREATOR_DIR: $$absolute_path($$QTCREATOR_DIR))
|
|
#message(LIBS: $$absolute_path($$LIBS))
|
|
#message(DESTDIR: $$absolute_path($$DESTDIR))
|
|
#message(DEPENDPATH: $$absolute_path($$DEPENDPATH))
|
|
#message(AMDAPPSDKROOT: $$(AMDAPPSDKROOT))
|
|
#message(CUDA_PATH: $$(CUDA_PATH))
|
|
|
|
win32 {
|
|
#message(RCPATH: $$RCPATH)
|
|
}
|
|
|
|
#message(LIB_INSTALL_DIR: $$absolute_path($$LIB_INSTALL_DIR))
|
|
#message(BIN_INSTALL_DIR: $$absolute_path($$BIN_INSTALL_DIR))
|
|
#message(SHARE_INSTALL_DIR: $$absolute_path($$SHARE_INSTALL_DIR))
|
|
#message(LAUNCHER_INSTALL_DIR: $$absolute_path($$LAUNCHER_INSTALL_DIR))
|