X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fwireframe%2Fwireframe-visual.cpp;h=e170655c0784d3222f9d4b2afce31ebb26b1be96;hp=238d4ac3e39c43f30bddd3148ac615bc7ec83c29;hb=29540fc153880d6949c85786b78b8583ae8f1d37;hpb=f22d66972ab2939d6e8135bc938294f494e15ef6 diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp index 238d4ac..e170655 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp @@ -42,7 +42,7 @@ const char * const INDEX_NAME("indices"); const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n -uniform mediump mat4 uMvpMatrix;\n +uniform highp mat4 uMvpMatrix;\n uniform mediump vec3 uSize;\n \n @@ -106,7 +106,7 @@ WireframeVisualPtr WireframeVisual::New( VisualFactoryCache& factoryCache, Visua } WireframeVisual::WireframeVisual( VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL ), +: Visual::Base( factoryCache, Visual::FittingMode::FILL, actualVisual ? actualVisual->GetType() : Toolkit::Visual::WIREFRAME ), mActualVisual( actualVisual ) { } @@ -168,7 +168,7 @@ void WireframeVisual::DoSetProperties( const Property::Map& propertyMap ) } } -void WireframeVisual::DoSetOnStage( Actor& actor ) +void WireframeVisual::DoSetOnScene( Actor& actor ) { InitializeRenderer(); @@ -240,6 +240,16 @@ void WireframeVisual::OnSetTransform() } } +Visual::Base& WireframeVisual::GetVisualObject() +{ + if( mActualVisual ) + { + return *mActualVisual.Get(); + } + + return *this; +} + } // namespace Internal } // namespace Toolkit