Update with latest Arc3D

BloCamLimb · Aug 21, 2024 · ea3f76a · ea3f76a
1 parent 4f0b0ff
commit ea3f76a
Show file tree

Hide file tree

Showing 19 changed files with 676 additions and 143 deletions.
diff --git a/core/src/main/java/icyllis/modernui/ModernUI.java b/core/src/main/java/icyllis/modernui/ModernUI.java
@@ -149,8 +149,8 @@ public void run(@NonNull Fragment fragment) {
         Monitor monitor = Monitor.getPrimary();
 
         /*TinyFileDialogs.tinyfd_messageBox(
-                "Arc3D Test",
-                "Arc3D starting with pid: " + ProcessHandle.current().pid(),
+                "ModernUI Test",
+                "ModernUI starting with pid: " + ProcessHandle.current().pid(),
                 "ok",
                 "info",
                 true

diff --git a/core/src/main/java/icyllis/modernui/graphics/AngularGradient.java b/core/src/main/java/icyllis/modernui/graphics/AngularGradient.java
@@ -171,7 +171,7 @@ private AngularGradient(float centerX, float centerY,
         if (colorCount < 1) {
             throw new IllegalArgumentException("needs >= 1 number of colors");
         }
-        mShader = icyllis.arc3d.core.shaders.AngularGradient.makeAngular(
+        mShader = icyllis.arc3d.core.shaders.AngularGradient.make(
                 centerX, centerY,
                 startAngle, endAngle,
                 colors,

diff --git a/core/src/main/java/icyllis/modernui/graphics/LinearGradient.java b/core/src/main/java/icyllis/modernui/graphics/LinearGradient.java
@@ -130,7 +130,7 @@ private LinearGradient(float startX, float startY,
         if (colorCount < 1) {
             throw new IllegalArgumentException("needs >= 1 number of colors");
         }
-        mShader = icyllis.arc3d.core.shaders.LinearGradient.makeLinear(
+        mShader = icyllis.arc3d.core.shaders.LinearGradient.make(
                 startX, startY,
                 endX, endY,
                 colors,

diff --git a/core/src/main/java/icyllis/modernui/graphics/RadialGradient.java b/core/src/main/java/icyllis/modernui/graphics/RadialGradient.java
@@ -130,7 +130,7 @@ private RadialGradient(float centerX, float centerY,
         if (colorCount < 1) {
             throw new IllegalArgumentException("needs >= 1 number of colors");
         }
-        mShader = icyllis.arc3d.core.shaders.RadialGradient.makeRadial(
+        mShader = icyllis.arc3d.core.shaders.RadialGradient.make(
                 centerX, centerY,
                 radius,
                 colors,

diff --git a/external/Arc3D/src/main/java/icyllis/arc3d/core/shaders/AngularGradient.java b/external/Arc3D/src/main/java/icyllis/arc3d/core/shaders/AngularGradient.java
@@ -105,15 +105,15 @@ public AngularGradient(float centerX, float centerY,
     @CheckReturnValue
     @Nullable
     @SharedPtr
-    public static Shader makeAngular(float centerX, float centerY,
-                                     float startAngle, float endAngle,
-                                     @Nonnull float[] colors,
-                                     @Nullable ColorSpace colorSpace,
-                                     @Nullable float[] positions,
-                                     int colorCount,
-                                     int tileMode,
-                                     int interpolation,
-                                     @Nullable Matrixc localMatrix) {
+    public static Shader make(float centerX, float centerY,
+                              float startAngle, float endAngle,
+                              @Nonnull float[] colors,
+                              @Nullable ColorSpace colorSpace,
+                              @Nullable float[] positions,
+                              int colorCount,
+                              int tileMode,
+                              int interpolation,
+                              @Nullable Matrixc localMatrix) {
         if (!Float.isFinite(startAngle) || !Float.isFinite(endAngle)) {
             return null;
         }
@@ -144,7 +144,7 @@ public static Shader makeAngular(float centerX, float centerY,
                 float[] newColor = {colors[0], colors[1], colors[2], colors[3],
                         colors[0], colors[1], colors[2], colors[3],
                         colors[i], colors[i + 1], colors[i + 2], colors[i + 3]};
-                return makeAngular(centerX, centerY, 0, endAngle,
+                return make(centerX, centerY, 0, endAngle,
                         newColor, colorSpace, newPos, 3, tileMode, interpolation, localMatrix);
             }
             return makeDegenerateGradient(colors, colorSpace, positions, colorCount, tileMode);

diff --git a/...s/arc3d/core/shaders/BlendModeShader.java → ...yllis/arc3d/core/shaders/BlendShader.java b/...s/arc3d/core/shaders/BlendModeShader.java → ...yllis/arc3d/core/shaders/BlendShader.java
@@ -23,15 +23,15 @@
 
 import javax.annotation.Nullable;
 
-public final class BlendModeShader extends Shader {
+public final class BlendShader extends Shader {
 
     private final BlendMode mMode;
     @SharedPtr
     private final Shader mSrc;
     @SharedPtr
     private final Shader mDst;
 
-    BlendModeShader(BlendMode mode, @SharedPtr Shader src, @SharedPtr Shader dst) {
+    BlendShader(BlendMode mode, @SharedPtr Shader src, @SharedPtr Shader dst) {
         mMode = mode;
         mSrc = src;
         mDst = dst;
@@ -60,7 +60,7 @@ public static Shader make(BlendMode mode, @SharedPtr Shader src, @SharedPtr Shad
                 return dst;
             }
         }
-        return new BlendModeShader(mode, src, dst); // move
+        return new BlendShader(mode, src, dst); // move
     }
 
     @Override