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 7d6bc49..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 };
 
@@ -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