Commit Graph

295 Commits

Author SHA1 Message Date
1cd5bee920 goodbye current engine static variable
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@446 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-19 23:33:46 +00:00
5cb819a1bd - added PCM destructor to handle yet another sperl memory leak
(seems to resolve majority of memory leakage, but perhaps not all)
- some comment cleanups



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@445 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-19 23:32:00 +00:00
3103c81baa more bug fixes- in particular, presetOutputs now has a destructor
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@444 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-19 21:32:26 +00:00
d1efb37060 lots of changes
- project init / destroy memory leak bugs fixed. some still exist
- moodbar partial integration. will be removed later


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@443 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-19 21:00:58 +00:00
830064215f added mood_r,g,b values. formatting changes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@442 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 05:05:33 +00:00
ab07c10359 updated CMakeLists to build moodbar
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@441 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 04:59:34 +00:00
0ff4d32b84 added moodbar algorithm. about 80% complete.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@440 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 04:59:11 +00:00
645c9397c0 paranoid commits, added some temp debug
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@439 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:41:50 +00:00
6e082ca305 fixed more ~projectM() issues. bugs left
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@438 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:39:43 +00:00
ddb0b1069b slowly making projectM class not depend on static crap
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@437 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:25:09 +00:00
fb2076a1a4 fixed all compiler warnings.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@436 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:09:37 +00:00
14e127cf03 - removed some compiler warnings
- added a projectM destructor
- bug still exists when closing sometimes


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@435 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 01:04:08 +00:00
f4474f7544 Better synchronization, cleanup, and a screen capture button
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@434 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-17 00:43:49 +00:00
abd30c0c41 Smooth Preset fix. for loop index not initialized to 0. Doh
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@433 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-16 17:46:42 +00:00
88cb631a75 Moved around some headers, removed glut.h
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@432 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-16 17:15:34 +00:00
4e0124e64d Fix for smooth preset crashing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@431 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-16 02:33:54 +00:00
bd296571ff - removed unneccessary PROJECTM_PRESET_DIR const string
- fixed error in print out when preset dir is invalid



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@430 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 20:37:13 +00:00
7ef8a7b2fc oops, this one compiles
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@429 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 20:30:39 +00:00
a92a8d084c added paranoi to smooth preset switching regarding empty preset chooser
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@428 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 20:30:17 +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
94c6036ee8 PJS: The idle preset
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@426 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 18:45:45 +00:00
bf9072698a PJS: disable aspect correction for image textured shapes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@425 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-14 17:14:25 +00:00
8b2b343732 updated line hack comment
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@424 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-10 00:59:49 +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
8c64f8ab68 initial import of newly ported jack-projectM
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@421 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-09 02:35:15 +00:00
ffa62ad01d more kickass bug fixes with parser
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@420 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-08 16:45:56 +00:00
ff3969c8ce got rid of another preset token wrap around crash. parser needs reworked. any volunteers?
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@419 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-08 16:33:00 +00:00
69c8fec160 another potential wrap around token fix
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@418 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-08 05:14:22 +00:00
6587d379b6 potential bug fix with wrap around functionality + custom shapes. custom waves should also be
examined.


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@417 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-08 05:09:51 +00:00
68e7f42ab0 Removed a lot of glMatrixMode calls
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@416 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-08 02:08:37 +00:00
37717c3393 removed push/pops
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@415 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-08 01:51:02 +00:00
8b77ad776f Per pixel mesh variables were set up with the wrong bounds
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@414 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-07 15:50:55 +00:00
be627196c1 User Variable Initial Conditions were not being evaluated once at the start of the preset. Adedd calls to InitCond->evaluate(true) during parsing. evaluate was given a boolean argument to decide whether to evlauate a user var or not. The old evaluate() is a wrapper that calls evaluate(false)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@413 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-07 05:23:33 +00:00
edd6cb0f0c Rendered code cleanup
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@412 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-07 04:43:52 +00:00
b86008c480 maybe fixed bugs, maybe introduced some
- moved every variable to bool rather than int when they should be bool



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@411 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-07 02:43:25 +00:00
f340d7fa11 The Custom Wave init_cond_tree was being evaluated twice. Once in evalInitConds, and once in evalCustomWavePerFrameEquations. This was not correct
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@410 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-07 02:35:36 +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
857017564b removed dead varo
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@407 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 05:20:20 +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
b8a660a6e1 fixed assertion error
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@405 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 04:41:37 +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
6a16eca184 removed dead variables, added assertion in per pixel eqn
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@401 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 03:56:39 +00:00
0dff8a5f78 made default init values smarter.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@400 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-05 03:53:36 +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
8fa2d00beb might have stamped samples to outside iterator fix. put it back
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@398 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-04 01:56:22 +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