X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fprimitive%2Fprimitive-visual.cpp;h=21c906431415ef0e860ad894140fb1c8dffb6767;hb=4f4ab5b156cd1dfd274b1c660e836f575362f784;hp=2bf5e410979d0372a73c7f61b87531b1b48a1be9;hpb=43ca048f4200d2f1d6e59c2163af59cd99a45b2e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp index 2bf5e41..21c9064 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp @@ -20,9 +20,8 @@ // EXTERNAL INCLUDES #include -#include +#include #include -#include #include #include @@ -399,7 +398,7 @@ void PrimitiveVisual::GetNaturalSize( Vector2& naturalSize ) naturalSize.y = mObjectDimensions.y; } -void PrimitiveVisual::DoSetOnStage( Actor& actor ) +void PrimitiveVisual::DoSetOnScene( Actor& actor ) { InitializeRenderer(); @@ -458,7 +457,7 @@ void PrimitiveVisual::InitializeRenderer() // Register transform properties mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); - mImpl->mMixColorIndex = DevelHandle::RegisterProperty( mImpl->mRenderer, Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); + mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty( Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); } void PrimitiveVisual::UpdateShaderUniforms() @@ -537,7 +536,7 @@ void PrimitiveVisual::CreateGeometry() Property::Map vertexFormat; vertexFormat[POSITION] = Property::VECTOR3; vertexFormat[NORMAL] = Property::VECTOR3; - PropertyBuffer surfaceVertices = PropertyBuffer::New( vertexFormat ); + VertexBuffer surfaceVertices = VertexBuffer::New( vertexFormat ); surfaceVertices.SetData( &vertices[0], vertices.Size() ); mGeometry.AddVertexBuffer( surfaceVertices );