Changeset 521 for GraphicTest/Packages/bgrabitmap/bgratransform.pas

Timestamp:

Apr 17, 2019, 12:58:41 AM (5 years ago)

Author:

chronos

Message:

• Modified: Propagate project build mode options to used packages.
• Added: Check memory leaks using heaptrc.
• Modified: Update BGRABitmap package.

Location:

GraphicTest

Files:

• . (modified) (1 prop)
• Packages/bgrabitmap/bgratransform.pas (modified) (16 diffs)

GraphicTest

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc

GraphicTest/Packages/bgrabitmap/bgratransform.pas

@@ -13 +13 @@
   { Contains an affine matrix, i.e. a matrix to transform linearly and translate TPointF coordinates }
   TAffineMatrix = BGRABitmapTypes.TAffineMatrix;
-
-  { TAffineBox }
-
-  TAffineBox = object
-  private
-    function GetAsPolygon: ArrayOfTPointF;
-    function GetBottomRight: TPointF;
-    function GetIsEmpty: boolean;
-  public
-    TopLeft, TopRight,
-    BottomLeft: TPointF;
-    class function EmptyBox: TAffineBox;
-    class function AffineBox(ATopLeft, ATopRight, ABottomLeft: TPointF): TAffineBox;
-    property BottomRight: TPointF read GetBottomRight;
-    property IsEmpty: boolean read GetIsEmpty;
-    property AsPolygon: ArrayOfTPointF read GetAsPolygon;
-  end;
+  { Contains an affine base and information on the resulting box }
+  TAffineBox = BGRABitmapTypes.TAffineBox;
 
   { TBGRAAffineScannerTransform allow to transform any scanner. To use it,
@@ -87 +72 @@
     procedure Init(ABitmap: TBGRACustomBitmap; ARepeatImageX: Boolean= false; ARepeatImageY: Boolean= false; AResampleFilter: TResampleFilter = rfLinear; AIncludeEdges: boolean = false);
   public
-    constructor Create(ABitmap: TBGRACustomBitmap; ARepeatImage: Boolean= false; AResampleFilter: TResampleFilter = rfLinear; AIncludeEdges: boolean = false);
-    constructor Create(ABitmap: TBGRACustomBitmap; ARepeatImageX: Boolean; ARepeatImageY: Boolean; AResampleFilter: TResampleFilter = rfLinear; AIncludeEdges: boolean = false);
+    constructor Create(ABitmap: TBGRACustomBitmap; ARepeatImage: Boolean= false; AResampleFilter: TResampleFilter = rfLinear; AIncludeEdges: boolean = false); overload;
+    constructor Create(ABitmap: TBGRACustomBitmap; ARepeatImageX: Boolean; ARepeatImageY: Boolean; AResampleFilter: TResampleFilter = rfLinear; AIncludeEdges: boolean = false); overload;
     destructor Destroy; override;
     function InternalScanCurrentPixel: TBGRAPixel; override;
@@ -137 +122 @@
     constructor Create(ASource: IBGRAScanner;
       ASourceMatrix: TAffineMatrix; const APoints: array of TPointF;
-      ATextureInterpolation: boolean = true);
+      ATextureInterpolation: boolean = true); overload;
     constructor Create(ASource: IBGRAScanner;
       const ATexCoords: array of TPointF; const APoints: array of TPointF;
-      ATextureInterpolation: boolean = true);
+      ATextureInterpolation: boolean = true); overload;
     destructor Destroy; override;
     property Culling: TFaceCulling read GetCulling write SetCulling;
@@ -191 +176 @@
 {---------------------- Affine matrix functions -------------------}
 //fill a matrix
-function AffineMatrix(m11,m12,m13,m21,m22,m23: single): TAffineMatrix;
+function AffineMatrix(m11,m12,m13,m21,m22,m23: single): TAffineMatrix; overload;
+function AffineMatrix(AU,AV: TPointF; ATranslation: TPointF): TAffineMatrix; overload;
 
 //matrix multiplication
@@ -200 +186 @@
 operator *(M: TAffineMatrix; V: TPointF): TPointF;
 operator *(M: TAffineMatrix; A: array of TPointF): ArrayOfTPointF;
+operator *(M: TAffineMatrix; ab: TAffineBox): TAffineBox;
 
 //check if matrix is inversible
@@ -221 +208 @@
 //define a scaling matrix
 function AffineMatrixScale(sx,sy: single): TAffineMatrix;
+function AffineMatrixScaledRotation(ASourceVector, ATargetVector: TPointF): TAffineMatrix;
+function AffineMatrixScaledRotation(ASourcePoint, ATargetPoint, AOrigin: TPointF): TAffineMatrix;
 
 function AffineMatrixSkewXDeg(AngleCW: single): TAffineMatrix;
@@ -228 +217 @@
 
 //define a linear matrix
-function AffineMatrixLinear(v1,v2: TPointF): TAffineMatrix;
+function AffineMatrixLinear(v1,v2: TPointF): TAffineMatrix; overload;
+function AffineMatrixLinear(const AMatrix: TAffineMatrix): TAffineMatrix; overload;
 
 //define a rotation matrix (positive radians are counter-clockwise)
@@ -242 +232 @@
 
 function IsAffineMatrixOrthogonal(M: TAffineMatrix): boolean;
+function IsAffineMatrixScaledRotation(M: TAffineMatrix): boolean;
 
 type
@@ -278 +269 @@
     procedure SetIncludeOppositePlane(AValue: boolean);
   public
