Commit Graph

68 Commits

Author SHA1 Message Date
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
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
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
85e46e522a Textured shapes == success
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@387 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 18:54:00 +00:00
cdea66aa3a PJS inital texture manager class
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@383 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 18:16:38 +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
f3fbb812df PJS: cleaned up interfaces
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@359 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-30 01:19:34 +00:00
43e3acf429 PJS: completed new conifg
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@358 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-29 23:39:51 +00:00
42a30734f5 PJS: moving to configfile c++ library
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@353 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-28 19:17:43 +00:00
88a75c148a carms changes from tonight
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@350 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-21 05:17:20 +00:00
ac354b8fdd forgot--This line, and those below, will be ignored--
M    projectM-engine/projectM.cpp


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@346 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 03:52:11 +00:00
807da7fe56 switch preset name when smooth switching
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@345 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 03:46:40 +00:00
e0e7c30ab8 fixed preset name display on my dist at least
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@342 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 03:22:25 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
0995313599 undoing carms zealous overwriting
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@265 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-10 03:18:16 +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
75a8102700 PJS: now compiling presetframeio.cpp and refactored construction of PresetFrameIO.cpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@263 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-09 04:13:49 +00:00
268133cbee more h -> hpp conversions.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@255 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-08 23:01:32 +00:00
a25d09fa68 lots of h -> hpp conversion
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@254 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-08 22:49:02 +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