From 2350520b6e471885e23a558d23b14a6bfd0ed7eb Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Fri, 22 Apr 2016 11:11:07 +0100 Subject: [PATCH] Fix JavaScript error after Rendering API clean-up Change-Id: Iec708cdbfe6d760a85e8039703e55ad6233e88ce --- node-addon/binding.gyp | 4 ++-- node-addon/examples/line-mesh.js | 4 +--- node-addon/examples/mesh-morph.js | 4 +--- node-addon/examples/point-mesh.js | 7 ++++--- node-addon/examples/texture-mesh.js | 14 ++++++++------ plugins/dali-script-v8/src/rendering/texture-set-api.cpp | 4 +--- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/node-addon/binding.gyp b/node-addon/binding.gyp index ac3b428..da23da5 100644 --- a/node-addon/binding.gyp +++ b/node-addon/binding.gyp @@ -50,14 +50,14 @@ '<(DALI_JS_DIR)/render-tasks/render-task-wrapper.cpp', '<(DALI_JS_DIR)/rendering/geometry-api.cpp', '<(DALI_JS_DIR)/rendering/geometry-wrapper.cpp', - '<(DALI_JS_DIR)/rendering/material-api.cpp', - '<(DALI_JS_DIR)/rendering/material-wrapper.cpp', '<(DALI_JS_DIR)/rendering/renderer-api.cpp', '<(DALI_JS_DIR)/rendering/renderer-wrapper.cpp', '<(DALI_JS_DIR)/rendering/sampler-api.cpp', '<(DALI_JS_DIR)/rendering/sampler-wrapper.cpp', '<(DALI_JS_DIR)/rendering/shader-api.cpp', '<(DALI_JS_DIR)/rendering/shader-wrapper.cpp', + '<(DALI_JS_DIR)/rendering/texture-set-api.cpp', + '<(DALI_JS_DIR)/rendering/texture-set-wrapper.cpp', '<(DALI_JS_DIR)/toolkit/builder/builder-api.cpp', '<(DALI_JS_DIR)/toolkit/builder/builder-wrapper.cpp', '<(DALI_JS_DIR)/toolkit/focus-manager/keyboard-focus-manager-api.cpp', diff --git a/node-addon/examples/line-mesh.js b/node-addon/examples/line-mesh.js index b68df19..63bf20a 100644 --- a/node-addon/examples/line-mesh.js +++ b/node-addon/examples/line-mesh.js @@ -58,8 +58,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 }; @@ -103,7 +101,7 @@ daliApp.createMeshActor = function() { geometry.setIndexBuffer( indices ); geometry.setGeometryType( dali.GEOMETRY_LINES ); - var renderer = new dali.Renderer(geometry, material); + var renderer = new dali.Renderer(geometry, shader); renderer.depthIndex = 0; // Create mesh actor diff --git a/node-addon/examples/mesh-morph.js b/node-addon/examples/mesh-morph.js index 7d6bc49..1f59d36 100644 --- a/node-addon/examples/mesh-morph.js +++ b/node-addon/examples/mesh-morph.js @@ -60,8 +60,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 +222,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 diff --git a/node-addon/examples/point-mesh.js b/node-addon/examples/point-mesh.js index eb1c830..c5f539e 100644 --- a/node-addon/examples/point-mesh.js +++ b/node-addon/examples/point-mesh.js @@ -79,9 +79,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, @@ -115,7 +115,8 @@ daliApp.createMeshActor = function() { geometry.addVertexBuffer( polyhedraVertices ); geometry.setGeometryType( 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; diff --git a/node-addon/examples/texture-mesh.js b/node-addon/examples/texture-mesh.js index bacde6b..f37fd67 100644 --- a/node-addon/examples/texture-mesh.js +++ b/node-addon/examples/texture-mesh.js @@ -64,13 +64,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, @@ -101,7 +101,8 @@ daliApp.createMeshActor = function() { geometry.addVertexBuffer( texturedQuadVertices ); geometry.setIndexBuffer( indices ); - 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 +114,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(); diff --git a/plugins/dali-script-v8/src/rendering/texture-set-api.cpp b/plugins/dali-script-v8/src/rendering/texture-set-api.cpp index 30d8d47..1c5ad39 100644 --- a/plugins/dali-script-v8/src/rendering/texture-set-api.cpp +++ b/plugins/dali-script-v8/src/rendering/texture-set-api.cpp @@ -89,9 +89,7 @@ TextureSet TextureSetApi::GetTextureSetFromParams( int paramIndex, */ TextureSet TextureSetApi::New( const v8::FunctionCallbackInfo< v8::Value >& args ) { - v8::Isolate* isolate = args.GetIsolate(); - v8::HandleScope handleScope( isolate ); - return TextureSet(); + return TextureSet::New(); } -- 2.7.4