Merge "Basic support of keyboard focus for multiple windows" into devel/master

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

diff --git a/node-addon/examples/texture-mesh.js b/node-addon/examples/texture-mesh.js
index 016a7a9..27f7744 100644 (file)
--- a/node-addon/examples/texture-mesh.js
+++ b/node-addon/examples/texture-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 = {};
 
@@ -64,13 +67,13 @@ daliApp.createMeshActor = function() {
 
       var shader = new dali.Shader(shaderOptions);
 
-      var material = new dali.Material( shader );
+      var textureSet = new dali.TextureSet;
       var image = new dali.ResourceImage( {url: imageDir + "image-1.jpg"} );
-      material.addTexture(image, "sTexture");
+      textureSet.setImage(0, image);
 
-      var material2 = new dali.Material( shader );
+      var textureSet2 = new dali.TextureSet;
       var image2 = new dali.ResourceImage( {url: imageDir + "image-2.jpg"} );
-      material2.addTexture(image2, "sTexture");
+      textureSet2.setImage(0, image2);
 
       // Create vertex buffer
       var texturedQuadVertexFormat ={ "aPosition" : dali.PROPERTY_VECTOR2,
@@ -84,8 +87,8 @@ daliApp.createMeshActor = function() {
 
       var texturedQuadVertexDataArray = new Float32Array(texturedQuadVertexData.length);
       texturedQuadVertexDataArray.set(texturedQuadVertexData, 0);
-      var texturedQuadVertices = new dali.PropertyBuffer(texturedQuadVertexFormat, 4);
-      texturedQuadVertices.setData(texturedQuadVertexDataArray);
+      var texturedQuadVertices = new dali.PropertyBuffer(texturedQuadVertexFormat);
+      texturedQuadVertices.setData(texturedQuadVertexDataArray, 4);
 
       var indexFormat ={ "indices" : dali.PROPERTY_INTEGER };
 
@@ -93,15 +96,14 @@ daliApp.createMeshActor = function() {
 
       var indexDataArray = new Uint32Array(indexData.length);
       indexDataArray.set(indexData, 0);
-      var indices = new dali.PropertyBuffer(indexFormat, 6);
-      indices.setData(indexDataArray);
 
       // Create geometry
       var geometry = new dali.Geometry();
       geometry.addVertexBuffer( texturedQuadVertices );
-      geometry.setIndexBuffer( indices );
+      geometry.setIndexBuffer( indexDataArray, 6 );
 
-      var renderer = new dali.Renderer(geometry, material);
+      var renderer = new dali.Renderer(geometry, shader);
+      renderer.setTextures(textureSet);
       renderer.depthIndex = 0;
 
       var meshActor = new dali.Actor();
@@ -113,7 +115,8 @@ daliApp.createMeshActor = function() {
 
       dali.stage.add( meshActor );
 
-      var renderer2 = new dali.Renderer(geometry, material2);
+      var renderer2 = new dali.Renderer(geometry, shader);
+      renderer2.setTextures(textureSet2);
       renderer2.depthIndex = 0;
 
       var meshActor2 = new dali.Actor();
@@ -129,10 +132,10 @@ daliApp.createMeshActor = function() {
       var animation = new dali.Animation(5);
 
       var keyFramesIndex = [{progress:0.0, value: [0.0, 0.0, 0.0, 0.0]}, {progress:1.0, value:[0.0, 1.0, 0.0, 1.0]}];
-      var animOptions = { alpha:"sin", delay:0, duration:5};
+      var animOptions = { alpha:dali.ALPHA_FUNCTION_SIN, delay:0, duration:5};
 
       var keyFramesIndex2 = [{progress:0.0, value: [0.0, 0.0, 0.0, 0.0]}, {progress:1.0, value:[1.0, 0.0, 1.0, 1.0]}];
-      var animOptions2 = { alpha:"sin", delay:0, duration:5};
+      var animOptions2 = { alpha:dali.ALPHA_FUNCTION_SIN, delay:0, duration:5};
 
       animation.animateBetween( meshActor, "uFadeColor", keyFramesIndex, animOptions );
       animation.animateBetween( meshActor2, "uFadeColor", keyFramesIndex2, animOptions2 );