Commit Graph

1302 Commits

Author SHA1 Message Date
2d682a5fe9 Old patch from JAmeson that I never comitted.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1263 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-18 02:22:19 +00:00
d08a9648e7 context menu for preset switching. bug fix selecting presets from
projectM.  moved preset change related code from key handler to 
projectm. 


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1262 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-16 22:47:22 +00:00
78b0cee568 might have fixed some crasing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1261 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-16 02:00:42 +00:00
283d960d91 supressed some printouts
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1260 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-04 02:27:16 +00:00
706ea22a2b smooth preset support for test apps
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1259 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-04 02:04:22 +00:00
4e35b122d7 reverted libprojectM cmake config to r1246.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1258 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-03 03:57:58 +00:00
2bb3c84649 smooth preset switching hot keys of N/P/R.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1257 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-03 03:57:23 +00:00
4c541edf4d oops reverting some files
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1256 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-03 02:13:34 +00:00
308e797deb oops reverting some files
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1255 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-03 02:11:45 +00:00
1925d77549 even better composite renderitem smoothing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1254 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-03 02:10:06 +00:00
1af739885e fixed qt file dialog bug.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1253 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-03 00:39:27 +00:00
f3d7fec84c I think this is better, video echo smoothing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1252 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-02 17:30:11 +00:00
49e8234be1 sigmoid function to smooth preset transitions even further
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1251 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-02 16:50:53 +00:00
fca7e835b3 I must apologize to our users. The state of projectM in trunk has been dismal until late. The preset merging code was a mess. A fundamental flaw in the way we were handling Milkdrop preset state was preventing smooth switching from achieving correct behavior. Some confusing trace led me to the culprit, MilkdropPresetFactory. HE would reuse the same PresetOutputs struct for every preset, leading our Pipeline infrastructure astray at every turn. A simple adjustment should suffice. Some extra thought was put into PipelineMerger on top of these corrections. A release is now imminent. Preset Merging is still nascent in this release, but now it is worth looking at.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1250 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-28 04:26:52 +00:00
9a8318ee22 Bug #1849729. Adding class DLLEXPORT attributes, removing method-specific ones.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1249 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-25 11:18:57 +00:00
3f167bdd32 Fixed stupidly broken FBO support check which was result of sloppy #ifdef logic
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1248 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-14 03:39:42 +00:00
64cb23d8c8 trunk build again (woops)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1247 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-11 15:56:12 +00:00
3dfb4d4df7 renamed PresetMerge to PipelineMerger.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1246 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-11 13:48:35 +00:00
f4c8a4ee10 commented out the experimental and therefore buggy merge code.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1245 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-11 13:39:00 +00:00
0a04de344c make everything unmatchable.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1244 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 06:06:35 +00:00
92a6f210f0 temporary ignore a memleak.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1243 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:59:15 +00:00
32545102f0 segfault fix when no merge function exists
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1242 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:56:41 +00:00
12974fb928 reverse smoothing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1241 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:42:13 +00:00
d59c08c2fb yet another mem leak fix.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1240 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:33:20 +00:00
4073001eee mem leak fix again
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1239 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:31:59 +00:00
ad281133b5 mem leak fix and less debugging
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1238 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:30:21 +00:00
c5c03e8c93 preset merge uses new preset merge functions.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1237 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:13:23 +00:00
c9e8f873df merge function changes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1236 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:08:20 +00:00
2e9b501860 not much really
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1235 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 04:40:49 +00:00
69e479882c Border Merge Function
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1234 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 04:24:50 +00:00
ea33adbdc8 merge function partial implementation in projectm toplevel.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1233 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 04:19:14 +00:00
3c6ccccd46 Oops
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1232 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 03:02:05 +00:00
3c4f09bd2b Config-file less constructor
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1231 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 02:58:36 +00:00
3c80aa3062 Im back!
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1230 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 02:29:31 +00:00
b676a2a855 typeid comparison fix, changed distance metric space to [0,1], lots of noisy debugging enabled.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1229 6778bc44-b910-0410-a7a0-be141de4315d
2009-06-20 18:18:03 +00:00
2f6f2461fe pass merge target render item as a pointer reference in merge function interface.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1228 6778bc44-b910-0410-a7a0-be141de4315d
2009-06-20 17:18:51 +00:00
0d49590b78 locale patch courtesy of Enurlyx, small change to render item merge function.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1227 6778bc44-b910-0410-a7a0-be141de4315d
2009-06-20 03:40:39 +00:00
ed743f9146 change deprecated include path for ftgl
see http://sourceforge.net/forum/message.php?msg_id=6698315


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1222 6778bc44-b910-0410-a7a0-be141de4315d
2009-03-08 21:18:18 +00:00
23a6b35515 added shape distance to master metric
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1221 6778bc44-b910-0410-a7a0-be141de4315d
2009-03-01 18:46:38 +00:00
f0b6d513d2 compile fix
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1219 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-25 04:51:27 +00:00
9be8c1c0eb accidentally commented out a push_back operation
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1218 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-25 04:13:03 +00:00
8286e23ba2 implemented simple to use RenderItemMatcher interface for sperl.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1217 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-25 04:11:18 +00:00
19b371cdc5 name fixes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1216 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-22 22:16:40 +00:00
e26d50861e small fix
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1215 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-22 22:13:00 +00:00
08f9af217c added merge function prototype
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1214 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-22 22:07:31 +00:00
66c32c1366 killed CVS directory
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1211 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-20 19:09:02 +00:00
737b223198 represet (version 2.1?) branch is now trunk branch.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1210 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-20 19:07:44 +00:00
e105122f66 bug fix
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1208 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-19 03:12:29 +00:00
cf83c16e3e first buildable implementation of a render item object optimal matching algorithm.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1207 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-18 09:31:41 +00:00
92f282a9bb hungarian method import (from MAS project)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1206 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-16 18:12:53 +00:00