Peter M. Groen / dali-demo

Commit 03d39591118c47c450740aad8a7186f7e65f05da

Authored by David Steele
2 parents d2223117 f902e5b9

[dali_1.1.33] Merge branch 'devel/master' 

Change-Id: I27d1470273853b185a74936736052d543ccfbb0e
Inline Side-by-side
Showing 11 changed files with 46 additions and 40 deletions
emscripten-examples/dali-toy.js
  View file @03d3959
@@ -3304,7 +3304,7 @@ dali.Builder.prototype.material = function(name, d) { @@ -3304,7 +3304,7 @@ dali.Builder.prototype.material = function(name, d) {
3304 // blend: "AUTO", 3304 // blend: "AUTO",
3305 // blendFunc : {srcFactorRGBA, destFactorRGBA}, 3305 // blendFunc : {srcFactorRGBA, destFactorRGBA},
3306 // blendEquation : "", 3306 // blendEquation : "",
3307 - // blendColor : [1,0,0,1] } ) 3307 + // mixColor : [1,0,0,1] } )
3308 // 3308 //
3309 "use strict"; 3309 "use strict";
3310 var value; // check required things 3310 var value; // check required things
examples/benchmark/benchmark.cpp
  View file @03d3959
@@ -229,7 +229,7 @@ Renderer CreateRenderer( unsigned int index ) @@ -229,7 +229,7 @@ Renderer CreateRenderer( unsigned int index )
229 textureSet.SetImage( 0u, image ); 229 textureSet.SetImage( 0u, image );
230 renderers[index] = Renderer::New( QuadMesh(), shader ); 230 renderers[index] = Renderer::New( QuadMesh(), shader );
231 renderers[index].SetTextures( textureSet ); 231 renderers[index].SetTextures( textureSet );
232 - renderers[index].SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::OFF ); 232 + renderers[index].SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF );
233 } 233 }
234 return renderers[index]; 234 return renderers[index];
235 } 235 }
examples/item-view/item-view-example.cpp
  View file @03d3959
@@ -868,7 +868,7 @@ public: // From ItemFactory @@ -868,7 +868,7 @@ public: // From ItemFactory
868 868
869 Property::Map solidColorProperty; 869 Property::Map solidColorProperty;
870 solidColorProperty.Insert( "rendererType", "color" ); 870 solidColorProperty.Insert( "rendererType", "color" );
871 - solidColorProperty.Insert( "blendColor", Vector4(0.f, 0.f, 0.f, 0.6f) ); 871 + solidColorProperty.Insert( "mixColor", Vector4(0.f, 0.f, 0.f, 0.6f) );
872 checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty ); 872 checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty );
873 873
874 if( MODE_REMOVE_MANY != mMode && 874 if( MODE_REMOVE_MANY != mMode &&
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @03d3959
@@ -466,8 +466,12 @@ void MetaballExplosionController::CreateMetaballActors() @@ -466,8 +466,12 @@ void MetaballExplosionController::CreateMetaballActors()
466 466
467 Geometry metaballGeom = CreateGeometry(); 467 Geometry metaballGeom = CreateGeometry();
468 Renderer renderer = Renderer::New( metaballGeom, shader ); 468 Renderer renderer = Renderer::New( metaballGeom, shader );
469 - renderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON );  
470 - renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE); 469 + renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
  470 + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB, BlendFactor::ONE );
  471 + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB, BlendFactor::ONE );
  472 + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA, BlendFactor::ONE );
  473 + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA, BlendFactor::ONE );
  474 +
471 //Initialization of each of the metaballs 475 //Initialization of each of the metaballs
472 for( int i = 0; i < METABALL_NUMBER; i++ ) 476 for( int i = 0; i < METABALL_NUMBER; i++ )
473 { 477 {
examples/metaball-refrac/metaball-refrac-example.cpp
  View file @03d3959
@@ -439,8 +439,11 @@ void MetaballRefracController::CreateMetaballActors() @@ -439,8 +439,11 @@ void MetaballRefracController::CreateMetaballActors()
439 Shader shader = Shader::New( METABALL_VERTEX_SHADER, METABALL_FRAG_SHADER ); 439 Shader shader = Shader::New( METABALL_VERTEX_SHADER, METABALL_FRAG_SHADER );
440 Geometry metaballGeom = CreateGeometry(); 440 Geometry metaballGeom = CreateGeometry();
441 Renderer renderer = Renderer::New( metaballGeom, shader ); 441 Renderer renderer = Renderer::New( metaballGeom, shader );
442 - renderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON );  
443 - renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE); 442 + renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
  443 + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB, BlendFactor::ONE );
  444 + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB, BlendFactor::ONE );
  445 + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA, BlendFactor::ONE );
  446 + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA, BlendFactor::ONE );
