Changes following "Remove Sampler scene object"

Change-Id: I5c99b4c1b27d0f3b8fc8102620f5f8e6e90f399b

diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp
index f673c49..ef0e473 100644 (file)
--- a/examples/benchmark/benchmark.cpp
+++ b/examples/benchmark/benchmark.cpp
@@ -225,9 +225,8 @@ Renderer CreateRenderer( unsigned int index )
 
     const char* imagePath = !gNinePatch ? IMAGE_PATH[index] : NINEPATCH_IMAGE_PATH[index];
     Image image = ResourceImage::New(imagePath);
-    Sampler textureSampler = Sampler::New( image, "sTexture" );
     Material material = Material::New( shader );
-    material.AddSampler(textureSampler);
+    material.AddTexture( image, "sTexture" );
     material.SetBlendMode( BlendingMode::OFF );
     renderers[index] = Renderer::New( QuadMesh(), material );
   }

diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp
index 6388956..e91722f 100644 (file)
--- a/examples/line-mesh/line-mesh-example.cpp
+++ b/examples/line-mesh/line-mesh-example.cpp
@@ -151,12 +151,11 @@ public:
     // Hide the indicator bar
     application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
 
-    mImage = ResourceImage::New( MATERIAL_SAMPLE );
-    mSampler = Sampler::New(mImage, "sTexture");
     mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
 
     mMaterial = Material::New( mShader );
-    mMaterial.AddSampler( mSampler );
+    mImage = ResourceImage::New( MATERIAL_SAMPLE );
+    mMaterial.AddTexture(mImage, "sTexture");
 
     mGeometry = CreateGeometry();
 
@@ -204,7 +203,8 @@ public:
   bool OnTimer()
   {
     Image image = ResourceImage::New( MATERIAL_SAMPLE2 );
-    mSampler.SetImage( image );
+
+    mMaterial.SetTextureImage(0,image);
     return false;
   }
 
@@ -225,7 +225,6 @@ private:
   Vector3 mStageSize;                                     ///< The size of the stage
 
   Image    mImage;
-  Sampler  mSampler;
   Shader   mShader;
   Material mMaterial;
   Geometry mGeometry;

