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

huge update with a few very awful bugs left

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@815 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-02-11 06:02:05 +00:00
parent 89d2752334
commit 607331c4dd
28 changed files with 302 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,9 +124,7 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
totalframes++;
DWRITE( "start Pass 1 \n" );
totalframes++;
//BEGIN PASS 1
//
@ -163,8 +161,7 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
DWRITE( "renderFrame: renderTarget->texsize: %d x %d\n", this->renderTarget->texsize, this->renderTarget->texsize );
if(this->renderTarget->useFBO)
{
@ -218,7 +215,7 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
}
else glViewport( 0, 0, this->vw, this->vh );
DWRITE( "viewport: %d x %d\n", this->vw, this->vh );
glBindTexture( GL_TEXTURE_2D, this->renderTarget->textureID[0] );
@ -249,7 +246,6 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
if(renderTarget->renderToTexture)
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
DWRITE("End of Pass 2\n" );
}
@ -708,8 +704,6 @@ void Renderer::WaveformMath(PresetOutputs *presetOutputs, PresetInputs *presetIn
presetOutputs->two_waves = false;
DWRITE( "WaveformMath: %d\n", presetOutputs->nWaveMode );
switch(presetOutputs->nWaveMode)
{
@ -720,7 +714,6 @@ void Renderer::WaveformMath(PresetOutputs *presetOutputs, PresetInputs *presetIn
presetOutputs->wave_scale =1.0;
presetOutputs->wave_y=-1*(presetOutputs->wave_y-1.0);
DWRITE( "nsamples: %d\n", beatDetect->pcm->numsamples );
presetOutputs->wave_samples = isSmoothing ? 512-32 : beatDetect->pcm->numsamples;
// presetOutputs->wave_samples= 512-32;
@ -1377,7 +1370,7 @@ void Renderer::draw_help( )
#ifdef USE_FTGL
//glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO);
DWRITE("pre-help");
glColor4f(1.0, 1.0, 1.0, 1.0);
glPushMatrix();
glTranslatef(0, 1, 0);
@ -1426,7 +1419,7 @@ void Renderer::draw_help( )
glPopMatrix();
// glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
DWRITE("post-help");
#endif /** USE_FTGL */
}