X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.cpp;h=885bc72a3a1421e5fe6715ff44b11515ec01226b;hb=6e79b1b333af799839c8e7b11a077f754132dc24;hp=69e859bd6287fc08c282aaa344e14ee4b7523bf7;hpb=29540fc153880d6949c85786b78b8583ae8f1d37;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 69e859b..885bc72 100755 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -20,7 +20,6 @@ // EXTERNAL HEADER #include -#include #include #include #include @@ -368,7 +367,6 @@ void Visual::Base::CreatePropertyMap( Property::Map& map ) const // which is ok, because they have a different key value range. map.Insert( Toolkit::Visual::Property::MIX_COLOR, mImpl->mMixColor ); // vec4 map.Insert( Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a ); - map.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired() ); auto fittingModeString = Scripting::GetLinearEnumerationName< FittingMode >( mImpl->mFittingMode, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT ); @@ -442,8 +440,7 @@ void Visual::Base::RegisterMixColor() // (Color and Primitive visuals will register their own and save to this index) if( mImpl->mMixColorIndex == Property::INVALID_INDEX ) { - mImpl->mMixColorIndex = DevelHandle::RegisterProperty( - mImpl->mRenderer, + mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty( Toolkit::Visual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); @@ -557,13 +554,13 @@ Renderer Visual::Base::GetRenderer() Property::Index Visual::Base::GetPropertyIndex( Property::Key key ) { - Property::Index index = DevelHandle::GetPropertyIndex( mImpl->mRenderer, key ); + Property::Index index = mImpl->mRenderer.GetPropertyIndex( key ); if( index == Property::INVALID_INDEX ) { // Is it a shader property? Shader shader = mImpl->mRenderer.GetShader(); - index = DevelHandle::GetPropertyIndex( shader, key ); + index = shader.GetPropertyIndex( key ); if( index != Property::INVALID_INDEX ) { // Yes - we should register it in the Renderer so it can be set / animated @@ -581,7 +578,7 @@ Property::Index Visual::Base::GetPropertyIndex( Property::Key key ) // Leave keyIndex as INVALID_KEY - it can still be registered against the string key. } Property::Value value = shader.GetProperty( index ); - index = DevelHandle::RegisterProperty( mImpl->mRenderer, keyIndex, keyName, value ); + index = mImpl->mRenderer.RegisterProperty( keyIndex, keyName, value ); } } return index;