444 447
445 //Each metaball has a different radius 448 //Each metaball has a different radius
446 mMetaballs[0].radius = mMetaballs[0].initRadius = 0.0145f; 449 mMetaballs[0].radius = mMetaballs[0].initRadius = 0.0145f;
examples/perf-scroll/perf-scroll.cpp
  View file @03d3959
@@ -231,8 +231,7 @@ Renderer CreateRenderer( unsigned int index ) @@ -231,8 +231,7 @@ Renderer CreateRenderer( unsigned int index )
231 textureSet.SetImage( 0u, image ); 231 textureSet.SetImage( 0u, image );
232 renderers[index] = Renderer::New( QuadMesh(), shader ); 232 renderers[index] = Renderer::New( QuadMesh(), shader );
233 renderers[index].SetTextures( textureSet ); 233 renderers[index].SetTextures( textureSet );
234 - renderers[index].SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::OFF );  
235 - 234 + renderers[index].SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF );
236 } 235 }
237 return renderers[index]; 236 return renderers[index];
238 } 237 }
packaging/com.samsung.dali-demo.spec
  View file @03d3959
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.1.32 5 +Version: 1.1.33
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
resources/scripts/animated-colors.json
  View file @03d3959
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 "sizeAspectRatio": false, 43 "sizeAspectRatio": false,
44 "background": { 44 "background": {
45 "rendererType": "color", 45 "rendererType": "color",
46 - "blendColor": [1,1,1,1] 46 + "mixColor": [1,1,1,1]
47 }, 47 },
48 "color": [ 48 "color": [
49 0.5686274509803921, 49 0.5686274509803921,
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 "sizeAspectRatio": false, 79 "sizeAspectRatio": false,
80 "background": { 80 "background": {
81 "rendererType": "color", 81 "rendererType": "color",
82 - "blendColor": [1,1,1,1] 82 + "mixColor": [1,1,1,1]
83 }, 83 },
84 "color": [ 84 "color": [
85 0.17647058823529413, 85 0.17647058823529413,
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 "sizeAspectRatio": false, 115 "sizeAspectRatio": false,
116 "background": { 116 "background": {
117 "rendererType": "color", 117 "rendererType": "color",
118 - "blendColor": [1,1,1,1] 118 + "mixColor": [1,1,1,1]
119 }, 119 },
120 "color": [ 120 "color": [
121 0.7411764705882353, 121 0.7411764705882353,
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 "sizeAspectRatio": false, 147 "sizeAspectRatio": false,
148 "background": { 148 "background": {
149 "rendererType": "color", 149 "rendererType": "color",
150 - "blendColor": [1,1,1,1] 150 + "mixColor": [1,1,1,1]
151 }, 151 },
152 "color": [ 152 "color": [
153 0.23137254901960785, 153 0.23137254901960785,
@@ -183,7 +183,7 @@ @@ -183,7 +183,7 @@
183 "sizeAspectRatio": false, 183 "sizeAspectRatio": false,
184 "background": { 184 "background": {
185 "rendererType": "color", 185 "rendererType": "color",
186 - "blendColor": [1,1,1,1] 186 + "mixColor": [1,1,1,1]
187 }, 187 },
188 "color": [ 188 "color": [
189 0.17647058823529413, 189 0.17647058823529413,
@@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
219 "sizeAspectRatio": false, 219 "sizeAspectRatio": false,
220 "background": { 220 "background": {
221 "rendererType": "color", 221 "rendererType": "color",
222 - "blendColor": [1,1,1,1] 222 + "mixColor": [1,1,1,1]
223 }, 223 },
224 "color": [ 224 "color": [
225 0.396078431372549, 225 0.396078431372549,
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 "sizeAspectRatio": false, 251 "sizeAspectRatio": false,
252 "background": { 252 "background": {
253 "rendererType": "color", 253 "rendererType": "color",
254 - "blendColor": [1,1,1,1] 254 + "mixColor": [1,1,1,1]
255 }, 255 },
256 "color": [ 256 "color": [
257 0, 257 0,
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
287 "sizeAspectRatio": false, 287 "sizeAspectRatio": false,
288 "background": { 288 "background": {
289 "rendererType": "color", 289 "rendererType": "color",
290 - "blendColor": [1,1,1,1] 290 + "mixColor": [1,1,1,1]
291 }, 291 },
292 "color": [ 292 "color": [
293 0.20784313725490197, 293 0.20784313725490197,
@@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@
323 "sizeAspectRatio": false, 323 "sizeAspectRatio": false,
324 "background": { 324 "background": {
325 "rendererType": "color", 325 "rendererType": "color",
326 - "blendColor": [1,1,1,1] 326 + "mixColor": [1,1,1,1]
327 }, 327 },
328 "color": [ 328 "color": [
329 0.4196078431372549, 329 0.4196078431372549,
@@ -355,7 +355,7 @@ @@ -355,7 +355,7 @@
355 "sizeAspectRatio": false, 355 "sizeAspectRatio": false,
356 "background": { 356 "background": {
357 "rendererType": "color", 357 "rendererType": "color",
358 - "blendColor": [1,1,1,1] 358 + "mixColor": [1,1,1,1]
359 }, 359 },
360 "color": [ 360 "color": [
361 0.47843137254901963, 361 0.47843137254901963,
@@ -387,7 +387,7 @@ @@ -387,7 +387,7 @@
387 "sizeAspectRatio": false, 387 "sizeAspectRatio": false,
388 "background": { 388 "background": {
389 "rendererType": "color", 389 "rendererType": "color",
390 - "blendColor": [1,1,1,1] 390 + "mixColor": [1,1,1,1]
391 }, 391 },
392 "color": [ 392 "color": [
393 0.4470588235294118, 393 0.4470588235294118,
@@ -419,7 +419,7 @@ @@ -419,7 +419,7 @@
419 "sizeAspectRatio": false, 419 "sizeAspectRatio": false,
420 "background": { 420 "background": {
421 "rendererType": "color", 421 "rendererType": "color",
422 - "blendColor": [1,1,1,1] 422 + "mixColor": [1,1,1,1]
423 }, 423 },
424 "color": [ 424 "color": [
425 1, 425 1,
@@ -451,7 +451,7 @@ @@ -451,7 +451,7 @@
451 "sizeAspectRatio": false, 451 "sizeAspectRatio": false,
452 "background": { 452 "background": {
453 "rendererType": "color", 453 "rendererType": "color",
454 - "blendColor": [1,1,1,1] 454 + "mixColor": [1,1,1,1]
455 }, 455 },
456 "color": [ 456 "color": [
457 0.43137254901960786, 457 0.43137254901960786,
@@ -487,7 +487,7 @@ @@ -487,7 +487,7 @@
487 "sizeAspectRatio": false, 487 "sizeAspectRatio": false,
488 "background": { 488 "background": {
489 "rendererType": "color", 489 "rendererType": "color",
490 - "blendColor": [1,1,1,1] 490 + "mixColor": [1,1,1,1]
491 }, 491 },
492 "color": [ 492 "color": [
493 0.8196078431372549, 493 0.8196078431372549,
@@ -519,7 +519,7 @@ @@ -519,7 +519,7 @@
519 "sizeAspectRatio": false, 519 "sizeAspectRatio": false,
520 "background": { 520 "background": {
521 "rendererType": "color", 521 "rendererType": "color",
522 - "blendColor": [1,1,1,1] 522 + "mixColor": [1,1,1,1]
523 }, 523 },
524 "color": [ 524 "color": [
525 0.6313725490196078, 525 0.6313725490196078,
@@ -558,7 +558,7 @@ @@ -558,7 +558,7 @@
558 "sizeAspectRatio": false, 558 "sizeAspectRatio": false,
559 "background": { 559 "background": {
560 "rendererType": "color", 560 "rendererType": "color",
561 - "blendColor": [1,1,1,1] 561 + "mixColor": [1,1,1,1]
562 }, 562 },
563 "color": [ 563 "color": [
564 0.9176470588235294, 564 0.9176470588235294,
@@ -590,7 +590,7 @@ @@ -590,7 +590,7 @@
590 "sizeAspectRatio": false, 590 "sizeAspectRatio": false,
591 "background": { 591 "background": {
592 "rendererType": "color", 592 "rendererType": "color",
593 - "blendColor": [1,1,1,1] 593 + "mixColor": [1,1,1,1]
594 }, 594 },
595 "color": [ 595 "color": [
596 0.24313725490196078, 596 0.24313725490196078,
@@ -623,7 +623,7 @@ @@ -623,7 +623,7 @@
623 "sizeAspectRatio": false, 623 "sizeAspectRatio": false,
624 "background": { 624 "background": {
625 "rendererType": "color", 625 "rendererType": "color",
626 - "blendColor": [1,1,1,1] 626 + "mixColor": [1,1,1,1]
627 }, 627 },
628 "color": [ 628 "color": [
629 0, 629 0,
@@ -662,7 +662,7 @@ @@ -662,7 +662,7 @@
662 "sizeAspectRatio": false, 662 "sizeAspectRatio": false,
663 "background": { 663 "background": {
664 "rendererType": "color", 664 "rendererType": "color",
665 - "blendColor": [1,1,1,1] 665 + "mixColor": [1,1,1,1]
666 }, 666 },
667 "color": [ 667 "color": [
668 1, 668 1,
@@ -694,7 +694,7 @@ @@ -694,7 +694,7 @@
694 "sizeAspectRatio": false, 694 "sizeAspectRatio": false,
695 "background": { 695 "background": {
696 "rendererType": "color", 696 "rendererType": "color",
697 - "blendColor": [1,1,1,1] 697 + "mixColor": [1,1,1,1]
698 }, 698 },
699 "color": [ 699 "color": [
700 0, 700 0,
@@ -727,7 +727,7 @@ @@ -727,7 +727,7 @@
727 "sizeAspectRatio": false, 727 "sizeAspectRatio": false,
728 "background": { 728 "background": {
729 "rendererType": "color", 729 "rendererType": "color",
730 - "blendColor": [1,1,1,1] 730 + "mixColor": [1,1,1,1]
731 }, 731 },
732 "color": [ 732 "color": [
733 1, 733 1,
@@ -759,7 +759,7 @@ @@ -759,7 +759,7 @@
759 "sizeAspectRatio": false, 759 "sizeAspectRatio": false,
760 "background": { 760 "background": {
761 "rendererType": "color", 761 "rendererType": "color",
762 - "blendColor": [1,1,1,1] 762 + "mixColor": [1,1,1,1]
763 }, 763 },
764 "color": [ 764 "color": [
765 0.01568627450980392, 765 0.01568627450980392,
@@ -791,7 +791,7 @@ @@ -791,7 +791,7 @@
791 "sizeAspectRatio": false, 791 "sizeAspectRatio": false,
792 "background": { 792 "background": {
793 "rendererType": "color", 793 "rendererType": "color",
794 - "blendColor": [1,1,1,1] 794 + "mixColor": [1,1,1,1]
795 }, 795 },
796 "color": [ 796 "color": [
797 0.2784313725490196, 797 0.2784313725490196,
@@ -824,7 +824,7 @@ @@ -824,7 +824,7 @@
824 "sizeAspectRatio": false, 824 "sizeAspectRatio": false,
825 "background": { 825 "background": {
826 "rendererType": "color", 826 "rendererType": "color",
827 - "blendColor": [1,1,1,1] 827 + "mixColor": [1,1,1,1]
828 }, 828 },
829 "color": [ 829 "color": [
830 0.1568627450980392, 830 0.1568627450980392,
resources/scripts/background.json
  View file @03d3959
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], 31 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
32 "background":{ 32 "background":{
33 "rendererType": "color", 33 "rendererType": "color",
34 - "blendColor": [ 0.8, 0, 0.2, 1 ] 34 + "mixColor": [ 0.8, 0, 0.2, 1 ]
35 } 35 }
36 }, 36 },
37 37
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], 92 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
93 "background":{ 93 "background":{
94 "rendererType": "color", 94 "rendererType": "color",
95 - "blendColor": [ 1, 1, 0, 1 ] 95 + "mixColor": [ 1, 1, 0, 1 ]
96 } 96 }
97 }, 97 },
98 98
resources/scripts/clock.json
  View file @03d3959
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 "anchorPoint": [0.5, 1, 0.5], 9 "anchorPoint": [0.5, 1, 0.5],
10 "background": { 10 "background": {
11 "rendererType": "color", 11 "rendererType": "color",
12 - "blendColor": [0.71, 0, 0, 1] 12 + "mixColor": [0.71, 0, 0, 1]
13 }, 13 },
14 "selected": false, 14 "selected": false,
15 "signals": [ 15 "signals": [
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 "anchorPoint": [0.5, 1, 0.5], 28 "anchorPoint": [0.5, 1, 0.5],
29 "background": { 29 "background": {
30 "rendererType": "color", 30 "rendererType": "color",
31 - "blendColor": [0, 0.14200000000000013, 0.71, 0.7] 31 + "mixColor": [0, 0.14200000000000013, 0.71, 0.7]
32 }, 32 },
33 "signals": [ 33 "signals": [
34 { 34 {
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 "anchorPoint": [0.5, 1, 0.5], 46 "anchorPoint": [0.5, 1, 0.5],
47 "background": { 47 "background": {
48 "rendererType": "color", 48 "rendererType": "color",
49 - "blendColor": [0.057450000000000064, 0.3, 0.0030000000000000027, 0.7] 49 + "mixColor": [0.057450000000000064, 0.3, 0.0030000000000000027, 0.7]
50 }, 50 },
51 "signals": [ 51 "signals": [
52 { 52 {
resources/scripts/table-view.json
  View file @03d3959
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 "type":"TableView", 44 "type":"TableView",
45 "background":{ 45 "background":{
46 "rendererType": "color", 46 "rendererType": "color",
47 - "blendColor": [0.5,0.5,0,1] 47 + "mixColor": [0.5,0.5,0,1]
48 }, 48 },
49 "parentOrigin": "CENTER", 49 "parentOrigin": "CENTER",
50 "size":[400,400,1], 50 "size":[400,400,1],