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

modded preset chooser so random selection changes the position iterator

Browse Source 
other very minor non behavioral changes


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@472 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-09-22 19:20:32 +00:00
parent fa900a0deb
commit ff10424a33
5 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/projectM-engine/projectM.cpp
View File

@ -219,11 +219,14 @@ DLLEXPORT void projectM::renderFrame()
presetInputs.progress=0.0;
presetInputs.frame = 1;
m_activePreset2 = m_presetChooser->weightedRandom<PresetChooser::UniformRandomFunctor>
(presetInputs, &m_activePreset->presetOutputs() == &presetOutputs ? presetOutputs2 : presetOutputs);
*m_presetPos = m_presetChooser->weightedRandom<PresetChooser::UniformRandomFunctor>();
m_activePreset2 = m_presetPos->allocate
(presetInputs, &m_activePreset->presetOutputs() == &presetOutputs ? presetOutputs2 : presetOutputs);
assert(m_activePreset2.get());
renderer->setPresetName(m_activePreset2->presetName());
nohard=(int)(presetInputs.fps*3.5);
smoothFrame = (int)(presetInputs.fps * smoothDuration);
@ -233,8 +236,10 @@ DLLEXPORT void projectM::renderFrame()
{
// printf("%f %d %d\n", beatDetect->bass-beatDetect->bass_old,this->frame,this->avgtime);
printf("HARD CUT");
m_activePreset = m_presetChooser->weightedRandom<PresetChooser::UniformRandomFunctor>
(presetInputs, presetOutputs);
*m_presetPos = m_presetChooser->weightedRandom<PresetChooser::UniformRandomFunctor> ();
m_activePreset = m_presetPos->allocate(presetInputs, presetOutputs);
assert(m_activePreset.get());
nohard=presetInputs.fps*5;
smoothFrame=0;
@ -278,7 +283,7 @@ DLLEXPORT void projectM::renderFrame()
{
if (smoothFrame == 1)
{
m_activePreset = m_activePreset2;
m_activePreset = m_activePreset2;
smoothFrame=0;
printf("Smooth Finished\n");
}