From 31f5a9b81937d528ffe10c521ea6188e2a828b09 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Thu, 12 May 2016 18:03:45 +0100 Subject: [PATCH] Use Geometry::QUAD() in toolkit Change-Id: I942e9b1d8c7722745a176f2d2e03de247c1935c1 --- .../dali-toolkit-test-utils/mesh-builder.cpp | 38 ---------------------- .../dali-toolkit-test-utils/mesh-builder.h | 3 -- .../dali-toolkit-test-utils/test-actor-utils.cpp | 2 +- .../controls/renderers/color/color-renderer.cpp | 2 +- .../renderers/gradient/gradient-renderer.cpp | 2 +- .../controls/renderers/image/image-renderer.cpp | 2 +- .../controls/renderers/renderer-factory-cache.cpp | 26 --------------- .../controls/renderers/renderer-factory-cache.h | 6 ---- .../controls/renderers/svg/svg-renderer.cpp | 2 +- .../cube-transition-effect-impl.cpp | 29 +---------------- 10 files changed, 6 insertions(+), 106 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp index 5b127c7..a35ea8b 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp @@ -35,42 +35,4 @@ TextureSet CreateTextureSet( Image image ) return textureSet; } -PropertyBuffer CreatePropertyBuffer() -{ - Property::Map texturedQuadVertexFormat; - texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; - texturedQuadVertexFormat["aVertexCoord"] = Property::VECTOR2; - - PropertyBuffer vertexData = PropertyBuffer::New( texturedQuadVertexFormat ); - return vertexData; -} - -Geometry CreateQuadGeometry(void) -{ - PropertyBuffer vertexData = CreatePropertyBuffer(); - return CreateQuadGeometryFromBuffer( vertexData ); -} - -Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData ) -{ - const float halfQuadSize = .5f; - struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; }; - TexturedQuadVertex texturedQuadVertexData[4] = { - { Vector2(-halfQuadSize, -halfQuadSize), Vector2(0.f, 0.f) }, - { Vector2( halfQuadSize, -halfQuadSize), Vector2(1.f, 0.f) }, - { Vector2(-halfQuadSize, halfQuadSize), Vector2(0.f, 1.f) }, - { Vector2( halfQuadSize, halfQuadSize), Vector2(1.f, 1.f) } }; - vertexData.SetData(texturedQuadVertexData, 4); - - unsigned short indexData[6] = { 0, 3, 1, 0, 2, 3 }; - - Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexData ); - geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) ); - - return geometry; -} - - - } // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h index bf5f6a6..9f30bbc 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h @@ -30,9 +30,6 @@ namespace Dali Shader CreateShader(); TextureSet CreateTextureSet(); TextureSet CreateTextureSet( Image image ); -Geometry CreateQuadGeometry(); -Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData ); -PropertyBuffer CreatePropertyBuffer(); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp index 2f833c6..fb50bf5 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp @@ -67,7 +67,7 @@ Actor CreateRenderableActor( Image texture ) Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ) { // Create the geometry - Geometry geometry = CreateQuadGeometry(); + Geometry geometry = Geometry::QUAD(); // Create Shader Shader shader = Shader::New( vertexShader, fragmentShader ); diff --git a/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp b/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp index c09f86f..3fd6a74 100644 --- a/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp @@ -119,7 +119,7 @@ void ColorRenderer::InitializeRenderer() Geometry geometry = mFactoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY ); if( !geometry ) { - geometry = RendererFactoryCache::CreateQuadGeometry(); + geometry = Geometry::QUAD(); mFactoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry ); } diff --git a/dali-toolkit/internal/controls/renderers/gradient/gradient-renderer.cpp b/dali-toolkit/internal/controls/renderers/gradient/gradient-renderer.cpp index 6b35829..c150497 100644 --- a/dali-toolkit/internal/controls/renderers/gradient/gradient-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/gradient/gradient-renderer.cpp @@ -311,7 +311,7 @@ void GradientRenderer::InitializeRenderer() Geometry geometry = mFactoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY ); if( !geometry ) { - geometry = RendererFactoryCache::CreateQuadGeometry(); + geometry = Geometry::QUAD(); mFactoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry ); } diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp index d0c6c91..90dd616 100644 --- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp @@ -113,7 +113,7 @@ Geometry CreateGeometry( RendererFactoryCache& factoryCache, ImageDimensions gri geometry = factoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY ); if( !geometry ) { - geometry = RendererFactoryCache::CreateQuadGeometry(); + geometry = Geometry::QUAD(); factoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry ); } } diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.cpp index 4fd7424..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 ) diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h index f6fd573..8bffd15 100644 --- a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h +++ b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h @@ -109,12 +109,6 @@ public: */ void SaveShader( ShaderType type, Shader shader ); - /* - * Greate the quad geometry. - * Quad geometry is shared by multiple kind of Renderer, so implement it in the factory-cache. - */ - static Geometry CreateQuadGeometry(); - /** * Create the grid geometry. * @param[in] gridSize The size of the grid. diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp index d6619d3..f48a5ad 100644 --- a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp @@ -96,7 +96,7 @@ void SvgRenderer::DoSetOnStage( Actor& actor ) Geometry geometry = mFactoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY ); if( !geometry ) { - geometry = mFactoryCache.CreateQuadGeometry(); + geometry = Geometry::QUAD(); mFactoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry ); } TextureSet textureSet = TextureSet::New(); diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp index 1cee6e1..3a31a49 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp @@ -84,33 +84,6 @@ Actor CreateTile( const Vector4& samplerRect ) return tile; } - -Geometry 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; -} - } const Vector4 CubeTransitionEffect::FULL_BRIGHTNESS( 1.0f, 1.0f, 1.0f, 1.0f ); @@ -272,7 +245,7 @@ void CubeTransitionEffect::OnStageConnection( int depth ) { Control::OnStageConnection( depth ); - Geometry geometry = CreateQuadGeometry(); + Geometry geometry = Geometry::QUAD(); Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); TextureSet textureSet = TextureSet::New(); -- 2.7.4