Remove dali-any from Property::Value

- 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

Remove dali-any from Property::Value
- 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
Kimmo Hoikka
1 parent ba003ef3
Showing 2 changed files with 5 additions and 9 deletions
examples/cluster/cluster-impl.cpp
resources/scripts/background-color.json
@@ -540,15 +540,15 @@ void Cluster::DoTransformAction(const Property::Map&amp; attributes)
     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 );
     }
   }
@@ -47,9 +47,7 @@
       "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"
       }
     },
@@ -62,9 +60,7 @@
       "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"
       }
     }
   ]