X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=node-addon%2Fexamples%2Fpoint-mesh.js;h=0ae3bab31dbbca0c5943d358f2b858e21d0ac133;hp=ee9cebe0292aa1099cc2699f19d318d6ecf3d27b;hb=0794e3c728f62a3604b387f631a9ca22892cf31d;hpb=267ef6d018339874093eddbe46f301f9ac350097 diff --git a/node-addon/examples/point-mesh.js b/node-addon/examples/point-mesh.js index ee9cebe..0ae3bab 100644 --- a/node-addon/examples/point-mesh.js +++ b/node-addon/examples/point-mesh.js @@ -20,11 +20,14 @@ var imageDir = "./images/"; -// 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 = {}; @@ -79,9 +82,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 +110,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 ); + geometry.setType( 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;