Commit Graph

85 Commits

Author SHA1 Message Date
c857ca6f65 Ensure debug and release options are explicitly specified with qmake 2015-08-01 11:00:13 +01:00
6b702334b9 Branch sync 2015-07-31 19:50:13 -07:00
fda1fdeee7 --Bug fixes
-Nvidia OpenCL compilation was broken for density filtering due to ambiguity in the arguments to min(). Fix it by casting.
 -Put Nvidia block size in DE back to 24 where it used to be. Nvidia fails when it's 32.
 -Fix misspelling of the word "Rendering" in failure messages in final render dialog.
 -Put FillSummary() back when loading an ember.
 -Properly disable add final xform button when a final xform is present.
2015-07-31 19:46:53 -07:00
fd5e177df7 Fix output directory in qt projects to be relative to the repository
Conflicts:
	Builds/QtCreator/build_all.sh
2015-07-29 12:42:22 +01:00
e81dfc3000 Merge branch 'master' into travis 2015-07-24 13:05:31 +01:00
e16c6a825f --User changes
-Add variations filter/selection dialog.

--Bug fixes
 -Fix summary window not properly indicating the presence of pose affine.
 -Remove a file named Fractorium.aps which had been erroneously committed a year ago.

--Code changes
 -Use qobject_cast instead of dynamic_cast where appropriate.
 -Add more override keyword where appropriate.
 -Add variations list to settings for filter dialog.
2015-07-23 18:16:36 -07:00
fc7923e8af Merge branch 'master' into travis 2015-07-22 14:14:37 +01:00
fb262c2469 --User changes
-Add motion support from Simon Detheridge at the ember level instead of just individual xforms:
  Add the ability to manipulate camera pitch, yaw and other goodies during flame rotation using a new element specified at the top-level of the flame.
  Create a new 'saw' motion function, so that these values can effectively be looped (e.g. yaw -1 to +1) over the course of a rotation.
  Add an offset to existing motion elements, to start them partway through their cycle. This would (for example) enable creating circular motion of xform affines, by combining two offset sine waves, one with an offset of 0.25 or 0.75.
  Fix loops in EmberGenome (they only had an on/off effect - this was broken in flame-genome as well) and make the loop count floating-point as well. For sequence animations, it's not necessary for clips to loop precisely if they're not designed specifically for the ES project.
  Similarly, there's no need for motion_frequency to be an integer value either so this was changed to allow motion that doesn't necessarily start or end at the loop boundary.
  I've attempted to keep each bit of functionality in its own commit.
  There's an argument as to whether to call the new flame motion elements <flame_motion/> (to differentiate programmatically) or just <motion/> (for consistency within the file) -- I opted for the former because it was easier to modify the xml parser that way.

--Code changes
 -Change FlameMotion.h to EmberMotion.h to keep the naming convention consistent.
 -Made elements of EmberMotion.m_MotionParams into their own type, MotionParam, which allows for CopyVec() to work.
 -Change m_FlameMotionElements to m_EmberMotionElements in Ember.
 -Use CopyVec() for EmberMotion instead of manual copy in copy constructors.
 -Add exports in Ember.cpp for EmberMotion.
 -Format eEmberMotionParam enum with one entry per line since it has many entries.
 -Use fabs() in XmlToEmber instead of glm::abs.
 -Minor formatting.
2015-07-06 21:36:46 -07:00
9d5f3e8578 Add new class to store flame motion parameters 2015-07-06 16:10:00 +01:00
448840f32b Merge branch 'master' into travis 2015-06-30 14:46:13 +01:00
fa3175aad1 --Code changes
-Better use of const functions.
 -Ember.pro should not define BUILDING_EMBERCL, instead define BUILDING_EMBER.
2015-06-29 20:13:53 -07:00
91006edf34 Merge branch 'master' into travis 2015-06-04 17:24:42 +01:00
5bd593b42f --User changes
Allow for setting rendering thread priorities from the command line and final render dialog. Currently only implemented on Windows.
 Show estimated time left on the final render dialog.
 Sort palette list by name, instead of by index in the palette file.
 Sorting can be flipped by clicking the column headers of the palette table.

--Code changes
 Remove unnecessary connect() statement in Variations tab.
2015-05-30 22:14:34 -07:00
1e88aa740c Merge branch 'master' into travis 2015-05-30 10:17:09 +01:00
c97946c660 --Code changes
Add DoubleSpinBoxTableItemDelegate.h to Fractorium.pro to get it building on Linux.
2015-05-29 21:57:09 -07:00
64fdcbdfb2 Add travis config
This adds a travis config to build everyting on 12.04. Because 12.04 is quite old, there are a certain number of hoops that need to be jumped through in order to get things working. As a result, the build script is more complex than I'd like.
2015-05-28 14:23:35 +01:00
822c787a6c Add missing FractoriumXformsSelect.cpp to qmake build 2015-05-18 11:50:24 +01:00
afad780c7d Update fractorium .pro with new files 2015-04-20 11:38:33 +01:00
2dc392a1cc Use different output directory for debug build
Saves lots of recompiling! :-)
2015-02-20 16:23:10 +00:00
eef2c548db Don't omit frame pointer in debug version
You can't really debug without a frame pointer :-)
2015-02-09 11:06:20 +00:00
c1031bbfee Update qt build script to set nvidia or native configs from commandline 2015-01-26 18:13:53 +00:00
52f6415085 Add nvidia config to build nvidia-compatible binary on osx/linux
Also added config to build a cpu-native binary to take advantage of additional CPU features
2015-01-26 17:50:41 +00:00
6e929a7aaf Tidy shared_settings to group platform-specific items together 2015-01-26 17:23:41 +00:00
254bf89469 Refactor .pro files to keep shared settings all in one place 2015-01-26 17:17:51 +00:00
5a610601af Don't strip symbols on osx release build
This avoids clang error in release mode: atom not found in symbolIndex(__ZN7EmberNs11EmberReport23StaticErrorReportStringERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEE) for architecture x86_64
2015-01-26 16:01:10 +00:00
0f0035e37c Add helper script to [re]build all QtCreator projects 2015-01-26 16:00:59 +00:00
940c51f16a Fix fractorium project file for osx 2015-01-14 11:39:49 +00:00
8342c97efb Fix project files for EmberGenome/Render/Animate for osx 2015-01-14 10:52:00 +00:00
3c4dc80342 Fix pro file for EmberCL on osx 2015-01-14 10:36:18 +00:00
1cd3ec86fe Add necessary osx changes to ember project file 2015-01-14 10:21:27 +00:00
3cf6141e27 Derive from QOpenGLWidget instead of QGLWidget.
Derive from QOpenGLWidget instead of QGLWidget.
More commits to follow.
2015-01-01 07:17:05 -08:00
9502ae57ab Linux. 2014-12-14 20:25:46 -08:00
f32eaadd3d Linux/Windows sync. 2014-12-11 15:13:26 -08:00
a9ecb6a78e More linux work. 2014-12-10 21:50:15 -08:00
9947cd1c84 More Linux work, getting started with QtCreator. 2014-12-08 02:18:16 -08:00