mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
307 Commits 5 Branches 0 Tags 20 MiB
4cffd47f47
Commit Graph

307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mfeemster
a3ecbbf690 --User changes 
-Add post_smartcrop.

--Bug fixes
 -Fix bug in crackle.
 -Wrong point assignment in hexaplay3D, hexnix3D.
 -Improper Z assignment in rblur.
 -Fix inconsistency with original in circlecrop.
 -Put EMBER_ROOT bakc to ./../../../ in default.pri. This is TBD.

--Code changes
 -Convert all enums to class enum to be consistent with C++11 style.
 -Convert some if/else statements in filter classes to case statements.
 -Add overloaded stream operators to print various enums.
 -Optimize crob, nBlur.
 -Fix weird assignment statement in falloff3.
 -Cleanup in VarFuncs::SimplexNoise3D().
 -Replace fabs() with std::abs().
 -General cleanup.
 2016-01-12 20:42:12 -08:00
mfeemster
a8688e87b5 Merge branch 'master' of https://github.com/mfeemster/fractorium.git 2016-01-04 16:51:23 -08:00
mfeemster
f5d0be5e5d --Code changes 
-Convert all enums to class enum to be consistent with C++11 style.
 -Convert some if/else statements in filter classes to case statements.
 -Add overloaded stream operators to print various enums.
 2016-01-04 16:50:15 -08:00
luyuju151
02261e6e76 modify Qt projects for building with Qt Creator (windows) 
add build guide using Qt Creator and MSVC2013
 2016-01-04 21:45:40 +08:00
Matt Feemster
fd084d2ce8 Merge pull request #47 from gambhiro/relative-paths 
conditional relative paths
 2016-01-02 10:10:40 -08:00
Gambhiro
12a9e1fb18 conditional relative paths 2016-01-02 14:46:34 +00:00
mfeemster
c8e2355ec2 --Code changes 
-Convert all enums to class enum to be consistent with C++11 style.
 -Convert some if/else statements in filter classes to case statements.
 -Add overloaded stream operators to print various enums.
 2015-12-31 16:00:36 -08:00
mfeemster
1dc363d190 Manual merge for default.pri 2015-12-31 13:55:24 -08:00
mfeemster
c43e3708b6 Merge 2015-12-31 13:51:55 -08:00
mfeemster
6ba16888e3 --User changes 
-Add new variations: crackle, dc_perlin.
 -Make default palette interp mode be linear instead of step.
 -Make summary tab the selected one in the Info tab.
 -Allow for highlight power of up to 10. It was previously limited to 2.

--Bug fixes
 -Direct color calculations were wrong.
 -Flattening was not applied to final xform.
 -Fix "pure virtual function call" error on shutdown.

--Code changes
 -Allow for array precalc params in variations by adding a size member to the ParamWithName class.
  -In IterOpenCLKernelCreator, memcpy precalc params instead of a direct assign since they can now be of variable length.
 -Add new file VarFuncs to consolidate some functions that are common to multiple variations. This also contains texture data for crackle and dc_perlin.
  -Place OpenCL versions of these functions in the FunctionMapper class in the EmberCL project.
 -Add new Singleton class that uses CRTP, is thread safe, and deletes after the last reference goes away. This fixes the usual "delete after main()" problem with singletons that use the static local function variable pattern.
 -Began saving files with AStyle autoformatter turned on. This will eventually touch all files as they are worked on.
 -Add missing backslash to CUDA include and library paths for builds on Nvidia systems.
 -Add missing gl.h include for Windows.
 -Remove glew include paths from Fractorium, it's not used.
 -Remove any Nvidia specific #defines and build targets, they are no longer needed with OpenCL 1.2.
 -Fix bad paths on linux build.
 -General cleanup.
 2015-12-31 13:41:59 -08:00
Matt Feemster
00490bf69e Merge pull request #45 from gambhiro/description 
update package description
 2015-12-22 09:37:24 -08:00
