Changeset 494 for GraphicTest/Packages/bgrabitmap/bgrafillinfo.pas

Timestamp:

Dec 22, 2016, 8:49:19 PM (8 years ago)

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/bgrafillinfo.pas (modified) (20 diffs)

GraphicTest/Packages/bgrabitmap/bgrafillinfo.pas

@@ -37 +37 @@
       function GetBounds: TRect; override;
 
-      //compute min-max to be drawn on destination bitmap according to cliprect. Returns false if
-      //there is nothing to draw
-      function ComputeMinMax(out minx,miny,maxx,maxy: integer; bmpDest: TBGRACustomBitmap): boolean; override;
-
       //check if the point is inside the filling zone
       function IsPointInside(x,y: single; windingMode: boolean): boolean; override;
@@ -54 +50 @@
       procedure ComputeAndSort(cury: single; var inter: ArrayOfTIntersectionInfo; out nbInter: integer; windingMode: boolean); override;
 
+      //can be called after ComputeAndSort or ComputeIntersection to determine the current horizontal slice
+      //so that it can be checked if the intermediates scanlines can be skipped
+      function GetSliceIndex: integer; override;
+
   end;
 
@@ -61 +61 @@
   private
     FX, FY, FRX, FRY: single;
+    FSliceIndex: integer;
     function GetCenter: TPointF;
   protected
@@ -71 +72 @@
     function GetBounds: TRect; override;
     function SegmentsCurved: boolean; override;
+    function GetSliceIndex: integer; override;
     property Center: TPointF read GetCenter;
     property RadiusX: single read FRX;
@@ -90 +92 @@
     function SegmentsCurved: boolean; override;
     destructor Destroy; override;
+    function GetSliceIndex: integer; override;
     property InnerBorder: TFillEllipseInfo read FInnerBorder;
     property OuterBorder: TFillEllipseInfo read FOuterBorder;
@@ -179 +182 @@
     constructor Create(const points: array of TPointF);
     destructor Destroy; override;
+    function GetSliceIndex: integer; override;
   end;
 
@@ -208 +212 @@
     FFirstWaiting, FFirstDrawing: POnePassRecord;
     FShouldInitializeDrawing: boolean;
+    FSliceIndex: integer;
     procedure ComputeIntersection(cury: single;
       var inter: ArrayOfTIntersectionInfo; var nbInter: integer); override;
@@ -213 +218 @@
     constructor Create(const points: array of TPointF);
     function CreateIntersectionArray: ArrayOfTIntersectionInfo; override;
+    function GetSliceIndex: integer; override;
     destructor Destroy; override;
   end;
@@ -243 +249 @@
 function IsPointInRectangle(x1, y1, x2, y2: single; point: TPointF): boolean;
 
+function BGRAShapeComputeMinMax(AShape: TBGRACustomFillInfo; out minx, miny, maxx, maxy: integer;
+  bmpDest: TBGRACustomBitmap): boolean;
+
 implementation
 
 uses Math;
+
+function BGRAShapeComputeMinMax(AShape: TBGRACustomFillInfo; out minx, miny, maxx, maxy: integer;
+  bmpDest: TBGRACustomBitmap): boolean;
+var clip,bounds: TRect;
+begin
+  result := true;
+  bounds := AShape.GetBounds;
+
+  if (bounds.Right <= bounds.left) or (bounds.bottom <= bounds.top) then
+  begin
+    result := false;
+    exit;
+  end;
+
+  miny := bounds.top;
+  maxy := bounds.bottom - 1;
+  minx := bounds.left;
+  maxx := bounds.right - 1;
+
+  clip := bmpDest.ClipRect;
+
+  if minx < clip.Left then
+    minx := clip.Left;
+  if maxx < clip.Left then
+    result := false;
+
+  if maxx > clip.Right - 1 then
+    maxx := clip.Right- 1;
+  if minx > clip.Right - 1 then
+    result := false;
+
+  if miny < clip.Top then
+    miny := clip.Top;
+  if maxy < clip.Top then
+    result := false;
+
+  if maxy > clip.Bottom - 1 then
+    maxy := clip.Bottom - 1;
+  if miny > clip.Bottom - 1 then
+    result := false;
+end;
 
 procedure ComputeAliasedRowBounds(x1,x2: single; minx,maxx: integer; out ix1,ix2: integer);
