X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fwireframe%2Fwireframe-visual.cpp;h=e674bf17e7cd42b4097578d210767ba759216708;hb=50a2c4b0715dba64d9b4a3455554b4ac65760ae5;hp=0a5221d785867d5f5fb6f33d0b96ebe7badd3167;hpb=0ade1ea02b460b002d9cd82cd3023a5107eb6294;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 0a5221d..e674bf1 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp @@ -67,12 +67,13 @@ void main()\n ); const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(\n -uniform lowp vec4 uColor;\n -uniform lowp vec4 mixColor;\n + uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform lowp float opacity;\n \n void main()\n {\n - gl_FragColor = uColor*mixColor;\n + gl_FragColor = uColor * vec4( mixColor, opacity );\n }\n ); @@ -152,6 +153,11 @@ void WireframeVisual::DoCreatePropertyMap( Property::Map& map ) const } } +void WireframeVisual::DoCreateInstancePropertyMap( Property::Map& map ) const +{ + // Do nothing +} + void WireframeVisual::DoSetProperties( const Property::Map& propertyMap ) { Property::Value* mixValue = propertyMap.Find( Toolkit::DevelVisual::Property::MIX_COLOR, MIX_COLOR ); @@ -168,6 +174,9 @@ void WireframeVisual::DoSetOnStage( Actor& actor ) InitializeRenderer(); actor.AddRenderer( mImpl->mRenderer ); + + // Wireframe generated and ready to display + ResourceReady(); } void WireframeVisual::InitializeRenderer()