#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 ),
+ mAlphaMaskUrl(),
mDesiredSize( size ),
mTextureId( TextureManager::INVALID_TEXTURE_ID ),
+ mAlphaMaskId( TextureManager::INVALID_TEXTURE_ID ),
mFittingMode( fittingMode ),
mSamplingMode( samplingMode ),
mWrapModeU( WrapMode::DEFAULT ),
mPixelArea( FULL_TEXTURE_RECT ),
mPlacementActor(),
mImageUrl(),
+ mAlphaMaskUrl(),
mDesiredSize(),
mTextureId( TextureManager::INVALID_TEXTURE_ID ),
+ mAlphaMaskId( TextureManager::INVALID_TEXTURE_ID ),
mFittingMode( FittingMode::DEFAULT ),
mSamplingMode( SamplingMode::DEFAULT ),
mWrapModeU( WrapMode::DEFAULT ),
ImageVisual::~ImageVisual()
{
+ if( mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID )
+ {
+ TextureManager& textureManager = mFactoryCache.GetTextureManager();
+ textureManager.Remove( mAlphaMaskId );
+ }
}
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 );
+ }
}
}
+ if( mAlphaMaskUrl.IsValid() )
+ {
+ // Immediately trigger the alpha mask loading (it may just get a cached value)
+ TextureManager& textureManager = mFactoryCache.GetTextureManager();
+ mAlphaMaskId = textureManager.RequestMaskLoad( mAlphaMaskUrl );
+ }
+
if( ( mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING ) && mImageUrl.IsValid() )
{
// if sync loading is required, the loading should start
{
bool atlasing = false;
mAttemptAtlasing = value.Get( atlasing );
+ break;
+ }
+
+ case Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL:
+ {
+ std::string alphaUrl;
+ if( value.Get( alphaUrl ) )
+ {
+ mAlphaMaskUrl = VisualUrl( alphaUrl );
+ }
+ break;
}
}
}
else if( mImageUrl.IsValid() && mImageUrl.GetLocation() == VisualUrl::LOCAL )
{
ImageDimensions dimensions = Dali::GetClosestImageSize( mImageUrl.GetUrl() );
- naturalSize.x = dimensions.GetWidth();
- naturalSize.y = dimensions.GetHeight();
+
+ 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;
}
}
}
- 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( mAlphaMaskId == TextureManager::INVALID_TEXTURE_ID )
+ {
+ mTextureId = textureManager.RequestLoad( mImageUrl, mDesiredSize, mFittingMode,
+ mSamplingMode, TextureManager::NO_ATLAS, this );
+ }
+ else
+ {
+ mTextureId = textureManager.RequestLoad( mImageUrl, mAlphaMaskId, mDesiredSize,
+ mFittingMode, mSamplingMode,
+ TextureManager::NO_ATLAS, 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 )
{
{
actor.AddRenderer( mImpl->mRenderer );
mPlacementActor.Reset();
+
+ // Image loaded and ready to display
+ ResourceReady();
}
}
map.Insert( Toolkit::ImageVisual::Property::WRAP_MODE_V, mWrapModeV );
map.Insert( Toolkit::DevelImageVisual::Property::ATLASING, mAttemptAtlasing );
+ map.Insert( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, mAlphaMaskUrl.GetUrl() );
}
void ImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
else
{
Image brokenImage = VisualFactoryCache::GetBrokenVisualImage();
+
+ textureSet = TextureSet::New();
+ mImpl->mRenderer.SetTextures( textureSet );
+
ApplyImageToSampler( brokenImage );
}
+ // Image loaded and ready to display
+ ResourceReady();
}
}
mTextureLoading = false;