Commit Graph

989 Commits

Author SHA1 Message Date
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
7a88312a7d 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
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
027dfa0684 fixed memory leak on milkdrop preset factory destroy.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1203 6778bc44-b910-0410-a7a0-be141de4315d
2009-01-20 05:57:34 +00:00
7a36b868f6 mac os x builds of ftgl and glew
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1202 6778bc44-b910-0410-a7a0-be141de4315d
2008-12-12 07:24:38 +00:00
f9f7958778 fixed for os x
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1201 6778bc44-b910-0410-a7a0-be141de4315d
2008-12-12 06:21:58 +00:00
d232739aa4 no more cmake warnings!
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1198 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-26 02:34:50 +00:00
889585e1ed projectM-test random sound data
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1197 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-25 17:06:36 +00:00
3b987daaac fixes to represet
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1196 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-25 08:08:27 +00:00
c7c25b69b3 clever solution to using auto pointers with custom factory delete methods
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1193 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-06 08:43:48 +00:00
3b56af7972 more native presets (rlg is busted tho)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1192 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-04 09:30:51 +00:00
c50be98eec more native presets
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1191 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-04 09:20:44 +00:00
dc5b6c8d11 buildable native presets
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1190 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-04 09:17:13 +00:00
8de0b677e4 cmakelists work for native presets
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1189 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-04 08:48:58 +00:00
3a04ae6ccd cpp -> hpp conversions, some native preset cmake work
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1188 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-04 08:42:49 +00:00
c01ffdf0f0 moved preset pipeline files to new location
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1187 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-04 08:29:43 +00:00
fdf215e488 native presets directory stub
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1186 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-04 08:27:49 +00:00
62f26f90b9 make install fixes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1185 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-26 17:59:53 +00:00
690215ce0b libprojectM builds correctly!
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1184 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-26 17:39:21 +00:00