X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_graphics.pas;h=1830c406172a53331dc69aba7d67c1f66c6a4460;hb=3d8489bb2d74d08d3a9ccad06eea7e8fb7d4038d;hp=3fdc66c51d10d4f5801dd385df81646fc065c607;hpb=0e354ade87a9aee657de86b63d4100b1dce7b483;p=d2df-sdl.git

diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas
index 3fdc66c..1830c40 100644
--- a/src/engine/e_graphics.pas
+++ b/src/engine/e_graphics.pas
@@ -71,7 +71,7 @@ procedure e_DrawSizeMirror(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel:
 procedure e_DrawFill(ID: DWORD; X, Y: Integer; XCount, YCount: Word; Alpha: Integer;
                      AlphaChannel: Boolean; Blending: Boolean);
 
-procedure e_DrawFillX (id: DWORD; x, y, wdt, hgt: Integer; alpha: Integer; alphachannel: Boolean; blending: Boolean);
+procedure e_DrawFillX (id: DWORD; x, y, wdt, hgt: Integer; alpha: Integer; alphachannel: Boolean; blending: Boolean; scale: Single);
 
 procedure e_DrawPoint(Size: Byte; X, Y: Integer; Red, Green, Blue: Byte);
 procedure e_DrawLine(Width: Byte; X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byte; Alpha: Byte = 0);
@@ -683,11 +683,63 @@ begin
   glDisable(GL_BLEND);
 end;
 
-procedure e_DrawFillX (id: DWORD; x, y, wdt, hgt: Integer; alpha: Integer; alphachannel: Boolean; blending: Boolean);
+
+//TODO: overflow checks
+function intersectRect (var x0, y0, w0, h0: Integer; const x1, y1, w1, h1: Integer): Boolean;
+var
+  ex0, ey0: Integer;
+begin
+  result := false;
+  if (w0 < 1) or (h0 < 1) or (w1 < 1) or (h1 < 1) then exit;
+  // check for intersection
+  if (x0+w0 <= x1) or (y0+h0 <= y1) or (x1+w1 <= x0) or (y1+h1 <= y0) then exit;
+  if (x0 >= x1+w1) or (y0 >= y1+h1) or (x1 >= x0+h0) or (y1 >= y0+h0) then exit;
+  // ok, intersects
+  ex0 := x0+w0;
+  ey0 := y0+h0;
+  if (x0 < x1) then x0 := x1;
+  if (y0 < y1) then y0 := y1;
+  if (ex0 > x1+w1) then ex0 := x1+w1;
+  if (ey0 > y1+h1) then ey0 := y1+h1;
+  w0 := ex0-x0;
+  h0 := ey0-y0;
+  result := (w0 > 0) and (h0 > 0);
+end;
+
+
+procedure e_DrawFillX (id: DWORD; x, y, wdt, hgt: Integer; alpha: Integer; alphachannel: Boolean; blending: Boolean; scale: Single);
 var
   x2, y2: Integer;
-  //dx, w, h: Integer;
-  //u, v: Single;
+  {
+  wassc: Boolean;
+  scxywh: array[0..3] of GLint;
+  vpxywh: array[0..3] of GLint;
+  }
+  w, h, dw, cw, ch, yofs: Integer;
+  u, v, cu, cv: Single;
+  onlyOneY: Boolean;
+
+  {
+  procedure setScissorGLInternal (x, y, w, h: Integer);
+  begin
+    //if not scallowed then exit;
+    x := trunc(x*scale);
+    y := trunc(y*scale);
+    w := trunc(w*scale);
+    h := trunc(h*scale);
+    y := vpxywh[3]-(y+h);
+    if not intersectRect(x, y, w, h, scxywh[0], scxywh[1], scxywh[2], scxywh[3]) then
+    begin
+      glScissor(0, 0, 0, 0);
+    end
+    else
+    begin
+      //writeln('  (', x, ',', y, ')-(', w, ',', h, ')');
+      glScissor(x, y, w, h);
+    end;
+  end;
+  }
+
 begin
   if e_NoGraphics then exit;
 
@@ -719,7 +771,7 @@ begin
   y2 := y+hgt;
 
   //k8: this SHOULD work... i hope
-  if (e_Textures[ID].tx.width = e_Textures[ID].tx.glwidth) and (e_Textures[ID].tx.height = e_Textures[ID].tx.glheight) then
+  if {false and} (e_Textures[ID].tx.width = e_Textures[ID].tx.glwidth) and (e_Textures[ID].tx.height = e_Textures[ID].tx.glheight) then
   begin
     glBegin(GL_QUADS);
       glTexCoord2f(0, hgt/e_Textures[ID].tx.height); glVertex2i(x,  y);
@@ -730,32 +782,44 @@ begin
   end
   else
   begin
+    // hard day's night; setup scissor
     {
-    glBegin(GL_QUADS);
-    // hard day's night
+    glGetIntegerv(GL_VIEWPORT, @vpxywh[0]);
+    wassc := (glIsEnabled(GL_SCISSOR_TEST) <> 0);
+    if wassc then glGetIntegerv(GL_SCISSOR_BOX, @scxywh[0]) else glGetIntegerv(GL_VIEWPORT, @scxywh[0]);
+    //writeln('(', scxywh[0], ',', scxywh[1], ')-(', scxywh[2], ',', scxywh[3], ')');
+    //glEnable(GL_SCISSOR_TEST);
+    setScissorGLInternal(x, y, wdt, hgt);
+    }
+    // draw quads
     u := e_Textures[ID].tx.u;
     v := e_Textures[ID].tx.v;
     w := e_Textures[ID].tx.width;
     h := e_Textures[ID].tx.height;
-    while YCount > 0 do
+    x2 := x;
+    if (hgt > h) then begin y += hgt-h; onlyOneY := false; end else onlyOneY := true;
+    glBegin(GL_QUADS);
+    while (hgt > 0) do
     begin
-      dx := XCount;
-      x2 := X;
-      while dx > 0 do
+      if (hgt >= h) then begin ch := h; cv := v; yofs := 0; end else begin ch := hgt; cv := v/(h/hgt); yofs := h-hgt; end;
+      if onlyOneY then yofs := 0;
+      Dec(hgt, h);
+      dw := wdt;
+      x := x2;
+      while (dw > 0) do
       begin
-        glTexCoord2f(0, v); glVertex2i(X,  Y);
-        glTexCoord2f(u, v); glVertex2i(X+w, Y);
-        glTexCoord2f(u, 0); glVertex2i(X+w, Y+h);
-        glTexCoord2f(0, 0); glVertex2i(X,  Y+h);
+        if (dw >= w) then begin cw := w; cu := u; end else begin cw := dw; cu := u/(w/dw); end;
+        Dec(dw, w);
+        glTexCoord2f(0, cv); glVertex2i(X,   Y+yofs);
+        glTexCoord2f(cu, cv); glVertex2i(X+cw, Y+yofs);
+        glTexCoord2f(cu, 0); glVertex2i(X+cw, Y+ch+yofs);
+        glTexCoord2f(0, 0); glVertex2i(X,   Y+ch+yofs);
         Inc(X, w);
-        Dec(dx);
       end;
-      X := x2;
-      Inc(Y, h);
-      Dec(YCount);
+      Dec(Y, h);
     end;
     glEnd();
-    }
+    //if wassc then glEnable(GL_SCISSOR_TEST) else glDisable(GL_SCISSOR_TEST);
   end;
 
   glDisable(GL_BLEND);