namespace
{
-const char* MATERIAL_SAMPLE( DALI_IMAGE_DIR "gallery-small-48.jpg" );
-const char* MATERIAL_SAMPLE2( DALI_IMAGE_DIR "gallery-medium-19.jpg" );
+const char* MATERIAL_SAMPLE( DEMO_IMAGE_DIR "gallery-small-48.jpg" );
+const char* MATERIAL_SAMPLE2( DEMO_IMAGE_DIR "gallery-medium-19.jpg" );
#define MAKE_SHADER(A)#A
// 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();
mMeshActor.SetSize(400, 400);
Property::Index fadeColorIndex = mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
- mRenderer.SetDepthIndex(0);
+ mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
mMeshActor.SetParentOrigin( ParentOrigin::TOP_CENTER );
mMeshActor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
mMeshActor2.AddRenderer( mRenderer2 );
mMeshActor2.SetSize(400, 400);
- mMeshActor2.RegisterProperty( "a-n-other-property", Color::GREEN );
+ mMeshActor2.RegisterProperty( "anotherProperty", Color::GREEN );
- mRenderer2.RegisterProperty( "a-n-other-property", Vector3::ZERO );
- mRenderer2.RegisterProperty( "a-coefficient", 0.008f );
+ mRenderer2.RegisterProperty( "anotherProperty", Vector3::ZERO );
+ mRenderer2.RegisterProperty( "aCoefficient", 0.008f );
Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE );
- mRenderer2.SetDepthIndex(0);
+ mRenderer2.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
mMeshActor2.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
mMeshActor2.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
animation.SetLooping(true);
animation.Play();
- stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));;
+ stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));
}
BufferImage CreateBufferImage()
Vector3 mStageSize; ///< The size of the stage
Image mImage;
- Sampler mSampler1;
- Sampler mSampler2;
Shader mShader;
Material mMaterial1;
Material mMaterial2;