X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=node-addon%2Fexamples%2Fline-mesh.js;h=e26948f82fccfa2528885ac0dcd2926d694c6f57;hp=faaedb9bc9a144ca88492f779c5c9f3f19a86b94;hb=2552b4ff0c24234ac66ba137ad568bf7262cca82;hpb=c2d1329e1e2211c372f8a696f7afd69edcdf23df diff --git a/node-addon/examples/line-mesh.js b/node-addon/examples/line-mesh.js index faaedb9..e26948f 100644 --- a/node-addon/examples/line-mesh.js +++ b/node-addon/examples/line-mesh.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 = {}; @@ -58,8 +61,6 @@ daliApp.createMeshActor = function() { var shader = new dali.Shader(shaderOptions); - var material = new dali.Material( shader ); - // Create vertex buffer var pentagonVertexFormat ={ "aPosition1" : dali.PROPERTY_VECTOR2 }; @@ -71,8 +72,8 @@ daliApp.createMeshActor = function() { var pentagonVertexDataArray = new Float32Array(pentagonVertexData.length); pentagonVertexDataArray.set(pentagonVertexData, 0); - var pentagonVertices = new dali.PropertyBuffer(pentagonVertexFormat, 5); - pentagonVertices.setData(pentagonVertexDataArray); + var pentagonVertices = new dali.PropertyBuffer(pentagonVertexFormat); + pentagonVertices.setData(pentagonVertexDataArray, 5); var pentacleVertexFormat ={ "aPosition2" : dali.PROPERTY_VECTOR2}; @@ -84,8 +85,8 @@ daliApp.createMeshActor = function() { var pentacleVertexDataArray = new Float32Array(pentacleVertexData.length); pentacleVertexDataArray.set(pentacleVertexData, 0); - var pentacleVertices = new dali.PropertyBuffer(pentacleVertexFormat, 5); - pentacleVertices.setData(pentacleVertexDataArray); + var pentacleVertices = new dali.PropertyBuffer(pentacleVertexFormat); + pentacleVertices.setData(pentacleVertexDataArray, 5); var indexFormat ={ "indices" : dali.PROPERTY_INTEGER }; @@ -93,17 +94,15 @@ daliApp.createMeshActor = function() { var indexDataArray = new Uint32Array(indexData.length); indexDataArray.set(indexData, 0); - var indices = new dali.PropertyBuffer(indexFormat, 10); - indices.setData(indexDataArray); // Create geometry var geometry = new dali.Geometry(); geometry.addVertexBuffer( pentagonVertices ); geometry.addVertexBuffer( pentacleVertices ); - geometry.setIndexBuffer( indices ); - geometry.setGeometryType( dali.GEOMETRY_LINES ); + geometry.setIndexBuffer( indexDataArray, 10 ); + geometry.setType( dali.GEOMETRY_LINES ); - var renderer = new dali.Renderer(geometry, material); + var renderer = new dali.Renderer(geometry, shader); renderer.depthIndex = 0; // Create mesh actor @@ -120,7 +119,7 @@ daliApp.createMeshActor = function() { var animation = new dali.Animation(5); var keyFramesIndex = [{progress:0.0, value: 0.0}, {progress:1.0, value:1.0}]; - var animOptions = { alpha:"sin", delay:0, duration:5}; + var animOptions = { alpha:dali.ALPHA_FUNCTION_SIN, delay:0, duration:5}; animation.animateBetween( meshActor, "uMorphAmount", keyFramesIndex, animOptions ); animation.setLooping(true);