Peter M. Groen / dali-demo

Commit 2ab1c750e3c15a4457ec8b2d0ca690102e18616e

Authored by Tom Robinson
1 parent 1bf65181

Moved TextureSet::SetImage() to separate devel-api module 

Change-Id: I801d127df7805fb8df6bbaa28fbfeeee46c898a6
Inline Side-by-side
Showing 3 changed files with 13 additions and 9 deletions
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @2ab1c75
1 /* 1 /*
2 - * Copyright (c) 2014 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 21
22 //Internal includes 22 //Internal includes
23 #include <dali/dali.h> 23 #include <dali/dali.h>
  24 +#include <dali/devel-api/images/texture-set-image.h>
24 #include <dali/devel-api/rendering/renderer.h> 25 #include <dali/devel-api/rendering/renderer.h>
25 #include <dali-toolkit/dali-toolkit.h> 26 #include <dali-toolkit/dali-toolkit.h>
26 27
@@ -551,8 +552,8 @@ void MetaballExplosionController::AddRefractionImage() @@ -551,8 +552,8 @@ void MetaballExplosionController::AddRefractionImage()
551 552
552 //Create new texture set 553 //Create new texture set
553 TextureSet textureSet = TextureSet::New(); 554 TextureSet textureSet = TextureSet::New();
554 - textureSet.SetImage( 0u, mBackImage );  
555 - textureSet.SetImage( 1u, fbo ); 555 + TextureSetImage( textureSet, 0u, mBackImage );
  556 + TextureSetImage( textureSet, 1u, fbo );
556 557
557 //Create geometry 558 //Create geometry
558 Geometry metaballGeom = CreateGeometryComposition(); 559 Geometry metaballGeom = CreateGeometryComposition();
examples/metaball-refrac/metaball-refrac-example.cpp
  View file @2ab1c75
1 /* 1 /*
2 - * Copyright (c) 2014 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 */ 16 */
17 17
18 #include <dali/dali.h> 18 #include <dali/dali.h>
  19 +#include <dali/devel-api/images/texture-set-image.h>
19 #include <dali/devel-api/rendering/renderer.h> 20 #include <dali/devel-api/rendering/renderer.h>
20 #include <dali-toolkit/dali-toolkit.h> 21 #include <dali-toolkit/dali-toolkit.h>
21 22
@@ -532,15 +533,15 @@ void MetaballRefracController::AddRefractionImage() @@ -532,15 +533,15 @@ void MetaballRefracController::AddRefractionImage()
532 533
533 //Create new texture set 534 //Create new texture set
534 mTextureSetRefraction = TextureSet::New(); 535 mTextureSetRefraction = TextureSet::New();
535 - mTextureSetRefraction.SetImage( 0u, mBackImage );  
536 - mTextureSetRefraction.SetImage( 1u, mMetaballFBO ); 536 + TextureSetImage( mTextureSetRefraction, 0u, mBackImage );
  537 + TextureSetImage( mTextureSetRefraction, 1u, mMetaballFBO );
537 538
538 //Create normal shader 539 //Create normal shader
539 mShaderNormal = Shader::New( METABALL_VERTEX_SHADER, FRAG_SHADER ); 540 mShaderNormal = Shader::New( METABALL_VERTEX_SHADER, FRAG_SHADER );
540 541
541 //Create new texture set 542 //Create new texture set
542 mTextureSetNormal = TextureSet::New(); 543 mTextureSetNormal = TextureSet::New();
543 - mTextureSetNormal.SetImage( 0u, mBackImage ); 544 + TextureSetImage( mTextureSetNormal, 0u, mBackImage );
544 545
545 //Create actor 546 //Create actor
546 mCompositionActor = Actor::New( ); 547 mCompositionActor = Actor::New( );
examples/new-window/new-window-example.cpp
  View file @2ab1c75
1 /* 1 /*
2 - * Copyright (c) 2014 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 */ 15 */
16 16
17 // EXTERNAL INCLUDES 17 // EXTERNAL INCLUDES
  18 +#include <dali/devel-api/images/texture-set-image.h>
18 #include <dali/devel-api/rendering/renderer.h> 19 #include <dali/devel-api/rendering/renderer.h>
19 #include <dali-toolkit/dali-toolkit.h> 20 #include <dali-toolkit/dali-toolkit.h>
20 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h> 21 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
@@ -329,7 +330,8 @@ void NewWindowController::AddBlendingImageActor( Actor&amp; parentActor ) @@ -329,7 +330,8 @@ void NewWindowController::AddBlendingImageActor( Actor&amp; parentActor )
329 blendActor.SetSize(140, 140); 330 blendActor.SetSize(140, 140);
330 parentActor.Add(blendActor); 331 parentActor.Add(blendActor);
331 332
332 - blendActor.GetRendererAt(0u).GetTextures().SetImage( 1u, fb2 ); 333 + TextureSet textureSet = blendActor.GetRendererAt(0u).GetTextures();
  334 + TextureSetImage( textureSet, 1u, fb2 );
333 } 335 }
334 336
335 void NewWindowController::AddTextLabel( Actor& parentActor ) 337 void NewWindowController::AddTextLabel( Actor& parentActor )