Commit ac3c02eeb96752ce10818fa6043817b9e29a0e27
1 parent
8d85ad48
Updates following enum changes to mesh and gradient renderer
Change-Id: I1a885d54a18113547b6af9bb1437d43c21a00de4
Showing
4 changed files
with
7 additions
and
7 deletions
examples/gradients/gradients-example.cpp
| @@ -117,7 +117,7 @@ public: | @@ -117,7 +117,7 @@ public: | ||
| 117 | Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f; | 117 | Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f; |
| 118 | gradientMap.Insert("startPosition", halfStageSize); | 118 | gradientMap.Insert("startPosition", halfStageSize); |
| 119 | gradientMap.Insert("endPosition", -halfStageSize ); | 119 | gradientMap.Insert("endPosition", -halfStageSize ); |
| 120 | - gradientMap.Insert("units", "userSpace"); | 120 | + gradientMap.Insert("units", "USER_SPACE"); |
| 121 | break; | 121 | break; |
| 122 | } | 122 | } |
| 123 | case 2: // radial gradient with units as objectBoundingBox | 123 | case 2: // radial gradient with units as objectBoundingBox |
| @@ -131,7 +131,7 @@ public: | @@ -131,7 +131,7 @@ public: | ||
| 131 | Vector2 stageSize = Stage::GetCurrent().GetSize(); | 131 | Vector2 stageSize = Stage::GetCurrent().GetSize(); |
| 132 | gradientMap.Insert("center", stageSize*0.5f); | 132 | gradientMap.Insert("center", stageSize*0.5f); |
| 133 | gradientMap.Insert("radius", stageSize.Length()); | 133 | gradientMap.Insert("radius", stageSize.Length()); |
| 134 | - gradientMap.Insert("units", "userSpace"); | 134 | + gradientMap.Insert("units", "USER_SPACE"); |
| 135 | break; | 135 | break; |
| 136 | } | 136 | } |
| 137 | } | 137 | } |
examples/mesh-renderer/mesh-renderer-example.cpp
| @@ -34,9 +34,9 @@ namespace | @@ -34,9 +34,9 @@ namespace | ||
| 34 | //Possible shader options. | 34 | //Possible shader options. |
| 35 | const char * const SHADER_TYPE[] = | 35 | const char * const SHADER_TYPE[] = |
| 36 | { | 36 | { |
| 37 | - "allTextures", | ||
| 38 | - "diffuseTexture", | ||
| 39 | - "textureless" | 37 | + "ALL_TEXTURES", |
| 38 | + "DIFFUSE_TEXTURE", | ||
| 39 | + "TEXTURELESS" | ||
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | //Files for background and toolbar | 42 | //Files for background and toolbar |
resources/style/demo-theme.json.in
| @@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
| 72 | "rendererType": "gradient", | 72 | "rendererType": "gradient", |
| 73 | "center": [240, 400], | 73 | "center": [240, 400], |
| 74 | "radius": 932, | 74 | "radius": 932, |
| 75 | - "units": "userSpace", | 75 | + "units": "USER_SPACE", |
| 76 | "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]] | 76 | "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]] |
| 77 | } | 77 | } |
| 78 | } | 78 | } |
resources/style/mobile/demo-theme.json.in
| @@ -85,7 +85,7 @@ | @@ -85,7 +85,7 @@ | ||
| 85 | "rendererType": "gradient", | 85 | "rendererType": "gradient", |
| 86 | "center": [360, 640], | 86 | "center": [360, 640], |
| 87 | "radius": 1468, | 87 | "radius": 1468, |
| 88 | - "units": "userSpace", | 88 | + "units": "USER_SPACE", |
| 89 | "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]] | 89 | "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]] |
| 90 | } | 90 | } |
| 91 | } | 91 | } |