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

another lower case mod

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@390 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-09-03 20:50:24 +00:00
parent e563aa50a6
commit 616a7e5281
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/projectM-engine/CustomWave.cpp
View File

@ -235,7 +235,7 @@ CustomWave::CustomWave(int _id):
}
if ((param = Param::new_param_bool("bUseDots", P_FLAG_NONE, &this->bUseDots, 1, 0, 0)) == NULL)
if ((param = Param::new_param_bool("busedots", P_FLAG_NONE, &this->bUseDots, 1, 0, 0)) == NULL)
{
delete(this);
/// @bug make exception
@ -248,7 +248,7 @@ CustomWave::CustomWave(int _id):
abort();
}
if ((param = Param::new_param_bool("bAdditive", P_FLAG_NONE, &this->bAdditive, 1, 0, 0)) == NULL)
if ((param = Param::new_param_bool("badditive", P_FLAG_NONE, &this->bAdditive, 1, 0, 0)) == NULL)
{
delete(this);
abort();

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

@ -169,10 +169,18 @@ token_t Parser::parseToken(std::istream & fs, char * string) {
}
std::cerr << "parsed away =" << std::endl;
--i;
break;
--i;
// if (fs && fs.get() == '\n') {
// line_mode = NORMAL_LINE_MODE;
// return tEOL;
// } else if (fs)
//fs.unget();
break;
}
line_mode = NORMAL_LINE_MODE;
return tEOL;
case ',':

4
src/projectM-engine/Preset.cpp
View File

@ -194,6 +194,10 @@ void Preset::evalCustomWavePerFrameEquations()
{
assert(_pos->second);
_pos->second->evaluate();
// if (_pos->second->param->name =="busedots")
// std::cerr << "busedots: " << (*(bool*)_pos->second->param->engine_val) << std::endl;
// else std::cerr << "name: " << _pos->second->param->name <<std::endl;
}
std::map<int, PerFrameEqn*> & per_frame_eqn_tree = (*pos)->per_frame_eqn_tree;