mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-14 11:25:47 +00:00
Code Issues Projects Releases Wiki Activity

User loadable pixel shader textures implementation. Texsize + random textures need to be done next

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1107 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2008-07-19 02:20:55 +00:00
parent a3d168a739
commit dd9e73171e
16 changed files with 948 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/projectM-engine/Parser.cpp
View File

@ -442,7 +442,7 @@ int Parser::parse_line(std::istream & fs, Preset * preset)
if (!strncmp(eqn_string, WARP_STRING, WARP_STRING_LENGTH))
{
//std::cout << "parsing warp string block\n" << std::endl;
parse_string_block(fs, &preset->presetOutputs().shader.warp);
parse_string_block(fs, &preset->presetOutputs().warpShader.programSource);
return PROJECTM_SUCCESS;
}
@ -451,7 +451,7 @@ int Parser::parse_line(std::istream & fs, Preset * preset)
if (!strncmp(eqn_string, COMPOSITE_STRING, COMPOSITE_STRING_LENGTH))
{
//std::cout << "parsing composite string block\n" << std::endl;
parse_string_block(fs, &preset->presetOutputs().shader.composite);
parse_string_block(fs, &preset->presetOutputs().compositeShader.programSource);
return PROJECTM_SUCCESS;
}
@ -1543,7 +1543,7 @@ void Parser::parse_string_block(std::istream & fs, std::string * out_string) {
skipList.insert('`');
readStringUntil(fs, out_string, false, skipList);
std::cout << "out_string:\n " << *out_string << "\n" << std::endl;
//std::cout << "out_string:\n " << *out_string << "\n" << std::endl;
}
@ -1655,15 +1655,15 @@ bool Parser::scanForComment(std::istream & fs) {
return true;
else
c = fs.get();
if (c == EOF)
if (c == EOF)
return true;
if (c == '\n')
{
return true;
}
}
} else {
} else {
fs.unget();
return false;
}
@ -1686,10 +1686,10 @@ void Parser::readStringUntil(std::istream & fs, std::string * out_buffer, bool w
/* Now interpret the character */
switch (c)
{
case '/':
case '/':
{
bool commentExisted = scanForComment(fs);
if (!commentExisted) {
if (!commentExisted) {
out_buffer->push_back(c);
break;
} else {
@ -1700,7 +1700,7 @@ void Parser::readStringUntil(std::istream & fs, std::string * out_buffer, bool w
case '\n':
if (!out_buffer->empty() && ((*out_buffer)[out_buffer->length() -1] == '\n'))
return;
line_count++;
if (wrapAround)
{