@@ -345 +395 @@
 end;
 
-function TFillShapeInfo.ComputeMinMax(out minx, miny, maxx, maxy: integer;
-  bmpDest: TBGRACustomBitmap): boolean;
-var clip,bounds: TRect;
-begin
-  result := true;
-  bounds := GetBounds;
-
-  if (bounds.Right <= bounds.left) or (bounds.bottom <= bounds.top) then
-  begin
-    result := false;
-    exit;
-  end;
-
-  miny := bounds.top;
-  maxy := bounds.bottom - 1;
-  minx := bounds.left;
-  maxx := bounds.right - 1;
-
-  clip := bmpDest.ClipRect;
-
-  if minx < clip.Left then
-    minx := clip.Left;
-  if maxx < clip.Left then
-    result := false;
-
-  if maxx > clip.Right - 1 then
-    maxx := clip.Right- 1;
-  if minx > clip.Right - 1 then
-    result := false;
-
-  if miny < clip.Top then
-    miny := clip.Top;
-  if maxy < clip.Top then
-    result := false;
-
-  if maxy > clip.Bottom - 1 then
-    maxy := clip.Bottom - 1;
-  if miny > clip.Bottom - 1 then
-    result := false;
-end;
 
 function TFillShapeInfo.IsPointInside(x, y: single; windingMode: boolean
@@ -489 +499 @@
   SortIntersection(inter,nbInter);
   if windingMode then ConvertFromNonZeroWinding(inter,nbInter);
+end;
+
+function TFillShapeInfo.GetSliceIndex: integer;
+begin
+  result := 0;
 end;
 
@@ -886 +901 @@
 end;
 
+function TFillPolyInfo.GetSliceIndex: integer;
+begin
+  Result:= FCurSlice;
+end;
+
 { TOnePassFillPolyInfo }
 
@@ -983 +1003 @@
         p^.nextDrawing := FFirstDrawing;
         FFirstDrawing := p;
+        inc(FSliceIndex);
       end;
     end
@@ -1013 +1034 @@
         FFirstDrawing:= pnext;
       p := pnext;
+      Inc(FSliceIndex);
       continue;
     end;
@@ -1056 +1078 @@
 
   SortByY;
+  FSliceIndex := 0;
 end;
 
@@ -1086 +1109 @@
 
   setlength(result, NbMaxIntersection);
+  for i := 0 to high(result) do
+    result[i] := nil;
+end;
+
+function TOnePassFillPolyInfo.GetSliceIndex: integer;
+begin
+  Result:= FSliceIndex;
 end;
 
@@ -1154 +1184 @@
   FRY := abs(ry);
   WindingFactor := 1;
+  FSliceIndex:= -1;
 end;
 
@@ -1164 +1195 @@
 begin
   Result:= true;
+end;
+
+function TFillEllipseInfo.GetSliceIndex: integer;
+begin
+  Result:= FSliceIndex;
 end;
 
@@ -1190 +1226 @@
     inter[nbinter].SetValues( FX + d, windingFactor, 1);
     Inc(nbinter);
+    FSliceIndex := 0;
+  end else
+  begin
+    if cury < FY then
+      FSliceIndex:= -1
+    else
+      FSliceIndex:= 1;
   end;
 end;
@@ -1241 +1284 @@
     FInnerBorder.Free;
   inherited Destroy;
+end;
+
+function TFillBorderEllipseInfo.GetSliceIndex: integer;
+begin
+  Result:= FOuterBorder.GetSliceIndex;
 end;