mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-22 05:30:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
589 Commits 5 Branches 0 Tags 20 MiB
eb315768ea
Commit Graph

589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Feemster
09fd339696 Fix build error with static member. 2016-02-12 09:31:41 -08:00
mfeemster
1436cb04e6 Merge branch 'master' of https://github.com/mfeemster/fractorium.git 2016-02-11 21:38:33 -08:00
mfeemster
a800b08b67 --User changes 
-Add variations changes to the list of functionality that can be applied to all xforms using the Select tab.
 -Allow for graphical affine adjustments to apply to multiple selected xforms.
 -Slight optimization of the pie variation.
 -Undo state is only saved when the render completes and the mouse buttons are released. This helps avoid intermediate steps for quickly completing renders while dragging.
 -Add some keyboard shortcuts for toolbar and menu items.
 -Make info tab tree always expanded.

--Bug fixes
 -Make precalcs for all hypertile variations safer by using Zeps() for denominators.
 -Changing the current xform with more than one selected would set all xform's color index value that of the current one.
 -Use hard found palette path information for randoms as well.
 -OpenCL build and assignment errors for Z value in epispiral variation.
 -Unitialized local variables in hexaplay3D, crob, pRose3D.

--Code changes
 -Change static member variables from m_ to s_.
 -Get rid of excessive endl and replace with "\n".
 -Remove old IMAGEGL2D define from before Nvidia supported OpenCL 1.2.
 -Remove old CriticalSection code and use std::recursive_mutex.
 -Make Affine2D Rotate() and RotateTrans() take radians instead of angles.
 -More C++11 work.
 -General cleanup.
 2016-02-11 21:38:21 -08:00
Matt Feemster
11f36dbbe6 Merge pull request #66 from gambhiro/executable 
set it to executable
 2016-02-11 12:51:30 -08:00
Gambhiro
c06b014df0 set it to executable 2016-02-11 20:39:49 +00:00
Matt Feemster
9eb45e7550 Merge pull request #65 from gambhiro/regex 
fix regex
 2016-02-11 10:58:41 -08:00
Gambhiro
aeaefef8bf fix regex 2016-02-11 18:53:44 +00:00
mfeemster
a345e2d5e1 --Bug fixes 
-Bad path parsing for multiple search paths for palette in command line programs.
 2016-02-09 15:53:55 -08:00
mfeemster
f10e4e610a --User changes 
-Allow locking of the scale at which affine circles are displayed.
 -Allow user to toggle whether xform will be animated when generating sequences. Also show the animate value when loading.

--Code changes
 -More conversion to C++11 style code.
 -Add another value to the eXformUpdate enum called UPDATE_CURRENT_AND_SELECTED in anticipation of future work.
 -Remove some old #defines.
 2016-02-02 17:51:58 -08:00
mfeemster
96d53113a0 Merge branch 'master' of https://github.com/mfeemster/fractorium.git 2016-01-29 17:02:26 -08:00
mfeemster
cf9da379b6 --User changes 
-Allow for pausing the renderer in the main window. This makes is more efficient when entering many parameters, such as when following a tutorial.
 -Add support for new variations: erf, gamma, jac_cn, jac_dn, jac_sn, logDB, pressure_wave, pRose3D, splits3D, w, waves2b, x, xerf, y, z.
 -Inform user of the start and stop of file parsing in EmberAnimate because the files could potentially be very large.
 -Move the follwing fields to a new table called Animation: Interpolation, Affine Interpolation, Temporal Samples, Temporal Filter Width, Temporal Filter Type.
  -These currently have no effect on the interactive renderer and instead are used when running flames through EmberGenome to generate sequences, and then animating them in Fractorium or EmberAnimate.
 -Add new parameter overrides for EmberRender and EmberAnimate which directly assign values to all flames being rendered, rather than scale:
  --quality
  --demin
  --demax

