Merge "Tizen Directory Migration" into devel/master

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

diff --git a/node-addon/examples/mesh-morph.js b/node-addon/examples/mesh-morph.js
index 7570405..14f3888 100644 (file)
--- a/node-addon/examples/mesh-morph.js
+++ b/node-addon/examples/mesh-morph.js
@@ -17,11 +17,14 @@
     'view-mode': viewMode,
  }
 
-// desktop
-//var dali = require('../build/Release/dali')( options );
-
-// target
-var dali = require('dali')( options );
+try {
+  // target
+  var dali = require('dali')( options );
+}
+catch(err) {
+  // desktop
+  var dali = require('../build/Release/dali')( options );
+}
 
 var daliApp = {};
 
@@ -60,8 +63,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 +111,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 +165,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 +216,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 +225,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