Peter M. Groen / dali-demo

Commit c410ccd847ff34f0a0145ac84dc3b01df8bcf61a

Authored by Francisco Santos
1 parent 5b74d885

Fixes for removal of animatable property-buffer. 

Change-Id: I32428f2a5be9009e5f3603ad9567b62b9db62c31
Inline Side-by-side
Showing 8 changed files with 16 additions and 16 deletions
examples/line-mesh/line-mesh-example.cpp
  View file @c410ccd
@@ -82,19 +82,19 @@ Geometry CreateGeometry() @@ -82,19 +82,19 @@ Geometry CreateGeometry()
82 82
83 Property::Map pentagonVertexFormat; 83 Property::Map pentagonVertexFormat;
84 pentagonVertexFormat["aPosition1"] = Property::VECTOR2; 84 pentagonVertexFormat["aPosition1"] = Property::VECTOR2;
85 - PropertyBuffer pentagonVertices = PropertyBuffer::New( PropertyBuffer::STATIC, pentagonVertexFormat, 5 ); 85 + PropertyBuffer pentagonVertices = PropertyBuffer::New( pentagonVertexFormat, 5 );
86 pentagonVertices.SetData(pentagonVertexData); 86 pentagonVertices.SetData(pentagonVertexData);
87 87
88 Property::Map pentacleVertexFormat; 88 Property::Map pentacleVertexFormat;
89 pentacleVertexFormat["aPosition2"] = Property::VECTOR2; 89 pentacleVertexFormat["aPosition2"] = Property::VECTOR2;
90 - PropertyBuffer pentacleVertices = PropertyBuffer::New( PropertyBuffer::STATIC, pentacleVertexFormat, 5 ); 90 + PropertyBuffer pentacleVertices = PropertyBuffer::New( pentacleVertexFormat, 5 );
91 pentacleVertices.SetData(pentacleVertexData); 91 pentacleVertices.SetData(pentacleVertexData);
92 92
93 // Create indices 93 // Create indices
94 unsigned int indexData[10] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 0 }; 94 unsigned int indexData[10] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 0 };
95 Property::Map indexFormat; 95 Property::Map indexFormat;
96 indexFormat["indices"] = Property::UNSIGNED_INTEGER; 96 indexFormat["indices"] = Property::UNSIGNED_INTEGER;
97 - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, sizeof(indexData)/sizeof(indexData[0]) ); 97 + PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) );
98 indices.SetData(indexData); 98 indices.SetData(indexData);
99 99
100 // Create the geometry object 100 // Create the geometry object
examples/mesh-morph/mesh-morph-example.cpp
  View file @c410ccd
@@ -218,17 +218,17 @@ Geometry CreateGeometry() @@ -218,17 +218,17 @@ Geometry CreateGeometry()
218 218
219 Property::Map initialPositionVertexFormat; 219 Property::Map initialPositionVertexFormat;
220 initialPositionVertexFormat["aInitPos"] = Property::VECTOR2; 220 initialPositionVertexFormat["aInitPos"] = Property::VECTOR2;
221 - PropertyBuffer initialPositionVertices = PropertyBuffer::New( PropertyBuffer::STATIC, initialPositionVertexFormat, numberOfVertices ); 221 + PropertyBuffer initialPositionVertices = PropertyBuffer::New( initialPositionVertexFormat, numberOfVertices );
222 initialPositionVertices.SetData(quad); 222 initialPositionVertices.SetData(quad);
223 223
224 Property::Map finalPositionVertexFormat; 224 Property::Map finalPositionVertexFormat;
225 finalPositionVertexFormat["aFinalPos"] = Property::VECTOR2; 225 finalPositionVertexFormat["aFinalPos"] = Property::VECTOR2;
226 - PropertyBuffer finalPositionVertices = PropertyBuffer::New( PropertyBuffer::STATIC, finalPositionVertexFormat, numberOfVertices ); 226 + PropertyBuffer finalPositionVertices = PropertyBuffer::New( finalPositionVertexFormat, numberOfVertices );
227 finalPositionVertices.SetData(cat); 227 finalPositionVertices.SetData(cat);
228 228
229 Property::Map colorVertexFormat; 229 Property::Map colorVertexFormat;
230 colorVertexFormat["aColor"] = Property::VECTOR3; 230 colorVertexFormat["aColor"] = Property::VECTOR3;
231 - PropertyBuffer colorVertices = PropertyBuffer::New( PropertyBuffer::STATIC, colorVertexFormat, numberOfVertices ); 231 + PropertyBuffer colorVertices = PropertyBuffer::New( colorVertexFormat, numberOfVertices );
232 colorVertices.SetData(colors); 232 colorVertices.SetData(colors);
233 233
234 // Create the geometry object 234 // Create the geometry object
examples/mesh-sorting/mesh-sorting-example.cpp
  View file @c410ccd
