Commit Graph

61 Commits

Author SHA1 Message Date
8e753741ca PJS: Multi threading stage 1: smooth preset switching accelerated
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@846 6778bc44-b910-0410-a7a0-be141de4315d
2008-02-28 01:01:36 +00:00
8e1904ad81 trunk builds again
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@564 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-10 04:19:24 +00:00
77e3caa9d2 changed most unneccessary maps to vectors
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@552 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-09 01:36:02 +00:00
113c0eb64a debug cleanup
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@499 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-03 03:15:00 +00:00
fa900a0deb - fixed serious bug introduced with win32 compatibility
- preset name display now only shows file name, not full path



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@471 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-22 17:20:47 +00:00
4cf4eeae80 - merged in geiss & sperl's idle preset
- preset chooser doesn't abort when preset dir is invalid
- added smooth preset switch cancellation when preset chooser empty (untested)
- changed preset construct to allow for custom preset name when using 
	input streams as source



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@427 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 19:45:45 +00:00
7b7930c8bf parse debug cleanup
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@423 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-09 22:27:37 +00:00
fbaa3092b7 another wrap around bug fix- possibly the mother of all wrap around bug fixes.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@422 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-09 19:31:17 +00:00
defdd2d0e5 wrote simple mod to exclude user defined parameters from ever being re-initialized to a constant per frame
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@409 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-06 01:22:49 +00:00
7e3581fd4a Fixed bug in evaluator. Per Pixel meshes werent being initialized with per-frame values. This also means that we dont need the is_mesh variables anymore, so they have been removed
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@408 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 06:04:52 +00:00
1c5909883a - put back sticky user defined variables
- q variable unspec bug probably still exists


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@406 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 05:18:32 +00:00
05d4cc06c1 wrote q variable copy function
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@404 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 04:36:03 +00:00
e810879d5f almost finished with copy safe q variables
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@403 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 04:28:16 +00:00
c2ca5f15d6 put back per frame / custom wave / custom shape init calls into evaluateFrame()
- NOTE: not bug free. q values aren't preserved


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@402 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 04:03:12 +00:00
a0d642157c first guess at per pixel non matrix user params
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@399 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 03:39:48 +00:00
a3b6e50c1c refactored bool param type to bool rather than int
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@397 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-04 01:52:26 +00:00
616a7e5281 another lower case mod
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@390 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 20:50:24 +00:00
61bca58ce8 token wrap 1.0
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@376 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 05:16:40 +00:00
b3060421dc PJS: implemented warp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@375 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 04:56:31 +00:00
9b48f89d4a lowercase bug fix in alternate name param storage
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@374 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 04:28:54 +00:00
ca927a2352 thought I commited this. new eval behavior test
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@373 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 03:46:52 +00:00
63192323d0 parser refactoring
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@368 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-02 03:36:15 +00:00
e78eca3f41 clearing the preset outputs struct now in preset init
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@344 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 03:40:11 +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
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
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
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
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
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
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
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
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
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
f7fee506c9 various touch ups, minor bug fix.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@291 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-05 05:04:35 +00:00
e961872101 carms updates
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@290 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-03 23:27:17 +00:00
0b757f5885 merge of work/home changes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@289 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-02 02:56:18 +00:00
467bcc8433 merge of changes from sperl machine. don't remember what I did (carm)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@286 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-02 02:16:06 +00:00
34a81c8cab PJS: carms stuff
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@282 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-28 05:02:37 +00:00
1516f575c2 billions of fixes. no. gazillions.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@274 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-27 19:24:29 +00:00
48027ffcb8 forgot.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@272 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-26 01:45:37 +00:00
86001df5ee - SplayTree is gone! excellent.
- some issues with load_custom_wave/shape_init_conds. will resolve soon


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@271 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-21 02:41:35 +00:00
4730ed89c8 massive gutting and refactoring. sperl is lazy carnivore.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@270 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-18 02:21:03 +00:00
7066917125 splaytree gutting
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@269 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-16 04:39:22 +00:00
16bc17f235 progress with prest inputs / outputs - per_pixe_ops[] or whatever is deprecated
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@264 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-10 00:01:49 +00:00
071afb4493 builds again with preset::find reference fixed hopefully
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@260 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-09 03:22:54 +00:00
99455a65b6 changed Param.h and Parser.h -> hppS
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@253 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-08 22:36:40 +00:00
1218d620c1 minimized # of includes required by projectM, but added annoying heap allocation of preset iterator to do so.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@242 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-07 01:43:39 +00:00
9c869fa717 - encapsulated some type defs
- more minor fixes / updates


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@241 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-07 01:11:20 +00:00