X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_graphics.pas;h=bfef6d2e7e73f0f8f4476bbdcb49dd2cfc12b951;hb=af1787819fb852141cfca39a570927c0d48ddb6a;hp=b78a175885a26b4652088019e36ac59cf8cdd50d;hpb=281b90361877a19420b086d8729eb4b6aaf882fa;p=d2df-sdl.git diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas index b78a175..bfef6d2 100644 --- a/src/engine/e_graphics.pas +++ b/src/engine/e_graphics.pas @@ -169,7 +169,8 @@ type Base: Uint32; CharWidth: Byte; CharHeight: Byte; - XC, YC, SPC: Word; + XC, YC: WORD; + SPC: ShortInt; end; TCharFont = record @@ -957,8 +958,10 @@ end; procedure e_DrawQuad(X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byte; Alpha: Byte = 0); var nX1, nY1, nX2, nY2: Integer; +{$IFDEF USE_NANOGL} + v: array [0..15] of GLfloat; +{$ENDIF} begin -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support glBegin(GL_LINES) if e_NoGraphics then Exit; // Only top-left/bottom-right quad if X1 > X2 then @@ -984,7 +987,34 @@ begin glDisable(GL_TEXTURE_2D); glColor4ub(Red, Green, Blue, 255-Alpha); glLineWidth(1); - +{$IFDEF USE_NANOGL} + nX1 := X1; nY1 := Y1; + nX2 := X2; nY2 := Y1; + e_LineCorrection(nX1, nY1, nX2, nY2); + v[0] := nX1; v[1] := nY1; v[2] := nX2; v[3] := nY2; + + nX1 := X2; nY1 := Y1; + nX2 := X2; nY2 := Y2; + e_LineCorrection(nX1, nY1, nX2, nY2); + v[4] := nX1; v[5] := nY1; v[6] := nX2; v[7] := nY2; + + nX1 := X2; nY1 := Y2; + nX2 := X1; nY2 := Y2; + e_LineCorrection(nX1, nY1, nX2, nY2); + v[8] := nX1; v[9] := nY1; v[10] := nX2; v[11] := nY2; + + nX1 := X1; nY1 := Y2; + nX2 := X1; nY2 := Y1; + e_LineCorrection(nX1, nY1, nX2, nY2); + v[12] := nX1; v[13] := nY1; v[14] := nX2; v[15] := nY2; + + glVertexPointer(2, GL_FLOAT, 0, @v[0]); + glEnableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glDrawArrays(GL_LINES, 0, 16); +{$ELSE} glBegin(GL_LINES); nX1 := X1; nY1 := Y1; nX2 := X2; nY2 := Y1; @@ -1010,11 +1040,11 @@ begin glVertex2i(nX1, nY1); glVertex2i(nX2, nY2); glEnd(); +{$ENDIF} glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255); glDisable(GL_BLEND); -{$ENDIF} end; procedure e_DrawFillQuad(X1, Y1, X2, Y2: Integer; Red, Green, Blue, Alpha: Byte; @@ -1085,8 +1115,11 @@ end; procedure e_DrawLine(Width: Byte; X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byte; Alpha: Byte = 0); +{$IFDEF USE_NANOGL} + var + v: array [0..3] of GLfloat; +{$ENDIF} begin -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support glBegin(GL_LINES) if e_NoGraphics then Exit; // Pixel-perfect lines if Width = 1 then @@ -1103,15 +1136,24 @@ begin glColor4ub(Red, Green, Blue, 255-Alpha); glLineWidth(Width); +{$IFDEF USE_NANOGL} + v[0] := X1; v[1] := Y1; v[2] := X2; v[3] := Y2; + glVertexPointer(2, GL_FLOAT, 0, @v[0]); + glEnableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glDrawArrays(GL_LINES, 0, 4); +{$ELSE} glBegin(GL_LINES); glVertex2i(X1, Y1); glVertex2i(X2, Y2); glEnd(); +{$ENDIF} glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255); glDisable(GL_BLEND); -{$ENDIF} end; //------------------------------------------------------------------ @@ -1582,10 +1624,11 @@ begin id := High(e_TextureFonts); end; -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists with e_TextureFonts[id] do begin +{$IF not DEFINED(USE_NANOGL)} Base := glGenLists(XCount*YCount); +{$ENDIF} TextureID := e_Textures[Tex].tx.id; CharWidth := (e_Textures[Tex].tx.Width div XCount)+Space; CharHeight := e_Textures[Tex].tx.Height div YCount; @@ -1595,6 +1638,7 @@ begin SPC := Space; end; +{$IF not DEFINED(USE_NANOGL)} glBindTexture(GL_TEXTURE_2D, e_Textures[Tex].tx.id); for loop1 := 0 to XCount*YCount-1 do begin @@ -1626,15 +1670,53 @@ end; procedure e_TextureFontKill(FontID: DWORD); begin if e_NoGraphics then Exit; -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists +{$IF not DEFINED(USE_NANOGL)} glDeleteLists(e_TextureFonts[FontID].Base, 256); {$ENDIF} e_TextureFonts[FontID].Base := 0; end; +{$IFDEF USE_NANOGL} +procedure e_TextureFontDrawChar(ch: Char; FontID: DWORD); + var + index: Integer; + cx, cy: GLfloat; + Tex: Integer; + Width, Height: Integer; + XCount, YCount: Integer; +begin + index := Ord(ch) - 32; + Tex := e_TextureFonts[FontID].Texture; + Width := e_Textures[Tex].tx.Width; + Height := e_Textures[Tex].tx.Height; + XCount := e_TextureFonts[FontID].XC; + YCount := e_TextureFonts[FontID].YC; + cx := (index mod XCount)/XCount; + cy := (index div YCount)/YCount; + glBegin(GL_QUADS); + glTexCoord2f(cx, 1 - cy - 1/YCount); + glVertex2i(0, Height div YCount); + glTexCoord2f(cx + 1/XCount, 1 - cy - 1/YCount); + glVertex2i(Width div XCount, Height div YCount); + glTexCoord2f(cx + 1/XCount, 1 - cy); + glVertex2i(Width div XCount, 0); + glTexCoord2f(cx, 1 - cy); + glVertex2i(0, 0); + glEnd(); + glTranslatef((e_Textures[Tex].tx.Width div XCount) + e_TextureFonts[FontID].SPC, 0, 0); +end; + +procedure e_TextureFontDrawString(Text: String; FontID: DWORD); + var + i: Integer; +begin + for i := 1 to High(Text) do + e_TextureFontDrawChar(Text[i], FontID); +end; +{$ENDIF} + procedure e_TextureFontPrint(X, Y: GLint; Text: string; FontID: DWORD); begin -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists if e_NoGraphics then Exit; if Integer(FontID) > High(e_TextureFonts) then Exit; if Text = '' then Exit; @@ -1647,38 +1729,47 @@ begin glPushMatrix; glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID); glEnable(GL_TEXTURE_2D); - glTranslated(x, y, 0); + glTranslatef(x, y, 0); +{$IFDEF USE_NANOGL} + e_TextureFontDrawString(Text, FontID); +{$ELSE} glListBase(DWORD(Integer(e_TextureFonts[FontID].Base)-32)); glCallLists(Length(Text), GL_UNSIGNED_BYTE, PChar(Text)); +{$ENDIF} glDisable(GL_TEXTURE_2D); glPopMatrix; glDisable(GL_BLEND); -{$ENDIF} end; // god forgive me for this, but i cannot figure out how to do it without lists procedure e_TextureFontPrintChar(X, Y: Integer; Ch: Char; FontID: DWORD; Shadow: Boolean = False); begin -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists if e_NoGraphics then Exit; glPushMatrix; if Shadow then begin glColor4ub(0, 0, 0, 128); - glTranslated(X+1, Y+1, 0); + glTranslatef(X+1, Y+1, 0); +{$IFDEF USE_NANOGL} + e_TextureFontDrawChar(Ch, FontID); +{$ELSE} glCallLists(1, GL_UNSIGNED_BYTE, @Ch); +{$ENDIF} glPopMatrix; glPushMatrix; end; glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255); - glTranslated(X, Y, 0); + glTranslatef(X, Y, 0); +{$IFDEF USE_NANOGL} + e_TextureFontDrawChar(Ch, FontID); +{$ELSE} glCallLists(1, GL_UNSIGNED_BYTE, @Ch); +{$ENDIF} glPopMatrix; -{$ENDIF} end; procedure e_TextureFontPrintCharEx (X, Y: Integer; Ch: Char; FontID: DWORD; Shadow: Boolean = False); @@ -1705,7 +1796,6 @@ var tc, c: TRGB; w: Word; begin -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists if e_NoGraphics then Exit; if Text = '' then Exit; if e_TextureFonts = nil then Exit; @@ -1725,7 +1815,10 @@ begin begin glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID); glEnable(GL_TEXTURE_2D); + +{$IF not DEFINED(USE_NANOGL)} glListBase(DWORD(Integer(e_TextureFonts[FontID].Base)-32)); +{$ENDIF} glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_BLEND); @@ -1791,20 +1884,21 @@ begin glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND); end; -{$ENDIF} end; procedure e_TextureFontPrintEx(X, Y: GLint; Text: string; FontID: DWORD; Red, Green, Blue: Byte; Scale: Single; Shadow: Boolean = False); begin -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists if e_NoGraphics then Exit; if Text = '' then Exit; glPushMatrix; glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID); glEnable(GL_TEXTURE_2D); + +{$IF not DEFINED(USE_NANOGL)} glListBase(DWORD(Integer(e_TextureFonts[FontID].Base)-32)); +{$ENDIF} glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_BLEND); @@ -1812,23 +1906,30 @@ begin if Shadow then begin glColor4ub(0, 0, 0, 128); - glTranslated(x+1, y+1, 0); + glTranslatef(x+1, y+1, 0); glScalef(Scale, Scale, 0); +{$IFDEF USE_NANOGL} + e_TextureFontDrawString(Text, FontID); +{$ELSE} glCallLists(Length(Text), GL_UNSIGNED_BYTE, PChar(Text)); +{$ENDIF} glPopMatrix; glPushMatrix; end; glColor4ub(Red, Green, Blue, 255); - glTranslated(x, y, 0); + glTranslatef(x, y, 0); glScalef(Scale, Scale, 0); +{$IFDEF USE_NANOGL} + e_TextureFontDrawString(Text, FontID); +{$ELSE} glCallLists(Length(Text), GL_UNSIGNED_BYTE, PChar(Text)); +{$ENDIF} glDisable(GL_TEXTURE_2D); glPopMatrix; glColor3ub(e_Colors.R, e_Colors.G, e_Colors.B); glDisable(GL_BLEND); -{$ENDIF} end; procedure e_TextureFontGetSize(ID: DWORD; out CharWidth, CharHeight: Byte); @@ -1852,7 +1953,7 @@ begin for i := 0 to High(e_TextureFonts) do if e_TextureFonts[i].Base <> 0 then begin -{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists +{$IFNDEF USE_NANOGL} glDeleteLists(e_TextureFonts[i].Base, 256); {$ENDIF} e_TextureFonts[i].Base := 0;