diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 693798382f8943bdb8cfbf2858d7fca05e9e4af8..206d6e4d8301b561a14fb27b460731e9e78ad84c 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
glTranslatef(-x, -y, 0);
- g_Map_BuildPVP(sX, sY, sX+sWidth-1, sY+sHeight-1);
- g_Map_DrawPanels(PANEL_BACK);
- g_Map_DrawPanels(PANEL_STEP);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_BACK);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_STEP);
g_Items_Draw();
g_Weapon_Draw();
g_Player_DrawShells();
g_Player_DrawAll();
g_Player_DrawCorpses();
- g_Map_DrawPanels(PANEL_WALL);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_WALL);
g_Monsters_Draw();
- g_Map_DrawPanels(PANEL_CLOSEDOOR);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_CLOSEDOOR);
g_GFX_Draw();
g_Map_DrawFlags();
- g_Map_DrawPanels(PANEL_ACID1);
- g_Map_DrawPanels(PANEL_ACID2);
- g_Map_DrawPanels(PANEL_WATER);
- g_Map_DrawPanels(PANEL_FORE);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_ACID1);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_ACID2);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_WATER);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_FORE);
if g_debug_HealthBar then
begin
g_Monsters_DrawHealth();
g_Player_DrawHealth();
end;
- g_Map_ResetPVP();
glPopMatrix();
end;
glTranslatef(a, b+p.IncCam, 0);
- g_Map_BuildPVP(sX, sY, sX+sWidth-1, sY+sHeight-1);
-
- g_Map_DrawPanels(PANEL_BACK);
- g_Map_DrawPanels(PANEL_STEP);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_BACK);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_STEP);
g_Items_Draw();
g_Weapon_Draw();
g_Player_DrawShells();
g_Player_DrawAll();
g_Player_DrawCorpses();
- g_Map_DrawPanels(PANEL_WALL);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_WALL);
g_Monsters_Draw();
- g_Map_DrawPanels(PANEL_CLOSEDOOR);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_CLOSEDOOR);
g_GFX_Draw();
g_Map_DrawFlags();
- g_Map_DrawPanels(PANEL_ACID1);
- g_Map_DrawPanels(PANEL_ACID2);
- g_Map_DrawPanels(PANEL_WATER);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_ACID1);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_ACID2);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_WATER);
+ //TODO: lights should be in separate grid, i think
+ // but on the other side: grid may be slower for dynlights, as their lifetime is short
if gwin_has_stencil and (g_dynLightCount > 0) then
begin
// setup OpenGL parameters
ly := g_dynLights[lln].y;
lrad := g_dynLights[lln].radius;
if lrad < 3 then continue;
+
+ if lx-sX+lrad < 0 then continue;
+ if ly-sY+lrad < 0 then continue;
+ if lx-sX-lrad >= gPlayerScreenSize.X then continue;
+ if ly-sY-lrad >= gPlayerScreenSize.Y then continue;
+
// set scissor to optimize drawing
glScissor((lx-sX)-lrad+2, gPlayerScreenSize.Y-(ly-sY)-lrad-1+2, lrad*2-4, lrad*2-4);
- // clear stencil buffer
- //glClear(GL_STENCIL_BUFFER_BIT); //!!!
+ // no need to clear stencil buffer, light blitting will do it for us
glStencilOp(GL_KEEP, GL_KEEP, GL_INCR);
// draw extruded panels
glDisable(GL_TEXTURE_2D);
if (lrad > 4) then g_Map_DrawPanelShadowVolumes(lx, ly, lrad);
// render light texture
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // modify color buffer
- //glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO); // draw light, and clear stencil buffer
// blend it
glEnable(GL_BLEND);
glScissor(0, 0, sWidth, sHeight);
end;
- g_Map_DrawPanels(PANEL_FORE);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_FORE);
if g_debug_HealthBar then
begin
g_Monsters_DrawHealth();
}
glPopMatrix();
- g_Map_ResetPVP();
p.DrawPain();
p.DrawPickup();