Rename 'localMatrix' file and function.

Tencent · Sep 20, 2024 · 458b3a3 · 458b3a3
1 parent 0c45523
commit 458b3a3
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/src/images/FilterImage.cpp b/src/images/FilterImage.cpp
@@ -22,7 +22,7 @@
 #include "gpu/processors/FragmentProcessor.h"
 #include "gpu/processors/TiledTextureEffect.h"
 #include "gpu/proxies/RenderTargetProxy.h"
-#include "utils/LocalMatrix.h"
+#include "utils/UVMatrix.h"
 
 namespace tgfx {
 std::shared_ptr<Image> FilterImage::MakeFrom(std::shared_ptr<Image> source,
@@ -114,7 +114,7 @@ std::unique_ptr<FragmentProcessor> FilterImage::asFragmentProcessor(const FPArgs
                                                                     TileMode tileModeY,
                                                                     const SamplingOptions& sampling,
                                                                     const Matrix* uvMatrix) const {
-  auto fpMatrix = LocalMatrix::Concat(bounds, uvMatrix);
+  auto fpMatrix = UVMatrix::Concat(bounds, uvMatrix);
 
   auto inputBounds = Rect::MakeWH(source->width(), source->height());
   auto drawBounds = args.drawRect;

diff --git a/src/images/OrientImage.cpp b/src/images/OrientImage.cpp
@@ -98,11 +98,11 @@ std::unique_ptr<FragmentProcessor> OrientImage::asFragmentProcessor(const FPArgs
                                                                     TileMode tileModeY,
                                                                     const SamplingOptions& sampling,
                                                                     const Matrix* uvMatrix) const {
-  auto matrix = concatLocalMatrix(uvMatrix);
+  auto matrix = concatUVMatrix(uvMatrix);
   return FragmentProcessor::Make(source, args, tileModeX, tileModeY, sampling, AddressOf(matrix));
 }
 
-std::optional<Matrix> OrientImage::concatLocalMatrix(const Matrix* uvMatrix) const {
+std::optional<Matrix> OrientImage::concatUVMatrix(const Matrix* uvMatrix) const {
   std::optional<Matrix> matrix = std::nullopt;
   if (orientation != Orientation::TopLeft) {
     matrix = OrientationToMatrix(orientation, source->width(), source->height());

diff --git a/src/images/OrientImage.h b/src/images/OrientImage.h
@@ -50,7 +50,7 @@ class OrientImage : public TransformImage {
                                                          const SamplingOptions& sampling,
                                                          const Matrix* uvMatrix) const override;
 
-  virtual std::optional<Matrix> concatLocalMatrix(const Matrix* uvMatrix) const;
+  virtual std::optional<Matrix> concatUVMatrix(const Matrix* uvMatrix) const;
 
   Orientation concatOrientation(Orientation newOrientation) const;
 };

diff --git a/src/images/RGBAAAImage.cpp b/src/images/RGBAAAImage.cpp
@@ -53,7 +53,7 @@ std::unique_ptr<FragmentProcessor> RGBAAAImage::asFragmentProcessor(const FPArgs
                                                                     const SamplingOptions& sampling,
                                                                     const Matrix* uvMatrix) const {
   auto proxy = source->lockTextureProxy(args.context, args.renderFlags);
-  auto matrix = concatLocalMatrix(uvMatrix);
+  auto matrix = concatUVMatrix(uvMatrix);
   return TextureEffect::MakeRGBAAA(std::move(proxy), alphaStart, sampling, AddressOf(matrix));
 }
 }  // namespace tgfx
diff --git a/src/images/SubsetImage.cpp b/src/images/SubsetImage.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "SubsetImage.h"
-#include "utils/LocalMatrix.h"
+#include "utils/UVMatrix.h"
 
 namespace tgfx {
 std::shared_ptr<Image> SubsetImage::MakeFrom(std::shared_ptr<Image> source, Orientation orientation,
@@ -57,8 +57,8 @@ std::shared_ptr<Image> SubsetImage::onMakeOriented(Orientation orientation) cons
   return SubsetImage::MakeFrom(source, newOrientation, newBounds);
 }
 
-std::optional<Matrix> SubsetImage::concatLocalMatrix(const Matrix* uvMatrix) const {
-  auto matrix = LocalMatrix::Concat(bounds, uvMatrix);
-  return OrientImage::concatLocalMatrix(AddressOf(matrix));
+std::optional<Matrix> SubsetImage::concatUVMatrix(const Matrix* uvMatrix) const {
+  auto matrix = UVMatrix::Concat(bounds, uvMatrix);
+  return OrientImage::concatUVMatrix(AddressOf(matrix));
 }
 }  // namespace tgfx
diff --git a/src/images/SubsetImage.h b/src/images/SubsetImage.h
@@ -47,7 +47,7 @@ class SubsetImage : public OrientImage {
 
   std::shared_ptr<Image> onMakeOriented(Orientation orientation) const override;
 
-  std::optional<Matrix> concatLocalMatrix(const Matrix* uvMatrix) const override;
+  std::optional<Matrix> concatUVMatrix(const Matrix* uvMatrix) const override;
 
   SubsetImage(std::shared_ptr<Image> source, Orientation orientation, const Rect& bounds);
 };

diff --git a/src/utils/LocalMatrix.cpp → src/utils/UVMatrix.cpp b/src/utils/LocalMatrix.cpp → src/utils/UVMatrix.cpp
@@ -16,10 +16,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "LocalMatrix.h"
+#include "UVMatrix.h"
 
 namespace tgfx {
-std::optional<Matrix> LocalMatrix::Concat(const Rect& subset, const Matrix* uvMatrix) {
+std::optional<Matrix> UVMatrix::Concat(const Rect& subset, const Matrix* uvMatrix) {
   std::optional<Matrix> matrix = std::nullopt;
   if (subset.x() != 0 || subset.y() != 0) {
     matrix = Matrix::MakeTrans(subset.x(), subset.y());

diff --git a/src/utils/LocalMatrix.h → src/utils/UVMatrix.h b/src/utils/LocalMatrix.h → src/utils/UVMatrix.h
@@ -22,7 +22,7 @@
 #include "tgfx/core/Matrix.h"
 
 namespace tgfx {
-class LocalMatrix {
+class UVMatrix {
  public:
   static std::optional<Matrix> Concat(const Rect& subset, const Matrix* uvMatrix);
 };