-    constructor Create(texture: IBGRAScanner; texCoord1,texCoord2: TPointF; const quad: array of TPointF);
-    constructor Create(texture: IBGRAScanner; const texCoordsQuad: array of TPointF; const quad: array of TPointF);
+    constructor Create(texture: IBGRAScanner; texCoord1,texCoord2: TPointF; const quad: array of TPointF); overload;
+    constructor Create(texture: IBGRAScanner; const texCoordsQuad: array of TPointF; const quad: array of TPointF); overload;
     destructor Destroy; override;
     procedure ScanMoveTo(X, Y: Integer); override;
@@ -298 +289 @@
   public
     constructor Create; overload;
-    constructor Create(x1,y1,x2,y2: single; const quad: array of TPointF);
-    constructor Create(const quad: array of TPointF; x1,y1,x2,y2: single);
-    constructor Create(const srcQuad,destQuad: array of TPointF);
+    constructor Create(x1,y1,x2,y2: single; const quad: array of TPointF); overload;
+    constructor Create(const quad: array of TPointF; x1,y1,x2,y2: single); overload;
+    constructor Create(const srcQuad,destQuad: array of TPointF); overload;
     function MapQuadToQuad(const srcQuad,destQuad: array of TPointF): boolean;
     function MapRectToQuad(x1,y1,x2,y2: single; const quad: array of TPointF): boolean;
@@ -386 +377 @@
 end;
 
+function AffineMatrix(AU, AV: TPointF; ATranslation: TPointF): TAffineMatrix;
+begin
+  result:= AffineMatrix(AU.x, AV.x, ATranslation.x,
+                        AU.y, AV.y, ATranslation.y);
+end;
+
 operator *(M, N: TAffineMatrix): TAffineMatrix;
 begin
@@ -427 +424 @@
     for i := 0 to high(A) do
       result[i] := M*A[i];
+end;
+
+operator*(M: TAffineMatrix; ab: TAffineBox): TAffineBox;
+begin
+  result.TopLeft := M*ab.TopLeft;
+  result.TopRight := M*ab.TopRight;
+  result.BottomLeft := M*ab.BottomLeft;
 end;
 
@@ -475 +479 @@
 end;
 
+function AffineMatrixScaledRotation(ASourceVector, ATargetVector: TPointF): TAffineMatrix;
+var
+  prevScale, newScale, scale: Single;
+  u1,v1,u2,v2,w: TPointF;
+begin
+  prevScale := VectLen(ASourceVector);
+  newScale := VectLen(ATargetVector);
+  if (prevScale = 0) or (newScale = 0) then
+    result := AffineMatrixIdentity
+  else
+  begin
+    scale := newScale/prevScale;
+    u1 := ASourceVector*(1/prevScale);
+    v1 := PointF(-u1.y,u1.x);
+    w := ATargetVector*(1/newScale);
+    u2 := PointF(w*u1, w*v1);
+    v2 := PointF(-u2.y,u2.x);
+    result := AffineMatrix(scale*u2,scale*v2,PointF(0,0));
+  end;
+end;
+
+function AffineMatrixScaledRotation(ASourcePoint, ATargetPoint, AOrigin: TPointF): TAffineMatrix;
+begin
+  result := AffineMatrixTranslation(AOrigin.x,AOrigin.y)*
+         AffineMatrixScaledRotation(ASourcePoint-AOrigin, ATargetPoint-AOrigin)*
+         AffineMatrixTranslation(-AOrigin.x,-AOrigin.y);
+end;
+
 function AffineMatrixSkewXDeg(AngleCW: single): TAffineMatrix;
 begin
@@ -506 +538 @@
 end;
 
+function AffineMatrixLinear(const AMatrix: TAffineMatrix): TAffineMatrix;
+begin
+  result := AffineMatrix(AMatrix[1,1],AMatrix[1,2],0,
+                         AMatrix[2,1],AMatrix[2,2],0);
+end;
+
 function AffineMatrixRotationRad(AngleCCW: Single): TAffineMatrix;
 begin
@@ -527 +565 @@
 begin
   result := PointF(M[1,1],M[2,1])*PointF(M[1,2],M[2,2]) = 0;
+end;
+
+function IsAffineMatrixScaledRotation(M: TAffineMatrix): boolean;
+begin
+  result := IsAffineMatrixOrthogonal(M) and
+           (VectLen(PointF(M[1,1],M[2,1]))=VectLen(PointF(M[1,2],M[2,2])));
 end;
 
@@ -608 +652 @@
   if y > FBounds.Bottom-1 then y := FBounds.Bottom-1;
   result := FSource.ScanAt(X,Y);
-end;
-
-{ TAffineBox }
-
-function TAffineBox.GetAsPolygon: ArrayOfTPointF;
-begin
-  result := PointsF([TopLeft,TopRight,BottomRight,BottomLeft]);
-end;
-
-function TAffineBox.GetBottomRight: TPointF;
-begin
-  if IsEmpty then
-    result := EmptyPointF
-  else
-    result := TopRight + (BottomLeft-TopLeft);
-end;
-
-function TAffineBox.GetIsEmpty: boolean;
-begin
-  result := isEmptyPointF(TopRight) or isEmptyPointF(BottomLeft) or isEmptyPointF(TopLeft);
-end;
-
-class function TAffineBox.EmptyBox: TAffineBox;
-begin
-  result.TopLeft := EmptyPointF;
-  result.TopRight := EmptyPointF;
-  result.BottomLeft := EmptyPointF;
-end;
-
-class function TAffineBox.AffineBox(ATopLeft, ATopRight, ABottomLeft: TPointF): TAffineBox;
-begin
-  result.TopLeft := ATopLeft;
-  result.TopRight := ATopRight;
-  result.BottomLeft := ABottomLeft;
 end;
 

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc