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

MilkdropWaveform added and tested as little as possible

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1060 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2008-06-26 03:43:28 +00:00
parent c65f9c854e
commit 64dfc352d7
7 changed files with 443 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ myCgContext = cgCreateContext();
cgGLSetDebugMode( CG_FALSE );
cgSetParameterSettingMode(myCgContext, CG_DEFERRED_PARAMETER_SETTING);
myCgProfile = cgGLGetLatestProfile(CG_GL_FRAGMENT);
cgGLSetOptimalOptions(myCgProfile);
checkForCgError("selecting fragment profile");
@ -151,7 +151,7 @@ myCgContext = cgCreateContext();
cgGLLoadProgram(myCgWarpProgram);
checkForCgError("loading fragment program");
myCgCompositeProgram =
cgCreateProgramFromFile(
@ -181,7 +181,7 @@ void Renderer::ResetTextures()
textureManager->Preload();
}
void Renderer::RenderFrame(const Pipeline* pipeline)
void Renderer::RenderFrame(const Pipeline* pipeline, const PipelineContext &pipelineContext)
{
glMatrixMode(GL_PROJECTION);
@ -233,9 +233,12 @@ void Renderer::RenderFrame(const Pipeline* pipeline)
checkForCgError("disabling fragment profile");
#endif
renderContext.time = pipelineContext.time;
renderContext.texsize = texsize;
renderContext.aspectCorrect = correction;
renderContext.aspectRatio = aspect;
renderContext.textureManager = textureManager;
renderContext.beatDetect = beatDetect;
for (std::vector<RenderItem*>::const_iterator pos = pipeline->drawables.begin(); pos != pipeline->drawables.end(); ++pos)
(*pos)->Draw(renderContext);
@ -583,10 +586,7 @@ void Renderer::Interpolation(const Pipeline *pipeline)
}
Pipeline* Renderer::currentPipe;
Point Renderer::PerPixel(Point p, PerPixelContext context)
{
return currentPipe->PerPixel(p,context);
}
Renderer::~Renderer()
{