Commit Graph

942 Commits

Author SHA1 Message Date
445a53892a 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
4c663aabe6 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
2562e6d5f7 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
fb862ef752 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
15b7193d38 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
e374f93c6c 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
aed29c40be 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
ee5e28f716 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
1de30574bb 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
439201f555 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
a2061dca65 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
a1b13e5efd 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
69feaf00f7 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
2b8fd5d365 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
ce7c94de70 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
f273a1c306 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
1b345a7239 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
8e89b2cd56 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
48a2399214 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
ad0584941d 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
f7d16a7a24 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
ad88c78a5f 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
8c946c844b 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
dd8a2e8a76 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
697893c5b0 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
8eab940b82 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
905be71343 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
64c91aa364 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
bf48e65636 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
24f0775b3e 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
dce7199e0d 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
96f98abffd 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
7f70b88c81 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
4bcbf1c345 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
3b1f0d007f 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
196c374a74 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
932dd7d655 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
0f44b60d07 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
0d94a07306 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
20f9400ee1 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
dfb1d72f85 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
01c5e566f7 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
742cee0f62 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
61b6737393 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
1102d19955 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
3de46f66df 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
2ef79b643d 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
65085e0caf 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
42b731443e removed more debugging
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1205 6778bc44-b910-0410-a7a0-be141de4315d
2009-01-22 04:18:40 +00:00
359835aa6c carm: memory leak fix when multiple preset extensions exist for same factory pointer.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1204 6778bc44-b910-0410-a7a0-be141de4315d
2009-01-22 04:15:24 +00:00