Merge "Fix JavaScript error after Rendering API clean-up" into devel/master

[platform/core/uifw/dali-toolkit.git] / node-addon / examples / point-mesh.js

diff --git a/node-addon/examples/point-mesh.js b/node-addon/examples/point-mesh.js
index ceb9b1e..c5f539e 100644 (file)
--- a/node-addon/examples/point-mesh.js
+++ b/node-addon/examples/point-mesh.js
@@ -79,9 +79,9 @@ daliApp.createMeshActor = function() {
 
       var shader = new dali.Shader(shaderOptions);
 
-      var material = new dali.Material( shader );
       var image = new dali.ResourceImage( {url: imageDir + "image-1.jpg"} );
-      material.addTexture(image, "sTexture");
+      var textureSet = new dali.TextureSet;
+      textureSet.setImage(0, image);
 
       // Create vertex buffer
       var polyhedraVertexFormat ={ "aPosition" : dali.PROPERTY_VECTOR2,
@@ -107,15 +107,16 @@ daliApp.createMeshActor = function() {
 
       var polyhedraVertexDataArray = new Float32Array(polyhedraVertexData.length);
       polyhedraVertexDataArray.set(polyhedraVertexData, 0);
-      var polyhedraVertices = new dali.PropertyBuffer(polyhedraVertexFormat, numSides);
-      polyhedraVertices.setData(polyhedraVertexDataArray);
+      var polyhedraVertices = new dali.PropertyBuffer(polyhedraVertexFormat);
+      polyhedraVertices.setData(polyhedraVertexDataArray, numSides);
 
       // Create geometry
       var geometry = new dali.Geometry();
       geometry.addVertexBuffer( polyhedraVertices );
       geometry.setGeometryType( dali.GEOMETRY_POINTS );
 
-      var renderer = new dali.Renderer(geometry, material);
+      var renderer = new dali.Renderer(geometry, shader);
+      renderer.setTextures(textureSet);
       renderer.registerAnimatableProperty("uFadeColor", [1.0, 0.0, 1.0, 1.0]); // Green
       renderer.registerAnimatableProperty("uPointSize", 80.0);
       renderer.depthIndex = 0;
@@ -132,7 +133,7 @@ daliApp.createMeshActor = function() {
 
       // Animate the mesh actor
       var animation = new dali.Animation(5);
-      var animOptions = { alpha:"linear", delay:0, duration:5};
+      var animOptions = { alpha:dali.ALPHA_FUNCTION_LINEAR, delay:0, duration:5};
       var rotation = new dali.Rotation(360,0,0,1);
       animation.animateBy( meshActor, "orientation", rotation, animOptions );
       animation.setLooping(true);