@@ -98,14 +98,14 @@ Geometry CreateGeometry() @@ -98,14 +98,14 @@ Geometry CreateGeometry()
98 Property::Map texturedQuadVertexFormat; 98 Property::Map texturedQuadVertexFormat;
99 texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; 99 texturedQuadVertexFormat["aPosition"] = Property::VECTOR2;
100 texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2; 100 texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2;
101 - PropertyBuffer texturedQuadVertices = PropertyBuffer::New( PropertyBuffer::STATIC, texturedQuadVertexFormat, 4 ); 101 + PropertyBuffer texturedQuadVertices = PropertyBuffer::New( texturedQuadVertexFormat, 4 );
102 texturedQuadVertices.SetData(texturedQuadVertexData); 102 texturedQuadVertices.SetData(texturedQuadVertexData);
103 103
104 // Create indices 104 // Create indices
105 unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 }; 105 unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 };
106 Property::Map indexFormat; 106 Property::Map indexFormat;
107 indexFormat["indices"] = Property::UNSIGNED_INTEGER; 107 indexFormat["indices"] = Property::UNSIGNED_INTEGER;
108 - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, 6 ); 108 + PropertyBuffer indices = PropertyBuffer::New( indexFormat, 6 );
109 indices.SetData(indexData); 109 indices.SetData(indexData);
110 110
111 // Create the geometry object 111 // Create the geometry object
examples/new-window/new-window-example.cpp
  View file @c410ccd
@@ -429,14 +429,14 @@ Geometry NewWindowController::CreateMeshGeometry() @@ -429,14 +429,14 @@ Geometry NewWindowController::CreateMeshGeometry()
429 vertexFormat["aPosition"] = Property::VECTOR3; 429 vertexFormat["aPosition"] = Property::VECTOR3;
430 vertexFormat["aTexCoord"] = Property::VECTOR2; 430 vertexFormat["aTexCoord"] = Property::VECTOR2;
431 vertexFormat["aColor"] = Property::VECTOR3; 431 vertexFormat["aColor"] = Property::VECTOR3;
432 - PropertyBuffer vertices = PropertyBuffer::New( PropertyBuffer::STATIC, vertexFormat, 5 ); 432 + PropertyBuffer vertices = PropertyBuffer::New( vertexFormat, 5 );
433 vertices.SetData( vertexData ); 433 vertices.SetData( vertexData );
434 434
435 // Specify all the faces 435 // Specify all the faces
436 unsigned int indexData[12] = { 0,1,3,0,2,4,0,3,4,0,2,1 }; 436 unsigned int indexData[12] = { 0,1,3,0,2,4,0,3,4,0,2,1 };
437 Property::Map indexFormat; 437 Property::Map indexFormat;
438 indexFormat["indices"] = Property::UNSIGNED_INTEGER; 438 indexFormat["indices"] = Property::UNSIGNED_INTEGER;
439 - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, 12 ); 439 + PropertyBuffer indices = PropertyBuffer::New( indexFormat, 12 );
440 indices.SetData( indexData ); 440 indices.SetData( indexData );
441 441
442 // Create the geometry object 442 // Create the geometry object
examples/point-mesh/point-mesh-example.cpp
  View file @c410ccd
@@ -98,7 +98,7 @@ Geometry CreateGeometry() @@ -98,7 +98,7 @@ Geometry CreateGeometry()
98 Property::Map polyhedraVertexFormat; 98 Property::Map polyhedraVertexFormat;
99 polyhedraVertexFormat["aPosition"] = Property::VECTOR2; 99 polyhedraVertexFormat["aPosition"] = Property::VECTOR2;
100 polyhedraVertexFormat["aHue"] = Property::FLOAT; 100 polyhedraVertexFormat["aHue"] = Property::FLOAT;
101 - PropertyBuffer polyhedraVertices = PropertyBuffer::New( PropertyBuffer::STATIC, polyhedraVertexFormat, numSides ); 101 + PropertyBuffer polyhedraVertices = PropertyBuffer::New( polyhedraVertexFormat, numSides );
102 polyhedraVertices.SetData(polyhedraVertexData); 102 polyhedraVertices.SetData(polyhedraVertexData);
103 103
104 // Create the geometry object 104 // Create the geometry object
examples/radial-menu/radial-sweep-view-impl.cpp
  View file @c410ccd
