diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2013-08-06 01:59:41 +0200 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2013-08-06 01:59:41 +0200 |
commit | 849ef4921e5a22bc58baae2f45a16d759619b850 (patch) | |
tree | b300e1d7a36e672e7fdc703e1756ef209b148563 /src/org/cyanogenmod/wallpapers/photophase/TextureManager.java | |
parent | 6ab3912f76d8886ccfc88def25c18819a0594f07 (diff) | |
download | android_packages_wallpapers_PhotoPhase-849ef4921e5a22bc58baae2f45a16d759619b850.tar.gz android_packages_wallpapers_PhotoPhase-849ef4921e5a22bc58baae2f45a16d759619b850.tar.bz2 android_packages_wallpapers_PhotoPhase-849ef4921e5a22bc58baae2f45a16d759619b850.zip |
Fix effect screen dimension (#2)
Effect.apply(...) requires the dimensions of the screen that should
be passed to the TextureManager to initialize the effect.
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src/org/cyanogenmod/wallpapers/photophase/TextureManager.java')
-rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/TextureManager.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java b/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java index 9c0d3d0..66464a2 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java +++ b/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java @@ -52,8 +52,7 @@ public class TextureManager implements OnMediaPictureDiscoveredListener { BackgroundPictureLoaderThread mBackgroundTask; private final MediaPictureDiscoverer mPictureDiscoverer; - - + /*package*/ Rect mScreenDimensions; /*package*/ Rect mDimensions; final GLESSurfaceDispatcher mDispatcher; @@ -77,13 +76,13 @@ public class TextureManager implements OnMediaPictureDiscoveredListener { // Bind to the GLES context GLESTextureInfo oldTextureInfo = sRecycledBitmaps.remove(0); ti = GLESUtil.loadTexture(oldTextureInfo.bitmap, - Effects.getNextEffect(mEffectContext), mDimensions); + Effects.getNextEffect(mEffectContext), mScreenDimensions); ti.path = oldTextureInfo.path; oldTextureInfo.bitmap = null; } else { // Load and bind to the GLES context ti = GLESUtil.loadTexture(mImage, mDimensions, - Effects.getNextEffect(mEffectContext), mDimensions, false); + Effects.getNextEffect(mEffectContext), mScreenDimensions, false); } synchronized (mSync) { @@ -118,15 +117,16 @@ public class TextureManager implements OnMediaPictureDiscoveredListener { * @param effectCtx The current effect context * @param dispatcher The GLES dispatcher * @param requestors The number of requestors - * @param dimensions The desired dimensions for the decoded bitmaps + * @param screenDimensions The screen dimensions */ public TextureManager(final Context ctx, final EffectContext effectCtx, - GLESSurfaceDispatcher dispatcher, int requestors, Rect dimensions) { + GLESSurfaceDispatcher dispatcher, int requestors, Rect screenDimensions) { super(); mContext = ctx; mEffectContext = effectCtx; mDispatcher = dispatcher; - mDimensions = dimensions; + mScreenDimensions = screenDimensions; + mDimensions = screenDimensions; // For now, use the screen dimensions as the preferred dimensions for bitmaps mSync = new Object(); mPendingRequests = new ArrayList<TextureRequestor>(requestors); mPictureDiscoverer = new MediaPictureDiscoverer(mContext, this); |