X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=node-addon%2Fexamples%2Fmesh-morph.js;h=1f59d36772307627ba1c84621d3a85d83a1ed6ef;hb=9884caf50c9603a1b83bcb5742cb71e012458a86;hp=edbdcf9ad6d84084608b7594e55115a13ebc43a1;hpb=c2d1329e1e2211c372f8a696f7afd69edcdf23df;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/node-addon/examples/mesh-morph.js b/node-addon/examples/mesh-morph.js index edbdcf9..1f59d36 100644 --- a/node-addon/examples/mesh-morph.js +++ b/node-addon/examples/mesh-morph.js @@ -60,8 +60,6 @@ daliApp.createMeshActor = function() { var shader = new dali.Shader(shaderOptions); - var material = new dali.Material( shader ); - // Create vertex buffer for initial positions var initialPositionVertexFormat = { "aInitPos" : dali.PROPERTY_VECTOR2 }; @@ -110,8 +108,8 @@ daliApp.createMeshActor = function() { var initialPositionVertexDataArray = new Float32Array(initialPositionVertexData.length); initialPositionVertexDataArray.set(initialPositionVertexData, 0); - var initialPositionVertices = new dali.PropertyBuffer(initialPositionVertexFormat, 27); - initialPositionVertices.setData(initialPositionVertexDataArray); + var initialPositionVertices = new dali.PropertyBuffer(initialPositionVertexFormat); + initialPositionVertices.setData(initialPositionVertexDataArray, 27); // Create vertex buffer for final positions var finalPositionVertexFormat = { "aFinalPos" : dali.PROPERTY_VECTOR2 }; @@ -164,8 +162,8 @@ daliApp.createMeshActor = function() { var finalPositionVertexDataArray = new Float32Array(finalPositionVertexData.length); finalPositionVertexDataArray.set(finalPositionVertexData, 0); - var finalPositionVertices = new dali.PropertyBuffer(finalPositionVertexFormat, 27); - finalPositionVertices.setData(finalPositionVertexDataArray); + var finalPositionVertices = new dali.PropertyBuffer(finalPositionVertexFormat); + finalPositionVertices.setData(finalPositionVertexDataArray, 27); // Create vertex buffer for color var colorVertexFormat = { "aColor" : dali.PROPERTY_VECTOR3 }; @@ -215,8 +213,8 @@ daliApp.createMeshActor = function() { var colorVertexDataArray = new Float32Array(colorVertexData.length); colorVertexDataArray.set(colorVertexData, 0); - var colorVertices = new dali.PropertyBuffer(colorVertexFormat, 27); - colorVertices.setData(colorVertexDataArray); + var colorVertices = new dali.PropertyBuffer(colorVertexFormat); + colorVertices.setData(colorVertexDataArray, 27); // Create geometry var geometry = new dali.Geometry(); @@ -224,7 +222,7 @@ daliApp.createMeshActor = function() { geometry.addVertexBuffer( finalPositionVertices ); geometry.addVertexBuffer( colorVertices ); - var renderer = new dali.Renderer(geometry, material); + var renderer = new dali.Renderer(geometry, shader); renderer.depthIndex = 0; // Create mesh actor @@ -240,7 +238,7 @@ daliApp.createMeshActor = function() { // Animate the mesh actor var animation = new dali.Animation(5); - var animOptions = { alpha:"sin", delay:0, duration:5}; + var animOptions = { alpha:dali.ALPHA_FUNCTION_SIN, delay:0, duration:5}; animation.animateTo( meshActor, "uDelta", 1.0, animOptions ); animation.setLooping(true);