projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DALi Version 1.1.14
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-impl.cpp
diff --git
a/dali-toolkit/internal/builder/builder-impl.cpp
b/dali-toolkit/internal/builder/builder-impl.cpp
index
07ca895
..
1535eeb
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-impl.cpp
+++ b/
dali-toolkit/internal/builder/builder-impl.cpp
@@
-301,7
+301,7
@@
void Builder::SetProperties( const TreeNode& node, Handle& handle, const Replace
if( !SetPropertyFromNode( keyChild.second, type, value, constant ) )
{
// verbose as this might not be a problem
if( !SetPropertyFromNode( keyChild.second, type, value, constant ) )
{
// verbose as this might not be a problem
- // eg parent
-o
rigin can be a string which is picked up later
+ // eg parent
O
rigin can be a string which is picked up later
DALI_SCRIPT_VERBOSE("Could not convert property:%s\n", key.c_str());
}
else
DALI_SCRIPT_VERBOSE("Could not convert property:%s\n", key.c_str());
}
else
@@
-547,7
+547,7
@@
void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
const Stage& stage = Stage::GetCurrent();
Layer root = stage.GetRootLayer();
const Stage& stage = Stage::GetCurrent();
Layer root = stage.GetRootLayer();
- if( OptionalString s = constant.IsString( IsChild(node, "source
-a
ctor") ) )
+ if( OptionalString s = constant.IsString( IsChild(node, "source
A
ctor") ) )
{
Actor actor = root.FindChildByName(*s);
if(actor)
{
Actor actor = root.FindChildByName(*s);
if(actor)
@@
-560,7
+560,7
@@
void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
}
}
}
}
- if( OptionalString s = constant.IsString( IsChild(node, "camera
-a
ctor") ) )
+ if( OptionalString s = constant.IsString( IsChild(node, "camera
A
ctor") ) )
{
CameraActor actor = CameraActor::DownCast( root.FindChildByName(*s) );
if(actor)
{
CameraActor actor = CameraActor::DownCast( root.FindChildByName(*s) );
if(actor)
@@
-573,7
+573,7
@@
void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
}
}
}
}
- if( OptionalString s = constant.IsString( IsChild(node, "target
-frame-b
uffer") ) )
+ if( OptionalString s = constant.IsString( IsChild(node, "target
FrameB
uffer") ) )
{
FrameBufferImage fb = GetFrameBufferImage( *s, constant );
if(fb)
{
FrameBufferImage fb = GetFrameBufferImage( *s, constant );
if(fb)
@@
-586,7
+586,7
@@
void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
}
}
}
}
- if( OptionalString s = constant.IsString( IsChild(node, "screen
-to-frame-buffer-f
unction") ) )
+ if( OptionalString s = constant.IsString( IsChild(node, "screen
ToFrameBufferF
unction") ) )
{
if("DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION" == *s)
{
{
if("DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION" == *s)
{
@@
-603,8
+603,7
@@
void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
}
// other setup is via the property system
}
// other setup is via the property system
- SetProperties( node, task, constant ); // @ todo, remove 'source-actor', 'camera-actor'?
-
+ SetProperties( node, task, constant );
}
void Builder::CreateRenderTask( const std::string &name )
}
void Builder::CreateRenderTask( const std::string &name )
@@
-615,7
+614,7
@@
void Builder::CreateRenderTask( const std::string &name )
const Stage& stage = Stage::GetCurrent();
const Stage& stage = Stage::GetCurrent();
- OptionalChild tasks = IsChild(*mParser.GetRoot(), "render
-t
asks");
+ OptionalChild tasks = IsChild(*mParser.GetRoot(), "render
T
asks");
if(tasks)
{
if(tasks)
{
@@
-673,7
+672,7
@@
ShaderEffect Builder::GetShaderEffect( const std::string &name, const Replacemen
}
else
{
}
else
{
- if( OptionalChild effects = IsChild( *mParser.GetRoot(), "shader
-e
ffects") )
+ if( OptionalChild effects = IsChild( *mParser.GetRoot(), "shader
E
ffects") )
{
if( OptionalChild effect = IsChild( *effects, name ) )
{
{
if( OptionalChild effect = IsChild( *effects, name ) )
{
@@
-709,7
+708,7
@@
FrameBufferImage Builder::GetFrameBufferImage( const std::string &name, const Re
}
else
{
}
else
{
- if( OptionalChild images = IsChild( *mParser.GetRoot(), "frame
-buffer-i
mages") )
+ if( OptionalChild images = IsChild( *mParser.GetRoot(), "frame
BufferI
mages") )
{
if( OptionalChild image = IsChild( *images, name ) )
{
{
if( OptionalChild image = IsChild( *images, name ) )
{
@@
-717,9
+716,13
@@
FrameBufferImage Builder::GetFrameBufferImage( const std::string &name, const Re
if( SetPropertyFromNode( *image, Property::MAP, property, constant ) )
{
Property::Map* map = property.GetMap();
if( SetPropertyFromNode( *image, Property::MAP, property, constant ) )
{
Property::Map* map = property.GetMap();
- (*map)[ KEYNAME_TYPE ] = Property::Value(std::string("FrameBufferImage") );
- ret = FrameBufferImage::DownCast( Dali::Scripting::NewImage( property ) );
- mFrameBufferImageLut[ name ] = ret;
+
+ if( map )
+ {
+ (*map)[ KEYNAME_TYPE ] = Property::Value(std::string("FrameBufferImage") );
+ ret = FrameBufferImage::DownCast( Dali::Scripting::NewImage( property ) );
+ mFrameBufferImageLut[ name ] = ret;
+ }
}
}
}
}
}
}
@@
-754,8
+757,8
@@
Path Builder::GetPath( const std::string& name )
ret = Path::New();
ret.SetProperty( Path::Property::POINTS, points);
ret = Path::New();
ret.SetProperty( Path::Property::POINTS, points);
- //control
-p
oints property
- if( OptionalChild pointsProperty = IsChild( *path, "control
-p
oints") )
+ //control
P
oints property
+ if( OptionalChild pointsProperty = IsChild( *path, "control
P
oints") )
{
Dali::Property::Value points(Property::ARRAY);
if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
{
Dali::Property::Value points(Property::ARRAY);
if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
@@
-828,8
+831,8
@@
PathConstrainer Builder::GetPathConstrainer( const std::string& name )
ret = PathConstrainer::New();
ret.SetProperty( PathConstrainer::Property::POINTS, points);
ret = PathConstrainer::New();
ret.SetProperty( PathConstrainer::Property::POINTS, points);
- //control
-p
oints property
- if( OptionalChild pointsProperty = IsChild( *pathConstrainer, "control
-p
oints") )
+ //control
P
oints property
+ if( OptionalChild pointsProperty = IsChild( *pathConstrainer, "control
P
oints") )
{
Dali::Property::Value points(Property::ARRAY);
if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
{
Dali::Property::Value points(Property::ARRAY);
if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
@@
-937,7
+940,7
@@
Dali::LinearConstrainer Builder::GetLinearConstrainer( const std::string& name )
ret = Dali::LinearConstrainer::New();
ret.SetProperty( LinearConstrainer::Property::VALUE, points);
ret = Dali::LinearConstrainer::New();
ret.SetProperty( LinearConstrainer::Property::VALUE, points);
- //control
-p
oints property
+ //control
P
oints property
if( OptionalChild pointsProperty = IsChild( *linearConstrainer, "progress") )
{
Dali::Property::Value points(Property::ARRAY);
if( OptionalChild pointsProperty = IsChild( *linearConstrainer, "progress") )
{
Dali::Property::Value points(Property::ARRAY);
@@
-1039,7
+1042,7
@@
void Builder::AddActors( const std::string §ionName, Actor toActor )
// to add automatically
if( "stage" == sectionName )
{
// to add automatically
if( "stage" == sectionName )
{
- if( OptionalChild renderTasks = IsChild(*mParser.GetRoot(), "render
-t
asks") )
+ if( OptionalChild renderTasks = IsChild(*mParser.GetRoot(), "render
T
asks") )
{
if( OptionalChild tasks = IsChild(*renderTasks, "stage") )
{
{
if( OptionalChild tasks = IsChild(*renderTasks, "stage") )
{
@@
-1359,6
+1362,7
@@
Builder::Builder()
defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR;
defaultDirs[ TOKEN_STRING(DALI_SOUND_DIR) ] = DALI_SOUND_DIR;
defaultDirs[ TOKEN_STRING(DALI_STYLE_DIR) ] = DALI_STYLE_DIR;
defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR;
defaultDirs[ TOKEN_STRING(DALI_SOUND_DIR) ] = DALI_SOUND_DIR;
defaultDirs[ TOKEN_STRING(DALI_STYLE_DIR) ] = DALI_STYLE_DIR;
+ defaultDirs[ TOKEN_STRING(DALI_STYLE_IMAGE_DIR) ] = DALI_STYLE_IMAGE_DIR;
AddConstants( defaultDirs );
}
AddConstants( defaultDirs );
}