X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fgradient%2Fgradient-visual.cpp;h=fbce369ee6c54531bdf887f04737f5adaae5cd52;hb=ec1cd006ed99fe40e444e90c8b3e6eb01ca2bc8b;hp=b6628210639e5a3ed7fc1f2cbac0fea05d56ea72;hpb=c211a7d84885dca19c90b4656055002865e6fce2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index b662821..fbce369 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -29,6 +29,7 @@ // INTERNAL INCLUDES #include +#include #include #include #include @@ -107,13 +108,27 @@ const char* VERTEX_SHADER[] = uniform mediump mat3 uAlignmentMatrix;\n varying mediump vec2 vTexCoord;\n \n + + //Visual size and offset + uniform mediump vec2 offset;\n + uniform mediump vec2 size;\n + uniform mediump vec4 offsetSizeMode;\n + uniform mediump vec2 origin;\n + uniform mediump vec2 anchorPoint;\n + + vec4 ComputeVertexPosition()\n + {\n + vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n + vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n + return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n + }\n + void main()\n {\n mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy;\n \n - vertexPosition.xyz *= uSize;\n - gl_Position = uMvpMatrix * vertexPosition;\n + gl_Position = uMvpMatrix * ComputeVertexPosition();\n }\n ), @@ -125,11 +140,26 @@ DALI_COMPOSE_SHADER( uniform mediump mat3 uAlignmentMatrix;\n varying mediump vec2 vTexCoord;\n \n + + //Visual size and offset + uniform mediump vec2 offset;\n + uniform mediump vec2 size;\n + uniform mediump vec4 offsetSizeMode;\n + uniform mediump vec2 origin;\n + uniform mediump vec2 anchorPoint;\n + + vec4 ComputeVertexPosition()\n + {\n + vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n + vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n + return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n + }\n + void main()\n {\n mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n vertexPosition.xyz *= uSize;\n - gl_Position = uMvpMatrix * vertexPosition;\n + gl_Position = uMvpMatrix * ComputeVertexPosition();\n \n vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy;\n }\n @@ -142,11 +172,13 @@ const char* FRAGMENT_SHADER[] = DALI_COMPOSE_SHADER( uniform sampler2D sTexture;\n // sampler1D? uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform lowp float opacity;\n varying mediump vec2 vTexCoord;\n \n void main()\n {\n - gl_FragColor = texture2D( sTexture, vec2( vTexCoord.y, 0.5 ) ) * uColor;\n + gl_FragColor = texture2D( sTexture, vec2( vTexCoord.y, 0.5 ) ) * vec4(mixColor*opacity, opacity) * uColor;\n }\n ), @@ -154,11 +186,13 @@ DALI_COMPOSE_SHADER( DALI_COMPOSE_SHADER( uniform sampler2D sTexture;\n // sampler1D? uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform lowp float opacity;\n varying mediump vec2 vTexCoord;\n \n void main()\n {\n - gl_FragColor = texture2D( sTexture, vec2( length(vTexCoord), 0.5 ) ) * uColor;\n + gl_FragColor = texture2D( sTexture, vec2( length(vTexCoord), 0.5 ) ) * vec4(mixColor*opacity, opacity) * uColor;\n }\n ) }; @@ -185,14 +219,17 @@ Dali::WrapMode::Type GetWrapMode( Toolkit::GradientVisual::SpreadMethod::Type sp } // unnamed namespace -GradientVisualPtr GradientVisual::New( VisualFactoryCache& factoryCache ) +GradientVisualPtr GradientVisual::New( VisualFactoryCache& factoryCache, const Property::Map& properties ) { - return new GradientVisual( factoryCache ); + GradientVisualPtr gradientVisualPtr( new GradientVisual( factoryCache ) ); + gradientVisualPtr->SetProperties( properties ); + return gradientVisualPtr; } GradientVisual::GradientVisual( VisualFactoryCache& factoryCache ) : Visual::Base( factoryCache ), - mGradientType( LINEAR ) + mGradientType( LINEAR ), + mIsOpaque( true ) { mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; } @@ -201,7 +238,7 @@ GradientVisual::~GradientVisual() { } -void GradientVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap ) +void GradientVisual::DoSetProperties( const Property::Map& propertyMap ) { Toolkit::GradientVisual::Units::Type gradientUnits = Toolkit::GradientVisual::Units::OBJECT_BOUNDING_BOX; @@ -228,9 +265,12 @@ void GradientVisual::DoInitialize( Actor& actor, const Property::Map& propertyMa } } -void GradientVisual::SetSize( const Vector2& size ) +void GradientVisual::OnSetTransform() { - Visual::Base::SetSize( size ); + if( mImpl->mRenderer ) + { + mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); + } } void GradientVisual::DoSetOnStage( Actor& actor ) @@ -243,7 +283,7 @@ void GradientVisual::DoSetOnStage( Actor& actor ) void GradientVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::GRADIENT ); + map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::GRADIENT ); map.Insert( Toolkit::GradientVisual::Property::UNITS, mGradient->GetGradientUnits() ); map.Insert( Toolkit::GradientVisual::Property::SPREAD_METHOD, mGradient->GetSpreadMethod() ); @@ -283,25 +323,14 @@ void GradientVisual::DoCreatePropertyMap( Property::Map& map ) const } } -void GradientVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) -{ - // TODO -} - -Dali::Property::Value GradientVisual::DoGetProperty( Dali::Property::Index index ) +void GradientVisual::DoCreateInstancePropertyMap( Property::Map& map ) const { - // TODO - return Dali::Property::Value(); + // Do nothing } void GradientVisual::InitializeRenderer() { Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); - if( !geometry ) - { - geometry = VisualFactoryCache::CreateQuadGeometry(); - mFactoryCache.SaveGeometry( VisualFactoryCache::QUAD_GEOMETRY, geometry ); - } Toolkit::GradientVisual::Units::Type gradientUnits = mGradient->GetGradientUnits(); VisualFactoryCache::ShaderType shaderType = GetShaderType( mGradientType, gradientUnits ); @@ -324,7 +353,16 @@ void GradientVisual::InitializeRenderer() mImpl->mRenderer = Renderer::New( geometry, shader ); mImpl->mRenderer.SetTextures( textureSet ); + // If opaque then no need to have blending + if( mIsOpaque ) + { + mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF ); + } + mImpl->mRenderer.RegisterProperty( UNIFORM_ALIGNMENT_MATRIX_NAME, mGradientTransform ); + + //Register transform properties + mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); } bool GradientVisual::NewGradient(Type gradientType, const Property::Map& propertyMap) @@ -382,6 +420,10 @@ bool GradientVisual::NewGradient(Type gradientType, const Property::Map& propert { mGradient->AddStop( offsetArray[i], Vector4(color.r*color.a, color.g*color.a, color.b*color.a, color.a)); numValidStop++; + if( ! Equals( color.a, 1.0f, Math::MACHINE_EPSILON_1 ) ) + { + mIsOpaque = false; + } } } } @@ -397,7 +439,7 @@ bool GradientVisual::NewGradient(Type gradientType, const Property::Map& propert if( spread ) { Toolkit::GradientVisual::SpreadMethod::Type spreadMethod = Toolkit::GradientVisual::SpreadMethod::PAD; - if( Scripting::GetEnumerationProperty( *spread, SPREAD_METHOD_TABLE, SPREAD_METHOD_TABLE_COUNT, spreadMethod ) ); + if( Scripting::GetEnumerationProperty( *spread, SPREAD_METHOD_TABLE, SPREAD_METHOD_TABLE_COUNT, spreadMethod ) ) { mGradient->SetSpreadMethod( spreadMethod ); }