Commit Graph

161 Commits

Author SHA1 Message Date
e210bf1903 sigmoid interpolation attempted, but for some confusing reason didnt look as good at linear interpolation
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@341 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 02:57:05 +00:00
4b65ccefef - updated config.1.00.in to new config format
- put back preset url behavior


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@340 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 02:42:37 +00:00
0c1a2de55c two waveforms
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@339 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 02:24:02 +00:00
07f1d678b9 projectM.hpp updates
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@338 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 02:09:27 +00:00
9e188e3708 try this sperly man. fixes a newly introduced bug in preset init
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@337 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 01:57:59 +00:00
469a2af230 more useful error message added when preset dir is invalid
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@336 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 01:31:31 +00:00
b6fa7486a0 new custom shape / wave resource handling design implemented, but untested
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@335 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 01:18:56 +00:00
b6f5aa573e Selecting a preset dir from the config file.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@334 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-15 02:02:52 +00:00
d738e1ade5 comments
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@333 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-15 01:56:51 +00:00
370dabf930 PJS: smoothing of waveforms == much better
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@332 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-15 00:51:23 +00:00
f1653eb9d2 oops. fixed a huge memory leak, but probably didn't change visual behavior.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@331 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-14 22:40:19 +00:00
0b725cc4d2 some touch up and empty() function added to preset chooser
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@330 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-14 22:35:58 +00:00
1d189aac2e removing some comments
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@329 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-14 22:11:13 +00:00
690c233c1e waveform fixes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@328 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-14 04:14:38 +00:00
6d3e46bc53 PJS: smooth waveform switching, a lot of work still needs done. Especially Waveform 7
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@327 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-14 03:22:48 +00:00
03cb8601d7 major bug fix via clear() calls in preset destructor of shape containers, but don't know exactly why.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@326 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-14 02:25:08 +00:00
913428e130 clutch bug fix in evalPerPointEqns(). may exist on trunk as well.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@325 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-14 01:34:04 +00:00
08aff7983d added -Wall, removed all warnings thereafter
- killed glConsole



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@324 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-14 01:24:39 +00:00
e526797597 commit with many many changes.
- deletion of all unused / dead code
- clean up, commenting, assertions


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@323 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-13 20:14:10 +00:00
aa8864d3f1 PJS: minor tweaks to smooth preset switching
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@322 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-12 18:55:14 +00:00
31fd2c5cd9 Smooth Preset Switching. Simple waveforms not animated properly. I think something is amiss with shapes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@321 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-12 18:28:48 +00:00
1147a37ae4 PJS: rudimentary smoothness
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@320 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-12 06:21:29 +00:00
12908bceb3 - tracing a bug that fires an param->engine_val assertion
- maybe fixed issues involving unspec'ed init conditions upon preset initialization


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@319 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-11 17:26:48 +00:00
d6898f401a re-enabling borders
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@318 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-11 00:07:29 +00:00
dfeab67539 removed printfs
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@317 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-11 00:06:14 +00:00
215450273f I found the bug. Thank god. studio also merged
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@316 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-11 00:04:30 +00:00
70c973fe0d fixed previous preset button, possibly.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@315 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-09 17:28:42 +00:00
0863755fd6 serious bug fix evaluateFrame()
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@314 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-09 17:07:54 +00:00
c3f6dfad04 added more assertions
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@313 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-09 15:28:11 +00:00
189e7fdcfd trivial improvements.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@312 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-09 05:21:08 +00:00
bc1b2ca06e PJS: ported config file and pkgconfig stuff from trunk
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@311 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-08 03:53:25 +00:00
1156dcfdd3 parse debugging off
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@310 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 13:09:46 +00:00
74e0aa5c28 not sure what I did
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@309 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 13:07:35 +00:00
0a93bfe93d - put back auto_ptrs: take that sperly man
- improved functionality in preset previous / next
- removed dead code in various files


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@308 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 04:32:45 +00:00
b29a56616d PJS: hard cuts/soft cuts
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@307 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 03:24:54 +00:00
2631738f7d added timeout preset switch
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@306 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 03:15:45 +00:00
78eba1e4bf PJS: carm sucks dick
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@305 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 03:07:33 +00:00
d0624b2463 - added treb to builtin params (where did it go?)
- fixed delete/free mismatch in Param.cpp


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@304 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 03:04:20 +00:00
276044c72d PJS: treb missing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@303 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 03:00:57 +00:00
add740788d - fixed more memory leaks.
- goodbye menu system
- C++'ifed Expr.[hc]pp



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@302 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 02:51:45 +00:00
0b753e758e PJS: oops forgot a char
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@301 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 02:19:44 +00:00
716a1ff9f3 took custom shape param tree from heap to stack, thus fixing memory leak
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@300 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 02:17:36 +00:00
09a3348820 beat ya!
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@299 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 02:17:18 +00:00
0d3688e877 added accessor for file path member of preset
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@298 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 01:53:17 +00:00
b9144d1ecc PJS: fixed xmms resizing, enabled FBO and corrected bug with texsize paramater initialization
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@297 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 01:51:43 +00:00
53a470df10 fixed memory leak in custom wave
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@296 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 01:47:58 +00:00
02724976b7 random preset switching is now functional
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@295 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-06 07:42:43 +00:00
b260bb7c5b super duper clutch changes to renderer. something interesting appears on the old laptop.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@294 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-06 06:55:20 +00:00
210ae1b1fc - potential sweet bug fix that will move beyond zomexp_mesh bug
- moved internal container member of builtin params from heap to stack
- various code cleanups


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@293 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-06 04:33:59 +00:00
3d08ac9ecc PJS: for carm
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@292 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-05 21:57:50 +00:00