@@ -330,13 +330,13 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector ) @@ -330,13 +330,13 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector )
330 vertexFormat["aAngleIndex"] = Property::FLOAT; 330 vertexFormat["aAngleIndex"] = Property::FLOAT;
331 vertexFormat["aPosition1"] = Property::VECTOR2; 331 vertexFormat["aPosition1"] = Property::VECTOR2;
332 vertexFormat["aPosition2"] = Property::VECTOR2; 332 vertexFormat["aPosition2"] = Property::VECTOR2;
333 - PropertyBuffer vertices = PropertyBuffer::New( PropertyBuffer::STATIC, vertexFormat, 7u ); 333 + PropertyBuffer vertices = PropertyBuffer::New( vertexFormat, 7u );
334 vertices.SetData( vertexData ); 334 vertices.SetData( vertexData );
335 335
336 unsigned int indexData[15] = { 0,1,2,0,2,3,0,3,4,0,4,5,0,5,6 }; 336 unsigned int indexData[15] = { 0,1,2,0,2,3,0,3,4,0,4,5,0,5,6 };
337 Property::Map indexFormat; 337 Property::Map indexFormat;
338 indexFormat["indices"] = Property::UNSIGNED_INTEGER; 338 indexFormat["indices"] = Property::UNSIGNED_INTEGER;
339 - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, 15u ); 339 + PropertyBuffer indices = PropertyBuffer::New( indexFormat, 15u );
340 indices.SetData( indexData ); 340 indices.SetData( indexData );
341 341
342 Geometry meshGeometry = Geometry::New(); 342 Geometry meshGeometry = Geometry::New();
examples/refraction-effect/refraction-effect-example.cpp
  View file @c410ccd
@@ -456,7 +456,7 @@ private: @@ -456,7 +456,7 @@ private:
456 vertexFormat["aPosition"] = Property::VECTOR3; 456 vertexFormat["aPosition"] = Property::VECTOR3;
457 vertexFormat["aNormal"] = Property::VECTOR3; 457 vertexFormat["aNormal"] = Property::VECTOR3;
458 vertexFormat["aTexCoord"] = Property::VECTOR2; 458 vertexFormat["aTexCoord"] = Property::VECTOR2;
459 - PropertyBuffer surfaceVertices = PropertyBuffer::New( PropertyBuffer::STATIC, vertexFormat, vertices.size() ); 459 + PropertyBuffer surfaceVertices = PropertyBuffer::New( vertexFormat, vertices.size() );
460 surfaceVertices.SetData( &vertices[0] ); 460 surfaceVertices.SetData( &vertices[0] );
461 461
462 Geometry surface = Geometry::New(); 462 Geometry surface = Geometry::New();
examples/textured-mesh/textured-mesh-example.cpp
  View file @c410ccd
@@ -75,14 +75,14 @@ Geometry CreateGeometry() @@ -75,14 +75,14 @@ Geometry CreateGeometry()
75 Property::Map texturedQuadVertexFormat; 75 Property::Map texturedQuadVertexFormat;
76 texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; 76 texturedQuadVertexFormat["aPosition"] = Property::VECTOR2;
77 texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2; 77 texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2;
78 - PropertyBuffer texturedQuadVertices = PropertyBuffer::New( PropertyBuffer::STATIC, texturedQuadVertexFormat, 4 ); 78 + PropertyBuffer texturedQuadVertices = PropertyBuffer::New( texturedQuadVertexFormat, 4 );
79 texturedQuadVertices.SetData(texturedQuadVertexData); 79 texturedQuadVertices.SetData(texturedQuadVertexData);
80 80
81 // Create indices 81 // Create indices
82 unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 }; 82 unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 };
83 Property::Map indexFormat; 83 Property::Map indexFormat;
84 indexFormat["indices"] = Property::UNSIGNED_INTEGER; 84 indexFormat["indices"] = Property::UNSIGNED_INTEGER;
85 - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, sizeof(indexData)/sizeof(indexData[0]) ); 85 + PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) );
86 indices.SetData(indexData); 86 indices.SetData(indexData);
87 87
88 // Create the geometry object 88 // Create the geometry object