Commit Graph

64 Commits

Author SHA1 Message Date
dd9e73171e User loadable pixel shader textures implementation. Texsize + random textures need to be done next
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1107 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-19 02:20:55 +00:00
a3d168a739 probably fixed the clear bug I just comitted in parser
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1106 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-19 00:50:09 +00:00
d3e613eee7 parser:
(1) clear string buffer before inserting text for pixel shader code
(2) wrt 1 removed extraneous newlines where applicable in final texst 
(3) took out unused update_string_buffer function



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1105 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-18 23:54:19 +00:00
e033ed347d I do not see any harm in comitting these files
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1084 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-11 06:07:37 +00:00
dd1e97f17e changed tooltip in projectm config dialog.
removed ' from parsing in shade/warp blocks.
allow newlines in parsed string of shade/warp blocks.


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1082 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-08 19:03:45 +00:00
2f6d4777d3 added warp and comp parameters
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1079 6778bc44-b910-0410-a7a0-be141de4315d
2008-06-30 03:58:35 +00:00
37853e4819 removed "projectM.hpp" where applicable to push along a cygwin build
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1005 6778bc44-b910-0410-a7a0-be141de4315d
2008-05-05 21:43:09 +00:00
e14d940f6e huge update with a few very awful bugs left
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@815 6778bc44-b910-0410-a7a0-be141de4315d
2008-02-11 06:02:05 +00:00
0b24861395 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
95836afabd encapsulated more data in Func class.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@554 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-09 15:57:34 +00:00
98f789a658 Comment touch ups, added some aborts for slightly better behavior in custom waves and shapes.
Removed equation string buffers from custom waves


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@553 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-09 15:36:30 +00:00
965f674284 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
72d83c7009 few mild comment improvements and code cleanups
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@549 6778bc44-b910-0410-a7a0-be141de4315d
2007-10-09 00:50:01 +00:00
d6eff41526 two small warning fixes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@484 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-26 20:42:52 +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
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
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
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
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
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
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
5709190400 potential bug fix with per point equation matrix eval
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@394 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 22:15:13 +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
835afcacc7 string parameters allow more flexible concept tokens (ie / and otherwise)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@382 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 17:04:23 +00:00
bdd826fd18 image url for custom shapes implemented
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@381 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 16:58:48 +00:00
e1c2ab53d3 seems to resolve multi-line bug by filtering out \r from tokenizer
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@380 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 06:04:35 +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
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
3b2255bcf5 improved parse debugging
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@371 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 02:02:19 +00:00
60549a9cf9 - lowercase style parsing implemented (or put back?)
- alpha sorted preset file entries


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@370 6778bc44-b910-0410-a7a0-be141de4315d
2007-09-03 01:11:56 +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
943985f846 git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@356 6778bc44-b910-0410-a7a0-be141de4315d 2007-08-29 21:02:47 +00:00
e0d17f940b fixed a few valgrind bugs
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@347 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-17 02:58:00 +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
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
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
add740788d - fixed more memory leaks.
- goodbye menu system
- C++'ifed Expr.[hc]pp



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@302 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 02:51:45 +00:00
716a1ff9f3 took custom shape param tree from heap to stack, thus fixing memory leak
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@300 6778bc44-b910-0410-a7a0-be141de4315d
2007-08-07 02:17:36 +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
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
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
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
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
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
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