Commit Graph

906 Commits

Author SHA1 Message Date
d8794e12c9 proper init of preset loader at projectm top level
took out all milkdrop specific stuff from projectM.cpp (including headers)


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1152 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-13 04:20:49 +00:00
0d320f20b5 added extensionHandled() check to PresetFactoryManager, now used by PresetLoader
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1151 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-13 04:11:22 +00:00
214ab292c0 multiple preset file extension support in preset factory abstract class
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1150 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-13 03:51:33 +00:00
25efb73871 Embedded a preset factory manager into preset loader.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1149 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-13 03:22:11 +00:00
9282657940 implemented allocate function of CompiledPresetFactory
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1145 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-09 07:04:28 +00:00
40a3965067 compilable preset factory class
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1144 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-09 06:49:45 +00:00
15c24d2567 compiled preset fu
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1143 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-09 03:19:54 +00:00
3f54c9a99d factory for compilable presets
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1139 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-07 23:10:19 +00:00
866b36ca60 Milkdrop Preset Factory partially implemented
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1138 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-07 20:42:17 +00:00
c83161e549 partial preset factory integration
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1137 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-07 16:35:30 +00:00
051ad3d7b7 preset loader refactoring
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1134 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-05 13:39:09 +00:00
3b2052d730 preset refactoring grunt work
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1133 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-05 04:33:01 +00:00
9903e524f1 first step of rehashing Preset definition
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1127 6778bc44-b910-0410-a7a0-be141de4315d
2008-08-06 04:57:46 +00:00
7315791420 personal dev branch for refactoring preset api
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1126 6778bc44-b910-0410-a7a0-be141de4315d
2008-08-06 04:36:20 +00:00
cd11fc8eec More refactoring towards a pipeline world
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1125 6778bc44-b910-0410-a7a0-be141de4315d
2008-08-01 04:27:20 +00:00
217245345c Perhaps I went to far. glInterleavedArrays + glDrawElements in a huge (w * h * 5 * 2) array. Benefits: dont have to reassign vertex coords each frame, faster drawing. Disadvantages: memory usage
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1124 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-27 23:31:04 +00:00
be37d492bc Perhaps I went to far. glInterleavedArrays + glDrawElements in a huge (w * h * 5 * 2) array. Benefits: dont have to reassign vertex coords each frame, faster drawing. Disadvantages: memory usage
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1123 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-27 23:30:42 +00:00
bedc10030b glInterleaved arrays. FASTER
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1122 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-27 22:58:15 +00:00
4156839938 Dynamic array instantiation for VC++ requested by XBMC
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1121 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-27 22:09:17 +00:00
fe7a87514e Bugfix from XBMC. Could be the BIG one
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1120 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-27 21:26:46 +00:00
5e456d6c62 More blur mucking-with
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1119 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-27 18:13:51 +00:00
d82cfd7017 SOVERSION 3
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1118 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-27 18:13:29 +00:00
7fbd41ff7d SVN I am back! Direct all thanks to the most benevolent of all cable guys, John from Time Warner Brooklyn.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1117 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-27 18:12:24 +00:00
cdba68a761 renamed projectM-engin libprojectM
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1116 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-22 01:08:53 +00:00
8b1f380748 Random Textures
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1115 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-21 00:08:52 +00:00
c0f8d09cf3 Blur regression fixed
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1114 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-20 16:18:12 +00:00
f34c05943e I still sense a disturbance in the code, but we are making progress
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1113 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-20 03:48:06 +00:00
f18f1c19f7 some regressions. but clamp + wrap are being set now
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1112 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-20 03:17:11 +00:00
b7e9403652 renderer cleanup
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1111 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-20 02:25:06 +00:00
76ef725357 Yay Formatting! Eclipse FTW!
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1110 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-19 23:11:59 +00:00
5cef72a1b4 TextureManager upgrades to allow some refactoring to pixel shader textures
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1109 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-19 23:00:15 +00:00
61e7a8ab62 SOIL updated, adding UserTexture
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1108 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-19 21:48:48 +00:00
1a6c429af1 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
16593bfde2 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
4d1a056cb3 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
c8953fa2e1 Noise Implementation Improved
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1104 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-16 05:01:11 +00:00
caaf3f23ef I misspoke last commit. NOW blur is proper
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1103 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-16 04:41:07 +00:00
da85ef60f1 I misspoke last commit. NOW blur is proper
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1102 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-16 03:53:47 +00:00
a4a24927cf Blur implemented (mostly) properly
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1101 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-16 01:14:53 +00:00
1601f9f5e7 blur3
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1100 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-13 03:22:22 +00:00
ef18012c53 blur bugfix, very naive blur
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1099 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-13 03:19:24 +00:00
5a3bc5baf1 roaming trigonometric values
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1098 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-13 02:10:14 +00:00
eea0bc07a3 new Q Variables 9-32, integration with Shaders, and proper shader aspect correction
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1097 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-13 01:40:49 +00:00
def54b48c6 Serious progress, althoug some string manipulations are necessary :(
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1096 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-13 00:33:31 +00:00
be66f3290e starting to make progress again
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1095 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-12 23:41:21 +00:00
892c280413 Wasted 4 hours
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1094 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-12 23:38:48 +00:00
e352bcee9d disable 3d perlin
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1093 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-12 23:34:56 +00:00
7b221dc8d6 more nosie
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1092 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-12 19:30:57 +00:00
5966d48170 load projectM.cg from CMAKE_INSTALL_PREFIX
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1091 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-12 17:52:34 +00:00
fc64566634 Perlin Noise is now acceptable
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1090 6778bc44-b910-0410-a7a0-be141de4315d
2008-07-12 06:07:24 +00:00