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
Changes after TouchedSignal changes
[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
5b127c7
..
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
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-14,6
+14,8
@@
* limitations under the License.
*
*/
* limitations under the License.
*
*/
+
+// CLASS HEADER
#include "mesh-builder.h"
namespace Dali
#include "mesh-builder.h"
namespace Dali
@@
-28,31
+30,27
@@
TextureSet CreateTextureSet()
{
return TextureSet::New();
}
{
return TextureSet::New();
}
-TextureSet CreateTextureSet( Image image )
+
+TextureSet CreateTextureSet( Texture texture )
{
TextureSet textureSet = TextureSet::New();
{
TextureSet textureSet = TextureSet::New();
- textureSet.Set
Image( 0u, image
);
+ textureSet.Set
Texture(0u, 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 = CreatePropertyBuffer();
- return CreateQuadGeometryFromBuffer( vertexData );
-}
-
-Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData )
-{
+ VertexBuffer vertexData = CreateVertexBuffer();
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] = {