From a945e5467fa078dee9a54b41a782e0664f222b4a Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Tue, 1 Sep 2020 18:02:53 +0900 Subject: [PATCH] Revert "Updates following rename of PropertyBuffer to VertexBuffer" This reverts commit 37809ae7570411971d415a9060b38f64bba81744. --- .../dali-toolkit-test-utils/mesh-builder.cpp | 6 +++--- .../dali-toolkit-test-utils/mesh-builder.h | 2 +- .../controls/bubble-effect/bubble-emitter-impl.cpp | 6 +++--- .../controls/bubble-effect/bubble-emitter-impl.h | 2 +- .../internal/controls/control/control-renderers.cpp | 8 ++++---- .../gaussian-blur-view/gaussian-blur-view-impl.cpp | 1 + .../internal/controls/model3d-view/obj-loader.cpp | 6 +++--- .../internal/controls/scene3d-view/gltf-loader.cpp | 20 ++++++++++---------- .../controls/scrollable/bouncing-effect-actor.cpp | 3 ++- .../internal/text/decorator/text-decorator.cpp | 4 ++-- .../text/rendering/atlas/text-atlas-renderer.cpp | 2 +- .../rendering/vector-based/vector-based-renderer.cpp | 3 ++- dali-toolkit/internal/text/text-controller-impl.cpp | 2 +- .../internal/visuals/border/border-visual.cpp | 2 +- .../internal/visuals/npatch/npatch-visual.cpp | 6 +++--- .../internal/visuals/primitive/primitive-visual.cpp | 2 +- .../internal/visuals/visual-factory-cache.cpp | 10 +++++----- .../internal/visuals/wireframe/wireframe-visual.cpp | 2 +- 18 files changed, 45 insertions(+), 42 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 3d7c359..2e8f724 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 @@ -38,19 +38,19 @@ TextureSet CreateTextureSet( Texture texture ) return textureSet; } -VertexBuffer CreateVertexBuffer() +PropertyBuffer CreatePropertyBuffer() { Property::Map texturedQuadVertexFormat; texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; texturedQuadVertexFormat["aVertexCoord"] = Property::VECTOR2; - VertexBuffer vertexData = VertexBuffer::New( texturedQuadVertexFormat ); + PropertyBuffer vertexData = PropertyBuffer::New( texturedQuadVertexFormat ); return vertexData; } Geometry CreateQuadGeometry(void) { - VertexBuffer vertexData = CreateVertexBuffer(); + PropertyBuffer vertexData = CreatePropertyBuffer(); const float halfQuadSize = .5f; struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; }; TexturedQuadVertex texturedQuadVertexData[4] = { 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 e593d38..37d13ec 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 @@ -28,7 +28,7 @@ Shader CreateShader(); TextureSet CreateTextureSet(); TextureSet CreateTextureSet( Texture texture ); Geometry CreateQuadGeometry(); -VertexBuffer CreateVertexBuffer(); +PropertyBuffer CreatePropertyBuffer(); } diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp index 5ee9047..1e07c2f 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp @@ -126,8 +126,8 @@ Dali::Geometry CreateTexturedQuad() { Dali::Vector2( -0.5f, 0.5f ), Dali::Vector2( 0.0f, 1.0f ) }, { Dali::Vector2( 0.5f, 0.5f ), Dali::Vector2( 1.0f, 1.0f ) }}; - // Create a vertex buffer for vertex positions and texture coordinates - Dali::VertexBuffer vertexBuffer = Dali::VertexBuffer::New( Dali::Property::Map() + //Create a vertex buffer for vertex positions and texture coordinates + Dali::PropertyBuffer vertexBuffer = Dali::PropertyBuffer::New( Dali::Property::Map() .Add( "aPosition", Dali::Property::VECTOR2 ) .Add( "aTexCoord", Dali::Property::VECTOR2 ) ); vertexBuffer.SetData( data, 4u ); @@ -388,7 +388,7 @@ Geometry BubbleEmitter::CreateGeometry( unsigned int numOfPatch ) vertexFormat["aIndex"] = Property::FLOAT; vertexFormat["aPosition"] = Property::VECTOR2; vertexFormat["aTexCoord"] = Property::VECTOR2; - VertexBuffer vertices = VertexBuffer::New( vertexFormat ); + PropertyBuffer vertices = PropertyBuffer::New( vertexFormat ); vertices.SetData( &vertexData[0], numVertex ); Geometry geometry = Geometry::New(); diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h index 30ccbbf..972f995 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h @@ -24,10 +24,10 @@ #include #include #include +#include #include #include #include -#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/controls/control/control-renderers.cpp b/dali-toolkit/internal/controls/control/control-renderers.cpp index ea6e2e4..052d822 100644 --- a/dali-toolkit/internal/controls/control/control-renderers.cpp +++ b/dali-toolkit/internal/controls/control/control-renderers.cpp @@ -99,15 +99,15 @@ Geometry CreateGridGeometry( Uint16Pair gridSize ) Property::Map vertexFormat; vertexFormat[ "aPosition" ] = Property::VECTOR2; - VertexBuffer vertexBuffer = VertexBuffer::New( vertexFormat ); + PropertyBuffer vertexPropertyBuffer = PropertyBuffer::New( vertexFormat ); if( vertices.Size() > 0 ) { - vertexBuffer.SetData( &vertices[ 0 ], vertices.Size() ); + vertexPropertyBuffer.SetData( &vertices[ 0 ], vertices.Size() ); } // Create the geometry object Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexBuffer ); + geometry.AddVertexBuffer( vertexPropertyBuffer ); if( indices.Size() > 0 ) { geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() ); @@ -138,7 +138,7 @@ Dali::Renderer CreateRenderer( const char* vertexSrc, const char* fragmentSrc ) Dali::Property::Map positionVertexFormat; positionVertexFormat["aPosition"] = Dali::Property::VECTOR2; - Dali::VertexBuffer positionVertices = Dali::VertexBuffer::New( positionVertexFormat ); + Dali::PropertyBuffer positionVertices = Dali::PropertyBuffer::New( positionVertexFormat ); positionVertices.SetData( positionArray, numberOfVertices ); texturedQuadGeometry.AddVertexBuffer( positionVertices ); diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp index 453fb96..d797e93 100644 --- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/model3d-view/obj-loader.cpp b/dali-toolkit/internal/controls/model3d-view/obj-loader.cpp index 273c8ca..fca57b4 100644 --- a/dali-toolkit/internal/controls/model3d-view/obj-loader.cpp +++ b/dali-toolkit/internal/controls/model3d-view/obj-loader.cpp @@ -640,7 +640,7 @@ Geometry ObjLoader::CreateGeometry( int objectProperties, bool useSoftNormals ) Property::Map vertexFormat; vertexFormat["aPosition"] = Property::VECTOR3; vertexFormat["aNormal"] = Property::VECTOR3; - VertexBuffer surfaceVertices = VertexBuffer::New( vertexFormat ); + PropertyBuffer surfaceVertices = PropertyBuffer::New( vertexFormat ); surfaceVertices.SetData( &vertices[0], vertices.Size() ); surface.AddVertexBuffer( surfaceVertices ); @@ -649,7 +649,7 @@ Geometry ObjLoader::CreateGeometry( int objectProperties, bool useSoftNormals ) { Property::Map textureFormat; textureFormat["aTexCoord"] = Property::VECTOR2; - VertexBuffer extraVertices = VertexBuffer::New( textureFormat ); + PropertyBuffer extraVertices = PropertyBuffer::New( textureFormat ); extraVertices.SetData( &textures[0], textures.Size() ); surface.AddVertexBuffer( extraVertices ); @@ -661,7 +661,7 @@ Geometry ObjLoader::CreateGeometry( int objectProperties, bool useSoftNormals ) Property::Map vertexExtFormat; vertexExtFormat["aTangent"] = Property::VECTOR3; vertexExtFormat["aBiNormal"] = Property::VECTOR3; - VertexBuffer extraVertices = VertexBuffer::New( vertexExtFormat ); + PropertyBuffer extraVertices = PropertyBuffer::New( vertexExtFormat ); extraVertices.SetData( &verticesExt[0], verticesExt.Size() ); surface.AddVertexBuffer( extraVertices ); diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp index d6c1d1e..1132e95 100644 --- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp +++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp @@ -372,14 +372,14 @@ void SetMeshInfoAndCanonize( MeshInfo& meshInfo, Dali::Vector &ve } template -VertexBuffer CreateVertexBuffer( Vector bufferData, std::string map, int32_t type ) +PropertyBuffer CreatePropertyBuffer( Vector bufferData, std::string map, int32_t type ) { Property::Map positionMap; positionMap[map] = type; - VertexBuffer vertexBuffer = VertexBuffer::New( positionMap ); - vertexBuffer.SetData( bufferData.Begin(), bufferData.Count() ); - return vertexBuffer; + PropertyBuffer propertyBuffer = PropertyBuffer::New( positionMap ); + propertyBuffer.SetData( bufferData.Begin(), bufferData.Count() ); + return propertyBuffer; } void SetVertexBufferData( MeshInfo& meshInfo, std::string path, std::vector& accessorArray, std::vector& bufferViewArray, std::vector& bufferArray, int32_t accessorIdx, std::string map, int32_t type ) @@ -390,8 +390,8 @@ void SetVertexBufferData( MeshInfo& meshInfo, std::string path, std::vector( bufferData, map, type ); - meshInfo.geometry.AddVertexBuffer( vertexBuffer ); + PropertyBuffer propertyBuffer = CreatePropertyBuffer( bufferData, map, type ); + meshInfo.geometry.AddVertexBuffer( propertyBuffer ); } } @@ -403,8 +403,8 @@ void SetAttributeBufferData( MeshInfo& meshInfo, std::string path, std::vector bufferData; LoadDataFromAccessor( accessorIdx, bufferData, path, accessorArray, bufferViewArray, bufferArray ); - VertexBuffer vertexBuffer = CreateVertexBuffer( bufferData, map, type ); - meshInfo.geometry.AddVertexBuffer( vertexBuffer ); + PropertyBuffer propertyBuffer = CreatePropertyBuffer( bufferData, map, type ); + meshInfo.geometry.AddVertexBuffer( propertyBuffer ); } } @@ -1152,8 +1152,8 @@ bool SetGeometry( MeshInfo& meshInfo, std::string path, std::vector& bufferData[i].z = inputBufferData[i].z; bufferData[i].w = 1.0; } - VertexBuffer vertexBuffer = CreateVertexBuffer( bufferData, "aVertexColor", Property::VECTOR4 ); - meshInfo.geometry.AddVertexBuffer( vertexBuffer ); + PropertyBuffer propertyBuffer = CreatePropertyBuffer( bufferData, "aVertexColor", Property::VECTOR4 ); + meshInfo.geometry.AddVertexBuffer( propertyBuffer ); } else if( accessorArray[accessorIdx].type == "VEC4" ) { diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp index a7db0d2..1b9c422 100644 --- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp +++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -113,7 +114,7 @@ Actor CreateBouncingEffectActor( Property::Index& bouncePropertyIndex ) Property::Map vertexFormat; vertexFormat["aPosition1"] = Property::VECTOR3; vertexFormat["aPosition2"] = Property::VECTOR3; - VertexBuffer vertices = VertexBuffer::New( vertexFormat ); + PropertyBuffer vertices = PropertyBuffer::New( vertexFormat ); vertices.SetData( vertexData, 20u ); unsigned short indexData[30] = { 0,3,1,0,2,3,4,7,5,4,6,7,8,11,9,8,10,11,12,15,13,12,14,15,16,19,17,16,18,19}; diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp index bfc4686..30c494f 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@ -1229,7 +1229,7 @@ struct Decorator::Impl : public ConnectionTracker if( ! mQuadVertices ) { - mQuadVertices = VertexBuffer::New( mQuadVertexFormat ); + mQuadVertices = PropertyBuffer::New( mQuadVertexFormat ); } mQuadVertices.SetData( &vertices[ 0 ], vertices.Size() ); @@ -1906,7 +1906,7 @@ struct Decorator::Impl : public ConnectionTracker CursorImpl mCursor[CURSOR_COUNT]; HandleImpl mHandle[HANDLE_TYPE_COUNT]; - VertexBuffer mQuadVertices; + PropertyBuffer mQuadVertices; Geometry mQuadGeometry; QuadContainer mHighlightQuadList; ///< Sub-selections that combine to create the complete selection highlight. diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp index 4fc28f8..d1aca24 100755 --- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp @@ -679,7 +679,7 @@ struct AtlasRenderer::Impl Actor CreateMeshActor( Actor textControl, Property::Index animatablePropertyIndex, const Vector4& defaultColor, const MeshRecord& meshRecord, const Vector2& actorSize, Style style ) { - VertexBuffer quadVertices = VertexBuffer::New( mQuadVertexFormat ); + PropertyBuffer quadVertices = PropertyBuffer::New( mQuadVertexFormat ); quadVertices.SetData( const_cast< AtlasManager::Vertex2D* >( &meshRecord.mMesh.mVertices[ 0 ] ), meshRecord.mMesh.mVertices.Size() ); Geometry quadGeometry = Geometry::New(); diff --git a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp index d7b245d..4718b11 100644 --- a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp @@ -275,7 +275,7 @@ Actor VectorBasedRenderer::Render( Text::ViewInterface& view, if( 0 != vertices.Count() ) { - VertexBuffer quadVertices = VertexBuffer::New( mImpl->mQuadVertexFormat ); + PropertyBuffer quadVertices = PropertyBuffer::New( mImpl->mQuadVertexFormat ); quadVertices.SetData( &vertices[ 0 ], vertices.Size() ); @@ -307,3 +307,4 @@ VectorBasedRenderer::~VectorBasedRenderer() { delete mImpl; } + diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp index dd59fc8..8cb03b4 100755 --- a/dali-toolkit/internal/text/text-controller-impl.cpp +++ b/dali-toolkit/internal/text/text-controller-impl.cpp @@ -3385,7 +3385,7 @@ Actor Controller::Impl::CreateBackgroundActor() quadVertexFormat[ "aPosition" ] = Property::VECTOR2; quadVertexFormat[ "aColor" ] = Property::VECTOR4; - VertexBuffer quadVertices = VertexBuffer::New( quadVertexFormat ); + PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat ); quadVertices.SetData( &mesh.mVertices[ 0 ], mesh.mVertices.Size() ); Geometry quadGeometry = Geometry::New(); diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index 47667fc..94376e6 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -323,7 +323,7 @@ Geometry BorderVisual::CreateBorderGeometry() Property::Map borderVertexFormat; borderVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2; borderVertexFormat[DRIFT_ATTRIBUTE_NAME] = Property::VECTOR2; - VertexBuffer borderVertices = VertexBuffer::New( borderVertexFormat ); + PropertyBuffer borderVertices = PropertyBuffer::New( borderVertexFormat ); borderVertices.SetData( borderVertexData, 16 ); // Create indices diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index c18bddf..e17f701 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -180,15 +180,15 @@ Geometry GenerateGeometry( const Vector< Vector2 >& vertices, const Vector< unsi { Property::Map vertexFormat; vertexFormat[ "aPosition" ] = Property::VECTOR2; - VertexBuffer vertexBuffer = VertexBuffer::New( vertexFormat ); + PropertyBuffer vertexPropertyBuffer = PropertyBuffer::New( vertexFormat ); if( vertices.Size() > 0 ) { - vertexBuffer.SetData( &vertices[ 0 ], vertices.Size() ); + vertexPropertyBuffer.SetData( &vertices[ 0 ], vertices.Size() ); } // Create the geometry object Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexBuffer ); + geometry.AddVertexBuffer( vertexPropertyBuffer ); if( indices.Size() > 0 ) { geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() ); diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp index 21c9064..449deb7 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp @@ -536,7 +536,7 @@ void PrimitiveVisual::CreateGeometry() Property::Map vertexFormat; vertexFormat[POSITION] = Property::VECTOR3; vertexFormat[NORMAL] = Property::VECTOR3; - VertexBuffer surfaceVertices = VertexBuffer::New( vertexFormat ); + PropertyBuffer surfaceVertices = PropertyBuffer::New( vertexFormat ); surfaceVertices.SetData( &vertices[0], vertices.Size() ); mGeometry.AddVertexBuffer( surfaceVertices ); diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp index 218ba4f..7044e6d 100644 --- a/dali-toolkit/internal/visuals/visual-factory-cache.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-cache.cpp @@ -89,7 +89,7 @@ Geometry VisualFactoryCache::CreateQuadGeometry() Property::Map quadVertexFormat; quadVertexFormat["aPosition"] = Property::VECTOR2; - VertexBuffer quadVertices = VertexBuffer::New( quadVertexFormat ); + PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat ); quadVertices.SetData( quadVertexData, 4 ); // Create the geometry object @@ -193,20 +193,20 @@ Geometry VisualFactoryCache::CreateGridGeometry( Uint16Pair gridSize ) Property::Map vertexFormat; vertexFormat[ "aPosition" ] = Property::VECTOR2; - VertexBuffer vertexBuffer = VertexBuffer::New( vertexFormat ); + PropertyBuffer vertexPropertyBuffer = PropertyBuffer::New( vertexFormat ); if( vertices.Size() > 0 ) { - vertexBuffer.SetData( &vertices[ 0 ], vertices.Size() ); + vertexPropertyBuffer.SetData( &vertices[ 0 ], vertices.Size() ); } Property::Map indexFormat; indexFormat[ "indices" ] = Property::INTEGER; - VertexBuffer indexVertexBuffer = VertexBuffer::New( indexFormat ); + PropertyBuffer indexPropertyBuffer = PropertyBuffer::New( indexFormat ); // Create the geometry object Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexBuffer ); + geometry.AddVertexBuffer( vertexPropertyBuffer ); if( indices.Size() > 0 ) { geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() ); diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp index ba3b651..e170655 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp @@ -216,7 +216,7 @@ Geometry WireframeVisual::CreateQuadWireframeGeometry() Property::Map quadVertexFormat; quadVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2; - VertexBuffer quadVertices = VertexBuffer::New( quadVertexFormat ); + PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat ); quadVertices.SetData( quadVertexData, 4 ); // Create indices -- 2.7.4