--Bug fixes
 -Left pad instead of right pad names of sequence outputs from EmberGenome.
 -Unique file naming was broken for files which already had an underscore in them.
 -Properly report that png is the default format of EmberRender and EmberAnimate output instead of erroneously claiming it was jpg.
 -Make command line programs search these folders in this order for the palette file:
  ./
  ~/.fractorium
  ~/.config/fractorium
  /usr/share/fractorium
  /usr/local/share/fractorium
 -Fix possible bad values in hexes.
 -Better assignment of Z variables.
 -Fix boarders due to use of poorly implemented rint() function from flam3. Use std::rint() now.
 -wedge_sph was completely wrong due to having accidentally swapped the mapping of two parameters.
 -Make juliascope juliascope_power parameter be of type REAL_NONZERO since it's used as a denominator.
 -Make Z assignment compatible with the originals in:
  -arch, bcircle, bCollide, bent, bent2, bisplit, blob, blur_linear, blur_square, bMod, boarders, boarders2, bSwirl, bTransform, butterfly, cardioid, cell, circleblur, circlize, circlize2, circus, collideoscope, cos, cosine, cosh, coth, cpow, cpow2, crescents, cropn, csc, csch, curl, curve, dc_gridout, deltaa, diamond, disc2, eclipse, eCollide, edisc, eJulia, elliptic, eMod, eMotion, ennepers, epispiral, ePush, eRotate, eScale, eSwirl, ex, exp, expo, exponential, fan, fdisc, fibonacci, fibonacci2, fisheye, flipcircle, flipy, flower, flux, funnel, glynnia, GlynnSim1, GlynnSim2, GlynnSim3, gridout, handkerchief, heart, hole, idisc, julia, julian2, juliaNab, kaleidoscope, lazyTravis, Lissajous, mask, MobiusN, mobius_strip, modulus, murl, murl2, npolar, ortho, oscilloscope, parabola, perspective, petal, phoenix_julia, pie (was also inconsistent between cpu and gpu), poincare, popcorn, popcorn2, power, pow_block, rational3, rays, rblur, rings, rippled, roundspher, sec, secant2, sigmoid, sin, sineblur, sinh, sinusgrid, sphericaln, spiralwing, spirograph, split, squarize, squirrel, squish, sschecks, starblur, stripes, stwin, super_shape, tan, tancos, tangent, tanh, TwinTrian, twoface, unpolar, waves, wavesn, wedge_julia, whorl, xheart, zblur, zscale.

--Code changes
 -Generalize Variation::PrecalcHelper() and rename to PrePostPrecalcHelper().
  --Do the same for the OpenCL version and rename it PrePostPrecalcOpenCLString().
 -Rename Variation::m_AssignType to m_PrePostAssignType since it's only relevant to pre/post variations.
 2016-01-29 17:02:15 -08:00
Matt Feemster
2ba1a235e2 Merge pull request #52 from gambhiro/fixes 
test for different CL and GL paths
 2016-01-24 09:52:16 -08:00
Gambhiro
e184557aed note to select Qt 5 2016-01-24 15:30:16 +00:00
Gambhiro
b1dbed83b2 test for different CL and GL paths 2016-01-24 13:48:43 +00:00
Matt Feemster
53cd390aa4 Merge pull request #50 from gambhiro/linux-build 
Linux build
 2016-01-20 13:03:57 -08:00
Gambhiro
149a90bea8 use PRJ_DIR 2016-01-20 20:56:00 +00:00
Gambhiro
e735191cb8 move icon 2016-01-20 20:54:56 +00:00
Gambhiro
dd5d901e6d deb download link 2016-01-20 18:55:44 +00:00
Gambhiro
cad18ebd9a ppa link 2016-01-20 18:50:07 +00:00
Gambhiro
581b0d975c readme upd 2016-01-20 18:48:21 +00:00
Gambhiro
43b4c9fbc1 changelog 2016-01-20 18:28:23 +00:00
Gambhiro
629e7c1c79 fix missing icon and launcher 2016-01-20 17:07:19 +00:00
Gambhiro
c853f478aa icon and launcher 2016-01-20 15:53:31 +00:00
Gambhiro
299e86b0c1 make sure to include the palettes file 2016-01-20 15:52:04 +00:00
Matt Feemster
3b969b4ce2 Merge pull request #49 from gambhiro/linux-build 
linux build 0.9.9.3
 2016-01-19 16:22:31 -08:00
mfeemster
6b02ea3465 --Bug fixes 
-Fix PCH in Fractorium.
 2016-01-19 16:21:01 -08:00
Gambhiro
3674a01393 fix PWD 2016-01-19 11:53:39 +00:00
mfeemster
79a2a28694 --0.9.9.3 Release 2016-01-17 16:10:06 -08:00
mfeemster
c94c1eba66 --Bug fixes 
-Long standing animation looping but that goes all the way back to flam3.
 -Build failure in hexes variation.
 2016-01-16 14:23:22 -08:00
mfeemster
0b05f1a394 --Bug fixes 
-Changes in the xaos grid were not always being processed due to rounding.
 2016-01-16 11:51:29 -08:00
mfeemster
19385c28b9 --User changes 
-Add the following modes to synth:
  -MODE_SHIFTNSTRETCH 14
  -MODE_SHIFTTANGENT 15
  -MODE_XMIRROR 17
  -MODE_XYMIRROR 18
  -MODE_SPHERICAL2 19
 -Clamp synth_mode, synth_*_type and synth_*_layer to valid values.

--Bug fixes
 -synth was broken due to passing synth_mode to Interpolate, rather than synth_smooth.
 -Fix bad include and link path in EmberAnimate project.
 2016-01-13 19:08:25 -08:00
mfeemster
ccd4ea8d05 Manual merge 2016-01-12 20:51:13 -08:00
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