From 97743b560becb16cf46a9548695832e4ba463df6 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Fri, 12 Jun 2015 20:12:46 +0100 Subject: [PATCH] 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 --- examples/cluster/cluster-impl.cpp | 6 +++--- resources/scripts/background-color.json | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/examples/cluster/cluster-impl.cpp b/examples/cluster/cluster-impl.cpp index a37214e..3092b7c 100644 --- a/examples/cluster/cluster-impl.cpp +++ b/examples/cluster/cluster-impl.cpp @@ -540,15 +540,15 @@ void Cluster::DoTransformAction(const Property::Map& 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 ); } } diff --git a/resources/scripts/background-color.json b/resources/scripts/background-color.json index 562b88e..0959179 100644 --- a/resources/scripts/background-color.json +++ b/resources/scripts/background-color.json @@ -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" } } ] -- 2.7.4