X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=node-addon%2Fexamples%2Fmesh-morph.js;h=14f3888d79b8f09052062a0fa5011fdbba72c998;hp=7d6bc49771f6875ff6a60bd096ef6a1a2d6eb3f3;hb=1e6044c72b27cd4ecfda3c929263d5aefa1efad0;hpb=6c6cdc0f1c2e6373e4eb3bf74397abba5befe026 diff --git a/node-addon/examples/mesh-morph.js b/node-addon/examples/mesh-morph.js index 7d6bc49..14f3888 100644 --- 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