mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-21 03:35:40 +00:00
Code Issues Projects Releases Wiki Activity

put back per frame / custom wave / custom shape init calls into evaluateFrame()

Browse Source 
- NOTE: not bug free. q values aren't preserved


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@402 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-09-05 04:03:12 +00:00
parent 6a16eca184
commit c2ca5f15d6
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,10 +199,6 @@ 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;
@ -240,13 +236,6 @@ void Preset::evalCustomShapePerFrameEquations()
void Preset::evalPerFrameInitEquations()
{
/// @bug not sure if necessary
for (std::map<std::string, InitCond*>::iterator pos = init_cond_tree.begin(); pos != init_cond_tree.end(); ++pos)
{
assert(pos->second);
pos->second->evaluate();
}
for (std::map<std::string, InitCond*>::iterator pos = per_frame_init_eqn_tree.begin(); pos != per_frame_init_eqn_tree.end(); ++pos)
{
assert(pos->second);
@ -304,10 +293,6 @@ void Preset::postloadInitialize() {
this->loadCustomWaveUnspecInitConds();
this->loadCustomShapeUnspecInitConds();
/// @note Recently moved from evaluateFrame() - is this more correct? not sure
evalPerFrameInitEquations();
evalCustomWaveInitConditions();
evalCustomShapeInitConditions();
}
@ -385,9 +370,15 @@ void Preset::evaluateFrame()
/* Evaluate all equation objects according to milkdrop flow diagram */
evalPerFrameInitEquations();
evalPerFrameEquations();
evalPerPixelEqns();
evalCustomWaveInitConditions();
evalCustomWavePerFrameEquations();
evalCustomShapeInitConditions();
evalCustomShapePerFrameEquations();
// Setup pointers of the custom waves and shapes to the preset outputs instance