diff --git a/README.md b/README.md index 0443ecd..50f0b70 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Glide.with(this).load(R.drawable.demo).bitmapTransform( ### Filter (use GPUImage) `ToonFilterTransformation`, `SepiaFilterTransformation`, `ContrastFilterTransformation` `InvertFilterTransformation`, `PixelationFilterTransformation`, `SketchFilterTransformation` -`SwirlFilterTransformation`, `KuwaharaFilterTransformation` +`SwirlFilterTransformation`, `KuwaharaFilterTransformation`, `VignetteFilterTransformation` ### Other `RoundedCornersTransformation` diff --git a/example/src/main/java/jp/wasabeef/example/glide/MainActivity.java b/example/src/main/java/jp/wasabeef/example/glide/MainActivity.java index 28be2de..9b26299 100644 --- a/example/src/main/java/jp/wasabeef/example/glide/MainActivity.java +++ b/example/src/main/java/jp/wasabeef/example/glide/MainActivity.java @@ -38,6 +38,7 @@ public class MainActivity extends ActionBarActivity { dataSet.add(Type.Swirl); dataSet.add(Type.Brightness); dataSet.add(Type.Kuawahara); + dataSet.add(Type.Vignette); recyclerView.setAdapter(new MainAdapter(this, dataSet)); } diff --git a/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java b/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java index c524fde..c6770e1 100644 --- a/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java +++ b/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java @@ -33,6 +33,7 @@ import jp.wasabeef.glide.transformations.gpu.SepiaFilterTransformation; import jp.wasabeef.glide.transformations.gpu.SketchFilterTransformation; import jp.wasabeef.glide.transformations.gpu.SwirlFilterTransformation; import jp.wasabeef.glide.transformations.gpu.ToonFilterTransformation; +import jp.wasabeef.glide.transformations.gpu.VignetteFilterTransformation; /** * Created by Wasabeef on 2015/01/11. @@ -59,7 +60,8 @@ public class MainAdapter extends RecyclerView.Adapter { Sketch, Swirl, Brightness, - Kuawahara + Kuawahara, + Vignette } public MainAdapter(Context context, List dataSet) { @@ -128,6 +130,10 @@ public class MainAdapter extends RecyclerView.Adapter { case Kuawahara: transformation = new KuwaharaFilterTransformation(mContext, mPool, 25); break; + case Vignette: + transformation = new VignetteFilterTransformation(mContext, mPool, + new PointF(0.5f, 0.5f), new float[]{0.0f, 0.0f, 0.0f}, 0f, 0.75f); + break; } Glide.with(mContext).load(R.drawable.demo) diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java new file mode 100644 index 0000000..1a216a4 --- /dev/null +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java @@ -0,0 +1,90 @@ +package jp.wasabeef.glide.transformations.gpu; + +/** + * Copyright (C) 2015 Wasabeef + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import com.bumptech.glide.load.Transformation; +import com.bumptech.glide.load.engine.Resource; +import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; +import com.bumptech.glide.load.resource.bitmap.BitmapResource; + +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.PointF; + +import java.util.Arrays; + +import jp.co.cyberagent.android.gpuimage.GPUImage; +import jp.co.cyberagent.android.gpuimage.GPUImageVignetteFilter; + +/** + * Performs a vignetting effect, fading out the image at the edges + * x: + * y: The directional intensity of the vignetting, with a default of x = 0.75, y = 0.5 + */ +public class VignetteFilterTransformation implements Transformation { + + private Context mContext; + private BitmapPool mBitmapPool; + + private GPUImageVignetteFilter mFilter = new GPUImageVignetteFilter(); + private PointF mCenter; + private float[] mVignetteColor; + private float mVignetteStart; + private float mVignetteEnd; + + + public VignetteFilterTransformation(Context context, BitmapPool pool) { + mContext = context; + mBitmapPool = pool; + mCenter = new PointF(); + } + + public VignetteFilterTransformation(Context context, BitmapPool pool, + PointF center, float[] color, float start, float end) { + mContext = context; + mBitmapPool = pool; + mCenter = center; + mVignetteColor = color; + mVignetteStart = start; + mVignetteEnd = end; + mFilter.setVignetteCenter(mCenter); + mFilter.setVignetteColor(mVignetteColor); + mFilter.setVignetteStart(mVignetteStart); + mFilter.setVignetteEnd(mVignetteEnd); + } + + @Override + public Resource transform(Resource resource, int outWidth, int outHeight) { + Bitmap source = resource.get(); + + GPUImage gpuImage = new GPUImage(mContext); + gpuImage.setImage(source); + gpuImage.setFilter(mFilter); + Bitmap bitmap = gpuImage.getBitmapWithFilterApplied(); + + source.recycle(); + + return BitmapResource.obtain(bitmap, mBitmapPool); + } + + @Override + public String getId() { + return "VignetteFilterTransformation(center=" + mCenter.toString() + + ",color=" + Arrays.toString(mVignetteColor) + + ",start=" + mVignetteStart + ",end=" + mVignetteEnd + ")"; + } +}