X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Ftoolkit%2Fbuilder%2Fbuilder-api.cpp;h=7af23dc0d7199e24195a7d032cfd0348fedb8a0b;hp=7feb25941e8791f97518010b91a7f556ef6ee9a7;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=5d49d819924da76f96f22845210abe89a7ade187 diff --git a/plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp b/plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp index 7feb259..7af23dc 100644 --- a/plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp +++ b/plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp @@ -32,8 +32,8 @@ #include #include #include -#include #include +#include namespace Dali @@ -257,7 +257,7 @@ void BuilderApi::Create( const v8::FunctionCallbackInfo< v8::Value >& args ) // options = // { - // template: "my-temppalte", + // template: "myTemplate", // constants: { IMAGE_DIR: "/usr/apps" , SHADER_DIR: "/usr/apps/.."} // } // @@ -293,17 +293,16 @@ void BuilderApi::Create( const v8::FunctionCallbackInfo< v8::Value >& args ) v8::Local image = ImageWrapper::WrapImage(isolate, Image::DownCast(handle) ); args.GetReturnValue().Set( image ); } - if( typeName == "Font ") + if( typeName == "ShaderEffect") { - v8::Local font = FontWrapper::WrapFont(isolate, Font::DownCast(handle) ); - args.GetReturnValue().Set( font ); + v8::Local shaderEffect = ShaderEffectWrapper::WrapShaderEffect(isolate, ShaderEffect::DownCast( handle )); + args.GetReturnValue().Set( shaderEffect ); } if( typeName == "Shader") { - v8::Local shader = ShaderEffectWrapper::WrapShaderEffect(isolate, ShaderEffect::DownCast( handle )); + v8::Local shader = ShaderWrapper::WrapShader(isolate, Shader::DownCast( handle )); args.GetReturnValue().Set( shader ); } - } void BuilderApi::ApplyStyle( const v8::FunctionCallbackInfo< v8::Value >& args ) {