X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Frenderer-factory-cache.cpp;h=3db2282f03177869c64870e969cb8120ff525c7c;hb=87b87263ddda2188a86217cca356932e36e4cd94;hp=3a6b79f09676eb4e7cad5c45b282f01cb8899e1f;hpb=e5ca10134c73ca0588f893adde82694ad907dd8d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp index 3a6b79f..3db2282 100644 --- a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp +++ b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp @@ -153,32 +153,6 @@ Renderer RendererFactoryCache::GetDebugRenderer() return mDebugRenderer; } -Geometry RendererFactoryCache::CreateQuadGeometry() -{ - const float halfWidth = 0.5f; - const float halfHeight = 0.5f; - struct QuadVertex { Vector2 position;}; - QuadVertex quadVertexData[4] = - { - { Vector2(-halfWidth, -halfHeight) }, - { Vector2(-halfWidth, halfHeight) }, - { Vector2( halfWidth, -halfHeight) }, - { Vector2( halfWidth, halfHeight) } - }; - - Property::Map quadVertexFormat; - quadVertexFormat["aPosition"] = Property::VECTOR2; - PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat ); - quadVertices.SetData( quadVertexData, 4 ); - - // Create the geometry object - Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( quadVertices ); - geometry.SetGeometryType( Geometry::TRIANGLE_STRIP ); - - return geometry; -} - SvgRasterizeThread* RendererFactoryCache::GetSVGRasterizationThread() { if( !mSvgRasterizeThread ) @@ -215,7 +189,7 @@ Geometry RendererFactoryCache::CreateGridGeometry( Uint16Pair gridSize ) } // Create indices - Vector< unsigned int > indices; + Vector< unsigned short > indices; indices.Reserve( (gridWidth+2)*gridHeight*2 - 2); for( unsigned int row = 0u; row < gridHeight; ++row ) @@ -251,15 +225,16 @@ Geometry RendererFactoryCache::CreateGridGeometry( Uint16Pair gridSize ) Property::Map indexFormat; indexFormat[ "indices" ] = Property::INTEGER; PropertyBuffer indexPropertyBuffer = PropertyBuffer::New( indexFormat ); - if( indices.Size() > 0 ) - { - indexPropertyBuffer.SetData( &indices[ 0 ], indices.Size() ); - } + // Create the geometry object Geometry geometry = Geometry::New(); geometry.AddVertexBuffer( vertexPropertyBuffer ); - geometry.SetIndexBuffer( indexPropertyBuffer ); + if( indices.Size() > 0 ) + { + geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() ); + } + geometry.SetGeometryType( Geometry::TRIANGLE_STRIP ); return geometry;