speed-dreams/speed-dreams-code
6
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Bug #589 Remove scissors when they are not necessary

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4989 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 063942492ae93996decf078eb6e50893e1ff5700
Former-commit-id: 9a2781f11dd98982566d19999847bf0ccc353899
This commit is contained in:
mungewell 2012-10-09 20:14:09 +00:00
parent 75e5d5b406
commit 1b1bb1a9a2
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/modules/graphic/ssggraph/grscreen.cpp
View file

@ -347,13 +347,20 @@ void cGrScreen::update(tSituation *s, const cGrFrameInfo* frameInfo)
GfParmWriteFile(NULL, grHandle, "Graph");
curCam->onSelect(curCar, s);
}
glEnable(GL_SCISSOR_TEST);
glViewport(scrx, scry, scrw, scrh);
glScissor(scrx, scry, scrw, scrh);
dispCam = curCam;
camDraw(s);
glDisable(GL_SCISSOR_TEST);
if (grNbActiveScreens > 1) {
// only need to scissor with split screens (to prevent a problem with Nouvuea driver)
glEnable(GL_SCISSOR_TEST);
glViewport(scrx, scry, scrw, scrh);
glScissor(scrx, scry, scrw, scrh);
dispCam = curCam;
camDraw(s);
glDisable(GL_SCISSOR_TEST);
} else {
glViewport(scrx, scry, scrw, scrh);
dispCam = curCam;
camDraw(s);
}
/* Mirror */
if (mirrorFlag && curCam->isMirrorAllowed ()) {
@ -378,11 +385,17 @@ void cGrScreen::update(tSituation *s, const cGrFrameInfo* frameInfo)
glDisable(GL_TEXTURE_2D);
TRACE_GL("cGrScreen::update glDisable(GL_DEPTH_TEST)");
glEnable(GL_SCISSOR_TEST);
glScissor(scrx + (scrw * (100 - boardWidth)/200), scry, scrw * boardWidth / 100, scrh);
board->refreshBoard(s, frameInfo, curCar,
if (boardWidth != 100) {
// Only need to scissor if board does not occupy whole (split) screen
glEnable(GL_SCISSOR_TEST);
glScissor(scrx + (scrw * (100 - boardWidth)/200), scry, scrw * boardWidth / 100, scrh);
board->refreshBoard(s, frameInfo, curCar,
grNbActiveScreens > 1 && grGetCurrentScreen() == this);
glDisable(GL_SCISSOR_TEST);
glDisable(GL_SCISSOR_TEST);
} else {
board->refreshBoard(s, frameInfo, curCar,
grNbActiveScreens > 1 && grGetCurrentScreen() == this);
}
TRACE_GL("cGrScreen::update display boards");
GfProfStopProfile("grDisp**");