Commit Graph

60 Commits

Author SHA1 Message Date
95790de331 Removed a lot of glClear
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@449 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-20 01:26:14 +00:00
befafe946f more render to texture stuff
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@448 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-20 00:43:58 +00:00
d7657402f6 first commit of render to texture code
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@447 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-20 00:10:36 +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
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
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
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
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
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
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
7bdb80dc58 new presets
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@392 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 21:03:24 +00:00
6336014f54 texture size status printout
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@388 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 19:07:04 +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
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
e8fdfae22a PJS: texture loading library and what I think is a fix to textured shapes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@372 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 03:22:48 +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
3c611bed07 removed expensive debug print outs in title font part of renderer
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@343 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-16 03:23: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
3c36353375 fixed CustomShape::findParam reference error
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@267 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-10 04:54:16 +00:00
2dd1a190cf Renderer bug fixes/reverts.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@266 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-10 04:14:06 +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
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
95aec70d01 changed Custom[Wave | Shape].h -> hpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@252 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-08 22:31:46 +00:00
2332cebbc9 changed IntCond.h -> hpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@251 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-08 22:28:11 +00:00