X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.cpp;h=67ab688b12cba40a978277218ab218f6a74eba5f;hp=fc962bd9284da471c0c37c1b0cf048ff14f9145d;hb=16912baf519a33ab99788619118df99c854076de;hpb=4b8ce75c615d3ebb84de69224a6210d3fd7cdea1 diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp index fc962bd..67ab688 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp @@ -242,12 +242,14 @@ void Internal::Visual::Base::Impl::CustomShader::CreatePropertyMap( Property::Ma } Internal::Visual::Base::Impl::Transform::Transform() -: mOffset( 0.0f,0.0f ), - mSize( 1.0f,1.0f ), - mExtraSize( 0.0f,0.0f ), - mOffsetSizeMode( 0.0f,0.0f,0.0f,0.0f ), - mOrigin( Toolkit::Align::TOP_BEGIN ), - mAnchorPoint( Toolkit::Align::TOP_BEGIN ) +: mOffset(0.0f, 0.0f), + mSize(1.0f, 1.0f), + mExtraSize(0.0f, 0.0f), + mOffsetSizeMode(0.0f, 0.0f, 0.0f, 0.0f), + mOrigin(Toolkit::Align::TOP_BEGIN), + mAnchorPoint(Toolkit::Align::TOP_BEGIN), + mOffsetIndex(Property::INVALID_INDEX), + mSizeIndex(Property::INVALID_INDEX) { } @@ -378,8 +380,8 @@ void Internal::Visual::Base::Impl::Transform::GetPropertyMap( Property::Map& map void Internal::Visual::Base::Impl::Transform::RegisterUniforms( Dali::Renderer renderer, Toolkit::Direction::Type direction ) { - renderer.RegisterProperty( SIZE, mSize ); - renderer.RegisterProperty( OFFSET, direction == Toolkit::Direction::LEFT_TO_RIGHT ? mOffset : mOffset * Vector2(-1.0f,1.0f)); + mSizeIndex = renderer.RegisterProperty(SIZE, mSize); + mOffsetIndex = renderer.RegisterProperty(OFFSET, direction == Toolkit::Direction::LEFT_TO_RIGHT ? mOffset : mOffset * Vector2(-1.0f, 1.0f)); renderer.RegisterProperty( OFFSET_SIZE_MODE, mOffsetSizeMode ); renderer.RegisterProperty( ORIGIN, PointToVector2( mOrigin, direction ) - Vector2(0.5,0.5) ); renderer.RegisterProperty( ANCHOR_POINT, Vector2(0.5,0.5) - PointToVector2( mAnchorPoint, direction ) );