From 2aeb33b260aceb4d0c0537e90a5f4a22f8aef16f Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Fri, 26 Jun 2020 23:20:23 -0700 Subject: [PATCH] Fix Windows build --- .../main/java/com/google/android/filament/View.java | 12 ++++++------ filament/include/filament/View.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/filament-android/src/main/java/com/google/android/filament/View.java b/android/filament-android/src/main/java/com/google/android/filament/View.java index 489fb435dc..7ef75e71ae 100644 --- a/android/filament-android/src/main/java/com/google/android/filament/View.java +++ b/android/filament-android/src/main/java/com/google/android/filament/View.java @@ -348,17 +348,17 @@ public class View { * Options to control the vignetting effect. */ public static class VignetteOptions { - /** - * Controls the shape of the vignette, from a rounded rectangle (0.0), to an oval (0.5), - * to a circle (1.0). The value must be between 0 and 1. - */ - public float roundness = 0.5f; - /** * High values restrict the vignette closer to the corners, between 0 and 1. */ public float midPoint = 0.5f; + /** + * Controls the shape of the vignette, from a rounded rectangle (0.0), to an oval (0.5), + * to a circle (1.0). The value must be between 0 and 1. + */ + public float roundness = 0.5f; + /** * Softening amount of the vignette effect, between 0 and 1. */ diff --git a/filament/include/filament/View.h b/filament/include/filament/View.h index 777c042815..10e2940914 100644 --- a/filament/include/filament/View.h +++ b/filament/include/filament/View.h @@ -180,8 +180,8 @@ public: * Options to control the vignetting effect. */ struct VignetteOptions { - float roundness = 0.5f; //!< controls the shape of the vignette, from a rounded rectangle (0.0), to an oval (0.5), to a circle (1.0) float midPoint = 0.5f; //!< high values restrict the vignette closer to the corners, between 0 and 1 + float roundness = 0.5f; //!< controls the shape of the vignette, from a rounded rectangle (0.0), to an oval (0.5), to a circle (1.0) float feather = 0.5f; //!< softening amount of the vignette effect, between 0 and 1 LinearColorA color{0.0f, 0.0f, 0.0f, 1.0f}; //!< color of the vignette effect, alpha is currently ignored bool enabled = false; //!< enables or disables the vignette effect