diff --git a/examples/mesh-sorting/mesh-sorting-example.cpp b/examples/mesh-sorting/mesh-sorting-example.cpp
index 39b26e4..354364f 100644 (file)
--- a/examples/mesh-sorting/mesh-sorting-example.cpp
+++ b/examples/mesh-sorting/mesh-sorting-example.cpp
@@ -169,9 +169,8 @@ public:
     for( unsigned i=0; i<NUMBER_OF_SAMPLES; ++i)
     {
       Image image = ResourceImage::New( MATERIAL_SAMPLES[i] );
-      Sampler sampler = Sampler::New(image, "sTexture");
       Material material = Material::New( mShader );
-      material.AddSampler( sampler );
+      material.AddTexture(image, "sTexture");
       if( i==0 ) { firstMat = material; }
 
       Renderer renderer = Renderer::New( mGeometry, material );

diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp
index 966f526..768632a 100644 (file)
--- a/examples/new-window/new-window-example.cpp
+++ b/examples/new-window/new-window-example.cpp
@@ -276,11 +276,9 @@ void NewWindowController::AddMeshActor()
 
  // Create a textured mesh
   Image effectImage = ResourceImage::New(EFFECT_IMAGE);
-  Sampler sampler = Sampler::New(effectImage, "sTexture");
-
   Shader shaderTextureMesh = Shader::New( VERTEX_TEXTURE_MESH, FRAGMENT_TEXTURE_MESH );
   Material textureMeshMaterial = Material::New( shaderTextureMesh );
-  textureMeshMaterial.AddSampler( sampler );
+  textureMeshMaterial.AddTexture(effectImage, "sTexture");
   Renderer textureMeshRenderer = Renderer::New( meshGeometry, textureMeshMaterial );
 
   Actor textureMeshActor = Actor::New();

diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp
index ec98259..b4e25cd 100644 (file)
--- a/examples/point-mesh/point-mesh-example.cpp
+++ b/examples/point-mesh/point-mesh-example.cpp
@@ -154,14 +154,12 @@ public:
 
     mImage = ResourceImage::New( MATERIAL_SAMPLE );
     Image image = ResourceImage::New( MATERIAL_SAMPLE2 );
-    mSampler1 = Sampler::New(mImage, "sTexture1");
-    mSampler2 = Sampler::New(image, "sTexture2");
 
     mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
 
     mMaterial = Material::New( mShader );
-    mMaterial.AddSampler( mSampler1 );
-    mMaterial.AddSampler( mSampler2 );
+    mMaterial.AddTexture(mImage, "sTexture1");
+    mMaterial.AddTexture(image, "sTexture2");
 
     mGeometry = CreateGeometry();
 
@@ -222,8 +220,6 @@ private:
   Vector3 mStageSize;                                     ///< The size of the stage
 
   Image    mImage;
-  Sampler  mSampler1;
-  Sampler  mSampler2;
   Shader   mShader;
   Material mMaterial;
   Geometry mGeometry;

diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp
index 80bdc0f..2027b9b 100644 (file)
--- a/examples/refraction-effect/refraction-effect-example.cpp
+++ b/examples/refraction-effect/refraction-effect-example.cpp
@@ -281,9 +281,8 @@ private:
     mGeometry = CreateGeometry( MESH_FILES[mCurrentMeshId] );
 
     Image texture = LoadStageFillingImage( TEXTURE_IMAGES[mCurrentTextureId] );
-    mSampler = Sampler::New( texture, "sTexture" );
     mMaterial = Material::New( mShaderFlat );
-    mMaterial.AddSampler( mSampler );
+    mMaterial.AddTexture( texture, "sTexture" );
 
     mRenderer = Renderer::New( mGeometry, mMaterial );
 
@@ -344,7 +343,7 @@ private:
   {
     mCurrentTextureId = ( mCurrentTextureId + 1 ) % NUM_TEXTURE_IMAGES;
     Image texture = LoadStageFillingImage( TEXTURE_IMAGES[mCurrentTextureId] );
-    mSampler.SetImage( texture );
+    mMaterial.SetTextureImage( 0, texture );
     return true;
   }
 
@@ -564,8 +563,6 @@ private:
 
   Application&   mApplication;
   Layer          mContent;
-
-  Sampler        mSampler;
   Material       mMaterial;
   Geometry       mGeometry;
   Renderer       mRenderer;

diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp
index 1597aca..2271dda 100644 (file)
--- a/examples/textured-mesh/textured-mesh-example.cpp
+++ b/examples/textured-mesh/textured-mesh-example.cpp
@@ -144,18 +144,15 @@ public:
     // Hide the indicator bar
     application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
 
-    mImage = ResourceImage::New( MATERIAL_SAMPLE, ResourceImage::ON_DEMAND, Image::NEVER );
-    mSampler1 = Sampler::New(mImage, "sTexture");
-
+    mImage = ResourceImage::New( MATERIAL_SAMPLE );
     Image image = ResourceImage::New( MATERIAL_SAMPLE2 );
-    mSampler2 = Sampler::New(image, "sTexture");
 
     mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
     mMaterial1 = Material::New( mShader );
-    mMaterial1.AddSampler( mSampler1 );
+    mMaterial1.AddTexture(mImage, "sTexture");
 
     mMaterial2 = Material::New( mShader );
-    mMaterial2.AddSampler( mSampler2 );
+    mMaterial2.AddTexture(image, "sTexture");
 
     mGeometry = CreateGeometry();
 
@@ -264,8 +261,6 @@ private:
   Vector3 mStageSize;                                     ///< The size of the stage
 
   Image    mImage;
-  Sampler  mSampler1;
-  Sampler  mSampler2;
   Shader   mShader;
   Material mMaterial1;
   Material mMaterial2;