From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Mon, 18 Jul 2016 12:43:59 +0000 (+0100)
Subject: Updates following enum changes to mesh and gradient renderer
X-Git-Tag: dali_1.1.44~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=ac3c02eeb96752ce10818fa6043817b9e29a0e27;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Updates following enum changes to mesh and gradient renderer

Change-Id: I1a885d54a18113547b6af9bb1437d43c21a00de4
---

diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp
index 654422e..324aa34 100644
--- a/examples/gradients/gradients-example.cpp
+++ b/examples/gradients/gradients-example.cpp
@@ -117,7 +117,7 @@ public:
         Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f;
         gradientMap.Insert("startPosition",   halfStageSize);
         gradientMap.Insert("endPosition",    -halfStageSize );
-        gradientMap.Insert("units",  "userSpace");
+        gradientMap.Insert("units",  "USER_SPACE");
         break;
       }
       case 2: // radial gradient with units as objectBoundingBox
@@ -131,7 +131,7 @@ public:
         Vector2 stageSize = Stage::GetCurrent().GetSize();
         gradientMap.Insert("center",  stageSize*0.5f);
         gradientMap.Insert("radius",  stageSize.Length());
-        gradientMap.Insert("units",  "userSpace");
+        gradientMap.Insert("units",  "USER_SPACE");
         break;
       }
     }
diff --git a/examples/mesh-renderer/mesh-renderer-example.cpp b/examples/mesh-renderer/mesh-renderer-example.cpp
index 805a5c1..55b7677 100644
--- a/examples/mesh-renderer/mesh-renderer-example.cpp
+++ b/examples/mesh-renderer/mesh-renderer-example.cpp
@@ -34,9 +34,9 @@ namespace
   //Possible shader options.
   const char * const SHADER_TYPE[] =
   {
-    "allTextures",
-    "diffuseTexture",
-    "textureless"
+    "ALL_TEXTURES",
+    "DIFFUSE_TEXTURE",
+    "TEXTURELESS"
   };
 
   //Files for background and toolbar
diff --git a/resources/style/demo-theme.json.in b/resources/style/demo-theme.json.in
index 3288d77..d2492b5 100644
--- a/resources/style/demo-theme.json.in
+++ b/resources/style/demo-theme.json.in
@@ -72,7 +72,7 @@
         "rendererType": "gradient",
         "center": [240, 400],
         "radius": 932,
-        "units": "userSpace",
+        "units": "USER_SPACE",
         "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
       }
     }
diff --git a/resources/style/mobile/demo-theme.json.in b/resources/style/mobile/demo-theme.json.in
index dd4cc59..3d722e5 100644
--- a/resources/style/mobile/demo-theme.json.in
+++ b/resources/style/mobile/demo-theme.json.in
@@ -85,7 +85,7 @@
         "rendererType": "gradient",
         "center": [360, 640],
         "radius": 1468,
-        "units": "userSpace",
+        "units": "USER_SPACE",
         "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
       }
     }