Commit Graph

27 Commits

Author SHA1 Message Date
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
a342563837 Carm, I told you how to fix this, you dumbass.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@247 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-08 21:45:27 +00:00
888d566cd8 disabled menu system, removed activePreset - use m_activePreset
- glConsole is also probably busted

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@245 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-08 17:59:52 +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
d6700b9a35 - added file loading / preset chooser init to projectM.cpp
- update console interface to match new preset design (somewhat)
- deciding where to handle preset change event (renderer?? seems bad)


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@238 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-06 05:30:25 +00:00
dcf56e4988 header dependencies modified and xmms-projectm builds but doesnt run
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@234 6778bc44-b910-0410-a7a0-be141de4315d
2007-07-04 16:56:09 +00:00
f26c2938e3 - added first guess at custom wave / shape collections to preset outputs
- removed renderer bug. replaced with wave/shape iterators
- other changes I forgot about already


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@223 6778bc44-b910-0410-a7a0-be141de4315d
2007-06-25 01:03:22 +00:00
1a6f11d561 - took symbolic type of out splaynode, which will break parameter associations temporarily
- hacked and commented renderer so it builds


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@221 6778bc44-b910-0410-a7a0-be141de4315d
2007-06-24 05:09:16 +00:00
d03e24e347 PJS: refactored a massive amount of stuff
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@219 6778bc44-b910-0410-a7a0-be141de4315d
2007-06-24 03:58:06 +00:00
f4025c8eaf PJS: maybe I made some mistakes... either way, progress is made
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@206 6778bc44-b910-0410-a7a0-be141de4315d
2007-06-22 02:31:41 +00:00
786014bedb PJS: Refactoring the Renderer out
made changes to FrameIO that you need to follow


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@197 6778bc44-b910-0410-a7a0-be141de4315d
2007-06-19 06:08:52 +00:00