X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fwireframe%2Fwireframe-visual.cpp;h=370746501917b8c9d9806ec0306bd391d66a7c56;hb=54342c70a267a34b3345b24c404f1064fed99338;hp=227a780c64e76a240497f3af05e6d7f94c070aae;hpb=8641983679bb074a9951c2df9fff7ac6cbf5f5f2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp index 227a780..3707465 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp @@ -42,13 +42,13 @@ const char * const INDEX_NAME("indices"); const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n -uniform mediump mat4 uMvpMatrix;\n -uniform mediump vec3 uSize;\n +uniform highp mat4 uMvpMatrix;\n +uniform highp vec3 uSize;\n \n //Visual size and offset uniform mediump vec2 offset;\n -uniform mediump vec2 size;\n +uniform highp vec2 size;\n uniform mediump vec4 offsetSizeMode;\n uniform mediump vec2 origin;\n uniform mediump vec2 anchorPoint;\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(); @@ -216,7 +216,7 @@ Geometry WireframeVisual::CreateQuadWireframeGeometry() Property::Map quadVertexFormat; quadVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2; - PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat ); + VertexBuffer quadVertices = VertexBuffer::New( quadVertexFormat ); quadVertices.SetData( quadVertexData, 4 ); // Create indices