Gambhiro
2d167b0ec5 update package description 2015-12-22 17:34:16 +00:00
Matt Feemster
e3a5aa5444 Merge pull request #43 from gambhiro/script-improvements 
Script improvements
 2015-12-18 09:59:47 -08:00
Gambhiro
c6ff23fc9a check that version numbers agree 2015-12-18 17:43:37 +00:00
Gambhiro
dca47ac5c9 readme upd linux deps 2015-12-18 15:16:46 +00:00
Gambhiro
2975069a91 helper script for symlinks 2015-12-18 15:14:21 +00:00
Gambhiro
ca35cd4c94 read the package version from the changelog file 2015-12-18 15:13:42 +00:00
Matt Feemster
fae3aadb3a Merge pull request #38 from gambhiro/ubuntu-15.10-nvidia 
Ubuntu 15.10 nvidia
 2015-12-16 17:30:05 -08:00
Gambhiro
efed23cf66 using ocl-icd-libopencl1 2015-12-16 17:27:36 +00:00
Gambhiro
2ce1e31a80 Deps is now Build/include/vendor 2015-12-16 16:41:20 +00:00
Gambhiro
f37fb43197 readme upd 2015-12-16 16:25:28 +00:00
Gambhiro
eaf802c562 opengl-headers 1.2 in vendor folder 2015-12-16 14:54:22 +00:00
Gambhiro
ea261c4c5e lib symlink fix 2015-12-16 04:28:25 +00:00
Gambhiro
d142ca6d07 mkdir lib and include 2015-12-15 18:27:14 +00:00
Gambhiro
f9923a673c local symlinks 2015-12-15 18:24:46 +00:00
Gambhiro
7318bff32c OpenCL 1.2 is supported in the Linux Nvidia drivers now 2015-12-15 16:26:22 +00:00
Gambhiro
994c05ba68 include paths 2015-12-15 16:22:51 +00:00
Gambhiro
a9a189e9a4 dependencies for Ubuntu 15.10 Wily Werevolf 2015-12-15 16:21:35 +00:00
Gambhiro
edf81fbe51 exclude debian folder from tarball 2015-12-15 16:20:39 +00:00
Gambhiro
85ba79c861 don't ignore flam3-palettes.xml 2015-12-15 16:19:03 +00:00
Matt Feemster
914b5412c3 Merge pull request #35 from gambhiro/linux-mac-0.9.9.2 
Linux mac 0.9.9.2
 2015-12-11 22:23:14 -08:00
Gambhiro
43d0aef5a4 Merge remote-tracking branch 'origin/master' into linux-mac-0.9.9.2 2015-12-11 12:00:46 +00:00
Gambhiro
b3cf5892c2 resurrect previous build scripts for reference 2015-12-11 11:55:36 +00:00
Matt Feemster
e20ea74113 Merge pull request #34 from gh2k/buildscript-tweak 
Fix incorrect syntax in qmake variable assignment
 2015-12-10 20:32:20 -08:00
mfeemster
aece4afc60 --Bug fixes: 
-Omit duplicate entries in error reports.
-Properly report missing palette file in command line programs.
 2015-12-10 20:19:41 -08:00
Gambhiro
599b0653e3 remove checkinstall suggestion 2015-12-10 18:21:20 +00:00
Gambhiro
5ab1d45bb2 readme instructions for building 2015-12-10 18:17:09 +00:00
Gambhiro
fe6a949e03 better options 2015-12-10 18:16:46 +00:00
Gambhiro
c11b2b4fc2 palette and theme install 2015-12-10 18:05:51 +00:00
Gambhiro
08428d155c unix and macx scoping 2015-12-10 18:03:08 +00:00
Gambhiro
06d4c95975 look harder for a palette 2015-12-10 18:02:24 +00:00
Gambhiro
88724376da options for linux packaging helper 2015-12-09 21:40:59 +00:00
Gambhiro
0aaa7bb490 warn and exit if PPA folder already exists 2015-12-09 18:15:21 +00:00
Gambhiro
c2d227b403 look for the palettes in various places 2015-12-09 18:08:21 +00:00
Gambhiro
66aa8fa6a1 successful Mac build on OSX 10.10 2015-12-09 16:14:44 +00:00
Gambhiro
fd6e14d651 remove autotools from deps 2015-12-09 16:05:09 +00:00
Gambhiro
fa5e6188ee squashed linux packaging commits 
Squashed commit of the following:

