- reimplement multivalue using more efficient union inside value
- remove unnecessary asserts when types dont match
- cleanup and sanitize scripting
- remove unnecessary templates from GetEnum, added error handling
Change-Id: If87d7eb6b5a0e3ff32f298cccc670b3f34dd091a
if( Property::VECTOR3 == type && "position" == stringValue.first )
{
- stringValue.second.Get(position);
+ stringValue.second.Get( position );
}
else if( Property::VECTOR3 == type && "scale" == stringValue.first )
{
- stringValue.second.Get(scale);
+ stringValue.second.Get( scale );
}
else if( "rotation" == stringValue.first )
{
- (void)Scripting::SetRotation(stringValue.second, rotation);
+ stringValue.second.Get( rotation );
}
}
"anchor-point": "TOP_CENTER",
"size": [400, 150, 1],
"background-image": {
- "image": {
- "filename": "{DALI_IMAGE_DIR}button-background.png"
- }
+ "filename": "{DALI_IMAGE_DIR}button-background.png"
}
},
"size": [400, 150, 1],
"background-color": [0, 0, 1, 1],
"background-image": {
- "image": {
- "filename": "{DALI_IMAGE_DIR}button-background.png"
- }
+ "filename": "{DALI_IMAGE_DIR}button-background.png"
}
}
]