projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Updates following rename of PropertyBuffer to VertexBuffer" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
mesh-builder.cpp
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
f8e3917
..
3d7c359
100644
(file)
--- 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
@@
-18,9
+18,6
@@
// CLASS HEADER
#include "mesh-builder.h"
// CLASS HEADER
#include "mesh-builder.h"
-// EXTERNAL INCLUDES
-#include <dali/devel-api/images/texture-set-image.h>
-
namespace Dali
{
namespace Dali
{
@@
-34,13
+31,6
@@
TextureSet CreateTextureSet()
return TextureSet::New();
}
return TextureSet::New();
}
-TextureSet CreateTextureSet( Image image )
-{
- TextureSet textureSet = TextureSet::New();
- TextureSetImage( textureSet, 0u, image );
- return textureSet;
-}
-
TextureSet CreateTextureSet( Texture texture )
{
TextureSet textureSet = TextureSet::New();
TextureSet CreateTextureSet( Texture texture )
{
TextureSet textureSet = TextureSet::New();
@@
-48,19
+38,19
@@
TextureSet CreateTextureSet( Texture texture )
return textureSet;
}
return textureSet;
}
-
PropertyBuffer CreateProperty
Buffer()
+
VertexBuffer CreateVertex
Buffer()
{
Property::Map texturedQuadVertexFormat;
texturedQuadVertexFormat["aPosition"] = Property::VECTOR2;
texturedQuadVertexFormat["aVertexCoord"] = Property::VECTOR2;
{
Property::Map texturedQuadVertexFormat;
texturedQuadVertexFormat["aPosition"] = Property::VECTOR2;
texturedQuadVertexFormat["aVertexCoord"] = Property::VECTOR2;
-
PropertyBuffer vertexData = Property
Buffer::New( texturedQuadVertexFormat );
+
VertexBuffer vertexData = Vertex
Buffer::New( texturedQuadVertexFormat );
return vertexData;
}
Geometry CreateQuadGeometry(void)
{
return vertexData;
}
Geometry CreateQuadGeometry(void)
{
-
PropertyBuffer vertexData = CreateProperty
Buffer();
+
VertexBuffer vertexData = CreateVertex
Buffer();
const float halfQuadSize = .5f;
struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; };
TexturedQuadVertex texturedQuadVertexData[4] = {
const float halfQuadSize = .5f;
struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; };
TexturedQuadVertex texturedQuadVertexData[4] = {