X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Frendering%2Ftexture-set-wrapper.cpp;fp=plugins%2Fdali-script-v8%2Fsrc%2Frendering%2Fmaterial-wrapper.cpp;h=454c966af31bc643f7ffd51735df8f0b52d856e0;hp=fb69a7e7d5a61a6cd72530fa974064c0c46e167b;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=a9e64686388c10743bf66a9c5d6e0aa06e198c70 diff --git a/plugins/dali-script-v8/src/rendering/material-wrapper.cpp b/plugins/dali-script-v8/src/rendering/texture-set-wrapper.cpp similarity index 51% rename from plugins/dali-script-v8/src/rendering/material-wrapper.cpp rename to plugins/dali-script-v8/src/rendering/texture-set-wrapper.cpp index fb69a7e..454c966 100644 --- a/plugins/dali-script-v8/src/rendering/material-wrapper.cpp +++ b/plugins/dali-script-v8/src/rendering/texture-set-wrapper.cpp @@ -16,11 +16,11 @@ */ // CLASS HEADER -#include "material-wrapper.h" +#include "texture-set-wrapper.h" // INTERNAL INCLUDES #include -#include +#include #include #include #include @@ -31,7 +31,7 @@ namespace Dali namespace V8Plugin { -v8::Persistent MaterialWrapper::mMaterialTemplate; +v8::Persistent TextureSetWrapper::mTextureSetTemplate; namespace // un-named name space { @@ -39,45 +39,38 @@ namespace // un-named name space /** * Contains a list of all functions that can be called */ -const ApiFunction MaterialFunctionTable[]= +const ApiFunction TextureSetFunctionTable[]= { /************************************** - * Material API (in order of Material.h) + * TextureSet API (in order of texture-set.h) **************************************/ - { "SetShader" , MaterialApi::SetShader }, - { "GetShader" , MaterialApi::GetShader }, - { "AddTexture" , MaterialApi::AddTexture }, - { "RemoveTexture" , MaterialApi::RemoveTexture }, - { "SetTextureImage" , MaterialApi::SetTextureImage }, - { "SetTextureSampler" , MaterialApi::SetTextureSampler }, - { "SetTextureUniformName" , MaterialApi::SetTextureUniformName }, - { "GetTextureIndex" , MaterialApi::GetTextureIndex }, - { "GetNumberOfTextures" , MaterialApi::GetNumberOfTextures }, + { "SetImage" , TextureSetApi::SetImage }, + { "SetSampler" , TextureSetApi::SetSampler }, }; -const unsigned int MaterialFunctionTableCount = sizeof(MaterialFunctionTable)/sizeof(MaterialFunctionTable[0]); +const unsigned int TextureSetFunctionTableCount = sizeof(TextureSetFunctionTable)/sizeof(TextureSetFunctionTable[0]); } //un-named space -MaterialWrapper::MaterialWrapper( const Dali::Material& material, GarbageCollectorInterface& gc ) -: HandleWrapper( BaseWrappedObject::MATERIAL , material, gc ) +TextureSetWrapper::TextureSetWrapper( const Dali::TextureSet& textureSet, GarbageCollectorInterface& gc ) +: HandleWrapper( BaseWrappedObject::TEXTURE_SET , textureSet, gc ) { - mMaterial = material; + mTextureSet = textureSet; } -v8::Handle MaterialWrapper::WrapMaterial(v8::Isolate* isolate, const Dali::Material& material ) +v8::Handle TextureSetWrapper::WrapTextureSet(v8::Isolate* isolate, const Dali::TextureSet& textureSet ) { v8::EscapableHandleScope handleScope( isolate ); v8::Local objectTemplate; - objectTemplate = GetMaterialTemplate( isolate); + objectTemplate = GetTextureSetTemplate( isolate); // create an instance of the template v8::Local localObject = objectTemplate->NewInstance(); - // create the Material wrapper - MaterialWrapper* pointer = new MaterialWrapper( material, Dali::V8Plugin::DaliWrapper::Get().GetDaliGarbageCollector() ); + // create the texture set wrapper + TextureSetWrapper* pointer = new TextureSetWrapper( textureSet, Dali::V8Plugin::DaliWrapper::Get().GetDaliGarbageCollector() ); // assign the JavaScript object to the wrapper. pointer->SetJavascriptObject( isolate, localObject ); @@ -85,25 +78,25 @@ v8::Handle MaterialWrapper::WrapMaterial(v8::Isolate* isolate, const return handleScope.Escape( localObject ); } -v8::Local MaterialWrapper::GetMaterialTemplate( v8::Isolate* isolate) +v8::Local TextureSetWrapper::GetTextureSetTemplate( v8::Isolate* isolate) { v8::EscapableHandleScope handleScope( isolate ); v8::Local objectTemplate; - if( mMaterialTemplate.IsEmpty() ) + if( mTextureSetTemplate.IsEmpty() ) { - objectTemplate = MakeMaterialTemplate( isolate ); - mMaterialTemplate.Reset( isolate, objectTemplate ); + objectTemplate = MakeTextureSetTemplate( isolate ); + mTextureSetTemplate.Reset( isolate, objectTemplate ); } else { // get the object template - objectTemplate = v8::Local::New( isolate, mMaterialTemplate ); + objectTemplate = v8::Local::New( isolate, mTextureSetTemplate ); } return handleScope.Escape( objectTemplate ); } -v8::Handle MaterialWrapper::MakeMaterialTemplate( v8::Isolate* isolate ) +v8::Handle TextureSetWrapper::MakeTextureSetTemplate( v8::Isolate* isolate ) { v8::EscapableHandleScope handleScope( isolate ); @@ -115,34 +108,34 @@ v8::Handle MaterialWrapper::MakeMaterialTemplate( v8::Isolat objTemplate->SetInternalFieldCount( BaseWrappedObject::FIELD_COUNT ); // add our function properties - ObjectTemplateHelper::InstallFunctions( isolate, objTemplate, MaterialFunctionTable, MaterialFunctionTableCount ); + ObjectTemplateHelper::InstallFunctions( isolate, objTemplate, TextureSetFunctionTable, TextureSetFunctionTableCount ); return handleScope.Escape( objTemplate ); } -void MaterialWrapper::NewMaterial( const v8::FunctionCallbackInfo< v8::Value >& args) +void TextureSetWrapper::NewTextureSet( const v8::FunctionCallbackInfo< v8::Value >& args) { v8::Isolate* isolate = args.GetIsolate(); v8::HandleScope handleScope( isolate); if(!args.IsConstructCall()) { - DALI_SCRIPT_EXCEPTION( isolate, "Material constructor called without 'new'"); + DALI_SCRIPT_EXCEPTION( isolate, "TextureSet constructor called without 'new'"); return; } - Dali::Material material = MaterialApi::New( args ); + Dali::TextureSet textureSet = TextureSetApi::New( args ); - if(material) + if(textureSet) { - v8::Local localObject = WrapMaterial( isolate, material ); + v8::Local localObject = WrapTextureSet( isolate, textureSet ); args.GetReturnValue().Set( localObject ); } } -Material MaterialWrapper::GetMaterial() +TextureSet TextureSetWrapper::GetTextureSet() { - return mMaterial; + return mTextureSet; }