Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ab927a4 authored by Lais Andrade's avatar Lais Andrade
Browse files

Remove android.os.vibrator.fix_audio_coupled_haptics_scaling 

Flag cleanup after bug fix fully released.

Fix: 409611533
Test: ExternalVibrationUtilsTest
Flag: EXEMPT flag removal
Change-Id: I407d7ca9fb40a3bf96d926e94d94af1616914bd2
parent b4dc3440

libs/vibrator/ExternalVibrationUtils.cpp

+2 −48
Original line number Diff line number Diff line
@@ -28,42 +28,9 @@ 
namespace android::os {



namespace {

static constexpr float HAPTIC_SCALE_VERY_LOW_RATIO = 2.0f / 3.0f;

static constexpr float HAPTIC_SCALE_LOW_RATIO = 3.0f / 4.0f;

static constexpr float HAPTIC_MAX_AMPLITUDE_FLOAT = 1.0f;

static constexpr float SCALE_GAMMA = 0.65f; // Same as VibrationEffect.SCALE_GAMMA

static constexpr float SCALE_LEVEL_GAIN = 1.4f; // Same as VibrationConfig.DEFAULT_SCALE_LEVEL_GAIN



float getOldHapticScaleGamma(HapticLevel level) {

    switch (level) {

    case HapticLevel::VERY_LOW:

        return 2.0f;

    case HapticLevel::LOW:

        return 1.5f;

    case HapticLevel::HIGH:

        return 0.5f;

    case HapticLevel::VERY_HIGH:

        return 0.25f;

    default:

        return 1.0f;

    }

}



float getOldHapticMaxAmplitudeRatio(HapticLevel level) {

    switch (level) {

    case HapticLevel::VERY_LOW:

        return HAPTIC_SCALE_VERY_LOW_RATIO;

    case HapticLevel::LOW:

        return HAPTIC_SCALE_LOW_RATIO;

    case HapticLevel::NONE:

    case HapticLevel::HIGH:

    case HapticLevel::VERY_HIGH:

        return 1.0f;

    default:

        return 0.0f;

    }

}



/* Same as VibrationScaler.getScaleFactor */

float getHapticScaleFactor(HapticScale scale) {

    if (android_os_vibrator_haptics_scale_v2_enabled()) {
@@ -105,13 +72,7 @@ float getHapticScaleFactor(HapticScale scale) { 
    }

}



float applyOldHapticScale(float value, float gamma, float maxAmplitudeRatio) {

    float sign = value >= 0 ? 1.0 : -1.0;

    return powf(fabsf(value / HAPTIC_MAX_AMPLITUDE_FLOAT), gamma)

                * maxAmplitudeRatio * HAPTIC_MAX_AMPLITUDE_FLOAT * sign;

}



float applyNewHapticScale(float value, float scaleFactor) {

float applyHapticScale(float value, float scaleFactor) {

    if (android_os_vibrator_haptics_scale_v2_enabled()) {

        if (scaleFactor <= 1 || value == 0) {

            return value * scaleFactor;
@@ -154,17 +115,10 @@ void applyHapticScale(float* buffer, size_t length, HapticScale scale) { 
    HapticLevel hapticLevel = scale.getLevel();

    float scaleFactor = getHapticScaleFactor(scale);

    float adaptiveScaleFactor = scale.getAdaptiveScaleFactor();

    float oldGamma = getOldHapticScaleGamma(hapticLevel);

    float oldMaxAmplitudeRatio = getOldHapticMaxAmplitudeRatio(hapticLevel);



    for (size_t i = 0; i < length; i++) {

        if (hapticLevel != HapticLevel::NONE) {

            if (android_os_vibrator_fix_audio_coupled_haptics_scaling() ||

                android_os_vibrator_haptics_scale_v2_enabled()) {

                buffer[i] = applyNewHapticScale(buffer[i], scaleFactor);

            } else {

                buffer[i] = applyOldHapticScale(buffer[i], oldGamma, oldMaxAmplitudeRatio);

            }

            buffer[i] = applyHapticScale(buffer[i], scaleFactor);

        }



        if (adaptiveScaleFactor >= 0 && adaptiveScaleFactor != 1.0f) {

libs/vibrator/tests/ExternalVibrationUtilsTest.cpp

+22 −136
Original line number Diff line number Diff line
@@ -64,18 +64,7 @@ protected: 
    float mBuffer[TEST_BUFFER_LENGTH];

};



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestLegacyScaleMute,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling),

                                          ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expected[TEST_BUFFER_LENGTH];

    std::fill(std::begin(expected), std::end(expected), 0);



    scaleBuffer(HapticLevel::MUTE);

    EXPECT_FLOATS_NEARLY_EQ(expected, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestFixedScaleMute,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling)),

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestScaleMute,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expected[TEST_BUFFER_LENGTH];

    std::fill(std::begin(expected), std::end(expected), 0);
@@ -84,9 +73,7 @@ TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestFixedScaleMute, 
    EXPECT_FLOATS_NEARLY_EQ(expected, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(

        ExternalVibrationUtilsTest, TestScaleV2Mute,

        // Value of fix_audio_coupled_haptics_scaling is not important, should work with either

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestScaleV2Mute,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expected[TEST_BUFFER_LENGTH];

    std::fill(std::begin(expected), std::end(expected), 0);
@@ -95,18 +82,7 @@ TEST_F_WITH_FLAGS( 
    EXPECT_FLOATS_NEARLY_EQ(expected, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestLegacyScaleNone,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling),

                                          ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expected[TEST_BUFFER_LENGTH];

    std::copy(std::begin(TEST_BUFFER), std::end(TEST_BUFFER), std::begin(expected));



    scaleBuffer(HapticLevel::NONE);

    EXPECT_FLOATS_NEARLY_EQ(expected, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestFixedScaleNone,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling)),

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestScaleNone,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expected[TEST_BUFFER_LENGTH];

    std::copy(std::begin(TEST_BUFFER), std::end(TEST_BUFFER), std::begin(expected));
@@ -115,9 +91,7 @@ TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestFixedScaleNone, 
    EXPECT_FLOATS_NEARLY_EQ(expected, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(

        ExternalVibrationUtilsTest, TestScaleV2None,

        // Value of fix_audio_coupled_haptics_scaling is not important, should work with either

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestScaleV2None,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expected[TEST_BUFFER_LENGTH];

    std::copy(std::begin(TEST_BUFFER), std::end(TEST_BUFFER), std::begin(expected));
@@ -126,28 +100,7 @@ TEST_F_WITH_FLAGS( 
    EXPECT_FLOATS_NEARLY_EQ(expected, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestLegacyScaleToHapticLevel,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling),

                                          ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expectedVeryHigh[TEST_BUFFER_LENGTH] = { 1, -1, 0.84f, -0.66f };

    scaleBuffer(HapticLevel::VERY_HIGH);

    EXPECT_FLOATS_NEARLY_EQ(expectedVeryHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);



    float expectedHigh[TEST_BUFFER_LENGTH] = { 1, -1, 0.7f, -0.44f };

    scaleBuffer(HapticLevel::HIGH);

    EXPECT_FLOATS_NEARLY_EQ(expectedHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);



    float expectedLow[TEST_BUFFER_LENGTH] = { 0.75f, -0.75f, 0.26f, -0.06f };

    scaleBuffer(HapticLevel::LOW);

    EXPECT_FLOATS_NEARLY_EQ(expectedLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);



    float expectedVeryLow[TEST_BUFFER_LENGTH] = { 0.66f, -0.66f, 0.16f, -0.02f };

    scaleBuffer(HapticLevel::VERY_LOW);

    EXPECT_FLOATS_NEARLY_EQ(expectedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestFixedScaleToHapticLevel,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling)),

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestScaleToHapticLevel,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expectedVeryHigh[TEST_BUFFER_LENGTH] = { 1, -1, 0.79f, -0.39f };

    scaleBuffer(HapticLevel::VERY_HIGH);
@@ -166,9 +119,7 @@ TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestFixedScaleToHapticLevel, 
    EXPECT_FLOATS_NEARLY_EQ(expectedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(

        ExternalVibrationUtilsTest, TestScaleV2ToHapticLevel,

        // Value of fix_audio_coupled_haptics_scaling is not important, should work with either

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestScaleV2ToHapticLevel,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expectedVeryHigh[TEST_BUFFER_LENGTH] = { 1, -1, 0.8f, -0.38f };

    scaleBuffer(HapticLevel::VERY_HIGH);
@@ -187,9 +138,7 @@ TEST_F_WITH_FLAGS( 
    EXPECT_FLOATS_NEARLY_EQ(expectedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(

        ExternalVibrationUtilsTest, TestScaleV2ToScaleFactorUndefinedUsesHapticLevel,

        // Value of fix_audio_coupled_haptics_scaling is not important, should work with either

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestScaleV2ToScaleFactorUndefinedUsesHapticLevel,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    constexpr float adaptiveScaleNone = 1.0f;

    float expectedVeryHigh[TEST_BUFFER_LENGTH] = {1, -1, 0.8f, -0.38f};
@@ -197,9 +146,7 @@ TEST_F_WITH_FLAGS( 
    EXPECT_FLOATS_NEARLY_EQ(expectedVeryHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(

        ExternalVibrationUtilsTest, TestScaleV2ToScaleFactorIgnoresLevel,

        // Value of fix_audio_coupled_haptics_scaling is not important, should work with either

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestScaleV2ToScaleFactorIgnoresLevel,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    constexpr float adaptiveScaleNone = 1.0f;
@@ -220,54 +167,14 @@ TEST_F_WITH_FLAGS( 
    EXPECT_FLOATS_NEARLY_EQ(expectedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorUndefinedIsIgnoredLegacyScale,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling),

                                          ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expectedVeryHigh[TEST_BUFFER_LENGTH] = {1, -1, 0.79f, -0.39f};

    scaleBuffer(HapticLevel::VERY_HIGH, -1.0f /* adaptiveScaleFactor */);

    EXPECT_FLOATS_NEARLY_EQ(expectedVeryHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorAppliedAfterLegacyScale,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling),

                                          ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    // Adaptive scale mutes vibration

    float expectedMuted[TEST_BUFFER_LENGTH];

    std::fill(std::begin(expectedMuted), std::end(expectedMuted), 0);

    scaleBuffer(HapticLevel::VERY_HIGH, 0.0f /* adaptiveScaleFactor */);

    EXPECT_FLOATS_NEARLY_EQ(expectedMuted, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);



    // Haptic level scale up then adaptive scale down

    float expectedVeryHigh[TEST_BUFFER_LENGTH] = { 0.2, -0.2, 0.16f, -0.13f };

    scaleBuffer(HapticLevel::VERY_HIGH, 0.2f /* adaptiveScaleFactor */);

    EXPECT_FLOATS_NEARLY_EQ(expectedVeryHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);



    // Haptic level scale up then adaptive scale up

    float expectedHigh[TEST_BUFFER_LENGTH] = { 1.5f, -1.5f, 1.06f, -0.67f };

    scaleBuffer(HapticLevel::HIGH, 1.5f /* adaptiveScaleFactor */);

    EXPECT_FLOATS_NEARLY_EQ(expectedHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);



    // Haptic level scale down then adaptive scale down

    float expectedLow[TEST_BUFFER_LENGTH] = { 0.45f, -0.45f, 0.15f, -0.04f };

    scaleBuffer(HapticLevel::LOW, 0.6f /* adaptiveScaleFactor */);

    EXPECT_FLOATS_NEARLY_EQ(expectedLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);



    // Haptic level scale down then adaptive scale up

    float expectedVeryLow[TEST_BUFFER_LENGTH] = { 1.33f, -1.33f, 0.33f, -0.05f };

    scaleBuffer(HapticLevel::VERY_LOW, 2 /* adaptiveScaleFactor */);

    EXPECT_FLOATS_NEARLY_EQ(expectedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorUndefinedIgnoredFixedScale,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling)),

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorUndefinedIgnoredScale,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expectedVeryHigh[TEST_BUFFER_LENGTH] = {1, -1, 0.79f, -0.39f};

    scaleBuffer(HapticLevel::VERY_HIGH, -1.0f /* adaptiveScaleFactor */);

    EXPECT_FLOATS_NEARLY_EQ(expectedVeryHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorAppliedAfterFixedScale,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling)),

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorAppliedAfterScale,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    // Adaptive scale mutes vibration

    float expectedMuted[TEST_BUFFER_LENGTH];
@@ -296,18 +203,14 @@ TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorAppliedAfte 
    EXPECT_FLOATS_NEARLY_EQ(expectedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(

        ExternalVibrationUtilsTest, TestAdaptiveScaleFactorUndefinedIgnoredScaleV2,

        // Value of fix_audio_coupled_haptics_scaling is not important, should work with either

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorUndefinedIgnoredScaleV2,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    float expectedVeryHigh[TEST_BUFFER_LENGTH] = {1, -1, 0.8f, -0.38f};

    scaleBuffer(HapticLevel::VERY_HIGH, -1.0f /* adaptiveScaleFactor */);

    EXPECT_FLOATS_NEARLY_EQ(expectedVeryHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(

        ExternalVibrationUtilsTest, TestAdaptiveScaleFactorAppliedAfterScaleV2,

        // Value of fix_audio_coupled_haptics_scaling is not important, should work with either

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestAdaptiveScaleFactorAppliedAfterScaleV2,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    // Adaptive scale mutes vibration

    float expectedMuted[TEST_BUFFER_LENGTH];
@@ -336,22 +239,7 @@ TEST_F_WITH_FLAGS( 
    EXPECT_FLOATS_NEARLY_EQ(expectedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestLimitAppliedAfterLegacyScale,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling),

                                          ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    // Scaled = { 0.2, -0.2, 0.16f, -0.13f };

    float expectedClippedVeryHigh[TEST_BUFFER_LENGTH] = { 0.15f, -0.15f, 0.15f, -0.13f };

    scaleBuffer(HapticLevel::VERY_HIGH, 0.2f /* adaptiveScaleFactor */, 0.15f /* limit */);

    EXPECT_FLOATS_NEARLY_EQ(expectedClippedVeryHigh, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);



    // Scaled = { 1, -1, 0.5f, -0.2f };

    float expectedClippedVeryLow[TEST_BUFFER_LENGTH] = { 0.7f, -0.7f, 0.33f, -0.05f };

    scaleBuffer(HapticLevel::VERY_LOW, 2 /* adaptiveScaleFactor */, 0.7f /* limit */);

    EXPECT_FLOATS_NEARLY_EQ(expectedClippedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestLimitAppliedAfterFixedScale,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, fix_audio_coupled_haptics_scaling)),

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestLimitAppliedAfterScale,

                  REQUIRES_FLAGS_DISABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    // Scaled = { 0.2, -0.2, 0.16f, -0.13f };

    float expectedClippedVeryHigh[TEST_BUFFER_LENGTH] = { 0.15f, -0.15f, 0.15f, -0.07f };
@@ -364,9 +252,7 @@ TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestLimitAppliedAfterFixedScale, 
    EXPECT_FLOATS_NEARLY_EQ(expectedClippedVeryLow, mBuffer, TEST_BUFFER_LENGTH, TEST_TOLERANCE);

}



TEST_F_WITH_FLAGS(

        ExternalVibrationUtilsTest, TestLimitAppliedAfterScaleV2,

        // Value of fix_audio_coupled_haptics_scaling is not important, should work with either

TEST_F_WITH_FLAGS(ExternalVibrationUtilsTest, TestLimitAppliedAfterScaleV2,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(FLAG_NS, haptics_scale_v2_enabled))) {

    // Scaled = { 0.2, -0.2, 0.15f, -0.07f };

    float expectedClippedVeryHigh[TEST_BUFFER_LENGTH] = { 0.15f, -0.15f, 0.15f, -0.07f };