X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-set-property.cpp;h=d00ca12eb73f5fcbb4111b355df91cf873ca90e9;hp=d64a04c68fb02fb1a48289120162fb0b66292231;hb=HEAD;hpb=5253e9e87aa853a60b624b1a342a19ebca26f7a4 diff --git a/dali-toolkit/internal/builder/builder-set-property.cpp b/dali-toolkit/internal/builder/builder-set-property.cpp index d64a04c..d00ca12 100644 --- a/dali-toolkit/internal/builder/builder-set-property.cpp +++ b/dali-toolkit/internal/builder/builder-set-property.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,49 +16,23 @@ */ // EXTERNAL INCLUDES -#include #include #include -#include +#include // INTERNAL INCLUDES -#include #include -#include +#include #include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - - -namespace -{ - -/** - * Converts a HTML style 'color' hex string ("#FF0000" for bright red) to a Vector4. - * The Vector4 alpha component will be set to 1.0f - * @param hexString The HTML style hex string - * @return a Vector4 containing the new color value - */ -Vector4 HexStringToVector4( const char* s ) -{ - unsigned int value(0u); - std::istringstream( s ) >> std::hex >> value; - return Vector4( ((value >> 16 ) & 0xff ) / 255.0f, - ((value >> 8 ) & 0xff ) / 255.0f, - (value & 0xff ) / 255.0f, - 1.0f ); -} - -} // anon namespace - - /** * A property value type can be forced when its unknown by a disambiguation convention in the json * ie "myarray": [1,2,3,4] ; would be a vector but @@ -68,57 +42,61 @@ Vector4 HexStringToVector4( const char* s ) * @param replacement The user overriding constant map * @return True if child contained a disambiguated string that could be converted. */ -bool Disambiguated(const TreeNode& child, +bool Disambiguated(const TreeNode& child, Dali::Property::Value& value, - const Replacement& replacement ) + const Replacement& replacement) { - OptionalString childType = IsString( IsChild(child, "typeCast") ); - OptionalChild childValue = IsChild(child, "value"); + OptionalString childType = IsString(IsChild(child, "typeCast")); + OptionalChild childValue = IsChild(child, "value"); - if( childType && childValue && (2 == child.Size()) ) + if(childType && childValue && (2 == child.Size())) { // this case allows disambiguation but normally the type is guessed // 2 == child.count() is an extra check as the user could have a user dictionary/map with // type-cast and value keys. If they do then a work around is to add a bogus key to not run this case. if(*childType == "boolean") { - return DeterminePropertyFromNode( *childValue, Dali::Property::BOOLEAN, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::BOOLEAN, value, replacement); } else if(*childType == "float") { - return DeterminePropertyFromNode( *childValue, Dali::Property::FLOAT, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::FLOAT, value, replacement); } else if(*childType == "vector2") { - return DeterminePropertyFromNode( *childValue, Dali::Property::VECTOR2, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::VECTOR2, value, replacement); } else if(*childType == "vector3") { - return DeterminePropertyFromNode( *childValue, Dali::Property::VECTOR3, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::VECTOR3, value, replacement); } else if(*childType == "vector4") { - return DeterminePropertyFromNode( *childValue, Dali::Property::VECTOR4, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::VECTOR4, value, replacement); } else if(*childType == "rotation") { - return DeterminePropertyFromNode( *childValue, Dali::Property::ROTATION, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::ROTATION, value, replacement); } else if(*childType == "rect") { - return DeterminePropertyFromNode( *childValue, Dali::Property::RECTANGLE, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::RECTANGLE, value, replacement); } else if(*childType == "string") { - return DeterminePropertyFromNode( *childValue, Dali::Property::STRING, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::STRING, value, replacement); } else if(*childType == "map") { - return DeterminePropertyFromNode( *childValue, Dali::Property::MAP, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::MAP, value, replacement); } else if(*childType == "array") { - return DeterminePropertyFromNode( *childValue, Dali::Property::ARRAY, value, replacement); + return DeterminePropertyFromNode(*childValue, Dali::Property::ARRAY, value, replacement); + } + else if(*childType == "extents") + { + return DeterminePropertyFromNode(*childValue, Dali::Property::EXTENTS, value, replacement); } } @@ -126,15 +104,13 @@ bool Disambiguated(const TreeNode& child, return false; } - -bool DeterminePropertyFromNode( const TreeNode& node, Property::Type type, Property::Value& value) +bool DeterminePropertyFromNode(const TreeNode& node, Property::Type type, Property::Value& value) { Replacement noReplacement; - return DeterminePropertyFromNode( node, type, value, noReplacement ); + return DeterminePropertyFromNode(node, type, value, noReplacement); } -bool DeterminePropertyFromNode( const TreeNode& node, Property::Type type, Property::Value& value, - const Replacement& replacer ) +bool DeterminePropertyFromNode(const TreeNode& node, Property::Type type, Property::Value& value, const Replacement& replacer) { bool done = false; @@ -142,118 +118,110 @@ bool DeterminePropertyFromNode( const TreeNode& node, Property::Type type, Prope { case Property::BOOLEAN: { - if( OptionalBoolean v = replacer.IsBoolean(node) ) + if(OptionalBoolean v = replacer.IsBoolean(node)) { value = *v; - done = true; + done = true; } break; } case Property::FLOAT: { - if( OptionalFloat v = replacer.IsFloat(node) ) + if(OptionalFloat v = replacer.IsFloat(node)) { value = *v; - done = true; + done = true; } break; } case Property::INTEGER: { - if( OptionalInteger v = replacer.IsInteger(node) ) + if(OptionalInteger v = replacer.IsInteger(node)) { value = *v; - done = true; + done = true; } break; } case Property::VECTOR2: { - if( OptionalVector2 v = replacer.IsVector2(node) ) + if(OptionalVector2 v = replacer.IsVector2(node)) { value = *v; - done = true; + done = true; } break; } case Property::VECTOR3: { - if( OptionalVector3 v = replacer.IsVector3(node) ) + if(OptionalVector3 v = replacer.IsVector3(node)) { value = *v; - done = true; + done = true; } break; } case Property::VECTOR4: { - if( OptionalVector4 v = replacer.IsVector4(node) ) + if(OptionalVector4 v = replacer.IsVector4(node)) { value = *v; - done = true; + done = true; } - else if( OptionalString s = replacer.IsString(node) ) + else if(OptionalString s = replacer.IsString(node)) { - if( (*s)[0] == '#' && 7 == (*s).size() ) - { - value = HexStringToVector4( &(*s)[1] ); - done = true; - } - else if( Dali::ColorController::Get() ) - { - Vector4 color; - done = Dali::ColorController::Get().RetrieveColor( *s, color ); - value = color; - } + Vector4 color; + done = ConvertStringToColor(*s, color); + value = color; } - else if( TreeNode::OBJECT == node.GetType() ) + else if(TreeNode::OBJECT == node.GetType()) { // check for "r", "g" and "b" child color component nodes - OptionalInteger r = replacer.IsInteger( IsChild(node, "r") ); - OptionalInteger g = replacer.IsInteger( IsChild(node, "g") ); - OptionalInteger b = replacer.IsInteger( IsChild(node, "b") ); - if( r && g && b ) + OptionalInteger r = replacer.IsInteger(IsChild(node, "r")); + OptionalInteger g = replacer.IsInteger(IsChild(node, "g")); + OptionalInteger b = replacer.IsInteger(IsChild(node, "b")); + if(r && g && b) { - float red( (*r) * (1.0f/255.0f) ); - float green( (*g) * (1.0f/255.0f) ); - float blue( (*b) * (1.0f/255.0f) ); + float red((*r) * (1.0f / 255.0f)); + float green((*g) * (1.0f / 255.0f)); + float blue((*b) * (1.0f / 255.0f)); // check for optional "a" (alpha) node, default to fully opaque if it is not found. - float alpha( 1.0f ); - OptionalInteger a = replacer.IsInteger( IsChild(node, "a") ); - if( a ) + float alpha(1.0f); + OptionalInteger a = replacer.IsInteger(IsChild(node, "a")); + if(a) { - alpha = (*a) * (1.0f/255.0f); + alpha = (*a) * (1.0f / 255.0f); } - value = Vector4( red, green, blue, alpha ); - done = true; + value = Vector4(red, green, blue, alpha); + done = true; } } break; } case Property::MATRIX3: { - if( OptionalMatrix3 v = replacer.IsMatrix3(node) ) + if(OptionalMatrix3 v = replacer.IsMatrix3(node)) { value = *v; - done = true; + done = true; } break; } case Property::MATRIX: { - if( OptionalMatrix v = replacer.IsMatrix(node) ) + if(OptionalMatrix v = replacer.IsMatrix(node)) { value = *v; - done = true; + done = true; } break; } case Property::RECTANGLE: { - if( OptionalRect v = replacer.IsRect(node) ) + if(OptionalRect v = replacer.IsRect(node)) { value = *v; - done = true; + done = true; } break; } @@ -261,93 +229,102 @@ bool DeterminePropertyFromNode( const TreeNode& node, Property::Type type, Prope { if(4 == node.Size()) { - if( OptionalVector4 ov = replacer.IsVector4(node) ) + if(OptionalVector4 ov = replacer.IsVector4(node)) { const Vector4& v = *ov; // angle, axis as per spec value = Quaternion(Radian(Degree(v[3])), - Vector3(v[0],v[1],v[2])); - done = true; + Vector3(v[0], v[1], v[2])); + done = true; } } else { // degrees Euler as per spec - if( OptionalVector3 v = replacer.IsVector3(node) ) + if(OptionalVector3 v = replacer.IsVector3(node)) { value = Quaternion(Radian(Degree((*v).x)), Radian(Degree((*v).y)), Radian(Degree((*v).z))); - done = true; + done = true; } } break; } case Property::STRING: { - if( OptionalString v = replacer.IsString(node) ) + if(OptionalString v = replacer.IsString(node)) { value = *v; - done = true; + done = true; } break; } case Property::ARRAY: { - if( replacer.IsArray( node, value ) ) + if(replacer.IsArray(node, value)) { done = true; } else if(node.Size()) { - value = Property::Value(Property::ARRAY); + value = Property::Value(Property::ARRAY); Property::Array* array = value.GetArray(); - unsigned int i = 0; + unsigned int i = 0; TreeNode::ConstIterator iter(node.CBegin()); - if( array ) + if(array) { - for( ; i < node.Size(); ++i, ++iter) + for(; i < node.Size(); ++i, ++iter) { Property::Value childValue; - DeterminePropertyFromNode( (*iter).second, childValue, replacer ); - array->PushBack( childValue ); + DeterminePropertyFromNode((*iter).second, childValue, replacer); + array->PushBack(childValue); } - done = ( array->Count() == node.Size() ); + done = (array->Count() == node.Size()); } } break; } case Property::MAP: { - if( replacer.IsMap( node, value ) ) + if(replacer.IsMap(node, value)) { done = true; } else if(node.Size()) { - value = Property::Value(Property::MAP); + value = Property::Value(Property::MAP); Property::Map* map = value.GetMap(); - unsigned int i = 0; + unsigned int i = 0; TreeNode::ConstIterator iter(node.CBegin()); - if( map ) + if(map) { - for( ; i < node.Size(); ++i, ++iter) + for(; i < node.Size(); ++i, ++iter) { Property::Value childValue; - DeterminePropertyFromNode( (*iter).second, childValue, replacer ); - map->Insert( (*iter).first, childValue ); + DeterminePropertyFromNode((*iter).second, childValue, replacer); + map->Insert((*iter).first, childValue); } - done = ( map->Count() == node.Size() ); + done = (map->Count() == node.Size()); } } break; } + case Property::EXTENTS: + { + if(OptionalExtents v = replacer.IsExtents(node)) + { + value = *v; + done = true; + } + break; + } case Property::NONE: { break; @@ -357,22 +334,20 @@ bool DeterminePropertyFromNode( const TreeNode& node, Property::Type type, Prope return done; } -void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value ) +void DeterminePropertyFromNode(const TreeNode& node, Property::Value& value) { Replacement replacer; - DeterminePropertyFromNode( node, value, replacer ); + DeterminePropertyFromNode(node, value, replacer); } -void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value, - const Replacement& replacer ) +void DeterminePropertyFromNode(const TreeNode& node, Property::Value& value, const Replacement& replacer) { - TreeNode::NodeType nodeType = node.GetType(); // Some values are ambiguous as we have no Property::Type but can be disambiguated in the JSON. // Currently Rotations and Rectangle must always be disambiguated when a type isn't available - if( !Disambiguated( node, value, replacer ) ) + if(!Disambiguated(node, value, replacer)) { bool done = false; @@ -383,75 +358,75 @@ void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value, // 4) If no match still; Create as array. // First handle nodes with children. - if( node.Size() ) + if(node.Size()) { // Handle array types. - if( nodeType == TreeNode::ARRAY ) + if(nodeType == TreeNode::ARRAY) { // our current heuristic for deciding an array is actually a vector and not say a map // is to check if the values are all floats bool allNumbers = true; - for( TreeConstIter iter = node.CBegin(); iter != node.CEnd(); ++iter ) + for(TreeConstIter iter = node.CBegin(); iter != node.CEnd(); ++iter) { - OptionalFloat checkFloat = IsFloat( ( *iter ).second ); - if( !checkFloat ) + OptionalFloat checkFloat = IsFloat((*iter).second); + if(!checkFloat) { allNumbers = false; break; } } - if( allNumbers ) + if(allNumbers) { // prefer finding vectors over presuming composite Property::Array... - if( OptionalMatrix v = IsMatrix( node ) ) + if(OptionalMatrix v = IsMatrix(node)) { value = *v; - done = true; + done = true; } - else if( OptionalMatrix3 v = IsMatrix3( node ) ) + else if(OptionalMatrix3 v = IsMatrix3(node)) { value = *v; - done = true; + done = true; } - else if( OptionalVector4 v = IsVector4( node ) ) + else if(OptionalVector4 v = IsVector4(node)) { value = *v; - done = true; + done = true; } - else if( OptionalVector3 v = IsVector3( node ) ) + else if(OptionalVector3 v = IsVector3(node)) { value = *v; - done = true; + done = true; } - else if( OptionalVector2 v = IsVector2( node ) ) + else if(OptionalVector2 v = IsVector2(node)) { value = *v; - done = true; + done = true; } - else if( 4 == node.Size() ) + else if(4 == node.Size()) { - if( OptionalVector4 v = IsVector4( node ) ) + if(OptionalVector4 v = IsVector4(node)) { value = *v; - done = true; + done = true; } } } } } // if node.size() - else if( ( nodeType != TreeNode::OBJECT ) && ( nodeType != TreeNode::ARRAY ) ) + else if((nodeType != TreeNode::OBJECT) && (nodeType != TreeNode::ARRAY)) { // no children so either one of bool, float, integer, string - OptionalBoolean aBool = replacer.IsBoolean( node ); - OptionalInteger anInt = replacer.IsInteger( node ); - OptionalFloat aFloat = replacer.IsFloat( node ); - OptionalString aString = replacer.IsString( node ); + OptionalBoolean aBool = replacer.IsBoolean(node); + OptionalInteger anInt = replacer.IsInteger(node); + OptionalFloat aFloat = replacer.IsFloat(node); + OptionalString aString = replacer.IsString(node); - if( aBool ) + if(aBool) { // a bool is also an int but here we presume int - if( anInt ) + if(anInt) { value = *anInt; } @@ -466,11 +441,11 @@ void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value, // {"value":"123"} // {"value":123} // This means we can't have a string with purely numeric content without disambiguation. - if( aFloat ) + if(aFloat) { value = *aFloat; } - else if( anInt ) + else if(anInt) { value = *anInt; } @@ -484,27 +459,27 @@ void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value, } // if( node.size() ) // If we have not created a value so far, attempt to create a Map or Array. - if( !done ) + if(!done) { // We are guaranteed to have at least one entry as this has been checked already. TreeConstIter containerIterator = node.CBegin(); - TreeConstIter containerEnd = node.CEnd(); + TreeConstIter containerEnd = node.CEnd(); // The TreeNode::OBJECT type implies a Property::Map. - if( nodeType == TreeNode::OBJECT ) + if(nodeType == TreeNode::OBJECT) { // We have a key, treat container as a Map. - value = Property::Value( Property::MAP ); + value = Property::Value(Property::MAP); Property::Map* map = value.GetMap(); - if( map ) + if(map) { // Iterate through container to add all entries. - for( ; containerIterator != containerEnd; ++containerIterator ) + for(; containerIterator != containerEnd; ++containerIterator) { Property::Value childValue; - DeterminePropertyFromNode( ( *containerIterator ).second, childValue, replacer ); - map->Insert( ( *containerIterator ).first, childValue ); + DeterminePropertyFromNode((*containerIterator).second, childValue, replacer); + map->Insert((*containerIterator).first, childValue); } } } @@ -513,25 +488,24 @@ void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value, // We don't have a key, treat container as an array. // Note: We don't check if the node type is array here, as we want to cope with unknowns by creating an array also. // This is the fall-back if no other types could be created. - value = Property::Value( Property::ARRAY ); + value = Property::Value(Property::ARRAY); Property::Array* array = value.GetArray(); - if( array ) + if(array) { // Iterate through container to add all entries. - for( ; containerIterator != containerEnd; ++containerIterator ) + for(; containerIterator != containerEnd; ++containerIterator) { Property::Value childValue; - DeterminePropertyFromNode( ( *containerIterator ).second, childValue, replacer ); - array->PushBack( childValue ); + DeterminePropertyFromNode((*containerIterator).second, childValue, replacer); + array->PushBack(childValue); } } } } // if !done - } // if !Disambiguated() + } // if !Disambiguated() } - } // namespace Internal } // namespace Toolkit