commit e7261977580bfd08d08717c27732eb0b0f534bb2
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 8 11:25:00 2015 +0000

    build signed source package

commit e652848b5e2d5dadfe1143282af204c13f8db418
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Sun Dec 6 12:51:42 2015 +0000

    linux packaging helper script

commit 0c8bf8fcea9d62692c3e973a277c9014b9ef636b
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Sat Dec 5 21:38:37 2015 +0000

    changelog

commit d6c6815d3a59779e03119c0546f01c778188c918
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Sat Dec 5 21:37:32 2015 +0000

    now it's all qmake

commit c37673a0d747134766bf9a1c3a898bbb9e416ed6
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Sat Dec 5 08:46:27 2015 +0000

    don't symlink in manual makefile

commit 2593da2401cbb5b83ea8ec188a3450f52595186e
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Thu Dec 3 16:53:31 2015 +0000

    postfix the version with an 'a'

commit 03d4bdde55d428354d8a8ebe4827ff191162bcb1
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Thu Dec 3 14:55:33 2015 +0000

    use MAKE_OPTS env if set

commit 6f7847c7c0e3eb32ec14e60736a4e2a7b5175a7c
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Thu Dec 3 14:36:21 2015 +0000

    also install dark theme, build only amd64 for now

commit e36d863b3101d4440816e08b9af704e89316d2e9
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 18:01:42 2015 +0000

    rules.dh7

commit 0e35f2ddf3b70eaf0040fcac6453d79c1a9571c8
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 17:57:57 2015 +0000

    deps

commit 492b4ae7aa41374bf89cd8accf82d5ab0283a5f9
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 10:40:04 2015 +0000

    typo

commit 6f0ed09a37849323f220d9aa50ac7c6bd3d411cb
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 10:37:55 2015 +0000

    deps and version

commit 82f2fd07b6703d5699926c297dee25a59111acb9
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 09:50:00 2015 +0000

    rev logic

commit e5d33b62236e0b33653fa79d82274e157cb26bc2
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 09:17:50 2015 +0000

    create bin and libdir

commit 84153860e6861a43ffc0f1073d462f2452f7e7c4
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 08:48:23 2015 +0000

    support prefix

commit a5da29a15a15fc130ef1147ed495d86238e7a2f3
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 08:45:52 2015 +0000

    support DESTDIR

commit da1be8b940fb3e51632ed4a35b6afe7defe17848
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 21:06:01 2015 +0000

    rev clean logic

commit 738c78a93b159d27fc5c00361bb621cd864ac224
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 20:59:34 2015 +0000

    better make clean

commit 2bf382412e573cd93c8a744b374196d5ea59c218
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 20:44:48 2015 +0000

    debian folder

commit af420ef5d98744315fa526f0d072197b00b1af28
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 18:18:51 2015 +0000

    make clean ./Bin too

commit 6d0243a10dac725251ea566ad717ff9b4fd0eea2
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 17:56:31 2015 +0000

    lowercase

commit 41b4eaef6d9adbbb8ec00a9a15c20498f300924e
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 17:34:21 2015 +0000

    configure and Makefile
 2015-12-08 11:49:19 +00:00
Simon Detheridge
e7d275ca16 Fix incorrect syntax in qmake variable assignment 2015-12-03 11:46:54 +00:00
Gambhiro
d60bc4dc6c hard-code /usr/share/fractorium for now 2015-12-01 17:33:27 +00:00
mfeemster
49e2104fd2 --Code changes: 
-Cleanup.
 2015-11-25 14:32:34 -08:00