mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-29 18:54:07 +00:00
Code Issues Projects Releases Wiki Activity

re-enabling borders

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@318 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-08-11 00:07:29 +00:00
parent dfeab67539
commit d6898f401a
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/projectM-engine/PresetMerge.cpp Normal file
View File

@ -0,0 +1,6 @@
#include "PresetMerge.hpp"
void PresetMerger::MergePresets(PresetOutputs *A, const PresetOutputs *B, double ratio)
{
return;
}

12
src/projectM-engine/PresetMerge.hpp Normal file
View File

@ -0,0 +1,12 @@
#ifndef PRESET_MERGE_HPP
#define PRESET_MERGE_HPP
#include "Preset.hpp"
class PresetMerger
{
public:
void MergePresets(PresetOutputs *A, const PresetOutputs *B, double ratio);
};
#endif

2
src/projectM-engine/Renderer.cpp
View File

@ -156,7 +156,7 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
draw_custom_waves(presetOutputs);
draw_waveform(presetOutputs, presetInputs);
if(presetOutputs->bDarkenCenter)darken_center();
// draw_borders(presetOutputs); //draw borders
draw_borders(presetOutputs); //draw borders
/** Restore original view state */
glMatrixMode( GL_MODELVIEW );