X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Builder.cpp;h=653325caf91f723234cc2dfca193762c4970b946;hp=164ab9e39998c04b528e8787512a612010822cfe;hb=3a289377436005f632a2dca8916706879b7e3a28;hpb=a3353d4f3763da656966e8e9a1c223c7e9585a13 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp index 164ab9e..653325c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp @@ -77,8 +77,8 @@ int UtcDaliBuilderQuitSignal(void) "[{" "\"type\": \"Actor\"," "\"size\": [100,100,1]," - "\"parent-origin\": \"TOP_LEFT\"," - "\"anchor-point\": \"TOP_LEFT\"," + "\"parentOrigin\": \"TOP_LEFT\"," + "\"anchorPoint\": \"TOP_LEFT\"," "\"signals\": [{" "\"name\": \"touched\"," "\"action\": \"quit\"" @@ -130,16 +130,16 @@ int UtcDaliBuilderAnimationP(void) " \"animations\": {" " \"animate\": {" " \"loop\": true," - " \"end-action\": \"BAKE\"," - " \"disconnect-action\": \"BAKE\"," + " \"endAction\": \"BAKE\"," + " \"disconnectAction\": \"BAKE\"," " \"properties\":" " [{" " \"actor\": \"greeting\"," " \"property\": \"position\"," " \"value\": [300, 300, -1000]," - " \"alpha-function\": \"{ALPHA_FUNCTION}\"," + " \"alphaFunction\": \"{ALPHA_FUNCTION}\"," " \"relative\": true," - " \"time-period\": {" + " \"timePeriod\": {" " \"delay\": 0," " \"duration\": 3" " }" @@ -147,81 +147,81 @@ int UtcDaliBuilderAnimationP(void) " {" " \"actor\": \"greeting\"," " \"property\": \"visible\"," - " \"alpha-function\": \"LINEAR\"," + " \"alphaFunction\": \"LINEAR\"," " \"value\": true" " }," " {" " \"actor\": \"greeting\"," - " \"property\": \"size-width\"," - " \"alpha-function\": \"REVERSE\"," + " \"property\": \"sizeWidth\"," + " \"alphaFunction\": \"REVERSE\"," " \"value\": 10.0" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"EASE_IN\"," + " \"alphaFunction\": \"EASE_IN\"," " \"value\": [10.0,20.0,30.0]" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"EASE_OUT\"," + " \"alphaFunction\": \"EASE_OUT\"," " \"value\": [0.0, 0.0, 0.0, 1.0]" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"EASE_IN_OUT\"," + " \"alphaFunction\": \"EASE_IN_OUT\"," " \"value\": [0.0, 0.0, 0.0, 1.0]" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"EASE_IN_SINE\"," + " \"alphaFunction\": \"EASE_IN_SINE\"," " \"value\": [0.0, 0.0, 0.0, 1.0]" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"EASE_OUT_SINE\"," + " \"alphaFunction\": \"EASE_OUT_SINE\"," " \"value\": [0.0, 0.0, 0.0, 1.0]" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"EASE_IN_OUT_SINE\"," + " \"alphaFunction\": \"EASE_IN_OUT_SINE\"," " \"value\": [0.0, 0.0, 0.0, 1.0]" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"BOUNCE\"," + " \"alphaFunction\": \"BOUNCE\"," " \"value\": [0.0, 0.0, 0.0, 1.0]" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"SIN\"," + " \"alphaFunction\": \"SIN\"," " \"value\": [0.0, 0.0, 0.0, 1.0]" " }," " {" " \"actor\": \"greeting\"," " \"property\": \"orientation\"," - " \"alpha-function\": \"EASE_OUT_BACK\"," + " \"alphaFunction\": \"EASE_OUT_BACK\"," " \"value\": [0.0, 0.0, 0.0, 1.0]" " }" " ]" " }," - " \"path-animation\": {" + " \"pathAnimation\": {" " \"duration\": 3.0," - " \"end-action\": \"DISCARD\"," - " \"disconnect-action\": \"BAKE_FINAL\"," + " \"endAction\": \"DISCARD\"," + " \"disconnectAction\": \"BAKE_FINAL\"," " \"properties\": [{" " \"actor\": \"greeting\"," " \"path\":\"path0\"," " \"forward\":[1,0,0]," - " \"alpha-function\": \"EASE_IN_OUT\"," - " \"time-period\": {" + " \"alphaFunction\": \"EASE_IN_OUT\"," + " \"timePeriod\": {" " \"delay\": 0," " \"duration\": 3" " }" @@ -232,7 +232,7 @@ int UtcDaliBuilderAnimationP(void) " \"name\": \"greeting\"," " \"type\": \"TextLabel\"," " \"text\": \"Touch me\"," - " \"styles\": [\"basic-text\"]," + " \"styles\": [\"basicText\"]," " \"position\": [0, -120, 0]," " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," @@ -258,7 +258,7 @@ int UtcDaliBuilderAnimationP(void) DALI_TEST_CHECK( anim ); - anim = builder.CreateAnimation("path-animation"); + anim = builder.CreateAnimation("pathAnimation"); DALI_TEST_CHECK( anim ); @@ -299,16 +299,16 @@ int UtcDaliBuilderAnimationN(void) " \"animations\": {" " \"animate\": {" " \"loop\": true," - " \"end-action\": \"BAKE\"," - " \"disconnect-action\": \"BAKE\"," + " \"endAction\": \"BAKE\"," + " \"disconnectAction\": \"BAKE\"," " \"properties\":" " [{" " \"actor\": \"{NAME}\"," " \"property\": \"positioninvalid\"," " \"value\": [300, 300, -1000]," - " \"alpha-function\": \"EASE_IN_OUT\"," + " \"alphaFunction\": \"EASE_IN_OUT\"," " \"relative\": true," - " \"time-period\": {" + " \"timePeriod\": {" " \"delay\": 0," " \"duration\": 3" " }" @@ -317,32 +317,32 @@ int UtcDaliBuilderAnimationN(void) " }," " \"animate2\": {" " \"loop\": true," - " \"end-action\": \"BAKE\"," - " \"disconnect-action\": \"BAKE\"," + " \"endAction\": \"BAKE\"," + " \"disconnectAction\": \"BAKE\"," " \"properties\":" " [{" " \"actor\": \"{NAME}\"," " \"property\": \"positioninvalid\"," " \"value\": [300, 300, -1000]," - " \"alpha-function\": \"EGGS_OVER_EASY\"," + " \"alphaFunction\": \"EGGS_OVER_EASY\"," " \"relative\": true," - " \"time-period\": {" + " \"timePeriod\": {" " \"delay\": 0," " \"duration\": 3" " }" " }" " ]" " }," - " \"path-animation\": {" + " \"pathAnimation\": {" " \"duration\": 3.0," - " \"end-action\": \"DISCARD\"," - " \"disconnect-action\": \"BAKE_FINAL\"," + " \"endAction\": \"DISCARD\"," + " \"disconnectAction\": \"BAKE_FINAL\"," " \"properties\": [{" " \"actor\": \"greeting\"," " \"path\":\"pathDoesntExist\"," " \"forward\":[1,0,0]," - " \"alpha-function\": \"EASE_IN_OUT\"," - " \"time-period\": {" + " \"alphaFunction\": \"EASE_IN_OUT\"," + " \"timePeriod\": {" " \"delay\": 0," " \"duration\": 3" " }" @@ -353,7 +353,7 @@ int UtcDaliBuilderAnimationN(void) " \"name\": \"greeting\"," " \"type\": \"TextLabel\"," " \"text\": \"Touch me\"," - " \"styles\": [\"basic-text\"]," + " \"styles\": [\"basicText\"]," " \"position\": [0, -120, 0]," " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," @@ -378,7 +378,7 @@ int UtcDaliBuilderAnimationN(void) Animation anim = builder.CreateAnimation("animate"); // log warning line coverage - anim = builder.CreateAnimation("path-animation"); + anim = builder.CreateAnimation("pathAnimation"); DALI_TEST_CHECK(anim); anim = builder.CreateAnimation("animate"); @@ -425,11 +425,11 @@ int UtcDaliBuilderConstantsP(void) " \"type\": \"ImageActor\"," " \"name\": \"{NAME}\"," " \"size\": [100,100,1]," - " \"parent-origin\": \"TOP_LEFT\"," - " \"anchor-point\": \"{ANCHOR}\"," + " \"parentOrigin\": \"TOP_LEFT\"," + " \"anchorPoint\": \"{ANCHOR}\"," " \"padding\": \"{PADDING}\"," " \"image\": { \"filename\": \"dir/{IMAGE_PATH}\" }," - " \"size-width\": \"{WIDTH}\"," + " \"sizeWidth\": \"{WIDTH}\"," " \"signals\": [{" " \"name\": \"touched\"," " \"action\": \"quit\"" @@ -479,11 +479,11 @@ int UtcDaliBuilderTemplatesAndStylesP(void) "}," "\"styles\":\n" "{\n" - " \"image-style\": \n" + " \"imageStyle\": \n" " {\n" " \"color\": [1,0,0,1],\n" " \"actors\": {\n" - " \"child-image\": {\n" + " \"childImage\": {\n" " \"color\": [0,1,0,1]\n" " }\n" " }\n" @@ -491,9 +491,9 @@ int UtcDaliBuilderTemplatesAndStylesP(void) "},\n" "\"templates\":\n" "{\n" - " \"image-tree\": { \n" + " \"imageTree\": { \n" " \"type\": \"ImageActor\",\n" - " \"styles\": [\"image-style\"],\n" + " \"styles\": [\"imageStyle\"],\n" " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" " \"signals\": [{\n" @@ -503,14 +503,14 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"actors\": [\n" " {\n" " \"type\":\"ImageActor\",\n" - " \"name\":\"child-image\" \n" + " \"name\":\"childImage\" \n" " }\n" " ]\n" " }\n" "},\n" "\"stage\":" "[{" - " \"type\": \"image-tree\"," + " \"type\": \"imageTree\"," " \"size\": [100,100,1]" "}]" "}\n" @@ -520,7 +520,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) "{\n" " \"color\": [1,0,0,1],\n" " \"actors\": {\n" - " \"child-image\": {\n" + " \"childImage\": {\n" " \"color\": [0,1,0,1]\n" " }\n" " }\n" @@ -530,7 +530,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) std::string templatejson( "{ \n" " \"type\": \"ImageActor\",\n" - " \"styles\": [\"image-style\"],\n" + " \"styles\": [\"imageStyle\"],\n" " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" " \"signals\": [{\n" @@ -540,7 +540,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"actors\": [\n" " {\n" " \"type\":\"ImageActor\",\n" - " \"name\":\"child-image\" \n" + " \"name\":\"childImage\" \n" " }\n" " ]\n" "}\n" @@ -549,12 +549,12 @@ int UtcDaliBuilderTemplatesAndStylesP(void) Builder builder = Builder::New(); builder.LoadFromString( json ); - ImageActor actor = ImageActor::DownCast( builder.Create( "image-tree" ) ); + ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) ); DALI_TEST_CHECK( actor ); Dali::Property::Map map; map["SIZE"] = Vector3(100,100,1); - actor = ImageActor::DownCast( builder.Create( "image-tree", map ) ); + actor = ImageActor::DownCast( builder.Create( "imageTree", map ) ); DALI_TEST_CHECK( actor ); // create from json snippet @@ -563,7 +563,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) // NB: already applied in create - DALI_TEST_CHECK( builder.ApplyStyle( "image-style", actor ) ); + DALI_TEST_CHECK( builder.ApplyStyle( "imageStyle", actor ) ); // apply from json snippet DALI_TEST_CHECK( builder.ApplyFromJson( actor, stylejson ) ); @@ -578,11 +578,11 @@ int UtcDaliBuilderRenderTasksP(void) // JSON with a quit event when the actor is touched std::string json( "{\n" - "\"render-tasks\":\n" + "\"renderTasks\":\n" "{\n" " \"task0\": {\n" - " \"source-actor\": \"image\",\n" - " \"camera-actor\": \"camera\" \n" + " \"sourceActor\": \"image\",\n" + " \"cameraActor\": \"camera\" \n" " }\n" "},\n" "\"stage\":\n" @@ -602,7 +602,7 @@ int UtcDaliBuilderRenderTasksP(void) " \"actors\": [\n" " {\n" " \"type\":\"ImageActor\",\n" - " \"name\":\"child-image\" \n" + " \"name\":\"childImage\" \n" " }\n" " ]\n" " }\n" @@ -636,17 +636,17 @@ int UtcDaliBuilderChildActionP(void) " \"type\": \"Actor\",\n" " \"name\": \"actor\",\n" " \"size\": [100,100,1],\n" - " \"parent-origin\": \"TOP_LEFT\",\n" - " \"anchor-point\": \"TOP_LEFT\",\n" + " \"parentOrigin\": \"TOP_LEFT\",\n" + " \"anchorPoint\": \"TOP_LEFT\",\n" " \"actors\": [{\n" " \"type\": \"Actor\",\n" - " \"name\": \"sub-actor\"\n" + " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" " \"name\": \"touched\",\n" " \"action\": \"hide\",\n" " \"actor\": \"actor\",\n" - " \"child-actor\": \"sub-actor\"\n" + " \"childActor\": \"subActor\"\n" " }]\n" " }]\n" "}\n" @@ -669,7 +669,7 @@ int UtcDaliBuilderChildActionP(void) application.SendNotification(); application.Render(); - Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("sub-actor"); + Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor"); DALI_TEST_CHECK( actor ); DALI_TEST_CHECK( !actor.IsVisible() ); @@ -689,16 +689,16 @@ int UtcDaliBuilderSetPropertyActionP(void) " \"type\": \"Actor\",\n" " \"name\": \"actor\",\n" " \"size\": [100,100,1],\n" - " \"parent-origin\": \"TOP_LEFT\",\n" - " \"anchor-point\": \"TOP_LEFT\",\n" + " \"parentOrigin\": \"TOP_LEFT\",\n" + " \"anchorPoint\": \"TOP_LEFT\",\n" " \"actors\": [{\n" " \"type\": \"Actor\",\n" - " \"name\": \"sub-actor\"\n" + " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" " \"name\": \"touched\",\n" " \"action\": \"set\",\n" - " \"actor\": \"sub-actor\",\n" + " \"actor\": \"subActor\",\n" " \"property\": \"visible\",\n" " \"value\": false\n" " }]\n" @@ -723,7 +723,7 @@ int UtcDaliBuilderSetPropertyActionP(void) application.SendNotification(); application.Render(); - Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("sub-actor"); + Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor"); DALI_TEST_CHECK( actor ); DALI_TEST_CHECK( !actor.IsVisible() ); @@ -743,11 +743,11 @@ int UtcDaliBuilderGenericActionP(void) " \"type\": \"Actor\",\n" " \"name\": \"actor\",\n" " \"size\": [100,100,1],\n" - " \"parent-origin\": \"TOP_LEFT\",\n" - " \"anchor-point\": \"TOP_LEFT\",\n" + " \"parentOrigin\": \"TOP_LEFT\",\n" + " \"anchorPoint\": \"TOP_LEFT\",\n" " \"actors\": [{\n" " \"type\": \"Actor\",\n" - " \"name\": \"sub-actor\"\n" + " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" " \"name\": \"touched\",\n" @@ -794,11 +794,11 @@ int UtcDaliBuilderPropertyNotificationP(void) " \"type\": \"Actor\",\n" " \"name\": \"actor\",\n" " \"size\": [100,100,1],\n" - " \"parent-origin\": \"TOP_LEFT\",\n" - " \"anchor-point\": \"TOP_LEFT\",\n" + " \"parentOrigin\": \"TOP_LEFT\",\n" + " \"anchorPoint\": \"TOP_LEFT\",\n" " \"actors\": [{\n" " \"type\": \"Actor\",\n" - " \"name\": \"sub-actor\"\n" + " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" " \"name\": \"touched\",\n" @@ -851,7 +851,7 @@ int UtcDaliBuilderCustomPropertyP(void) "{\n" "\"templates\":\n" "{\n" - " \"image-tree\": { \n" + " \"imageTree\": { \n" " \"type\": \"ImageActor\",\n" " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" @@ -859,13 +859,13 @@ int UtcDaliBuilderCustomPropertyP(void) " \"name\": \"touched\",\n" " \"action\": \"quit\"\n" " }],\n" - " \"custom-properties\": {\n" + " \"customProperties\": {\n" " \"newproperty\": true\n" " },\n" " \"actors\": [\n" " {\n" " \"type\":\"ImageActor\",\n" - " \"name\":\"child-image\" \n" + " \"name\":\"childImage\" \n" " }\n" " ]\n" " }\n" @@ -876,7 +876,7 @@ int UtcDaliBuilderCustomPropertyP(void) Builder builder = Builder::New(); builder.LoadFromString( json ); - ImageActor actor = ImageActor::DownCast( builder.Create( "image-tree" ) ); + ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) ); DALI_TEST_CHECK( actor ); // NB: already applied in create @@ -904,19 +904,19 @@ int UtcDaliBuilderShaderEffectP(void) " 0.9150390625,\n" " 0.0\n" " ],\n" - " \"parent-origin\": [0.5, 0.5, 0.5],\n" + " \"parentOrigin\": [0.5, 0.5, 0.5],\n" " \"size\": [200, 200, 0],\n" " \"effect\": \"Ripple2D\",\n" " \"image\": {\n" " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n" " \"width\": 200,\n" " \"height\": 80,\n" - " \"load-policy\": \"IMMEDIATE\",\n" - " \"release-policy\": \"NEVER\"\n" + " \"loadPolicy\": \"IMMEDIATE\",\n" + " \"releasePolicy\": \"NEVER\"\n" " },\n" " \"signals\": [\n" " {\n" - " \"name\": \"on-stage\",\n" + " \"name\": \"onStage\",\n" " \"action\": \"play\",\n" " \"animation\": \"Animation_1\"\n" " }\n" @@ -932,8 +932,8 @@ int UtcDaliBuilderShaderEffectP(void) " \"actor\": \"Image1\",\n" " \"property\": \"uTime\",\n" " \"value\": 10.0,\n" - " \"alpha-function\": \"LINEAR\",\n" - " \"time-period\": {\n" + " \"alphaFunction\": \"LINEAR\",\n" + " \"timePeriod\": {\n" " \"delay\": 0,\n" " \"duration\": 10.0\n" " },\n" @@ -942,17 +942,17 @@ int UtcDaliBuilderShaderEffectP(void) " ]\n" " }\n" " },\n" - " \"shader-effects\": {\n" + " \"shaderEffects\": {\n" " \"Ripple2D\": {\n" " \"program\": {\n" " \"vertexPrefix\": \"\",\n" " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n" " \"fragmentPrefix\": \"\",\n" " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" - " \"geometry-type\": \"GEOMETRY_TYPE_IMAGE\"\n" + " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n" " },\n" - " \"geometry-hints\": \"HINT_NONE\",\n" - " \"grid-density\": 0,\n" + " \"geometryHints\": \"HINT_NONE\",\n" + " \"gridDensity\": 0,\n" " \"loop\": true,\n" " \"uAmplitude\": 0.02,\n" " \"uTime\": 0.0\n" @@ -985,8 +985,8 @@ int UtcDaliBuilderLoadFromStringN(void) "[{" "\"type\": \"Actor\"," "\"size\": [100,100,1]," - "\"parent-origin\": \"TOP_LEFT\"," - "\"anchor-point\": \"TOP_LEFT\"," + "\"parentOrigin\": \"TOP_LEFT\"," + "\"anchorPoint\": \"TOP_LEFT\"," "\"signals\": [{" "\"name\": \"touched\"," "\"action\": \"quit\"" @@ -1023,10 +1023,10 @@ int UtcDaliBuilderShaderEffect2P(void) "{\n" "\"templates\":\n" "{\n" - " \"image-tree\": { \n" + " \"imageTree\": { \n" " \"type\": \"ImageActor\",\n" " \"size\": [100,100,1],\n" - " \"parent-origin\": [0.5, 0.5, 0.5],\n" + " \"parentOrigin\": [0.5, 0.5, 0.5],\n" " \"position\": [\n" " 0.40461349487305,\n" " 0.9150390625,\n" @@ -1039,39 +1039,39 @@ int UtcDaliBuilderShaderEffect2P(void) " \"actors\": [\n" " {\n" " \"type\":\"ImageActor\",\n" - " \"name\":\"child-image\" \n" + " \"name\":\"childImage\" \n" " }\n" " ]\n" " }\n" "},\n" " \"stage\": [\n" " {\n" - " \"type\": \"image-tree\",\n" + " \"type\": \"imageTree\",\n" " \"name\": \"Image1\",\n" " \"effect\": \"Ripple2D\",\n" " \"image\": \"offscreen\"" " }\n" " ],\n" - " \"shader-effects\": {\n" + " \"shaderEffects\": {\n" " \"Ripple2D\": {\n" " \"program\": {\n" " \"vertexPrefix\": \"\",\n" " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n" " \"fragmentPrefix\": \"\",\n" " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" - " \"geometry-type\": \"GEOMETRY_TYPE_IMAGE\"\n" + " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n" " },\n" - " \"geometry-hints\": \"HINT_NONE\",\n" - " \"grid-density\": 0,\n" + " \"geometryHints\": \"HINT_NONE\",\n" + " \"gridDensity\": 0,\n" " \"loop\": true,\n" " \"uAmplitude\": 0.02,\n" " \"uTime\": 0.0\n" " }\n" " },\n" - " \"frame-buffer-images\": {\n" + " \"frameBufferImages\": {\n" " \"offscreen\": {\n" " \"type\": \"FrameBufferImage\"," - " \"pixel-format\":\"RGBA8888\"," + " \"pixelFormat\":\"RGBA8888\"," " \"width\": 400," " \"height\": 400" " }" @@ -1101,18 +1101,18 @@ int UtcDaliBuilderAddActorsP(void) " \"type\": \"Actor\",\n" " \"name\": \"actor\",\n" " \"size\": [100,100,1],\n" - " \"parent-origin\": \"TOP_LEFT\",\n" - " \"anchor-point\": \"TOP_LEFT\",\n" + " \"parentOrigin\": \"TOP_LEFT\",\n" + " \"anchorPoint\": \"TOP_LEFT\",\n" " \"actors\": [{\n" " \"type\": \"Actor\",\n" - " \"name\": \"sub-actor\",\n" + " \"name\": \"subActor\",\n" " \"visible\": false\n" " }],\n" " \"signals\": [{\n" " \"name\": \"touched\",\n" " \"action\": \"hide\",\n" " \"actor\": \"actor\",\n" - " \"child-actor\": \"sub-actor\"\n" + " \"childActor\": \"subActor\"\n" " }]\n" " }]\n" "}\n" @@ -1126,7 +1126,7 @@ int UtcDaliBuilderAddActorsP(void) application.SendNotification(); application.Render(); - Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("sub-actor"); + Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor"); DALI_TEST_CHECK( actor ); DALI_TEST_CHECK( !actor.IsVisible() ); @@ -1157,27 +1157,27 @@ int UtcDaliBuilderFrameBufferP(void) " 0.9150390625,\n" " 0.0\n" " ],\n" - " \"parent-origin\": [0.5, 0.5, 0.5],\n" + " \"parentOrigin\": [0.5, 0.5, 0.5],\n" " \"size\": [300, 300, 0],\n" " \"image\": \"fb0\",\n" - " \"clear-color\": [1,0,0,1]\n" + " \"clearColor\": [1,0,0,1]\n" " },\n" " {\n" " \"type\": \"ImageActor\",\n" " \"name\": \"Image1\",\n" " \"size\": [200, 200, 0],\n" - " \"parent-origin\": [0.5, 0.5, 0.5],\n" + " \"parentOrigin\": [0.5, 0.5, 0.5],\n" " \"effect\": \"Ripple2D\",\n" " \"image\": {\n" " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n" " \"width\": 200,\n" " \"height\": 80,\n" - " \"load-policy\": \"IMMEDIATE\",\n" - " \"release-policy\": \"NEVER\"\n" + " \"loadPolicy\": \"IMMEDIATE\",\n" + " \"releasePolicy\": \"NEVER\"\n" " },\n" " \"signals\": [\n" " {\n" - " \"name\": \"on-stage\",\n" + " \"name\": \"onStage\",\n" " \"action\": \"play\",\n" " \"animation\": \"Animation_1\"\n" " }\n" @@ -1186,33 +1186,33 @@ int UtcDaliBuilderFrameBufferP(void) " {\n" " \"type\":\"CameraActor\",\n" " \"name\":\"fbCam\",\n" - " \"aspect-ratio\": \"{FB_ASPECT_RATIO}\",\n" - " \"projection-mode\": \"PERSPECTIVE_PROJECTION\",\n" - " \"field-of-view\": 0.785,\n" - " \"invert-y-axis\": true\n" + " \"aspectRatio\": \"{FB_ASPECT_RATIO}\",\n" + " \"projectionMode\": \"PERSPECTIVE_PROJECTION\",\n" + " \"fieldOfView\": 0.785,\n" + " \"invertYAxis\": true\n" " }\n" " ],\n" - " \"frame-buffer-images\":\n" + " \"frameBufferImages\":\n" " {\n" " \"fb0\":\n" " {\n" " \"type\": \"FrameBufferImage\",\n" - " \"width\": { \"type-cast\":\"float\", \"value\":\"{FB_WIDTH}\" },\n" - " \"height\": { \"type-cast\":\"float\", \"value\":\"{FB_HEIGHT}\" }\n" + " \"width\": { \"typeCast\":\"float\", \"value\":\"{FB_WIDTH}\" },\n" + " \"height\": { \"typeCast\":\"float\", \"value\":\"{FB_HEIGHT}\" }\n" " }\n" " },\n" - " \"render-tasks\":\n" + " \"renderTasks\":\n" " {\n" " \"stage\":\n" " [\n" " {\n" - " \"source-actor\": \"fbOnStage\"\n" + " \"sourceActor\": \"fbOnStage\"\n" " },\n" " {\n" - " \"source-actor\": \"Image1\",\n" - " \"target-frame-buffer\": \"fb0\",\n" - " \"viewport-size\":\"{FB_SIZE}\",\n" - " \"camera-actor\":\"fbCam\"\n" + " \"sourceActor\": \"Image1\",\n" + " \"targetFrameBuffer\": \"fb0\",\n" + " \"viewportSize\":\"{FB_SIZE}\",\n" + " \"cameraActor\":\"fbCam\"\n" " }\n" " ]\n" " },\n" @@ -1225,8 +1225,8 @@ int UtcDaliBuilderFrameBufferP(void) " \"actor\": \"Image1\",\n" " \"property\": \"uTime\",\n" " \"value\": 10.0,\n" - " \"alpha-function\": \"LINEAR\",\n" - " \"time-period\": {\n" + " \"alphaFunction\": \"LINEAR\",\n" + " \"timePeriod\": {\n" " \"delay\": 0,\n" " \"duration\": 10.0\n" " },\n" @@ -1235,17 +1235,17 @@ int UtcDaliBuilderFrameBufferP(void) " ]\n" " }\n" " },\n" - " \"shader-effects\": {\n" + " \"shaderEffects\": {\n" " \"Ripple2D\": {\n" " \"program\": {\n" " \"vertexPrefix\": \"\",\n" " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n" " \"fragmentPrefix\": \"\",\n" " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" - " \"geometry-type\": \"GEOMETRY_TYPE_IMAGE\"\n" + " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n" " },\n" - " \"geometry-hints\": \"HINT_NONE\",\n" - " \"grid-density\": 0,\n" + " \"geometryHints\": \"HINT_NONE\",\n" + " \"gridDensity\": 0,\n" " \"loop\": true,\n" " \"uAmplitude\": 0.02,\n" " \"uTime\": 0.0\n" @@ -1293,47 +1293,47 @@ int UtcDaliBuilderPathConstraintsP(void) " \"type\": \"ImageActor\",\n" " \"name\": \"Image1\",\n" " \"size\": [200, 200, 0],\n" - " \"parent-origin\": [0.5, 0.5, 0.5],\n" + " \"parentOrigin\": [0.5, 0.5, 0.5],\n" " \"effect\": \"Ripple2D\",\n" " \"image\": {\n" " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n" " \"width\": 200,\n" " \"height\": 80,\n" - " \"load-policy\": \"IMMEDIATE\",\n" - " \"release-policy\": \"NEVER\"\n" + " \"loadPolicy\": \"IMMEDIATE\",\n" + " \"releasePolicy\": \"NEVER\"\n" " },\n" " \"signals\": [\n" " {\n" - " \"name\": \"on-stage\",\n" + " \"name\": \"onStage\",\n" " \"action\": \"play\",\n" - " \"animation\": \"path-animation\"\n" + " \"animation\": \"pathAnimation\"\n" " },\n" " {\n" - " \"name\": \"on-stage\",\n" + " \"name\": \"onStage\",\n" " \"action\": \"applyConstraint\",\n" " \"constrainer\": \"constrainer0\",\n" " \"properties\":\n" " [\n" " {\n" " \"source\": \"Image1\",\n" - " \"sourceProperty\": \"position-x\",\n" + " \"sourceProperty\": \"positionX\",\n" " \"target\": \"Image1\",\n" - " \"targetProperty\": \"color-red\",\n" + " \"targetProperty\": \"colorRed\",\n" " \"range\": [-300,300]\n" " }\n" " ]\n" " },\n" " {\n" - " \"name\": \"on-stage\",\n" + " \"name\": \"onStage\",\n" " \"action\": \"applyConstraint\",\n" " \"constrainer\": \"constrainer1\",\n" " \"properties\":\n" " [\n" " {\n" " \"source\": \"Image1\",\n" - " \"sourceProperty\": \"position-x\",\n" + " \"sourceProperty\": \"positionX\",\n" " \"target\": \"Image1\",\n" - " \"targetProperty\": \"color-blue\",\n" + " \"targetProperty\": \"colorBlue\",\n" " \"range\": [-300,300]\n" " }\n" " ]\n" @@ -1355,7 +1355,7 @@ int UtcDaliBuilderPathConstraintsP(void) " {\n" " \"type\": \"PathConstrainer\",\n" " \"points\": [ [0, 0, 0], [0,0,0], [0,0,0] ],\n" - " \"control-points\": [ [0, 0, 0], [0,0,0], [0,0,0] ]\n" + " \"controlPoints\": [ [0, 0, 0], [0,0,0], [0,0,0] ]\n" " },\n" " \"constrainer1\":\n" " {\n" @@ -1364,15 +1364,15 @@ int UtcDaliBuilderPathConstraintsP(void) " }\n" " },\n" " \"animations\": {\n" - " \"path-animation\": {\n" + " \"pathAnimation\": {\n" " \"duration\": 3.0,\n" " \"properties\":\n" " [{\n" " \"actor\": \"Image1\",\n" " \"path\":\"path0\",\n" " \"forward\":[1,0,0],\n" - " \"alpha-function\": \"EASE_IN_OUT\",\n" - " \"time-period\": {\n" + " \"alphaFunction\": \"EASE_IN_OUT\",\n" + " \"timePeriod\": {\n" " \"delay\": 0,\n" " \"duration\": 3\n" " }\n" @@ -1381,8 +1381,8 @@ int UtcDaliBuilderPathConstraintsP(void) " \"actor\": \"Image1\",\n" " \"property\": \"uTime\",\n" " \"value\": 10.0,\n" - " \"alpha-function\": \"LINEAR\",\n" - " \"time-period\": {\n" + " \"alphaFunction\": \"LINEAR\",\n" + " \"timePeriod\": {\n" " \"delay\": 0,\n" " \"duration\": 10.0\n" " },\n" @@ -1396,8 +1396,8 @@ int UtcDaliBuilderPathConstraintsP(void) " \"actor\": \"Image1\",\n" " \"property\": \"uTime\",\n" " \"value\": 10.0,\n" - " \"alpha-function\": \"LINEAR\",\n" - " \"time-period\": {\n" + " \"alphaFunction\": \"LINEAR\",\n" + " \"timePeriod\": {\n" " \"delay\": 0,\n" " \"duration\": 10.0\n" " },\n" @@ -1406,17 +1406,17 @@ int UtcDaliBuilderPathConstraintsP(void) " ]\n" " }\n" " },\n" - " \"shader-effects\": {\n" + " \"shaderEffects\": {\n" " \"Ripple2D\": {\n" " \"program\": {\n" " \"vertexPrefix\": \"\",\n" " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n" " \"fragmentPrefix\": \"\",\n" " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" - " \"geometry-type\": \"GEOMETRY_TYPE_IMAGE\"\n" + " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n" " },\n" - " \"geometry-hints\": \"HINT_NONE\",\n" - " \"grid-density\": 0,\n" + " \"geometryHints\": \"HINT_NONE\",\n" + " \"gridDensity\": 0,\n" " \"loop\": true,\n" " \"uAmplitude\": 0.02,\n" " \"uTime\": 0.0\n"