X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Frenders%2Fopengl%2Fr_map.pas;h=eff895d9b528d404a0560b035f1958efe48bf619;hb=b4e158834e92ec5c007a8af5a116855b8062c82d;hp=028c724541e5cd119949d364bef86ea4848e940d;hpb=203d8922aa34a34fb63e312691c711c419c34ae1;p=d2df-sdl.git diff --git a/src/game/renders/opengl/r_map.pas b/src/game/renders/opengl/r_map.pas index 028c724..eff895d 100644 --- a/src/game/renders/opengl/r_map.pas +++ b/src/game/renders/opengl/r_map.pas @@ -38,19 +38,16 @@ interface procedure r_Map_DrawPlayerModel (pm: TPlayerModel; x, y: Integer; alpha: Byte); {$ENDIF} + procedure r_Map_Reset; procedure r_Map_Update; - procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer); + procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer; out acx, acy: Integer); implementation uses + {$I ../../../nogl/noGLuses.inc} Math, SysUtils, - {$IFDEF USE_GLES1} - GLES11, - {$ELSE} - GL, GLEXT, - {$ENDIF} e_log, binheap, MAPDEF, utils, g_options, g_animations, g_basic, g_phys, @@ -236,6 +233,7 @@ implementation var DebugCameraScale: Single; + FillOutsizeArea: Boolean; SkyTexture: TGLTexture; RenTextures: array of record spec: LongInt; @@ -528,10 +526,22 @@ implementation r_Common_FreeAndNil(Items[i].tex); end; + procedure r_Map_FreeTextures; + var i: Integer; + begin + plist.Clear; + r_Common_FreeAndNil(SkyTexture); + if RenTextures <> nil then + for i := 0 to High(RenTextures) do + r_Common_FreeAndNil(RenTextures[i].tex); + SetLength(RenTextures, 0); + end; + procedure r_Map_LoadTextures; const DefaultAnimInfo: TAnimInfo = (loop: true; delay: 1; frames: 1; back: false); var i, n: Integer; txt: TAnimTextInfo; begin + r_Map_FreeTextures; if Textures <> nil then begin n := Length(Textures); @@ -539,8 +549,8 @@ implementation r_Common_SetLoading(_lc[I_LOAD_TEXTURES], n); for i := 0 to n - 1 do begin - txt.anim := DefaultAnimInfo; RenTextures[i].tex := nil; + RenTextures[i].anim := DefaultAnimInfo; case Textures[i].TextureName of TEXTURE_NAME_WATER: RenTextures[i].spec := TEXTURE_SPECIAL_WATER; TEXTURE_NAME_ACID1: RenTextures[i].spec := TEXTURE_SPECIAL_ACID1; @@ -548,12 +558,18 @@ implementation else RenTextures[i].spec := 0; RenTextures[i].tex := r_Textures_LoadMultiTextFromFile(Textures[i].FullName, txt, []); - if RenTextures[i].tex = nil then - e_LogWritefln('r_Map_LoadTextures: failed to load texture: %s', [Textures[i].FullName]) - else + if RenTextures[i].tex <> nil then + begin + RenTextures[i].anim := txt.anim; r_Common_StepLoading(1); + end + else + begin + e_LogWritefln('r_Map_LoadTextures: failed to load texture: %s', [Textures[i].FullName]); + end; end; - RenTextures[i].anim := txt.anim; + ASSERT(RenTextures[i].anim.frames > 0); + ASSERT(RenTextures[i].anim.delay > 0); end; end; if gMapInfo.SkyFullName <> '' then @@ -564,41 +580,37 @@ implementation plist.Clear; end; - procedure r_Map_FreeTextures; - var i: Integer; - begin - plist.Clear; - r_Common_FreeAndNil(SkyTexture); - if RenTextures <> nil then - for i := 0 to High(RenTextures) do - r_Common_FreeAndNil(RenTextures[i].tex); - SetLength(RenTextures, 0); - end; - procedure r_Map_DrawPanel (p: TPanel); var Texture: Integer; t: TGLMultiTexture; tex: TGLTexture; count, frame: LongInt; a: TAnimInfo; begin ASSERT(p <> nil); if p.FCurTexture >= 0 then begin + ASSERT(p.FCurTexture <= High(p.TextureIDs)); Texture := p.TextureIDs[p.FCurTexture].Texture; - t := RenTextures[Texture].tex; - if (RenTextures[Texture].spec = 0) or (t <> nil) then + t := nil; + ASSERT(Texture >= -1); + ASSERT(Texture <= High(RenTextures)); + if Texture >= 0 then begin - count := 0; frame := 0; - if p.AnimTime <= gTime then + t := RenTextures[Texture].tex; + if (RenTextures[Texture].spec = 0) or (t <> nil) then begin - a := RenTextures[Texture].anim; - a.loop := p.AnimLoop; - g_Anim_GetFrameByTime(a, (gTime - p.AnimTime) DIV GAME_TICK, count, frame); + count := 0; frame := 0; + if p.AnimTime <= gTime then + begin + a := RenTextures[Texture].anim; + a.loop := p.AnimLoop; + g_Anim_GetFrameByTime(a, (gTime - p.AnimTime) DIV GAME_TICK, count, frame); + end; + if t <> nil then + begin + tex := t.GetTexture(frame); + r_Draw_TextureRepeat(tex, p.x, p.y, p.width, p.height, false, 255, 255, 255, 255 - p.alpha, p.blending); + end + else + r_Draw_TextureRepeat(nil, p.x, p.y, p.width, p.height, false, 255, 255, 255, 255, false); end; - if t <> nil then - begin - tex := t.GetTexture(frame); - r_Draw_TextureRepeat(tex, p.x, p.y, p.width, p.height, false, 255, 255, 255, 255 - p.alpha, p.blending); - end - else - r_Draw_TextureRepeat(nil, p.x, p.y, p.width, p.height, false, 255, 255, 255, 255, false); end; if t = nil then @@ -822,19 +834,31 @@ implementation end; procedure r_Map_DrawBubble (x, y: Integer; cb, cf: TRGB); - var dot: Integer; + const w = 20; h = 14; + const dx = 6; dy = 8; dot = 6; size = 2; + const tx = 6; ty = h - 1; begin - // Outer borders - r_Draw_Rect(x + 1, y, x + 18, y + 13, cb.R, cb.G, cb.B, 255); - r_Draw_Rect(x, y + 1, x + 19, y + 12, cb.R, cb.G, cb.B, 255); + // Outer box (top/down) + r_Draw_FillRect(x + 1, y, x + w - 1, y + 1, cb.R, cb.G, cb.B, 255); + r_Draw_FillRect(x + 1, y + h - 1, x + w - 1, y + h, cb.R, cb.G, cb.B, 255); + // Outer box (left/right) + r_Draw_FillRect(x, y + 1, x + 1, y + h - 1, cb.R, cb.G, cb.B, 255); + r_Draw_FillRect(x + w - 1, y + 1, x + w, y + h - 1, cb.R, cb.G, cb.B, 255); + // Outer tail + r_Draw_FillRect(x + tx - 1, y + ty + 0, x + tx + 3 + 1, y + ty + 1, cb.R, cb.G, cb.B, 255); + r_Draw_FillRect(x + tx - 1, y + ty + 1, x + tx + 2 + 1, y + ty + 2, cb.R, cb.G, cb.B, 255); + r_Draw_FillRect(x + tx - 1, y + ty + 2, x + tx + 1 + 1, y + ty + 3, cb.R, cb.G, cb.B, 255); + r_Draw_FillRect(x + tx - 1, y + ty + 3, x + tx + 0 + 1, y + ty + 4, cb.R, cb.G, cb.B, 255); + // Inner tail + r_Draw_FillRect(x + tx, y + ty + 0, x + tx + 3, y + ty + 1, cf.R, cf.G, cf.B, 255); + r_Draw_FillRect(x + tx, y + ty + 1, x + tx + 2, y + ty + 2, cf.R, cf.G, cf.B, 255); + r_Draw_FillRect(x + tx, y + ty + 2, x + tx + 1, y + ty + 3, cf.R, cf.G, cf.B, 255); // Inner box - r_Draw_FillRect(x + 1, y + 1, x + 18, y + 12, cf.R, cf.G, cf.B, 255); - // TODO Tail + r_Draw_FillRect(x + 1, y + 1, x + w - 1, y + h - 1, cf.R, cf.G, cf.B, 255); // Dots - dot := 6; - r_Draw_FillRect(x + dot + 0, y + 8, x + dot + 0 + 1 + 1, y + 9 + 1, cb.R, cb.G, cb.B, 255); - r_Draw_FillRect(x + dot + 3, y + 8, x + dot + 3 + 1 + 1, y + 9 + 1, cb.R, cb.G, cb.B, 255); - r_Draw_FillRect(x + dot + 6, y + 8, x + dot + 6 + 1 + 1, y + 9 + 1, cb.R, cb.G, cb.B, 255); + r_Draw_FillRect(x + dx + 0*3, y + dy, x + dx + 0*3 + size, y + dy + size, cb.R, cb.G, cb.B, 255); + r_Draw_FillRect(x + dx + 1*3, y + dy, x + dx + 1*3 + size, y + dy + size, cb.R, cb.G, cb.B, 255); + r_Draw_FillRect(x + dx + 2*3, y + dy, x + dx + 2*3 + size, y + dy + size, cb.R, cb.G, cb.B, 255); end; procedure r_Map_DrawTalkBubble (p: TPlayer); @@ -1054,6 +1078,11 @@ implementation end; end; + procedure r_Map_ResetGFX; + begin + SetLength(gfxlist, 0); + end; + procedure r_Map_UpdateGFX (tick: LongWord); var i: Integer; count: LongInt; begin @@ -1109,21 +1138,23 @@ implementation end; procedure r_Map_DrawParticles (x, y, w, h: Integer); - var i, fx, fy: Integer; + var i, fx, fy: Integer; factor: Single; begin if gpart_dbg_enabled and (Particles <> nil) then begin - glDisable(GL_TEXTURE_2D); - if (g_dbg_scale < 0.6) then + r_Draw_EnableTexture2D(false); + factor := r_pixel_scale * g_dbg_scale; + if factor < 0.6 then glPointSize(1) - else if (g_dbg_scale > 1.3) then - glPointSize(g_dbg_scale + 1) + else if factor > 1.3 then + glPointSize(factor + 1) else glPointSize(2); glDisable(GL_POINT_SMOOTH); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + r_Draw_SetColor(255, 255, 255, 255); glBegin(GL_POINTS); for i := 0 to High(Particles) do begin @@ -1132,10 +1163,11 @@ implementation fx := nlerp(Particles[i].oldX, Particles[i].x, gLerpFactor); fy := nlerp(Particles[i].oldY, Particles[i].y, gLerpFactor); glColor4ub(Particles[i].red, Particles[i].green, Particles[i].blue, Particles[i].alpha); - glVertex2f(fx, fy); + glVertex2i(fx, fy); end; end; glEnd; + r_Draw_SetColor(0, 0, 0, 255); glDisable(GL_BLEND); end; @@ -1382,32 +1414,82 @@ implementation end; end; - procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer); - var iter: TPanelGrid.Iter; p: PPanel; cx, cy, cw, ch, xx, yy, ww, hh: Integer; sx, sy, sw, sh: LongInt; l, t, r, b: Integer; + procedure r_Map_DrawGame (xx, yy, ww, hh: Integer; player: TPlayer); + (* xx/yy/ww/hh are in map units *) + var iter: TPanelGrid.Iter; p: PPanel; begin - r_Draw_GetRect(l, t, r, b); - r_Draw_SetRect(x, y, x + w, y + h); - glTranslatef(x, y, 0); + plist.Clear; + iter := mapGrid.ForEachInAABB(xx, yy, ww, hh, GridDrawableMask); + for p in iter do + if ((p^.tag and GridTagDoor) <> 0) = p^.door then + plist.Insert(p^); + iter.Release; + + r_Map_DrawPanelType(PANEL_BACK); + r_Map_DrawPanelType(PANEL_STEP); + r_Map_DrawItems(xx, yy, ww, hh, false); + r_Map_DrawShots(xx, yy, ww, hh); + {$IFDEF ENABLE_SHELLS} + r_Map_DrawShells(xx, yy, ww, hh); + {$ENDIF} + r_Map_DrawPlayers(xx, yy, ww, hh, player); + {$IFDEF ENABLE_GIBS} + r_Map_DrawGibs(xx, yy, ww, hh); + {$ENDIF} + {$IFDEF ENABLE_CORPSES} + r_Map_DrawCorpses(xx, yy, ww, hh); + {$ENDIF} + r_Map_DrawPanelType(PANEL_WALL); + r_Map_DrawMonsters(xx, yy, ww, hh); + r_Map_DrawItems(xx, yy, ww, hh, true); + r_Map_DrawPanelType(PANEL_CLOSEDOOR); + {$IFDEF ENABLE_GFX} + r_Map_DrawParticles(xx, yy, ww, hh); + r_Map_DrawGFX(xx, yy, ww, hh); + {$ENDIF} + r_Map_DrawFlags(xx, yy, ww, hh); + r_Map_DrawPanelType(PANEL_ACID1); + r_Map_DrawPanelType(PANEL_ACID2); + r_Map_DrawPanelType(PANEL_WATER); + r_Map_DrawPanelType(PANEL_FORE); + // TODO draw monsters health bar + // TODO draw players health bar + end; + procedure r_Map_DrawScaled (w, h, camx, camy: Integer; player: TPlayer; out acx, acy, acw, ach, axx, ayy, aww, ahh: Integer); + (* w/h/camx/camy are in map units (scaled) *) + const limit = 32767; + var cx, cy, cw, ch, xx, yy, ww, hh{, ml, mt, mr, mb}: Integer; sx, sy, sw, sh: LongInt; + begin (* camera rect *) - cx := (camx - w) + w div 2; - cy := (camy - h) + h div 2; + cx := camx - w div 2; + cy := camy - h div 2; cw := w; ch := h; (* camera bounds *) if g_dbg_ignore_bounds = false then begin - if cx + cw > gMapInfo.Width then - cx := gMapInfo.Width - cw; - if cy + ch > gMapInfo.Height then - cy := gMapInfo.Height - ch; - if cx < 0 then + if w > gMapInfo.Width then + cx := gMapInfo.Width div 2 - w div 2 + else if cx + cw > gMapInfo.Width then + cx := gMapInfo.Width - cw + else if cx < 0 then cx := 0; - if cy < 0 then + + if h > gMapInfo.Height then + cy := gMapInfo.Height div 2 - h div 2 + else if cy + ch > gMapInfo.Height then + cy := gMapInfo.Height - ch + else if cy < 0 then cy := 0; end; + acx := cx; + acy := cy; + acw := cw; + ach := ch; + (* map bounds *) xx := cx; yy := cy; @@ -1421,15 +1503,24 @@ implementation xx := 0; if yy < 0 then yy := 0; + axx := xx; + ayy := yy; + aww := ww; + ahh := hh; + +{ + (* view bounds *) + ml := x; mt := y; mr := x + w; mb := y + h; + if FillOutsizeArea and (DebugCameraScale = 1.0) then + begin + ml := MAX(cx + ml, 0) - cx; + mt := MAX(cy + mt, 0) - cy; + mr := MIN(cx + mr, gMapInfo.Width - 1) - cx; + mb := MIN(cy + mb, gMapInfo.Height - 1) - cy; + end; + r_Draw_SetRect(ml, mt, mr, mb); +} - plist.Clear; - iter := mapGrid.ForEachInAABB(xx, yy, ww, hh, GridDrawableMask); - for p in iter do - if ((p^.tag and GridTagDoor) <> 0) = p^.door then - plist.Insert(p^); - iter.Release; - - glPushMatrix; if DebugCameraScale <> 1.0 then begin glTranslatef(cw div 2, ch div 2, 0); @@ -1444,50 +1535,57 @@ implementation end; glTranslatef(-cx, -cy, 0); - r_Map_DrawPanelType(PANEL_BACK); - r_Map_DrawPanelType(PANEL_STEP); - r_Map_DrawItems(xx, yy, ww, hh, false); - r_Map_DrawShots(xx, yy, ww, hh); - {$IFDEF ENABLE_SHELLS} - r_Map_DrawShells(xx, yy, ww, hh); - {$ENDIF} - r_Map_DrawPlayers(xx, yy, ww, hh, player); - {$IFDEF ENABLE_GIBS} - r_Map_DrawGibs(xx, yy, ww, hh); - {$ENDIF} - {$IFDEF ENABLE_CORPSES} - r_Map_DrawCorpses(xx, yy, ww, hh); - {$ENDIF} - r_Map_DrawPanelType(PANEL_WALL); - r_Map_DrawMonsters(xx, yy, ww, hh); - r_Map_DrawItems(xx, yy, ww, hh, true); - r_Map_DrawPanelType(PANEL_CLOSEDOOR); - {$IFDEF ENABLE_GFX} - r_Map_DrawParticles(xx, yy, ww, hh); - r_Map_DrawGFX(xx, yy, ww, hh); - {$ENDIF} - r_Map_DrawFlags(xx, yy, ww, hh); - r_Map_DrawPanelType(PANEL_ACID1); - r_Map_DrawPanelType(PANEL_ACID2); - r_Map_DrawPanelType(PANEL_WATER); - r_Map_DrawPanelType(PANEL_FORE); - // TODO draw monsters health bar - // TODO draw players health bar - if gGameSettings.GameMode <> GM_SINGLE then - r_Map_DrawPlayerIndicators(player, cx, cy, cw, ch); + r_Map_DrawGame(xx, yy, ww, hh, player); + if FillOutsizeArea and (DebugCameraScale = 1.0) then + begin + (* top *) r_Draw_FillRect(0 - limit, 0 - limit, gMapInfo.Width + limit, 0, 0, 0, 0, 255); + (* left *) r_Draw_FillRect(0 - limit, 0, 0, gMapInfo.Height + limit, 0, 0, 0, 255); + (* right *) r_Draw_FillRect(gMapInfo.Width, 0, gMapInfo.Width + limit, gMapInfo.Height + limit, 0, 0, 0, 255); + (* bottom *) r_Draw_FillRect(0 - limit, gMapInfo.Height, gMapInfo.Width + limit, gMapInfo.Height + limit, 0, 0, 0, 255); + end; + glTranslatef(cx, cy, 0); + end; + + procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer; out acx, acy: Integer); + var cx, cy, cw, ch, xx, yy, ww, hh, ml, mt, mr, mb, mcx, mcy: Integer; l, t, r, b: Integer; + begin + glPushMatrix; + r_Draw_GetRect(l, t, r, b); + glTranslatef(x, y, 0); + glScalef(g_dbg_scale, g_dbg_scale, 0); + + r_Draw_SetRect(x, y, x + w, y + h); + r_Map_DrawScaled(Round(w / g_dbg_scale), Round(h / g_dbg_scale), camx, camy, player, cx, cy, cw, ch, xx, yy, ww, hh); + acx := cx; + acy := cy; + r_Draw_SetRect(x, y, x + w, y + h); + if DebugCameraScale <> 1.0 then begin - r_Draw_Rect (cx, cy, cx + cw, cy + ch, 0, 255, 0, 255); - r_Draw_Rect (xx, yy, xx + ww, yy + hh, 255, 0, 0, 255); + r_Draw_Rect(0, 0, cw, ch, 0, 255, 0, 255); + r_Draw_Rect(-cx + xx, -cy + yy, -cx + xx + ww, -cy + yy + hh, 255, 0, 0, 255); end; - glPopMatrix; - r_Map_DrawScreenEffects(x, y, w, h, player); + if gGameSettings.GameMode <> GM_SINGLE then + begin + glTranslatef(-cx, -cy, 0); + r_Map_DrawPlayerIndicators(player, cx, cy, cw, ch); + end; // TODO draw g_debug_player - glTranslatef(-x, -y, 0); + //glTranslatef(-x, -y, 0); r_Draw_SetRect(l, t, r, b); + glPopMatrix; + + r_Map_DrawScreenEffects(x, y, w, h, player); + end; + + procedure r_Map_Reset; + begin + {$IFDEF ENABLE_GFX} + r_Map_ResetGFX; + {$ENDIF} end; procedure r_Map_Update; @@ -1502,5 +1600,7 @@ implementation initialization conRegVar('r_debug_camera_scale', @DebugCameraScale, 0.0001, 1000.0, '', ''); + conRegVar('r_gl_fill_outside', @FillOutsizeArea, '', ''); DebugCameraScale := 1.0; + FillOutsizeArea := true; end.