From c4db8708c9030bb03015159ab120fc5ad348c8d7 Mon Sep 17 00:00:00 2001
From: ziadb <ziadb@google.com>
Date: Thu, 26 Jul 2018 12:35:17 -0400
Subject: SkAR Java: refactored SkARUtil (now PaintUtil)

SkAR Java: refactored SkARMatrix.java


Merge branch 'master' of https://skia.googlesource.com/skia into skar-java


SkAR Java: better UI for finger painting


Merge branch 'master' of https://skia.googlesource.com/skia into skar-java


SkAR Java: smooth finger painting, planes draw with outlines


SkAR Java: better finger painting. Cleaner UI


FREEZE.unindexed


SkAR Java: drawing planes as paths

Bug: skia:
Change-Id: I56a26b358f1c5903fafe20cacf221c6eb6585c4b
Reviewed-on: https://skia-review.googlesource.com/143541
Reviewed-by: Ziad Ben Hadj-Alouane <ziadb@google.com>
---
 .../src/main/java/com/google/skar/PaintUtil.java   | 29 ++++++++++++++++++++
 .../src/main/java/com/google/skar/SkARUtil.java    | 31 ----------------------
 2 files changed, 29 insertions(+), 31 deletions(-)
 create mode 100644 platform_tools/android/apps/skar_java/src/main/java/com/google/skar/PaintUtil.java
 delete mode 100644 platform_tools/android/apps/skar_java/src/main/java/com/google/skar/SkARUtil.java

(limited to 'platform_tools/android')

diff --git a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/PaintUtil.java b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/PaintUtil.java
new file mode 100644
index 0000000000..75fa86bc27
--- /dev/null
+++ b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/PaintUtil.java
@@ -0,0 +1,29 @@
+package com.google.skar;
+
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+
+import java.util.Arrays;
+
+public class PaintUtil {
+
+    private static final float MIDDLE_GRAY_GAMMA = 0.466f;
+
+    /**
+     * Returns a ColorFilter that can be used on a Paint to apply color correction effects
+     * as documented by ARCore.
+     *
+     * @param colorCorr output array of getColorCorrection() from ARCore
+     * @return ColorFilter with effects applied
+     */
+    public static ColorFilter createLightCorrectionColorFilter(float[] colorCorr) {
+        float[] colorCorrCopy = Arrays.copyOf(colorCorr, 4);
+        for (int i = 0; i < 3; i++) {
+            colorCorrCopy[i] *= colorCorrCopy[3] / MIDDLE_GRAY_GAMMA;
+        }
+        ColorMatrix m = new ColorMatrix();
+        m.setScale(colorCorrCopy[0], colorCorrCopy[1], colorCorrCopy[2], 1);
+        return new ColorMatrixColorFilter(m);
+    }
+}
diff --git a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/SkARUtil.java b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/SkARUtil.java
deleted file mode 100644
index 42a221af86..0000000000
--- a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/SkARUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.google.skar;
-
-import android.graphics.ColorFilter;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
-
-import java.util.Arrays;
-
-public class SkARUtil {
-
-    private static final float MIDDLE_GRAY_GAMMA = 0.466f;
-
-    /**
-     * Returns a ColorFilter that can be used on a Paint to apply color correction effects
-     * as documented by ARCore in
-     * <a href="https://developers.google.com/ar/reference/java/com/google/ar/core/LightEstimate">LightEstimate</a>
-     *
-     * @param colorCorr output array of
-     *                  <a href="https://developers.google.com/ar/reference/java/com/google/ar/core/LightEstimate.html#getColorCorrection(float[],%20int)">getColorCorrection()</a>
-     * @return ColorFilter with effects applied
-     */
-    public static ColorFilter createLightCorrectionColorFilter(float[] colorCorr) {
-        float[] colorCorrCopy = Arrays.copyOf(colorCorr, 4);
-        for (int i = 0; i < 3; i++) {
-            colorCorrCopy[i] *= colorCorrCopy[3] / MIDDLE_GRAY_GAMMA;
-        }
-        ColorMatrix m = new ColorMatrix();
-        m.setScale(colorCorrCopy[0], colorCorrCopy[1], colorCorrCopy[2], 1);
-        return new ColorMatrixColorFilter(m);
-    }
-}
-- 
cgit v1.2.3