#include <dali/public-api/images/native-image.h>
#include <dali/integration-api/debug.h>
#include <dali/devel-api/adaptor-framework/bitmap-loader.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
#include <dali/public-api/images/pixel-data.h>
#include <dali/public-api/rendering/texture.h>
#include <dali/public-api/rendering/texture-set.h>
// INTERNAL HEADER
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
varying mediump vec2 vTexCoord;\n
uniform sampler2D sTexture;\n
uniform lowp vec4 uColor;\n
- uniform lowp float uAlphaBlending; // Set to 1.0 for conventional alpha blending; if pre-multiplied alpha blending, set to 0.0
+ uniform lowp vec4 mixColor;\n
+ uniform lowp float preMultipliedAlpha;\n
+ lowp vec4 visualMixColor()\n
+ {\n
+ return vec4( mixColor.rgb * mix( 1.0, mixColor.a, preMultipliedAlpha ), mixColor.a );\n
+ }\n
\n
void main()\n
{\n
- gl_FragColor = texture2D( sTexture, vTexCoord ) * vec4( uColor.rgb*max( uAlphaBlending, uColor.a ), uColor.a );\n
+ gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor * visualMixColor();
}\n
);
} // unnamed namespace
-BatchImageVisualPtr BatchImageVisual::New( VisualFactoryCache& factoryCache, const std::string& url )
+BatchImageVisualPtr BatchImageVisual::New( VisualFactoryCache& factoryCache, const std::string& url, const Property::Map& properties )
{
BatchImageVisualPtr visual = new BatchImageVisual( factoryCache );
visual->mImageUrl = url;
+ visual->SetProperties( properties );
+
return visual;
}
{
// url already passed in constructor
- int desiredWidth = 0;
- Property::Value* desiredWidthValue = propertyMap.Find( Dali::Toolkit::ImageVisual::Property::DESIRED_WIDTH, DESIRED_WIDTH );
- if( desiredWidthValue )
- {
- desiredWidthValue->Get( desiredWidth );
- }
-
- int desiredHeight = 0;
- Property::Value* desiredHeightValue = propertyMap.Find( Dali::Toolkit::ImageVisual::Property::DESIRED_HEIGHT, DESIRED_HEIGHT );
- if( desiredHeightValue )
+ for( Property::Map::SizeType iter = 0; iter < propertyMap.Count(); ++iter )
{
- desiredHeightValue->Get( desiredHeight );
+ KeyValuePair keyValue = propertyMap.GetKeyValue( iter );
+ if( keyValue.first.type == Property::Key::INDEX )
+ {
+ DoSetProperty( keyValue.first.indexKey, keyValue.second );
+ }
+ else
+ {
+ if( keyValue.first == DESIRED_WIDTH )
+ {
+ DoSetProperty( Toolkit::ImageVisual::Property::DESIRED_WIDTH, keyValue.second );
+ }
+ else if( keyValue.first == DESIRED_HEIGHT )
+ {
+ DoSetProperty( Toolkit::ImageVisual::Property::DESIRED_HEIGHT, keyValue.second );
+ }
+ }
}
-
- mDesiredSize = ImageDimensions( desiredWidth, desiredHeight );
}
-void BatchImageVisual::SetSize( const Vector2& size )
+void BatchImageVisual::DoSetProperty( Property::Index index, const Property::Value& value )
{
- Visual::Base::SetSize( size );
+ switch( index )
+ {
+ case Dali::Toolkit::ImageVisual::Property::DESIRED_WIDTH:
+ {
+ int width;
+ if( value.Get( width ) )
+ {
+ mDesiredSize.SetWidth( width );
+ }
+ else
+ {
+ DALI_LOG_ERROR("BatchImageVisual: width property has incorrect type\n");
+ }
+ break;
+ }
+ case Dali::Toolkit::ImageVisual::Property::DESIRED_HEIGHT:
+ {
+ int height;
+ if( value.Get( height ) )
+ {
+ mDesiredSize.SetHeight( height );
+ }
+ else
+ {
+ DALI_LOG_ERROR("BatchImageVisual: height property has incorrect type\n");
+ }
+ break;
+ }
+ }
}
void BatchImageVisual::GetNaturalSize( Vector2& naturalSize )
mImpl->mRenderer.SetTextures( textureSet );
// Turn batching on, to send message it must be on stage.
- mImpl->mRenderer.SetProperty( Dali::Renderer::Property::BATCHING_ENABLED, true );
+ mImpl->mRenderer.SetProperty( Dali::DevelRenderer::Property::BATCHING_ENABLED, true );
}
mImpl->mFlags |= Impl::IS_FROM_CACHE;
}
InitializeRenderer( mImageUrl );
}
// Turn batching on, to send message it must be on stage
- mImpl->mRenderer.SetProperty( Dali::Renderer::Property::BATCHING_ENABLED, true );
+ mImpl->mRenderer.SetProperty( Dali::DevelRenderer::Property::BATCHING_ENABLED, true );
actor.AddRenderer( mImpl->mRenderer );
}
void BatchImageVisual::DoCreatePropertyMap( Property::Map& map ) const
{
map.Clear();
- map.Insert( Toolkit::VisualProperty::TYPE, Toolkit::Visual::IMAGE );
+ map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::IMAGE );
if( !mImageUrl.empty() )
{
}
}
-void BatchImageVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue )
-{
- // TODO
-}
-
-Dali::Property::Value BatchImageVisual::DoGetProperty( Dali::Property::Index index )
-{
- // TODO
- return Dali::Property::Value();
-}
-
Shader BatchImageVisual::GetBatchShader( VisualFactoryCache& factoryCache )
{
Shader shader = factoryCache.GetShader( VisualFactoryCache::BATCH_IMAGE_SHADER );
}
}
+void BatchImageVisual::OnSetTransform()
+{
+ if( mImpl->mRenderer )
+ {
+ //Register transform properties
+ mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT );
+ }
+}
} // namespace Internal