From c410ccd847ff34f0a0145ac84dc3b01df8bcf61a Mon Sep 17 00:00:00 2001 From: Francisco Santos Date: Wed, 3 Jun 2015 13:41:55 +0100 Subject: [PATCH] Fixes for removal of animatable property-buffer. Change-Id: I32428f2a5be9009e5f3603ad9567b62b9db62c31 --- examples/line-mesh/line-mesh-example.cpp | 6 +++--- examples/mesh-morph/mesh-morph-example.cpp | 6 +++--- examples/mesh-sorting/mesh-sorting-example.cpp | 4 ++-- examples/new-window/new-window-example.cpp | 4 ++-- examples/point-mesh/point-mesh-example.cpp | 2 +- examples/radial-menu/radial-sweep-view-impl.cpp | 4 ++-- examples/refraction-effect/refraction-effect-example.cpp | 2 +- examples/textured-mesh/textured-mesh-example.cpp | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp index 9b5ec4c..30303bb 100644 --- a/examples/line-mesh/line-mesh-example.cpp +++ b/examples/line-mesh/line-mesh-example.cpp @@ -82,19 +82,19 @@ Geometry CreateGeometry() Property::Map pentagonVertexFormat; pentagonVertexFormat["aPosition1"] = Property::VECTOR2; - PropertyBuffer pentagonVertices = PropertyBuffer::New( PropertyBuffer::STATIC, pentagonVertexFormat, 5 ); + PropertyBuffer pentagonVertices = PropertyBuffer::New( pentagonVertexFormat, 5 ); pentagonVertices.SetData(pentagonVertexData); Property::Map pentacleVertexFormat; pentacleVertexFormat["aPosition2"] = Property::VECTOR2; - PropertyBuffer pentacleVertices = PropertyBuffer::New( PropertyBuffer::STATIC, pentacleVertexFormat, 5 ); + PropertyBuffer pentacleVertices = PropertyBuffer::New( pentacleVertexFormat, 5 ); pentacleVertices.SetData(pentacleVertexData); // Create indices unsigned int indexData[10] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 0 }; Property::Map indexFormat; indexFormat["indices"] = Property::UNSIGNED_INTEGER; - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, sizeof(indexData)/sizeof(indexData[0]) ); + PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) ); indices.SetData(indexData); // Create the geometry object diff --git a/examples/mesh-morph/mesh-morph-example.cpp b/examples/mesh-morph/mesh-morph-example.cpp index 5c99097..26b5b59 100644 --- a/examples/mesh-morph/mesh-morph-example.cpp +++ b/examples/mesh-morph/mesh-morph-example.cpp @@ -218,17 +218,17 @@ Geometry CreateGeometry() Property::Map initialPositionVertexFormat; initialPositionVertexFormat["aInitPos"] = Property::VECTOR2; - PropertyBuffer initialPositionVertices = PropertyBuffer::New( PropertyBuffer::STATIC, initialPositionVertexFormat, numberOfVertices ); + PropertyBuffer initialPositionVertices = PropertyBuffer::New( initialPositionVertexFormat, numberOfVertices ); initialPositionVertices.SetData(quad); Property::Map finalPositionVertexFormat; finalPositionVertexFormat["aFinalPos"] = Property::VECTOR2; - PropertyBuffer finalPositionVertices = PropertyBuffer::New( PropertyBuffer::STATIC, finalPositionVertexFormat, numberOfVertices ); + PropertyBuffer finalPositionVertices = PropertyBuffer::New( finalPositionVertexFormat, numberOfVertices ); finalPositionVertices.SetData(cat); Property::Map colorVertexFormat; colorVertexFormat["aColor"] = Property::VECTOR3; - PropertyBuffer colorVertices = PropertyBuffer::New( PropertyBuffer::STATIC, colorVertexFormat, numberOfVertices ); + PropertyBuffer colorVertices = PropertyBuffer::New( colorVertexFormat, numberOfVertices ); colorVertices.SetData(colors); // Create the geometry object diff --git a/examples/mesh-sorting/mesh-sorting-example.cpp b/examples/mesh-sorting/mesh-sorting-example.cpp index cfddd10..b019791 100644 --- a/examples/mesh-sorting/mesh-sorting-example.cpp +++ b/examples/mesh-sorting/mesh-sorting-example.cpp @@ -98,14 +98,14 @@ Geometry CreateGeometry() Property::Map texturedQuadVertexFormat; texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2; - PropertyBuffer texturedQuadVertices = PropertyBuffer::New( PropertyBuffer::STATIC, texturedQuadVertexFormat, 4 ); + PropertyBuffer texturedQuadVertices = PropertyBuffer::New( texturedQuadVertexFormat, 4 ); texturedQuadVertices.SetData(texturedQuadVertexData); // Create indices unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 }; Property::Map indexFormat; indexFormat["indices"] = Property::UNSIGNED_INTEGER; - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, 6 ); + PropertyBuffer indices = PropertyBuffer::New( indexFormat, 6 ); indices.SetData(indexData); // Create the geometry object diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp index 251843a..7e854b0 100644 --- a/examples/new-window/new-window-example.cpp +++ b/examples/new-window/new-window-example.cpp @@ -429,14 +429,14 @@ Geometry NewWindowController::CreateMeshGeometry() vertexFormat["aPosition"] = Property::VECTOR3; vertexFormat["aTexCoord"] = Property::VECTOR2; vertexFormat["aColor"] = Property::VECTOR3; - PropertyBuffer vertices = PropertyBuffer::New( PropertyBuffer::STATIC, vertexFormat, 5 ); + PropertyBuffer vertices = PropertyBuffer::New( vertexFormat, 5 ); vertices.SetData( vertexData ); // Specify all the faces unsigned int indexData[12] = { 0,1,3,0,2,4,0,3,4,0,2,1 }; Property::Map indexFormat; indexFormat["indices"] = Property::UNSIGNED_INTEGER; - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, 12 ); + PropertyBuffer indices = PropertyBuffer::New( indexFormat, 12 ); indices.SetData( indexData ); // Create the geometry object diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp index bf6c077..63326e6 100644 --- a/examples/point-mesh/point-mesh-example.cpp +++ b/examples/point-mesh/point-mesh-example.cpp @@ -98,7 +98,7 @@ Geometry CreateGeometry() Property::Map polyhedraVertexFormat; polyhedraVertexFormat["aPosition"] = Property::VECTOR2; polyhedraVertexFormat["aHue"] = Property::FLOAT; - PropertyBuffer polyhedraVertices = PropertyBuffer::New( PropertyBuffer::STATIC, polyhedraVertexFormat, numSides ); + PropertyBuffer polyhedraVertices = PropertyBuffer::New( polyhedraVertexFormat, numSides ); polyhedraVertices.SetData(polyhedraVertexData); // Create the geometry object diff --git a/examples/radial-menu/radial-sweep-view-impl.cpp b/examples/radial-menu/radial-sweep-view-impl.cpp index f13d58a..1647b26 100644 --- a/examples/radial-menu/radial-sweep-view-impl.cpp +++ b/examples/radial-menu/radial-sweep-view-impl.cpp @@ -330,13 +330,13 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector ) vertexFormat["aAngleIndex"] = Property::FLOAT; vertexFormat["aPosition1"] = Property::VECTOR2; vertexFormat["aPosition2"] = Property::VECTOR2; - PropertyBuffer vertices = PropertyBuffer::New( PropertyBuffer::STATIC, vertexFormat, 7u ); + PropertyBuffer vertices = PropertyBuffer::New( vertexFormat, 7u ); vertices.SetData( vertexData ); unsigned int indexData[15] = { 0,1,2,0,2,3,0,3,4,0,4,5,0,5,6 }; Property::Map indexFormat; indexFormat["indices"] = Property::UNSIGNED_INTEGER; - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, 15u ); + PropertyBuffer indices = PropertyBuffer::New( indexFormat, 15u ); indices.SetData( indexData ); Geometry meshGeometry = Geometry::New(); diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index 8a82398..8626c38 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -456,7 +456,7 @@ private: vertexFormat["aPosition"] = Property::VECTOR3; vertexFormat["aNormal"] = Property::VECTOR3; vertexFormat["aTexCoord"] = Property::VECTOR2; - PropertyBuffer surfaceVertices = PropertyBuffer::New( PropertyBuffer::STATIC, vertexFormat, vertices.size() ); + PropertyBuffer surfaceVertices = PropertyBuffer::New( vertexFormat, vertices.size() ); surfaceVertices.SetData( &vertices[0] ); Geometry surface = Geometry::New(); diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp index a6238cb..7fb3426 100644 --- a/examples/textured-mesh/textured-mesh-example.cpp +++ b/examples/textured-mesh/textured-mesh-example.cpp @@ -75,14 +75,14 @@ Geometry CreateGeometry() Property::Map texturedQuadVertexFormat; texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2; - PropertyBuffer texturedQuadVertices = PropertyBuffer::New( PropertyBuffer::STATIC, texturedQuadVertexFormat, 4 ); + PropertyBuffer texturedQuadVertices = PropertyBuffer::New( texturedQuadVertexFormat, 4 ); texturedQuadVertices.SetData(texturedQuadVertexData); // Create indices unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 }; Property::Map indexFormat; indexFormat["indices"] = Property::UNSIGNED_INTEGER; - PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, sizeof(indexData)/sizeof(indexData[0]) ); + PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) ); indices.SetData(indexData); // Create the geometry object -- 2.7.4