/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
// EXTERNAL HEADERS
#include <cstring> // for strlen()
#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/common/stage.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/images/native-image.h>
#include <dali/devel-api/images/texture-set-image.h>
-#include <dali/devel-api/adaptor-framework/bitmap-loader.h>
#include <dali/devel-api/adaptor-framework/image-loading.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
const char * const IMAGE_DESIRED_HEIGHT( "desiredHeight" );
const char * const SYNCHRONOUS_LOADING( "synchronousLoading" );
const char * const IMAGE_ATLASING("atlasing");
+const char * const ALPHA_MASK_URL("alphaMaskUrl");
// fitting modes
DALI_ENUM_TO_STRING_TABLE_BEGIN( FITTING_MODE )
mPixelArea( FULL_TEXTURE_RECT ),
mPlacementActor(),
mImageUrl( imageUrl ),
+ mMaskingData( NULL ),
mDesiredSize( size ),
mTextureId( TextureManager::INVALID_TEXTURE_ID ),
mFittingMode( fittingMode ),
mPixelArea( FULL_TEXTURE_RECT ),
mPlacementActor(),
mImageUrl(),
+ mMaskingData( NULL ),
mDesiredSize(),
mTextureId( TextureManager::INVALID_TEXTURE_ID ),
mFittingMode( FittingMode::DEFAULT ),
ImageVisual::~ImageVisual()
{
+ delete mMaskingData;
}
void ImageVisual::DoSetProperties( const Property::Map& propertyMap )
{
DoSetProperty( Toolkit::DevelImageVisual::Property::ATLASING, keyValue.second );
}
+ else if ( keyValue.first == ALPHA_MASK_URL )
+ {
+ DoSetProperty( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, keyValue.second );
+ }
+ else if ( keyValue.first == MASK_CONTENT_SCALE_NAME )
+ {
+ DoSetProperty( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, keyValue.second );
+ }
+ else if ( keyValue.first == CROP_TO_MASK_NAME )
+ {
+ DoSetProperty( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, keyValue.second );
+ }
}
}
{
bool atlasing = false;
mAttemptAtlasing = value.Get( atlasing );
+ break;
+ }
+
+ case Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL:
+ {
+ std::string alphaUrl;
+ if( value.Get( alphaUrl ) )
+ {
+ AllocateMaskData();
+ // Immediately trigger the alpha mask loading (it may just get a cached value)
+ mMaskingData->SetImage( alphaUrl );
+ }
+ break;
+ }
+
+ case Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE:
+ {
+ float scale;
+ if( value.Get( scale ) )
+ {
+ AllocateMaskData();
+ mMaskingData->mContentScaleFactor = scale;
+ }
+ break;
}
+
+ case Toolkit::DevelImageVisual::Property::CROP_TO_MASK:
+ {
+ bool crop=false;
+ if( value.Get( crop ) )
+ {
+ AllocateMaskData();
+ mMaskingData->mCropToMask = crop;
+ }
+ break;
+ }
+ }
+}
+
+void ImageVisual::AllocateMaskData()
+{
+ if( mMaskingData == NULL )
+ {
+ TextureManager& textureManager = mFactoryCache.GetTextureManager();
+ mMaskingData = new MaskingData(textureManager);
}
}
naturalSize.y = mDesiredSize.GetHeight();
return;
}
- else if( mImageUrl.IsValid() && mImageUrl.GetLocation() == VisualUrl::LOCAL )
+ else if( mImpl->mRenderer ) // Check if we have a loaded image
{
- ImageDimensions dimensions = Dali::GetClosestImageSize( mImageUrl.GetUrl() );
- naturalSize.x = dimensions.GetWidth();
- naturalSize.y = dimensions.GetHeight();
+ auto textureSet = mImpl->mRenderer.GetTextures();
+
+ if( textureSet )
+ {
+ auto texture = textureSet.GetTexture(0);
+ naturalSize.x = texture.GetWidth();
+ naturalSize.y = texture.GetHeight();
+ return;
+ }
+ }
+
+ if( mMaskingData != NULL && mMaskingData->mAlphaMaskUrl.IsValid() &&
+ mMaskingData->mCropToMask )
+ {
+ ImageDimensions dimensions = Dali::GetClosestImageSize( mMaskingData->mAlphaMaskUrl.GetUrl() );
+ if( dimensions != ImageDimensions( 0, 0 ) )
+ {
+ naturalSize.x = dimensions.GetWidth();
+ naturalSize.y = dimensions.GetHeight();
+ }
return;
}
+ else if( mImageUrl.IsValid() )
+ {
+ if( mImageUrl.GetLocation() == VisualUrl::LOCAL )
+ {
+ ImageDimensions dimensions = Dali::GetClosestImageSize( mImageUrl.GetUrl() );
+
+ if( dimensions != ImageDimensions( 0, 0 ) )
+ {
+ naturalSize.x = dimensions.GetWidth();
+ naturalSize.y = dimensions.GetHeight();
+ }
+ else
+ {
+ Image brokenImage = VisualFactoryCache::GetBrokenVisualImage();
+
+ naturalSize.x = brokenImage.GetWidth();
+ naturalSize.y = brokenImage.GetWidth();
+ }
+ return;
+ }
+ }
naturalSize = Vector2::ZERO;
}
}
}
- shader.RegisterProperty( PIXEL_ALIGNED_UNIFORM_NAME, PIXEL_ALIGN_ON ); // Set default to align
+ // Set pixel align off as default.
+ // ToDo: Pixel align causes issues such as rattling image animation.
+ // We should trun it off until issues are resolved
+ shader.RegisterProperty( PIXEL_ALIGNED_UNIFORM_NAME, PIXEL_ALIGN_OFF );
mImpl->mRenderer = Renderer::New( geometry, shader );
if( textureSet )
{
if( mImageUrl.IsValid() )
{
- BitmapLoader loader = BitmapLoader::New( mImageUrl.GetUrl(), mDesiredSize, mFittingMode, mSamplingMode );
- loader.Load();
- mPixels = loader.GetPixelData();
+ Devel::PixelBuffer pixelBuffer = LoadImageFromFile( mImageUrl.GetUrl(), mDesiredSize, mFittingMode, mSamplingMode );
+
+ if( pixelBuffer )
+ {
+ mPixels = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer
+ }
mTextureLoading = false;
}
}
{
mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
TextureManager& textureManager = mFactoryCache.GetTextureManager();
- mTextureId = textureManager.RequestLoad( mImageUrl, mDesiredSize, mFittingMode,
- mSamplingMode, TextureManager::NO_ATLAS, this );
+ if( mMaskingData == NULL )
+ {
+ mTextureId = textureManager.RequestLoad( mImageUrl, mDesiredSize, mFittingMode,
+ mSamplingMode, TextureManager::NO_ATLAS, this );
+ }
+ else
+ {
+ mTextureId = textureManager.RequestLoad( mImageUrl,
+ mMaskingData->mAlphaMaskId,
+ mMaskingData->mContentScaleFactor,
+ mDesiredSize,
+ mFittingMode, mSamplingMode,
+ TextureManager::NO_ATLAS,
+ mMaskingData->mCropToMask,
+ this );
+ }
TextureManager::LoadState loadState = textureManager.GetTextureState( mTextureId );
// don't reuse CreateTextureSet
TextureSet textures = TextureSet::New();
- // Renderer can't be shared if mImage is NativeImage
NativeImage nativeImage = NativeImage::DownCast( image );
if( nativeImage )
{
map.Insert( Toolkit::ImageVisual::Property::WRAP_MODE_V, mWrapModeV );
map.Insert( Toolkit::DevelImageVisual::Property::ATLASING, mAttemptAtlasing );
+ if( mMaskingData != NULL )
+ {
+ map.Insert( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, mMaskingData->mAlphaMaskUrl.GetUrl() );
+ map.Insert( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, mMaskingData->mContentScaleFactor );
+ map.Insert( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, mMaskingData->mCropToMask );
+ }
}
void ImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
}
// From Texture Manager
-void ImageVisual::UploadComplete( bool loadingSuccess, TextureSet textureSet, bool usingAtlas, const Vector4& atlasRectangle )
+void ImageVisual::UploadComplete( bool loadingSuccess, int32_t textureId, TextureSet textureSet, bool usingAtlas, const Vector4& atlasRectangle )
{
Actor actor = mPlacementActor.GetHandle();
if( actor )
else
{
Image brokenImage = VisualFactoryCache::GetBrokenVisualImage();
+
+ textureSet = TextureSet::New();
+ mImpl->mRenderer.SetTextures( textureSet );
+
ApplyImageToSampler( brokenImage );
}
// Image loaded and ready to display
}
}
+
+ImageVisual::MaskingData::MaskingData( TextureManager& textureManager )
+: mTextureManager( textureManager ),
+ mAlphaMaskUrl(),
+ mAlphaMaskId( TextureManager::INVALID_TEXTURE_ID ),
+ mContentScaleFactor( 1.0f ),
+ mCropToMask( true )
+{
+}
+
+ImageVisual::MaskingData::~MaskingData()
+{
+ if( Stage::IsInstalled() )
+ {
+ // TextureManager could have been deleted before the actor that contains this
+ // ImageVisual is destroyed (e.g. due to stage shutdown). Ensure the stage
+ // is still valid before accessing texture manager.
+ if( mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID )
+ {
+ mTextureManager.Remove( mAlphaMaskId );
+ }
+ }
+}
+
+void ImageVisual::MaskingData::SetImage( const std::string& maskUrl )
+{
+ mAlphaMaskUrl = maskUrl;
+ mAlphaMaskId = mTextureManager.RequestMaskLoad( mAlphaMaskUrl );
+}
+
} // namespace Internal
} // namespace Toolkit
projects / platform / core / uifw / dali-toolkit.git / blobdiff