mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-06 07:45:24 +00:00
Code Issues Projects Releases Wiki Activity

PJS: fixed xmms resizing, enabled FBO and corrected bug with texsize paramater initialization

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@297 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-08-07 01:51:43 +00:00
parent 53a470df10
commit b9144d1ecc
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ RenderTarget::RenderTarget(int texsize, int width, int height) : usePbuffers(fal
int mindim = 0;
int origtexsize = 0;
int usePbuffers = 1;
this->usePbuffers = 1;
this->texsize=texsize;

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

@ -1494,8 +1494,7 @@ void Renderer::draw_preset() {
title_font->FaceSize((unsigned)(12*(this->vh/512.0)));
if(this->noSwitch) title_font->Render("[LOCKED] " );
title_font->FaceSize((unsigned)(20*(this->vh/512.0)));
if (this->presetName)
title_font->Render(this->presetName );
//if (this->presetName) title_font->Render(this->presetName );
@ -1586,11 +1585,11 @@ sprintf( buffer, " (%f)", this->aspect);
glRasterPos2f(0, -.13+offset);
sprintf( buffer, "viewport: %d x %d", this->vw, this->vh);
other_font->Render(buffer);
/* REME: FIX
glRasterPos2f(0, -.17+offset);
other_font->Render((this->renderer->renderTarget->usePbuffers ? " FBO: on" : " FBO: off"));
*/
other_font->Render((this->renderTarget->usePbuffers ? " FBO: on" : " FBO: off"));
glRasterPos2f(0, -.21+offset);
sprintf( buffer, " mesh: %d x %d", presetInputs->gx,presetInputs->gy);
other_font->Render(buffer);

1
src/projectM-engine/Renderer.hpp
View File

@ -50,7 +50,6 @@ FTGLPolygonFont *poly_font;
int studio;
int correction;
char *presetName;
char *fontURL;
int noSwitch;

16
src/projectM-xmms/main.cpp
View File

@ -54,7 +54,7 @@ www.gamedev.net/reference/programming/features/beatdetection/
extern "C" void projectM_xmms_init(void);
extern "C" void projectM_cleanup(void);
extern "C" void projectM_about(void);
extern "C" void projectM_configure(void)
extern "C" void projectM_configure(void);
extern "C" void projectM_playback_start(void);
extern "C" void projectM_playback_stop(void);
extern "C" void projectM_render_pcm(gint16 pcm_data[2][512]);
@ -192,8 +192,8 @@ int worker_func(void*)
globalPM->presetURL = (char *)malloc( sizeof( char ) * 512 );
strcpy( globalPM->presetURL, preset_dir );
globalPM->projectM_init(gx, gy, texsize, fps, fullscreen ? fvw:wvw, fullscreen? fvh:wvh);
globalPM->projectM_init(gx, gy, fps, texsize, fullscreen ? fvw:wvw, fullscreen? fvh:wvh);
globalPM->projectM_resetGL( wvw, wvh );
@ -209,16 +209,13 @@ int worker_func(void*)
SDL_Event event;
while ( SDL_PollEvent( &event ) ) {
/** Translate into projectM codes and process */
evt = sdl2pmEvent( event );
if (!((event.type == SDL_KEYDOWN) || (event.type == SDL_KEYUP)))
continue;
evt = sdl2pmEvent( event );
key = sdl2pmKeycode( event.key.keysym.sym );
mod = sdl2pmModifier( event.key.keysym.mod );
if ( evt == PROJECTM_KEYDOWN ) {
printf("menu-imp\n");
if(key == PROJECTM_K_f)
{
@ -240,6 +237,9 @@ int worker_func(void*)
}
else if ( evt == PROJECTM_VIDEORESIZE )
{
wvw=event.resize.w;
wvh=event.resize.h;