commit 4ecd42e4bf41ef5ad92bfd67bdcf365c8c6d2864
author sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Mar 19 15:07:30 2013 +0000
committer sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Mar 19 15:07:30 2013 +0000
tree 0f90d8db18d83c96a6ce1a00e442ea60de50eae6
parent 56a2e0de631a647aa04e98ec123f3544273f26ca

Fix for displacement mapping

Fixed the skia displacement map effect to match the WebKit displacement map fix.
Review URL: https://codereview.chromium.org/12787007

git-svn-id: http://skia.googlecode.com/svn/trunk@8225 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/displacement.cpp

diff --git a/gm/displacement.cpp b/gm/displacement.cpp
index 5317a31..888051d 100644
--- a/gm/displacement.cpp
+++ b/gm/displacement.cpp
@@ -86,40 +86,40 @@
         drawClippedBitmap(canvas, 0, 0, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kB_ChannelSelectorType,
-             SkDisplacementMapEffect::kA_ChannelSelectorType, 0.2f, displ)))->unref();
+             SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ)))->unref();
         drawClippedBitmap(canvas, 100, 0, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kR_ChannelSelectorType,
-             SkDisplacementMapEffect::kB_ChannelSelectorType, 0.4f, displ)))->unref();
+             SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ)))->unref();
         drawClippedBitmap(canvas, 200, 0, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kG_ChannelSelectorType,
-             SkDisplacementMapEffect::kA_ChannelSelectorType, 0.6f, displ)))->unref();
+             SkDisplacementMapEffect::kA_ChannelSelectorType, 48.0f, displ)))->unref();
         drawClippedBitmap(canvas, 300, 0, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kR_ChannelSelectorType,
-             SkDisplacementMapEffect::kA_ChannelSelectorType, 0.8f, displ)))->unref();
+             SkDisplacementMapEffect::kA_ChannelSelectorType, 64.0f, displ)))->unref();
         drawClippedBitmap(canvas, 400, 0, paint);
 
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kR_ChannelSelectorType,
-             SkDisplacementMapEffect::kG_ChannelSelectorType, 0.5f, displ)))->unref();
+             SkDisplacementMapEffect::kG_ChannelSelectorType, 40.0f, displ)))->unref();
         drawClippedBitmap(canvas, 0, 100, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kB_ChannelSelectorType,
-             SkDisplacementMapEffect::kA_ChannelSelectorType, 0.5f, displ)))->unref();
+             SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ)))->unref();
         drawClippedBitmap(canvas, 100, 100, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kR_ChannelSelectorType,
-             SkDisplacementMapEffect::kB_ChannelSelectorType, 0.5f, displ)))->unref();
+             SkDisplacementMapEffect::kB_ChannelSelectorType, 40.0f, displ)))->unref();
         drawClippedBitmap(canvas, 200, 100, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kG_ChannelSelectorType,
-             SkDisplacementMapEffect::kA_ChannelSelectorType, 0.5f, displ)))->unref();
+             SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ)))->unref();
         drawClippedBitmap(canvas, 300, 100, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kR_ChannelSelectorType,
-             SkDisplacementMapEffect::kA_ChannelSelectorType, 0.5f, displ)))->unref();
+             SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ)))->unref();
         drawClippedBitmap(canvas, 400, 100, paint);
     }