From: Adeel Kazmi Date: Tue, 19 Jul 2016 10:38:26 +0000 (+0100) Subject: Updates after Renderer Type values changed X-Git-Tag: dali_1.1.44~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F80670%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git Updates after Renderer Type values changed Change-Id: I32c2aa4576413ba56bcdac4376b491125805b0f3 --- diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp index 4d49c58..9e18355 100644 --- a/examples/dissolve-effect/dissolve-effect-example.cpp +++ b/examples/dissolve-effect/dissolve-effect-example.cpp @@ -91,7 +91,7 @@ Toolkit::ImageView CreateStageFillingImageView( const char * const imagePath ) Size stageSize = Stage::GetCurrent().GetSize(); Toolkit::ImageView imageView = Toolkit::ImageView::New(); Property::Map map; - map["rendererType"] = "image"; + map["rendererType"] = "IMAGE"; map["url"] = imagePath; map["desiredWidth"] = stageSize.x; map["desiredHeight"] = stageSize.y; diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp index 324aa34..ccd7a67 100644 --- a/examples/gradients/gradients-example.cpp +++ b/examples/gradients/gradients-example.cpp @@ -79,7 +79,7 @@ public: // ---- Gradient for background - mGradientMap.Insert("rendererType", "gradient"); + mGradientMap.Insert("rendererType", "GRADIENT"); Property::Array stopOffsets; stopOffsets.PushBack( 0.0f ); diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index b6fff18..64b7a84 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -177,7 +177,7 @@ public: // Background image: Dali::Property::Map backgroundImage; - backgroundImage.Insert( "rendererType", "image" ); + backgroundImage.Insert( "rendererType", "IMAGE" ); backgroundImage.Insert( "url", BACKGROUND_IMAGE ); backgroundImage.Insert( "desiredWidth", stage.GetSize().width ); backgroundImage.Insert( "desiredHeight", stage.GetSize().height ); diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index ef33c4b..156176e 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -878,7 +878,7 @@ public: // From ItemFactory borderActor.SetColorMode( USE_PARENT_COLOR ); Property::Map borderProperty; - borderProperty.Insert( "rendererType", "border" ); + borderProperty.Insert( "rendererType", "BORDER" ); borderProperty.Insert( "borderColor", Color::WHITE ); borderProperty.Insert( "borderSize", ITEM_BORDER_SIZE ); borderProperty.Insert( "antiAliasing", true ); @@ -902,7 +902,7 @@ public: // From ItemFactory checkbox.SetZ( 0.1f ); Property::Map solidColorProperty; - solidColorProperty.Insert( "rendererType", "color" ); + solidColorProperty.Insert( "rendererType", "COLOR" ); solidColorProperty.Insert( "mixColor", Vector4(0.f, 0.f, 0.f, 0.6f) ); checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty ); diff --git a/examples/mesh-renderer/mesh-renderer-example.cpp b/examples/mesh-renderer/mesh-renderer-example.cpp index 55b7677..2c322ce 100644 --- a/examples/mesh-renderer/mesh-renderer-example.cpp +++ b/examples/mesh-renderer/mesh-renderer-example.cpp @@ -189,7 +189,7 @@ public: { //Create mesh property map Property::Map map; - map.Insert( "rendererType", "mesh" ); + map.Insert( "rendererType", "MESH" ); map.Insert( "objectUrl", MODEL_FILE[mModelIndex] ); map.Insert( "materialUrl", MATERIAL_FILE[mModelIndex] ); map.Insert( "texturesPath", TEXTURES_PATH ); diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp index a638249..6b6f0f2 100644 --- a/examples/motion-blur/motion-blur-example.cpp +++ b/examples/motion-blur/motion-blur-example.cpp @@ -103,7 +103,7 @@ const float ORIENTATION_DURATION = 0.5f; ///< Time to rotate to void SetImageFittedInBox( ImageView& imageView, Property::Map& shaderEffect, const char * const imagePath, int maxWidth, int maxHeight ) { Property::Map map; - map["rendererType"] = "image"; + map["rendererType"] = "IMAGE"; map["url"] = imagePath; // Load the image nicely scaled-down to fit within the specified max width and height: map["desiredWidth"] = maxWidth; diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index 20bff95..7837be6 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -454,7 +454,7 @@ private: { ImageView actor = ImageView::New(); Property::Map map; - map["rendererType"] = "image"; + map["rendererType"] = "IMAGE"; map["url"] = filename; map["desiredWidth"] = width; map["desiredHeight"] = height; diff --git a/examples/text-scrolling/text-scrolling-example.cpp b/examples/text-scrolling/text-scrolling-example.cpp index ef479a7..febac32 100644 --- a/examples/text-scrolling/text-scrolling-example.cpp +++ b/examples/text-scrolling/text-scrolling-example.cpp @@ -77,7 +77,7 @@ public: parent.Add( box ); Dali::Property::Map border; - border.Insert( "rendererType", "border" ); + border.Insert( "rendererType", "BORDER" ); border.Insert( "borderColor", Color::WHITE ); border.Insert( "borderSize", 1.f ); box.SetProperty( Control::Property::BACKGROUND, border ); diff --git a/examples/video-view/video-view-example.cpp b/examples/video-view/video-view-example.cpp index 5621a80..8c46b8a 100644 --- a/examples/video-view/video-view-example.cpp +++ b/examples/video-view/video-view-example.cpp @@ -211,12 +211,12 @@ class VideoViewController: public ConnectionTracker Property::Map customShader; customShader.Insert( "fragmentShader", FRAGMENT_SHADER ); - mCustomShader.Insert( "rendererType", "image" ); + mCustomShader.Insert( "rendererType", "IMAGE" ); mCustomShader.Insert( "shader", customShader ); Property::Map defaultShader; customShader.Insert( "fragmentShader", DEFAULT_FRAGMENT_SHADER ); - mDefaultShader.Insert( "rendererType", "image" ); + mDefaultShader.Insert( "rendererType", "IMAGE" ); mDefaultShader.Insert( "shader", defaultShader ); mWindowSurfaceTarget.Insert( "RENDERING_TARGET", "windowSurfaceTarget" ); diff --git a/resources/scripts/animated-colors.json b/resources/scripts/animated-colors.json index 79d253c..9c51526 100644 --- a/resources/scripts/animated-colors.json +++ b/resources/scripts/animated-colors.json @@ -42,7 +42,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -78,7 +78,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -114,7 +114,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -146,7 +146,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -182,7 +182,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -218,7 +218,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -250,7 +250,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -286,7 +286,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -322,7 +322,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -354,7 +354,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -386,7 +386,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -418,7 +418,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -450,7 +450,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -486,7 +486,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -518,7 +518,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -557,7 +557,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -589,7 +589,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -622,7 +622,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -661,7 +661,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -693,7 +693,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -726,7 +726,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -758,7 +758,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -790,7 +790,7 @@ "heightResizePolicy":"FILL_TO_PARENT", "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ @@ -823,7 +823,7 @@ "sizeModeFactor": [0.25,0.166667,1], "sizeAspectRatio": false, "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [1,1,1,1] }, "color": [ diff --git a/resources/scripts/background.json b/resources/scripts/background.json index cd1944a..115ef5e 100644 --- a/resources/scripts/background.json +++ b/resources/scripts/background.json @@ -30,7 +30,7 @@ "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], "background":{ - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [ 0.8, 0, 0.2, 1 ] } }, @@ -45,7 +45,7 @@ "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], "background": { - "rendererType": "image", + "rendererType": "IMAGE", "url": "{DEMO_IMAGE_DIR}Kid1.svg" } }, @@ -60,7 +60,7 @@ "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], "background": { - "rendererType" : "border", + "rendererType" : "BORDER", "borderColor" : [ 0.5, 0.5, 0.5, 1 ], "borderSize" : 15.0 } @@ -76,7 +76,7 @@ "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], "background": { - "rendererType": "image", + "rendererType": "IMAGE", "url": "{DEMO_IMAGE_DIR}gallery-large-9.jpg" } }, @@ -91,7 +91,7 @@ "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], "background":{ - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [ 1, 1, 0, 1 ] } }, @@ -106,7 +106,7 @@ "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], "background": { - "rendererType" : "gradient", + "rendererType" : "GRADIENT", "startPosition" : [ -0.5, -0.5 ], "endPosition": [ 0.5, 0.5 ], "stopColor" : [ diff --git a/resources/scripts/clock.json b/resources/scripts/clock.json index d8cecfc..d445f48 100644 --- a/resources/scripts/clock.json +++ b/resources/scripts/clock.json @@ -8,7 +8,7 @@ "parentOrigin": [0.5, 0.5, 0.5], "anchorPoint": [0.5, 1, 0.5], "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [0.71, 0, 0, 1] }, "selected": false, @@ -27,7 +27,7 @@ "parentOrigin": [0.5, 0.5, 0.5], "anchorPoint": [0.5, 1, 0.5], "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [0, 0.14200000000000013, 0.71, 0.7] }, "signals": [ @@ -45,7 +45,7 @@ "parentOrigin": [0.5, 0.5, 0.5], "anchorPoint": [0.5, 1, 0.5], "background": { - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [0.057450000000000064, 0.3, 0.0030000000000000027, 0.7] }, "signals": [ diff --git a/resources/scripts/table-view.json b/resources/scripts/table-view.json index 1fe03a7..a6aa3c7 100644 --- a/resources/scripts/table-view.json +++ b/resources/scripts/table-view.json @@ -43,7 +43,7 @@ "name":"simpleTable", "type":"TableView", "background":{ - "rendererType": "color", + "rendererType": "COLOR", "mixColor": [0.5,0.5,0,1] }, "parentOrigin": "CENTER", diff --git a/resources/style/demo-theme.json.in b/resources/style/demo-theme.json.in index d2492b5..e2bce75 100644 --- a/resources/style/demo-theme.json.in +++ b/resources/style/demo-theme.json.in @@ -69,7 +69,7 @@ { "background": { - "rendererType": "gradient", + "rendererType": "GRADIENT", "center": [240, 400], "radius": 932, "units": "USER_SPACE", diff --git a/resources/style/mobile/demo-theme.json.in b/resources/style/mobile/demo-theme.json.in index 3d722e5..b5048da 100644 --- a/resources/style/mobile/demo-theme.json.in +++ b/resources/style/mobile/demo-theme.json.in @@ -82,7 +82,7 @@ { "background": { - "rendererType": "gradient", + "rendererType": "GRADIENT", "center": [360, 640], "radius": 1468, "units": "USER_SPACE", diff --git a/shared/view.h b/shared/view.h index a0b528f..dc396a0 100644 --- a/shared/view.h +++ b/shared/view.h @@ -131,7 +131,7 @@ Dali::Layer CreateView( Dali::Application& application, if ( !backgroundImagePath.empty() ) { Dali::Property::Map map; - map["rendererType"] = "image"; + map["rendererType"] = "IMAGE"; map["url"] = backgroundImagePath; map["desiredWidth"] = stage.GetSize().x; map["desiredHeight"] = stage.GetSize().y;