From fcf51be2a38a3e002cfb4742da69490834af61ef Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Fri, 22 Apr 2016 14:04:01 +0100 Subject: [PATCH] Blending enum clean-up We were previously using a mixture of BLEND and BLENDING in enums. The order of the BLEND_FACTOR enums & string names was also inconsistent. As a rule of thumb always use Blend & BLEND for namespaces & enums/constants (not Blending or BLENDING) Change-Id: Ia4dd6483edc56e9736436e7aa8545b40f999ba47 --- emscripten-examples/dali-toy.js | 2 +- examples/benchmark/benchmark.cpp | 2 +- examples/item-view/item-view-example.cpp | 2 +- .../metaball-explosion-example.cpp | 8 +++- .../metaball-refrac/metaball-refrac-example.cpp | 7 +++- examples/perf-scroll/perf-scroll.cpp | 3 +- resources/scripts/animated-colors.json | 48 +++++++++++----------- resources/scripts/background.json | 4 +- resources/scripts/clock.json | 6 +-- resources/scripts/table-view.json | 2 +- 10 files changed, 45 insertions(+), 39 deletions(-) diff --git a/emscripten-examples/dali-toy.js b/emscripten-examples/dali-toy.js index c1e8329..2fa343e 100644 --- a/emscripten-examples/dali-toy.js +++ b/emscripten-examples/dali-toy.js @@ -3304,7 +3304,7 @@ dali.Builder.prototype.material = function(name, d) { // blend: "AUTO", // blendFunc : {srcFactorRGBA, destFactorRGBA}, // blendEquation : "", - // blendColor : [1,0,0,1] } ) + // mixColor : [1,0,0,1] } ) // "use strict"; var value; // check required things diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp index 470f9b9..3824de8 100644 --- a/examples/benchmark/benchmark.cpp +++ b/examples/benchmark/benchmark.cpp @@ -229,7 +229,7 @@ Renderer CreateRenderer( unsigned int index ) textureSet.SetImage( 0u, image ); renderers[index] = Renderer::New( QuadMesh(), shader ); renderers[index].SetTextures( textureSet ); - renderers[index].SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::OFF ); + renderers[index].SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF ); } return renderers[index]; } diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index aeb1d2e..c898c0c 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -868,7 +868,7 @@ public: // From ItemFactory Property::Map solidColorProperty; solidColorProperty.Insert( "rendererType", "color" ); - solidColorProperty.Insert( "blendColor", Vector4(0.f, 0.f, 0.f, 0.6f) ); + solidColorProperty.Insert( "mixColor", Vector4(0.f, 0.f, 0.f, 0.6f) ); checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty ); if( MODE_REMOVE_MANY != mMode && diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp index 39519b8..231d778 100644 --- a/examples/metaball-explosion/metaball-explosion-example.cpp +++ b/examples/metaball-explosion/metaball-explosion-example.cpp @@ -466,8 +466,12 @@ void MetaballExplosionController::CreateMetaballActors() Geometry metaballGeom = CreateGeometry(); Renderer renderer = Renderer::New( metaballGeom, shader ); - renderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON ); - renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE); + renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB, BlendFactor::ONE ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB, BlendFactor::ONE ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA, BlendFactor::ONE ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA, BlendFactor::ONE ); + //Initialization of each of the metaballs for( int i = 0; i < METABALL_NUMBER; i++ ) { diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp index 995977c..a1382b3 100644 --- a/examples/metaball-refrac/metaball-refrac-example.cpp +++ b/examples/metaball-refrac/metaball-refrac-example.cpp @@ -439,8 +439,11 @@ void MetaballRefracController::CreateMetaballActors() Shader shader = Shader::New( METABALL_VERTEX_SHADER, METABALL_FRAG_SHADER ); Geometry metaballGeom = CreateGeometry(); Renderer renderer = Renderer::New( metaballGeom, shader ); - renderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON ); - renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE); + renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB, BlendFactor::ONE ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB, BlendFactor::ONE ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA, BlendFactor::ONE ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA, BlendFactor::ONE ); //Each metaball has a different radius mMetaballs[0].radius = mMetaballs[0].initRadius = 0.0145f; diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp index 90a02ce..78ca137 100644 --- a/examples/perf-scroll/perf-scroll.cpp +++ b/examples/perf-scroll/perf-scroll.cpp @@ -231,8 +231,7 @@ Renderer CreateRenderer( unsigned int index ) textureSet.SetImage( 0u, image ); renderers[index] = Renderer::New( QuadMesh(), shader ); renderers[index].SetTextures( textureSet ); - renderers[index].SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::OFF ); - + renderers[index].SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF ); } return renderers[index]; } diff --git a/resources/scripts/animated-colors.json b/resources/scripts/animated-colors.json index 02ecf4d..79d253c 100644 --- a/resources/scripts/animated-colors.json +++ b/resources/scripts/animated-colors.json @@ -43,7 +43,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.5686274509803921, @@ -79,7 +79,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.17647058823529413, @@ -115,7 +115,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.7411764705882353, @@ -147,7 +147,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.23137254901960785, @@ -183,7 +183,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.17647058823529413, @@ -219,7 +219,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.396078431372549, @@ -251,7 +251,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0, @@ -287,7 +287,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.20784313725490197, @@ -323,7 +323,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.4196078431372549, @@ -355,7 +355,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.47843137254901963, @@ -387,7 +387,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.4470588235294118, @@ -419,7 +419,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 1, @@ -451,7 +451,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.43137254901960786, @@ -487,7 +487,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.8196078431372549, @@ -519,7 +519,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.6313725490196078, @@ -558,7 +558,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.9176470588235294, @@ -590,7 +590,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.24313725490196078, @@ -623,7 +623,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0, @@ -662,7 +662,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 1, @@ -694,7 +694,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0, @@ -727,7 +727,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 1, @@ -759,7 +759,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.01568627450980392, @@ -791,7 +791,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.2784313725490196, @@ -824,7 +824,7 @@ "sizeAspectRatio": false, "background": { "rendererType": "color", - "blendColor": [1,1,1,1] + "mixColor": [1,1,1,1] }, "color": [ 0.1568627450980392, diff --git a/resources/scripts/background.json b/resources/scripts/background.json index 365289c..cd1944a 100644 --- a/resources/scripts/background.json +++ b/resources/scripts/background.json @@ -31,7 +31,7 @@ "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], "background":{ "rendererType": "color", - "blendColor": [ 0.8, 0, 0.2, 1 ] + "mixColor": [ 0.8, 0, 0.2, 1 ] } }, @@ -92,7 +92,7 @@ "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], "background":{ "rendererType": "color", - "blendColor": [ 1, 1, 0, 1 ] + "mixColor": [ 1, 1, 0, 1 ] } }, diff --git a/resources/scripts/clock.json b/resources/scripts/clock.json index c132b0a..d8cecfc 100644 --- a/resources/scripts/clock.json +++ b/resources/scripts/clock.json @@ -9,7 +9,7 @@ "anchorPoint": [0.5, 1, 0.5], "background": { "rendererType": "color", - "blendColor": [0.71, 0, 0, 1] + "mixColor": [0.71, 0, 0, 1] }, "selected": false, "signals": [ @@ -28,7 +28,7 @@ "anchorPoint": [0.5, 1, 0.5], "background": { "rendererType": "color", - "blendColor": [0, 0.14200000000000013, 0.71, 0.7] + "mixColor": [0, 0.14200000000000013, 0.71, 0.7] }, "signals": [ { @@ -46,7 +46,7 @@ "anchorPoint": [0.5, 1, 0.5], "background": { "rendererType": "color", - "blendColor": [0.057450000000000064, 0.3, 0.0030000000000000027, 0.7] + "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 075cb8f..482719c 100644 --- a/resources/scripts/table-view.json +++ b/resources/scripts/table-view.json @@ -44,7 +44,7 @@ "type":"TableView", "background":{ "rendererType": "color", - "blendColor": [0.5,0.5,0,1] + "mixColor": [0.5,0.5,0,1] }, "parentOrigin": "CENTER", "size":[400,400,1], -- 2.7.4