/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
// testing resource deletion when taken off stage
tet_infoline( "UtcDaliImageFactoryCachedRequest02 - Discard previously requested resource" );
- Image image = ResourceImage::New( gTestImageFilename, ResourceImage::IMMEDIATE, Image::UNUSED );
+ Image image = ResourceImage::New( gTestImageFilename );
Actor actor = CreateRenderableActor( image );
application.SendNotification();
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <test-native-image.h>
// Internal headers are allowed here
-#include <dali/public-api/shader-effects/shader-effect.h>
#include <dali/internal/event/common/thread-local-storage.h>
#include <dali/internal/update/resources/texture-metadata.h>
#include <dali/internal/update/resources/resource-manager.h>
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
END_TEST;
}
-int UtcDaliBufferImageNewWithPolicy01(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliBufferImageNewWithPolicy01 - BufferImage::New(unsigned int, unsigned int, Pixel::Format, LoadPolicy, ReleasePolicy)");
-
- // Force texture id's
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
-
- // invoke default handle constructor
- BufferImage image;
-
- // initialise handle
- image = BufferImage::New(16, 16, Pixel::A8, Image::UNUSED);
- application.SendNotification();
- application.Render(16);
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK( image.GetWidth() == 16);
- Actor actor = CreateRenderableActor( image );
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
- // testing ReleasePolicy::Unused
- // fake loading image
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // discard texture when actor comes off stage
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( application.GetGlAbstraction().CheckTextureDeleted(23) );
- END_TEST;
-}
-
-int UtcDaliBufferImageNewWithPolicy02(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliBufferImageNewWithPolicy02 - BufferImage::New(PixelBuffer*, unsigned int, unsigned int, Pixel::Format, unsigned int, ReleasePolicy)");
-
- // Force texture id's
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
-
- PixelBuffer* buffer = new PixelBuffer[16 * 16];
- BufferImage image = BufferImage::New(buffer, 16, 16, Pixel::A8, 16, Image::UNUSED);
- application.SendNotification();
- application.Render(16);
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK( image.GetWidth() == 16);
- Actor actor = CreateRenderableActor( image );
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
- // testing ReleasePolicy::Unused
- // fake loading image
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // discard texture when actor comes off stage
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( application.GetGlAbstraction().CheckTextureDeleted(23) );
- END_TEST;
-}
-
int UtcDaliBufferImageDownCast(void)
{
TestApplication application;
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
EncodedBufferImage image1;
DALI_TEST_CHECK( !image1 );
- image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::NEVER );
+ image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
EncodedBufferImage image2( image1 );
DALI_TEST_EQUALS( image1, image2, TEST_LOCATION );
EncodedBufferImage image1;
DALI_TEST_CHECK( !image1 );
- image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::NEVER );
+ image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
EncodedBufferImage image2;
image2 = image1;
{
TestApplication application;
- Image image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::NEVER );
+ Image image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
EncodedBufferImage image2 = DownCast< EncodedBufferImage >(image1);
DALI_TEST_EQUALS( image1, image2, TEST_LOCATION );
DALI_TEST_CHECK( !image );
// Trigger image decode to initialise the handle
- image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::NEVER );
+ image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
DALI_TEST_CHECK( image );
- // Change the release policy to Unused:
- Image image2;
-
- DALI_TEST_CHECK( !image2 );
-
- // Trigger image decode to initialise the handle
- image2 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::UNUSED );
-
- DALI_TEST_CHECK( image2 );
END_TEST;
}
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
DALI_TEST_CHECK( !image );
- // initialise handle with UNUSED release policy
- image = FrameBufferImage::New(*(nativeImage.Get()), Image::UNUSED);
-
- DALI_TEST_CHECK( image );
-
- // ReleasePolicy is deprecated. Only set, but not used internally.
- DALI_TEST_EQUALS( image.GetReleasePolicy(), Image::UNUSED, TEST_LOCATION );
-
- // initialise handle with NEVER release policy
- image.Reset();
- DALI_TEST_CHECK( !image );
-
- image = FrameBufferImage::New(*(nativeImage.Get()), Image::NEVER);
+ // initialise handle
+ image = FrameBufferImage::New(*(nativeImage.Get()));
DALI_TEST_CHECK( image );
- // ReleasePolicy is deprecated. Only set, but not used internally.
- DALI_TEST_EQUALS( image.GetReleasePolicy(), Image::NEVER, TEST_LOCATION );
-
END_TEST;
}
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
RenderTask renderTask[2];
renderTask[0] = taskList.GetTask( 0u );
- FrameBufferImage frameBufferImage = FrameBufferImage::New(stageSize.width, stageSize.height, Pixel::A8, Image::NEVER);
+ FrameBufferImage frameBufferImage = FrameBufferImage::New(stageSize.width, stageSize.height, Pixel::A8);
renderTask[1] = taskList.CreateTask();
renderTask[1].SetSourceActor( actor[1] );
renderTask[1].SetExclusive( true );
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
END_TEST;
}
-int UtcDaliImageGetReleasePolicy(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageGetReleasePolicy");
-
- Image image = ResourceImage::New(gTestImageFilename, ResourceImage::IMMEDIATE, Image::UNUSED);
-
- DALI_TEST_CHECK( image );
-
- DALI_TEST_CHECK( Image::UNUSED == image.GetReleasePolicy() );
-
- END_TEST;
-}
-
int UtcDaliImageGetWidthHeight(void)
{
TestApplication application;
platform.SetClosestImageSize(closestImageSize);
- tet_infoline("UtcDaliImageContextLoss - Load image with LoadPolicy::Immediate, ReleasePolicy::Never, bitmap discard. Check that the image is re-requested on context regain\n");
+ tet_infoline("UtcDaliImageContextLoss - Load image with LoadPolicy::Immediate, bitmap discard. Check that the image is re-requested on context regain\n");
- Image image = ResourceImage::New("image.png", ResourceImage::IMMEDIATE, Image::NEVER);
+ Image image = ResourceImage::New("image.png");
DALI_TEST_CHECK( image );
}
else
{
- bufferImage = BufferImage::New( 1u, 1u, Pixel::RGB888, Dali::Image::NEVER );
+ bufferImage = BufferImage::New( 1u, 1u, Pixel::RGB888 );
PixelBuffer* pBuffer = bufferImage.GetBuffer();
if( pBuffer )
{
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <stdlib.h>
#include <dali/public-api/dali-core.h>
+#include <dali/devel-api/images/nine-patch-image.h>
#include <dali-test-suite-utils.h>
using namespace Dali;
return true;
}
-Actor CreateLoadingActor(TestApplication& application, std::string filename, ResourceImage::LoadPolicy loadPolicy, Image::ReleasePolicy releasePolicy)
+Actor CreateLoadingActor(TestApplication& application, std::string filename)
{
- Image image = ResourceImage::New(filename, loadPolicy, releasePolicy);
+ Image image = ResourceImage::New(filename);
DALI_TEST_CHECK( image );
application.SendNotification();
application.Render(16);
return actor;
}
-Image CreateLoadingImage(TestApplication& application, std::string filename, ResourceImage::LoadPolicy loadPolicy, Image::ReleasePolicy releasePolicy)
+Image CreateLoadingImage(TestApplication& application, std::string filename)
{
- Image image = ResourceImage::New(filename, loadPolicy, releasePolicy);
+ Image image = ResourceImage::New(filename);
DALI_TEST_CHECK( image );
application.SendNotification();
application.Render(16);
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
Stage::GetCurrent().Add( rootActor );
CameraActor offscreenCameraActor = CameraActor::New();
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
Shader shader = CreateShader();
- Image image = CreateLoadingImage(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Image image = CreateLoadingImage(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
Stage::GetCurrent().Add( offscreenCameraActor );
Shader shader = CreateShader();
- Image image = CreateLoadingImage(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Image image = CreateLoadingImage(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
Stage::GetCurrent().Add( offscreenCameraActor );
Shader shader = CreateShader();
- Image image = CreateLoadingImage(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Image image = CreateLoadingImage(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Stage::GetCurrent().Add(secondRootActor);
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
Stage::GetCurrent().Add( offscreenCameraActor );
Shader shader = CreateShader();
- Image image = CreateLoadingImage(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Image image = CreateLoadingImage(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
Stage::GetCurrent().Add( offscreenCameraActor );
Shader shader = CreateShader();
- Image image = CreateLoadingImage(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Image image = CreateLoadingImage(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor secondRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Stage::GetCurrent().Add(secondRootActor);
CameraActor offscreenCameraActor = CameraActor::New();
Stage::GetCurrent().Add( offscreenCameraActor );
- Actor firstRootActor = CreateLoadingActor(application, "aFile.jpg", ResourceImage::IMMEDIATE, Image::UNUSED);
+ Actor firstRootActor = CreateLoadingActor(application, "aFile.jpg");
Integration::ResourceRequest* imageRequest = application.GetPlatform().GetRequest();
Integration::ResourceId imageRequestId = imageRequest->GetId();
Integration::ResourceTypeId imageType = imageRequest->GetType()->id;
RenderTaskList taskList = stage.GetRenderTaskList();
RenderTask renderTask = taskList.CreateTask();
- FrameBufferImage frameBufferImage = FrameBufferImage::New(stageSize.width*scale.x, stageSize.height*scale.y, Pixel::A8, Image::NEVER);
+ FrameBufferImage frameBufferImage = FrameBufferImage::New(stageSize.width*scale.x, stageSize.height*scale.y, Pixel::A8);
renderTask.SetSourceActor( offscreenActor );
renderTask.SetExclusive( true );
renderTask.SetInputEnabled( true );
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
END_TEST;
}
-// 1.3
-int UtcDaliResourceImageNewWithPolicies01(void)
-{
- TestApplication application;
- TestPlatformAbstraction& platform = application.GetPlatform();
-
- // testing delayed loading
- tet_infoline("UtcDaliResourceImageNewWithPolicies01 - Load image with LoadPolicy::OnDemand, ReleasePolicy::Never");
- DALI_TEST_CHECK( !platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
- ResourceImage image = ResourceImage::New(gTestImageFilename, ResourceImage::ON_DEMAND, Image::NEVER);
-
- DALI_TEST_CHECK( image );
-
- application.SendNotification();
- application.Render(16);
-
- // request file loading only when actor added to stage
- DALI_TEST_CHECK( !platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- Actor actor = CreateRenderableActor(image);
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
-
- DALI_TEST_CHECK( platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- // testing ReleasePolicy::Never
- // fake loading image
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
- LoadBitmapResource( platform );
-
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // never discard texture
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
- END_TEST;
-}
-
-// 1.4
-int UtcDaliResourceImageNewWithPolicies02(void)
-{
- TestApplication application;
- TestPlatformAbstraction& platform = application.GetPlatform();
- const Vector2 closestImageSize( 80, 45);
- platform.SetClosestImageSize(closestImageSize);
-
- // testing resource deletion when taken off stage
- tet_infoline("UtcDaliResourceImageNewWithPolicies02 - Load image with LoadPolicy::OnDemand, ReleasePolicy::Unused");
-
- ResourceImage image = ResourceImage::New(gTestImageFilename, ResourceImage::ON_DEMAND, Image::UNUSED);
-
- DALI_TEST_CHECK( image );
-
- application.SendNotification();
- application.Render(16);
-
- // request file loading only when actor added to stage
- DALI_TEST_CHECK( !platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- Actor actor = CreateRenderableActor(image);
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
-
- DALI_TEST_CHECK( platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- // testing ReleasePolicy::Unused
- // fake loading image
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
- LoadBitmapResource( platform );
-
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // discard texture when actor comes off stage
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( application.GetGlAbstraction().CheckTextureDeleted(23) );
- END_TEST;
-}
-
-// 1.5
-int UtcDaliResourceImageNewWithPolicies03(void)
-{
- TestApplication application;
- TestPlatformAbstraction& platform = application.GetPlatform();
- const Vector2 closestImageSize( 80, 45);
- platform.SetClosestImageSize(closestImageSize);
-
- // load immediately -> resource deletion when taken off stage -> put actor back on stage -> load resource again
- tet_infoline("UtcDaliResourceImageNewWithPolicies03 - Load image with LoadPolicy::Immediate, ReleasePolicy::Unused");
-
- ResourceImage image = ResourceImage::New(gTestImageFilename, ResourceImage::IMMEDIATE, Image::UNUSED);
-
- DALI_TEST_CHECK( image );
-
- application.SendNotification();
- application.Render(16);
-
- // request file loading immediately
- DALI_TEST_CHECK( platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- Actor actor = CreateRenderableActor(image);
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
-
- // testing ReleasePolicy::Unused
- // fake loading image
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
- LoadBitmapResource( platform );
-
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // discard texture when actor comes off stage
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // check load request when actor added back to stage
- application.GetPlatform().ResetTrace();
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- application.Render(16);
-
- DALI_TEST_CHECK( platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
- END_TEST;
-}
-
-// 1.6
-int UtcDaliResourceImageNewWithPolicies04(void)
-{
- TestApplication application;
- TestPlatformAbstraction& platform = application.GetPlatform();
-
- // load immediately, don't release texture when off stage
- tet_infoline("UtcDaliResourceImageNewWithPolicies03 - Load image with LoadPolicy::Immediate, ReleasePolicy::Never");
-
- ResourceImage image = ResourceImage::New(gTestImageFilename, ResourceImage::IMMEDIATE, Image::NEVER);
-
- DALI_TEST_CHECK( image );
-
- application.SendNotification();
- application.Render(16);
-
- // request file loading immediately
- DALI_TEST_CHECK( platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- Actor actor = CreateRenderableActor(image);
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
-
- // testing ReleasePolicy::Never
- // fake loading image
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
- LoadBitmapResource(platform);
-
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // texture is not discarded
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // no load request when actor added back to stage
- application.GetPlatform().ResetTrace();
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- application.Render(16);
-
- DALI_TEST_CHECK( !platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
- END_TEST;
-}
-
// 1.7
int UtcDaliResourceImageDownCast(void)
{
END_TEST;
}
-// 1.12
-int UtcDaliResourceImageGetLoadPolicy(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageGetLoadPolicy");
-
- ResourceImage image = ResourceImage::New(gTestImageFilename, ResourceImage::ON_DEMAND, Image::NEVER);
-
- DALI_TEST_CHECK( image );
-
- DALI_TEST_CHECK( ResourceImage::ON_DEMAND == image.GetLoadPolicy());
- END_TEST;
-}
-
static bool SignalLoadFlag = false;
static void SignalLoadHandler(ResourceImage image)
// Change values
{
- ResourceImage image = ResourceImage::New( "MY_PATH", ResourceImage::ON_DEMAND, Image::UNUSED, ImageDimensions( 300, 400 ), FittingMode::FIT_WIDTH );
+ ResourceImage image = ResourceImage::New( "MY_PATH", ImageDimensions( 300, 400 ), FittingMode::FIT_WIDTH );
Property::Map map;
CreatePropertyMap( image, map );
-# Copyright (c) 2015 Samsung Electronics Co., Ltd.
+# Copyright (c) 2016 Samsung Electronics Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
develapiscriptingdir = $(develapidir)/scripting
develapisignalsdir = $(develapidir)/signals
develapithreadingdir = $(develapidir)/threading
+develapishadereffectsdir = $(develapidir)/shader-effects
develapi_HEADERS = $(devel_api_header_files)
develapiactors_HEADERS = $(devel_api_core_actors_header_files)
develapiscripting_HEADERS = $(devel_api_core_scripting_header_files)
develapisignals_HEADERS = $(devel_api_core_signals_header_files)
develapithreading_HEADERS = $(devel_api_core_threading_header_files)
-
+develapishadereffects_HEADERS = $(devel_api_core_shader_effects_header_files)
#public api
publicapidir = $(devincludepath)/dali/public-api
publicapirendertasksdir = $(publicapidir)/render-tasks
publicapisignalsdir = $(publicapidir)/signals
publicapisizenegotiationdir = $(publicapidir)/size-negotiation
-publicapishadereffectsdir = $(publicapidir)/shader-effects
publicapi_HEADERS = $(public_api_header_files)
publicapiactors_HEADERS = $(public_api_core_actors_header_files)
publicapirendertasks_HEADERS = $(public_api_core_render_tasks_header_files)
publicapisignals_HEADERS = $(public_api_core_signals_header_files)
publicapisizenegotiation_HEADERS = $(public_api_core_size_negotiation_header_files)
-publicapishadereffects_HEADERS = $(public_api_core_shader_effects_header_files)
CLEANFILES = dali-shaders.cpp \
dali-shaders.h
-# Add devel source files here for DALi internal developer files used by Adaptor & Toolkit
-
+# Add devel source files here for DALi internal developer files used by Adaptor & Toolkit
devel_api_src_files = \
$(devel_api_src_dir)/animation/animation-data.cpp \
$(devel_api_src_dir)/animation/path-constrainer.cpp \
$(devel_api_src_dir)/images/atlas.cpp \
$(devel_api_src_dir)/images/distance-field.cpp \
$(devel_api_src_dir)/images/texture-set-image.cpp \
+ $(devel_api_src_dir)/images/nine-patch-image.cpp \
$(devel_api_src_dir)/object/weak-handle.cpp \
$(devel_api_src_dir)/scripting/scripting.cpp \
$(devel_api_src_dir)/signals/signal-delegate.cpp \
$(devel_api_src_dir)/threading/conditional-wait.cpp \
$(devel_api_src_dir)/threading/mutex.cpp \
- $(devel_api_src_dir)/threading/thread.cpp
+ $(devel_api_src_dir)/threading/thread.cpp \
+ $(devel_api_src_dir)/shader-effects/shader-effect.cpp
# Add devel header files here DALi internal developer files used by Adaptor & Toolkit
$(devel_api_src_dir)/images/atlas.h \
$(devel_api_src_dir)/images/distance-field.h \
$(devel_api_src_dir)/images/native-image-interface-extension.h \
- $(devel_api_src_dir)/images/texture-set-image.h
+ $(devel_api_src_dir)/images/texture-set-image.h \
+ $(devel_api_src_dir)/images/nine-patch-image.h
devel_api_core_object_header_files = \
$(devel_api_src_dir)/object/weak-handle.h
$(devel_api_src_dir)/threading/mutex.h \
$(devel_api_src_dir)/threading/thread.h
+devel_api_core_shader_effects_header_files = \
+ $(devel_api_src_dir)/shader-effects/shader-effect.h
*/
// CLASS HEADER
-#include <dali/public-api/images/nine-patch-image.h>
+#include <dali/devel-api/images/nine-patch-image.h>
// INTERNAL INCLUDES
#include <dali/internal/common/image-attributes.h>
NinePatchImage NinePatchImage::New( const std::string& filename )
{
- Internal::NinePatchImagePtr internal = Internal::NinePatchImage::New( filename, Image::NEVER );
+ Internal::NinePatchImagePtr internal = Internal::NinePatchImage::New( filename );
return NinePatchImage(internal.Get());
}
namespace
{
-// Tables used here for converting strings to the enumerations and vice versa
-const StringEnum IMAGE_LOAD_POLICY_TABLE[] =
-{
- { "IMMEDIATE", ResourceImage::IMMEDIATE },
- { "ON_DEMAND", ResourceImage::ON_DEMAND },
-};
-const unsigned int IMAGE_LOAD_POLICY_TABLE_COUNT = sizeof( IMAGE_LOAD_POLICY_TABLE ) / sizeof( IMAGE_LOAD_POLICY_TABLE[0] );
-
-const StringEnum IMAGE_RELEASE_POLICY_TABLE[] =
-{
- { "UNUSED", Image::UNUSED },
- { "NEVER", Image::NEVER },
-};
-const unsigned int IMAGE_RELEASE_POLICY_TABLE_COUNT = sizeof( IMAGE_RELEASE_POLICY_TABLE ) / sizeof( IMAGE_RELEASE_POLICY_TABLE[0] );
-
const StringEnum PIXEL_FORMAT_TABLE[] =
{
{ "A8", Pixel::A8 },
}
map[ "type" ] = imageType;
- map[ "releasePolicy" ] = GetEnumerationName< Image::ReleasePolicy >( image.GetReleasePolicy(), IMAGE_RELEASE_POLICY_TABLE, IMAGE_RELEASE_POLICY_TABLE_COUNT );
ResourceImage resourceImage = ResourceImage::DownCast( image );
if( resourceImage )
{
map[ "filename" ] = resourceImage.GetUrl();
- map[ "loadPolicy" ] = GetEnumerationName< ResourceImage::LoadPolicy >( resourceImage.GetLoadPolicy(), IMAGE_LOAD_POLICY_TABLE, IMAGE_LOAD_POLICY_TABLE_COUNT );
}
int width( image.GetWidth() );
#include <dali/public-api/actors/draw-mode.h>
#include <dali/devel-api/animation/animation-data.h>
#include <dali/public-api/images/image.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
#include <dali/public-api/object/property-array.h>
#include <dali/public-api/object/property-map.h>
#include <dali/public-api/object/property-value.h>
*/
// CLASS HEADER
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
// INTERNAL INCLUDES
#include <dali/internal/event/effects/shader-effect-impl.h>
#include <dali/internal/event/actors/actor-impl.h>
#include <dali/internal/event/actors/camera-actor-impl.h>
-#include <dali/internal/event/actors/image-actor-impl.h>
#include <dali/internal/event/actors/layer-impl.h>
#include <dali/internal/event/animation/animation-impl.h>
sizeof( Internal::CameraActor ) +
sizeof( Internal::SceneGraph::Node ) +
sizeof( Internal::SceneGraph::Camera ) );
-const int IMAGE_ACTOR_MEMORY_SIZE(
- sizeof( Internal::ImageActor ) +
- sizeof( Internal::SceneGraph::Node ) +
- sizeof( Internal::Render::Renderer ));
const int LAYER_MEMORY_SIZE(
sizeof( Internal::Layer ) +
sizeof( Internal::SceneGraph::Layer ) );
+++ /dev/null
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/event/actors/image-actor-impl.h>
-
-// EXTERNAL INCLUDES
-#include <cstring> // for strcmp
-
-// INTERNAL INCLUDES
-#include <dali/public-api/animation/constraints.h> // for EqualToConstraint
-#include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/rendering/renderer.h>
-#include <dali/devel-api/scripting/scripting.h>
-#include <dali/internal/event/animation/constraint-impl.h>
-#include <dali/internal/event/common/property-helper.h>
-#include <dali/internal/event/effects/shader-effect-impl.h>
-#include <dali/internal/event/images/image-connector.h>
-#include <dali/internal/event/images/nine-patch-image-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace
-{
-
-// Properties
-
-// Name Type writable animatable constraint-input enum for index-checking
-DALI_PROPERTY_TABLE_BEGIN
-DALI_PROPERTY( "pixelArea", RECTANGLE, true, false, true, Dali::ImageActor::Property::PIXEL_AREA )
-DALI_PROPERTY( "style", STRING, true, false, true, Dali::ImageActor::Property::STYLE )
-DALI_PROPERTY( "border", VECTOR4, true, false, true, Dali::ImageActor::Property::BORDER )
-DALI_PROPERTY( "image", MAP, true, false, false, Dali::ImageActor::Property::IMAGE )
-DALI_PROPERTY_TABLE_END( DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX )
-
-BaseHandle Create()
-{
- return Dali::ImageActor::New();
-}
-
-TypeRegistration mType( typeid( Dali::ImageActor ), typeid( Dali::Actor ), Create );
-
-struct GridVertex
-{
- GridVertex( float positionX, float positionY, const Vector2& size )
- : mPosition( positionX*size.x, positionY*size.y, 0.f ),
- mTextureCoord( positionX+0.5f, positionY+0.5f )
- {
- }
-
- Vector3 mPosition;
- Vector2 mTextureCoord;
-};
-
-GeometryPtr CreateGeometry( unsigned int gridWidth, unsigned int gridHeight, const Vector2& size )
-{
- // Create vertices
- std::vector< GridVertex > vertices;
- vertices.reserve( ( gridWidth + 1 ) * ( gridHeight + 1 ) );
-
- for( unsigned int y = 0u; y < gridHeight + 1; ++y )
- {
- float yPos = (float)y / gridHeight;
- for( unsigned int x = 0u; x < gridWidth + 1; ++x )
- {
- float xPos = (float)x / gridWidth;
- vertices.push_back( GridVertex( xPos - 0.5f, yPos - 0.5f, size ) );
- }
- }
-
- // Create indices
- Vector< unsigned short > indices;
- indices.Reserve( ( gridWidth + 2 ) * gridHeight * 2 - 2);
-
- for( unsigned int row = 0u; row < gridHeight; ++row )
- {
- unsigned int rowStartIndex = row*(gridWidth+1u);
- unsigned int nextRowStartIndex = rowStartIndex + gridWidth +1u;
-
- if( row != 0u ) // degenerate index on non-first row
- {
- indices.PushBack( rowStartIndex );
- }
-
- for( unsigned int column = 0u; column < gridWidth+1u; column++) // main strip
- {
- indices.PushBack( rowStartIndex + column);
- indices.PushBack( nextRowStartIndex + column);
- }
-
- if( row != gridHeight-1u ) // degenerate index on non-last row
- {
- indices.PushBack( nextRowStartIndex + gridWidth );
- }
- }
-
- Property::Map vertexFormat;
- vertexFormat[ "aPosition" ] = Property::VECTOR3;
- vertexFormat[ "aTexCoord" ] = Property::VECTOR2;
- PropertyBufferPtr vertexPropertyBuffer = PropertyBuffer::New( vertexFormat );
- if( vertices.size() > 0 )
- {
- vertexPropertyBuffer->SetData( &vertices[ 0 ], vertices.size() );
- }
-
- // Create the geometry object
- GeometryPtr geometry = Geometry::New();
- geometry->AddVertexBuffer( *vertexPropertyBuffer );
- if( indices.Size() > 0 )
- {
- geometry->SetIndexBuffer( &indices[0], indices.Size() );
- }
- geometry->SetType( Dali::Geometry::TRIANGLE_STRIP );
-
- return geometry;
-}
-
-const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
- attribute mediump vec3 aPosition;\n
- attribute mediump vec2 aTexCoord;\n
- varying mediump vec2 vTexCoord;\n
- uniform mediump mat4 uMvpMatrix;\n
- uniform mediump vec3 uSize;\n
- uniform mediump vec4 sTextureRect;\n
- \n
- void main()\n
- {\n
- gl_Position = uMvpMatrix * vec4(aPosition, 1.0);\n
- vTexCoord = aTexCoord;\n
- }\n
-);
-
-const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
- varying mediump vec2 vTexCoord;\n
- uniform sampler2D sTexture;\n
- uniform lowp vec4 uColor;\n
- \n
- void main()\n
- {\n
- gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n
- }\n
-);
-
-const char * const TEXTURE_RECT_UNIFORM_NAME( "sTextureRect" );
-
-const int INVALID_RENDERER_ID = -1;
-const uint16_t MAXIMUM_GRID_SIZE = 2048;
-}
-
-ImageActorPtr ImageActor::New()
-{
- ImageActorPtr actor( new ImageActor );
-
- // Second-phase construction of base class
- actor->Initialize();
-
- //Create the renderer
- actor->mRenderer = Renderer::New();
-
- GeometryPtr quad = CreateGeometry( 1u, 1u, Vector2::ONE );
- actor->mRenderer->SetGeometry( *quad );
-
- ShaderPtr shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER, Dali::Shader::Hint::NONE );
- actor->mRenderer->SetShader( *shader );
- TextureSetPtr textureSet = TextureSet::New();
- actor->mRenderer->SetTextures( *textureSet );
-
- return actor;
-}
-
-void ImageActor::OnInitialize()
-{
- // TODO: Remove this, at the moment its needed for size negotiation to work
- SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-}
-
-void ImageActor::SetImage( ImagePtr& image )
-{
- if( !image )
- {
- if( mRendererIndex != INVALID_RENDERER_ID )
- {
- RemoveRenderer( mRendererIndex );
- mRendererIndex = INVALID_RENDERER_ID;
- }
- }
- else
- {
- SamplerPtr sampler = Sampler::New();
- sampler->SetFilterMode( mMinFilter, mMagFilter );
-
- TextureSet* textureSet( mRenderer->GetTextures() );
- textureSet->SetImage( 0u, image.Get() );
- textureSet->SetSampler( 0u, sampler );
-
- if( mRendererIndex == INVALID_RENDERER_ID )
- {
- mRendererIndex = AddRenderer( *mRenderer );
- }
-
- if( !mIsPixelAreaSet )
- {
- mPixelArea = PixelArea( 0, 0, image->GetWidth(), image->GetHeight() );
- }
-
- RelayoutRequest();
- UpdateTexureRect();
- }
-}
-
-ImagePtr ImageActor::GetImage() const
-{
- return mRenderer->GetTextures()->GetImage( 0u );
-}
-
-void ImageActor::SetPixelArea( const PixelArea& pixelArea )
-{
- mPixelArea = pixelArea;
- mIsPixelAreaSet = true;
-
- RelayoutRequest();
- UpdateTexureRect();
-}
-
-const ImageActor::PixelArea& ImageActor::GetPixelArea() const
-{
- return mPixelArea;
-}
-
-bool ImageActor::IsPixelAreaSet() const
-{
- return mIsPixelAreaSet;
-}
-
-void ImageActor::ClearPixelArea()
-{
- mIsPixelAreaSet = false;
-
- int imageWidth = 0;
- int imageHeight = 0;
- ImagePtr image = GetImage();
- if( image )
- {
- imageWidth = image->GetWidth();
- imageHeight = image->GetHeight();
- }
-
- mPixelArea = PixelArea( 0, 0, imageWidth, imageHeight );
-
- RelayoutRequest();
- UpdateTexureRect();
-}
-
-void ImageActor::SetStyle( Dali::ImageActor::Style style )
-{
- DALI_LOG_WARNING( "SetStyle Deprecated. Only STYLE_QUAD supported.\n" );
- mStyle = style;
-}
-
-Dali::ImageActor::Style ImageActor::GetStyle() const
-{
- DALI_LOG_WARNING( "GetStyle Deprecated. Only STYLE_QUAD supported.\n" );
- return mStyle;
-}
-
-void ImageActor::SetNinePatchBorder( const Vector4& border )
-{
- DALI_LOG_WARNING( "SetNinePatchBorder Deprecated. Only STYLE_QUAD supported.\n" );
- mNinePatchBorder = border;
-}
-
-Vector4 ImageActor::GetNinePatchBorder() const
-{
- DALI_LOG_WARNING( "GetNinePatchBorder Deprecated. Only STYLE_QUAD supported.\n" );
- return mNinePatchBorder;
-}
-
-ImageActor::ImageActor()
-: Actor( Actor::BASIC ),
- mActorSize( Vector2::ZERO ),
- mGridSize( 1u, 1u ),
- mRendererIndex( INVALID_RENDERER_ID ),
- mMinFilter( FilterMode::DEFAULT ),
- mMagFilter( FilterMode::DEFAULT ),
- mStyle( Dali::ImageActor::STYLE_QUAD ),
- mIsPixelAreaSet( false )
-{
-}
-
-ImageActor::~ImageActor()
-{
-}
-
-Vector3 ImageActor::GetNaturalSize() const
-{
- Vector2 naturalSize( CalculateNaturalSize() );
- return Vector3( naturalSize.width, naturalSize.height, 0.f );
-}
-
-Vector2 ImageActor::CalculateNaturalSize() const
-{
- // if no image then natural size is 0
- Vector2 size( 0.0f, 0.0f );
-
- ImagePtr image = GetImage();
- if( image )
- {
- if( IsPixelAreaSet() )
- {
- PixelArea area(GetPixelArea());
- size.width = area.width;
- size.height = area.height;
- }
- else
- {
- size = image->GetNaturalSize();
- }
- }
-
- return size;
-}
-
-void ImageActor::UpdateGeometry()
-{
- uint16_t gridWidth = 1u;
- uint16_t gridHeight = 1u;
-
- if( mShaderEffect )
- {
- Vector2 gridSize = mShaderEffect->GetGridSize( Vector2(mPixelArea.width, mPixelArea.height) );
-
- //limit the grid size
- gridWidth = std::min( MAXIMUM_GRID_SIZE, static_cast<uint16_t>(gridSize.width) );
- gridHeight = std::min( MAXIMUM_GRID_SIZE, static_cast<uint16_t>(gridSize.height) );
- }
-
- mGridSize.SetWidth( gridWidth );
- mGridSize.SetHeight( gridHeight );
-
- GeometryPtr geometry = CreateGeometry( gridWidth, gridHeight, mActorSize );
- mRenderer->SetGeometry( *geometry );
-}
-void ImageActor::UpdateTexureRect()
-{
- Vector4 textureRect( 0.f, 0.f, 1.f, 1.f );
-
- ImagePtr image = GetImage();
- if( mIsPixelAreaSet && image )
- {
- const float uScale = 1.0f / float(image->GetWidth());
- const float vScale = 1.0f / float(image->GetHeight());
- // bottom left
- textureRect.x = uScale * float(mPixelArea.x);
- textureRect.y = vScale * float(mPixelArea.y);
- // top right
- textureRect.z = uScale * float(mPixelArea.x + mPixelArea.width);
- textureRect.w = vScale * float(mPixelArea.y + mPixelArea.height);
- }
-
- mRenderer->RegisterProperty( TEXTURE_RECT_UNIFORM_NAME, textureRect );
-}
-
-unsigned int ImageActor::GetDefaultPropertyCount() const
-{
- return Actor::GetDefaultPropertyCount() + DEFAULT_PROPERTY_COUNT;
-}
-
-void ImageActor::GetDefaultPropertyIndices( Property::IndexContainer& indices ) const
-{
- Actor::GetDefaultPropertyIndices( indices ); // Actor class properties
-
- indices.Reserve( indices.Size() + DEFAULT_PROPERTY_COUNT );
-
- int index = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
- for ( int i = 0; i < DEFAULT_PROPERTY_COUNT; ++i, ++index )
- {
- indices.PushBack( index );
- }
-}
-
-bool ImageActor::IsDefaultPropertyWritable( Property::Index index ) const
-{
- if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
- {
- return Actor::IsDefaultPropertyWritable(index);
- }
-
- index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
- if ( ( index >= 0 ) && ( index < DEFAULT_PROPERTY_COUNT ) )
- {
- return DEFAULT_PROPERTY_DETAILS[ index ].writable;
- }
-
- return false;
-}
-
-bool ImageActor::IsDefaultPropertyAnimatable( Property::Index index ) const
-{
- if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
- {
- return Actor::IsDefaultPropertyAnimatable( index );
- }
-
- index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
- if ( ( index >= 0 ) && ( index < DEFAULT_PROPERTY_COUNT ) )
- {
- return DEFAULT_PROPERTY_DETAILS[ index ].animatable;
- }
-
- return false;
-}
-
-bool ImageActor::IsDefaultPropertyAConstraintInput( Property::Index index ) const
-{
- if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
- {
- return Actor::IsDefaultPropertyAConstraintInput( index );
- }
-
- index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
- if ( ( index >= 0 ) && ( index < DEFAULT_PROPERTY_COUNT ) )
- {
- return DEFAULT_PROPERTY_DETAILS[ index ].constraintInput;
- }
-
- return false;
-}
-
-Property::Type ImageActor::GetDefaultPropertyType( Property::Index index ) const
-{
- if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
- {
- return Actor::GetDefaultPropertyType( index );
- }
-
- index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
- if ( ( index >= 0 ) && ( index < DEFAULT_PROPERTY_COUNT ) )
- {
- return DEFAULT_PROPERTY_DETAILS[index].type;
- }
-
- // index out-of-bounds
- return Property::NONE;
-}
-
-const char* ImageActor::GetDefaultPropertyName( Property::Index index ) const
-{
- if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT)
- {
- return Actor::GetDefaultPropertyName(index);
- }
-
- index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
- if ( ( index >= 0 ) && ( index < DEFAULT_PROPERTY_COUNT ) )
- {
- return DEFAULT_PROPERTY_DETAILS[index].name;
- }
-
- // index out-of-bounds
- return NULL;
-}
-
-Property::Index ImageActor::GetDefaultPropertyIndex(const std::string& name) const
-{
- Property::Index index = Property::INVALID_INDEX;
-
- // Look for name in default properties
- for( int i = 0; i < DEFAULT_PROPERTY_COUNT; ++i )
- {
- const Internal::PropertyDetails* property = &DEFAULT_PROPERTY_DETAILS[ i ];
- if( 0 == strcmp( name.c_str(), property->name ) ) // Don't want to convert rhs to string
- {
- index = i + DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
- break;
- }
- }
-
- // If not found, check in base class
- if( Property::INVALID_INDEX == index )
- {
- index = Actor::GetDefaultPropertyIndex( name );
- }
- return index;
-}
-
-void ImageActor::SetDefaultProperty( Property::Index index, const Property::Value& propertyValue )
-{
- if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
- {
- Actor::SetDefaultProperty( index, propertyValue );
- }
- else
- {
- switch(index)
- {
- case Dali::ImageActor::Property::PIXEL_AREA:
- {
- SetPixelArea(propertyValue.Get<Rect<int> >());
- break;
- }
- case Dali::ImageActor::Property::STYLE:
- {
- //not supported
- break;
- }
- case Dali::ImageActor::Property::BORDER:
- {
- //not supported
- break;
- }
- case Dali::ImageActor::Property::IMAGE:
- {
- Dali::Image img = Scripting::NewImage( propertyValue );
- if(img)
- {
- ImagePtr image( &GetImplementation(img) );
- SetImage( image );
- }
- else
- {
- DALI_LOG_WARNING("Cannot create image from property value\n");
- }
- break;
- }
- default:
- {
- DALI_LOG_WARNING("Unknown property (%d)\n", index);
- break;
- }
- } // switch(index)
-
- } // else
-}
-
-Property::Value ImageActor::GetDefaultProperty( Property::Index index ) const
-{
- Property::Value ret;
- if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
- {
- ret = Actor::GetDefaultProperty( index );
- }
- else
- {
- switch( index )
- {
- case Dali::ImageActor::Property::PIXEL_AREA:
- {
- Rect<int> r = GetPixelArea();
- ret = r;
- break;
- }
- case Dali::ImageActor::Property::STYLE:
- {
- //not supported
- break;
- }
- case Dali::ImageActor::Property::BORDER:
- {
- //not supported
- break;
- }
- case Dali::ImageActor::Property::IMAGE:
- {
- Property::Map map;
- Scripting::CreatePropertyMap( Dali::Image( GetImage().Get() ), map );
- ret = Property::Value( map );
- break;
- }
- default:
- {
- DALI_LOG_WARNING( "Unknown property (%d)\n", index );
- break;
- }
- } // switch(index)
- }
-
- return ret;
-}
-
-void ImageActor::SetSortModifier(float modifier)
-{
- mRenderer->SetDepthIndex( modifier );
-}
-
-float ImageActor::GetSortModifier() const
-{
- return mRenderer->GetDepthIndex();
-}
-
-void ImageActor::SetBlendMode( BlendingMode::Type mode )
-{
- mRenderer->SetBlendMode( static_cast<BlendMode::Type>( mode ) );
-}
-
-BlendingMode::Type ImageActor::GetBlendMode() const
-{
- return static_cast<BlendingMode::Type>( mRenderer->GetBlendMode() );
-}
-
-void ImageActor::SetBlendFunc( BlendingFactor::Type srcFactorRgba, BlendingFactor::Type destFactorRgba )
-{
- mRenderer->SetBlendFunc( static_cast<BlendFactor::Type>(srcFactorRgba), static_cast<BlendFactor::Type>(destFactorRgba), static_cast<BlendFactor::Type>(srcFactorRgba), static_cast<BlendFactor::Type>(destFactorRgba) );
-}
-
-void ImageActor::SetBlendFunc( BlendingFactor::Type srcFactorRgb, BlendingFactor::Type destFactorRgb,
- BlendingFactor::Type srcFactorAlpha, BlendingFactor::Type destFactorAlpha )
-{
- mRenderer->SetBlendFunc( static_cast<BlendFactor::Type>(srcFactorRgb), static_cast<BlendFactor::Type>(destFactorRgb), static_cast<BlendFactor::Type>(srcFactorAlpha), static_cast<BlendFactor::Type>(destFactorAlpha) );
-}
-
-void ImageActor::GetBlendFunc( BlendingFactor::Type& srcFactorRgb, BlendingFactor::Type& destFactorRgb,
- BlendingFactor::Type& srcFactorAlpha, BlendingFactor::Type& destFactorAlpha ) const
-{
- mRenderer->GetBlendFunc( reinterpret_cast<BlendFactor::Type&>(srcFactorRgb), reinterpret_cast<BlendFactor::Type&>(destFactorRgb), reinterpret_cast<BlendFactor::Type&>(srcFactorAlpha), reinterpret_cast<BlendFactor::Type&>(destFactorAlpha) );
-}
-
-void ImageActor::SetBlendEquation( BlendingEquation::Type equationRgba )
-{
- mRenderer->SetBlendEquation( static_cast<BlendEquation::Type>(equationRgba), static_cast<BlendEquation::Type>(equationRgba) );
-}
-
-void ImageActor::SetBlendEquation( BlendingEquation::Type equationRgb, BlendingEquation::Type equationAlpha )
-{
- mRenderer->SetBlendEquation( static_cast<BlendEquation::Type>(equationRgb), static_cast<BlendEquation::Type>(equationAlpha) );
-}
-
-void ImageActor::GetBlendEquation( BlendingEquation::Type& equationRgb, BlendingEquation::Type& equationAlpha ) const
-{
- mRenderer->GetBlendEquation( reinterpret_cast<BlendEquation::Type&>(equationRgb), reinterpret_cast<BlendEquation::Type&>(equationAlpha) );
-}
-
-void ImageActor::SetBlendColor( const Vector4& color )
-{
- mBlendColor = color;
- mRenderer->SetBlendColor( mBlendColor );
-}
-
-const Vector4& ImageActor::GetBlendColor() const
-{
- return mBlendColor;
-}
-
-void ImageActor::SetFilterMode( FilterMode::Type minFilter, FilterMode::Type magFilter )
-{
- mMinFilter = minFilter;
- mMagFilter = magFilter;
-
- SamplerPtr sampler = Sampler::New();
- sampler->SetFilterMode( minFilter, magFilter );
- mRenderer->GetTextures()->SetSampler( 0u, sampler.Get() );
-}
-
-void ImageActor::GetFilterMode( FilterMode::Type& minFilter, FilterMode::Type& magFilter ) const
-{
- minFilter = mMinFilter;
- magFilter = mMagFilter;
-}
-
-void ImageActor::SetShaderEffect( ShaderEffect& effect )
-{
- if( mShaderEffect )
- {
- mShaderEffect->Disconnect( this );
- }
-
- mShaderEffect = ShaderEffectPtr( &effect );
- effect.Connect( this );
-
- ShaderPtr shader = mShaderEffect->GetShader();
- mRenderer->SetShader( *shader );
-
- EffectImageUpdated();
-
- UpdateGeometry();
-}
-
-ShaderEffectPtr ImageActor::GetShaderEffect() const
-{
- return mShaderEffect;
-}
-
-void ImageActor::RemoveShaderEffect()
-{
- if( mShaderEffect )
- {
- mShaderEffect->Disconnect( this );
- // change to the standard shader and quad geometry
- ShaderPtr shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER, Dali::Shader::Hint::NONE );
- mRenderer->SetShader( *shader );
- mShaderEffect.Reset();
-
- UpdateGeometry();
- }
-}
-
-void ImageActor::EffectImageUpdated()
-{
- if( mShaderEffect )
- {
- Dali::Image effectImage = mShaderEffect->GetEffectImage();
- if( effectImage )
- {
- Image& effectImageImpl = GetImplementation( effectImage );
- mRenderer->GetTextures()->SetImage( 1u, &effectImageImpl );
- }
- else
- {
- mRenderer->GetTextures()->SetImage( 1u, 0 );
- }
- }
-}
-
-void ImageActor::OnRelayout( const Vector2& size, RelayoutContainer& container )
-{
- if( mActorSize != size )
- {
- mActorSize = size;
- UpdateGeometry();
- }
-}
-
-void ImageActor::OnSizeSet( const Vector3& targetSize )
-{
- Vector2 size( targetSize.x, targetSize.y );
- if( mActorSize != size )
- {
- mActorSize = size;
- UpdateGeometry();
- }
-}
-
-} // namespace Internal
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_INTERNAL_IMAGE_ACTOR_H__
-#define __DALI_INTERNAL_IMAGE_ACTOR_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/public-api/object/ref-object.h>
-#include <dali/public-api/actors/image-actor.h>
-#include <dali/public-api/math/uint-16-pair.h>
-#include <dali/internal/event/actors/actor-declarations.h>
-#include <dali/internal/event/actors/actor-impl.h>
-#include <dali/internal/event/animation/animation-impl.h>
-#include <dali/internal/event/effects/shader-effect-impl.h>
-#include <dali/internal/event/images/nine-patch-image-impl.h>
-#include <dali/internal/event/rendering/texture-set-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-class Image;
-
-/**
- * An actor which displays an Image.
- */
-class ImageActor : public Actor
-{
-public:
-
- typedef Dali::ImageActor::PixelArea PixelArea;
-
- /**
- * @brief Create an image actor instance.
- * @return A smart-pointer to a newly allocated image actor.
- */
- static ImageActorPtr New();
-
- /**
- * @copydoc Dali::Internal::Actor::OnInitialize
- */
- void OnInitialize() ;
-
- /**
- * @see Dali::ImageActor::SetImage()
- * @param[in] ImagePtr reference to the image object to display. Reference to avoid unnecessary increment/decrement reference.
- */
- void SetImage( ImagePtr& image );
-
- /**
- * Retrieve the image rendered by the actor.
- * @return smart pointer to the image or an empty one if no image is assigned
- */
- ImagePtr GetImage() const;
-
- /**
- * @copydoc Dali::ImageActor::SetPixelArea()
- */
- void SetPixelArea( const PixelArea& pixelArea );
-
- /**
- * @copydoc Dali::ImageActor::GetPixelArea()
- */
- const PixelArea& GetPixelArea() const;
-
- /**
- * @copydoc Dali::ImageActor::IsPixelAreaSet()
- */
- bool IsPixelAreaSet() const;
-
- /**
- * @copydoc Dali::ImageActor::ClearPixelArea()
- */
- void ClearPixelArea();
-
- /**
- * @copydoc Dali::ImageActor::SetStyle()
- */
- void SetStyle( Dali::ImageActor::Style style );
-
- /**
- * @copydoc Dali::ImageActor::GetStyle()
- */
- Dali::ImageActor::Style GetStyle() const;
-
- /**
- * @copydoc Dali::ImageActor::SetNinePatchBorder()
- */
- void SetNinePatchBorder( const Vector4& border );
-
- /**
- * @copydoc Dali::ImageActor::GetNinePatchBorder()
- */
- Vector4 GetNinePatchBorder() const;
-
- /**
- * @copydoc Dali::RenderableActor::SetSortModifier()
- */
- void SetSortModifier(float modifier);
-
- /**
- * @copydoc Dali::RenderableActor::GetSortModifier()
- */
- float GetSortModifier() const;
-
- /**
- * @copydoc Dali::RenderableActor::SetBlendMode()
- */
- void SetBlendMode( BlendingMode::Type mode );
-
- /**
- * @copydoc Dali::RenderableActor::GetBlendMode()
- */
- BlendingMode::Type GetBlendMode() const;
-
- /**
- * @copydoc Dali::RenderableActor::SetBlendFunc()
- */
- void SetBlendFunc( BlendingFactor::Type srcFactorRgba, BlendingFactor::Type destFactorRgba );
-
- /**
- * @copydoc Dali::RenderableActor::SetBlendFunc()
- */
- void SetBlendFunc( BlendingFactor::Type srcFactorRgb, BlendingFactor::Type destFactorRgb,
- BlendingFactor::Type srcFactorAlpha, BlendingFactor::Type destFactorAlpha );
-
- /**
- * @copydoc Dali::RenderableActor::GetBlendFunc()
- */
- void GetBlendFunc( BlendingFactor::Type& srcFactorRgb, BlendingFactor::Type& destFactorRgb,
- BlendingFactor::Type& srcFactorAlpha, BlendingFactor::Type& destFactorAlpha ) const;
-
- /**
- * @copydoc Dali::RenderableActor::SetBlendEquation()
- */
- void SetBlendEquation( BlendingEquation::Type equationRgba );
-
- /**
- * @copydoc Dali::RenderableActor::SetBlendEquation()
- */
- void SetBlendEquation( BlendingEquation::Type equationRgb, BlendingEquation::Type equationAlpha );
-
- /**
- * @copydoc Dali::RenderableActor::GetBlendEquation()
- */
- void GetBlendEquation( BlendingEquation::Type& equationRgb, BlendingEquation::Type& equationAlpha ) const;
-
- /**
- * @copydoc Dali::RenderableActor::SetBlendColor()
- */
- void SetBlendColor( const Vector4& color );
-
- /**
- * @copydoc Dali::RenderableActor::GetBlendColor()
- */
- const Vector4& GetBlendColor() const;
-
- /**
- * @copydoc Dali::RenderableActor::SetFilterMode()
- */
- void SetFilterMode( FilterMode::Type minFilter, FilterMode::Type magFilter );
-
- /**
- * @copydoc Dali::RenderableActor::GetFilterMode()
- */
- void GetFilterMode( FilterMode::Type& minFilter, FilterMode::Type& magFilter ) const;
-
- /**
- * @brief Allows this ImageActor to respond to the eventa that the shader effect's effect texture has been changed
- */
- void EffectImageUpdated();
-
-public:
- /**
- * @copydoc Actor::SetShaderEffect
- */
- virtual void SetShaderEffect(ShaderEffect& effect);
-
- /**
- * @copydoc Actor::GetShaderEffect
- */
- virtual ShaderEffectPtr GetShaderEffect() const;
-
- /**
- * @copydoc Actor::RemoveShaderEffect
- */
- virtual void RemoveShaderEffect();
-
-private:
-
- /**
- * @copydoc Actor::OnRelayout
- */
- virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
-
- /**
- * @copydoc Actor::OnSizeSet
- */
- virtual void OnSizeSet( const Vector3& targetSize );
-
-public: // Default property extensions from Object
-
- /**
- * @copydoc Dali::Internal::Object::GetDefaultPropertyCount()
- */
- virtual unsigned int GetDefaultPropertyCount() const;
-
- /**
- * @copydoc Dali::Internal::Object::GetDefaultPropertyIndices()
- */
- virtual void GetDefaultPropertyIndices( Property::IndexContainer& indices ) const;
-
- /**
- * @copydoc Dali::Internal::Object::GetDefaultPropertyName()
- */
- virtual const char* GetDefaultPropertyName(Property::Index index) const;
-
- /**
- * @copydoc Dali::Internal::Object::GetDefaultPropertyIndex()
- */
- virtual Property::Index GetDefaultPropertyIndex(const std::string& name) const;
-
- /**
- * @copydoc Dali::Internal::Object::IsDefaultPropertyWritable()
- */
- virtual bool IsDefaultPropertyWritable(Property::Index index) const;
-
- /**
- * @copydoc Dali::Internal::Object::IsDefaultPropertyAnimatable()
- */
- virtual bool IsDefaultPropertyAnimatable(Property::Index index) const;
-
- /**
- * @copydoc Dali::Internal::Object::IsDefaultPropertyAConstraintInput()
- */
- virtual bool IsDefaultPropertyAConstraintInput( Property::Index index ) const;
-
- /**
- * @copydoc Dali::Internal::Object::GetDefaultPropertyType()
- */
- virtual Property::Type GetDefaultPropertyType(Property::Index index) const;
-
- /**
- * @copydoc Dali::Internal::Object::SetDefaultProperty()
- */
- virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
-
- /**
- * @copydoc Dali::Internal::Object::GetDefaultProperty()
- */
- virtual Property::Value GetDefaultProperty( Property::Index index ) const;
-
-public: // From Actor
-
- /**
- * @copydoc Dali::Actor::GetNaturalSize()
- */
- virtual Vector3 GetNaturalSize() const;
-
-protected:
-
- /**
- * Protected constructor; see also ImageActor::New()
- */
- ImageActor();
-
- /**
- * A reference counted object may only be deleted by calling Unreference()
- */
- virtual ~ImageActor();
-
-private:
-
- /**
- * Calculate the natural size of this image actor
- *
- * @return Return the natural size as a Vector2
- */
- Vector2 CalculateNaturalSize() const;
-
- /**
- * Update the grid geometry.
- */
- void UpdateGeometry();
-
- /**
- * Update the texture rect uniform
- */
- void UpdateTexureRect();
-
-private:
-
- ShaderEffectPtr mShaderEffect; ///< Optional referenced shader effect
- RendererPtr mRenderer; ///< The renderer used to render the image
- PixelArea mPixelArea; ///< The pixel area of the image to render
- Vector4 mBlendColor; ///< The blend color for this ImageActor
- Vector4 mNinePatchBorder; ///< Nine-patch not supported, but this is used to store what is set so it can be returned for backwards compatibility.
- Vector2 mActorSize; ///< The actor size
- Uint16Pair mGridSize; ///< The geometry grid size
- int mRendererIndex; ///< The index location of mRenderer
- FilterMode::Type mMinFilter; ///< The minification filter currently set
- FilterMode::Type mMagFilter; ///< The magnification filter currently set
- Dali::ImageActor::Style mStyle; ///< The style set by SetStyle. Not used internally, only used to store what is set so it can be returned for backwards compatibility.
- bool mIsPixelAreaSet; ///< Flag indicating if the pixel area has been set
-};
-
-} // namespace Internal
-
-// Helpers for public-api forwarding methods
-
-inline Internal::ImageActor& GetImplementation(Dali::ImageActor& image)
-{
- DALI_ASSERT_ALWAYS(image && "Image handle is empty");
-
- BaseObject& handle = image.GetBaseObject();
-
- return static_cast<Internal::ImageActor&>(handle);
-}
-
-inline const Internal::ImageActor& GetImplementation(const Dali::ImageActor& image)
-{
- DALI_ASSERT_ALWAYS(image && "Image handle is empty");
-
- const BaseObject& handle = image.GetBaseObject();
-
- return static_cast<const Internal::ImageActor&>(handle);
-}
-
-} // namespace Dali
-
-#endif // __DALI_INTERNAL_IMAGE_ACTOR_H__
#include <dali/public-api/math/vector2.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/devel-api/scripting/scripting.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
-#include <dali/internal/event/actors/image-actor-impl.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
#include <dali/internal/event/common/property-helper.h>
#include <dali/internal/event/images/image-impl.h>
#include "dali-shaders.h"
}
//inform connected actors the image has been unset
- for(std::vector< ActorPtr >::iterator it = mConnectedActors.begin(); it != mConnectedActors.end(); ++it )
- {
- ImageActor* imageActor = dynamic_cast< ImageActor* >( it->Get() );
- if( imageActor )
- {
- imageActor->EffectImageUpdated();
- }
- }
+ // TODO or CHECK: ImageActor part was removed.
}
void ShaderEffect::SetUniform( const std::string& name, Property::Value value, UniformCoordinateType uniformCoordinateType )
// INTERNAL INCLUDES
#include <dali/public-api/images/image.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
#include <dali/internal/event/actors/actor-impl.h>
#include <dali/internal/event/effects/shader-declarations.h>
#include <dali/internal/event/common/object-impl.h>
#include <dali/integration-api/debug.h>
#include <dali/internal/event/actors/actor-impl.h>
#include <dali/internal/event/actors/camera-actor-impl.h>
-#include <dali/internal/event/actors/image-actor-impl.h>
#include <dali/internal/event/actors/layer-impl.h>
#include <dali/internal/event/actors/layer-list.h>
#include <dali/internal/event/common/system-overlay-impl.h>
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
{
--mConnectionCount;
- if ( Dali::Image::UNUSED == mReleasePolicy &&
- mConnectionCount == 0 )
- {
- ReleaseAtlas();
- }
+ // Only release the atlas upon destruction
}
}
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
BufferImagePtr BufferImage::New( unsigned int width,
unsigned int height,
- Pixel::Format pixelformat,
- ReleasePolicy releasePol )
+ Pixel::Format pixelformat )
{
- BufferImagePtr internal = new BufferImage( width, height, pixelformat, releasePol );
+ BufferImagePtr internal = new BufferImage( width, height, pixelformat );
internal->Initialize();
return internal;
}
unsigned int width,
unsigned int height,
Pixel::Format pixelformat,
- unsigned int stride,
- ReleasePolicy releasePol )
+ unsigned int stride )
{
- BufferImagePtr internal = new BufferImage( pixBuf, width, height, pixelformat, stride, releasePol );
+ BufferImagePtr internal = new BufferImage( pixBuf, width, height, pixelformat, stride );
internal->Initialize();
return internal;
}
-BufferImage::BufferImage(unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy releasePol)
-: Image( releasePol ),
+BufferImage::BufferImage(unsigned int width, unsigned int height, Pixel::Format pixelformat)
+: Image(),
mInternalBuffer( NULL ),
mExternalBuffer( NULL ),
mResourceClient( NULL ),
mPixelFormat( pixelformat ),
mResourcePolicy( ResourcePolicy::OWNED_DISCARD )
{
- SetupBuffer( width, height, pixelformat, width, releasePol );
+ SetupBuffer( width, height, pixelformat, width );
// Allocate a persistent internal buffer
mInternalBuffer = new PixelBuffer[ mBufferSize ];
unsigned int width,
unsigned int height,
Pixel::Format pixelformat,
- unsigned int stride,
- ReleasePolicy releasePol )
-: Image( releasePol ),
+ unsigned int stride)
+: Image(),
mInternalBuffer( NULL ),
mExternalBuffer( pixBuf ),
mResourceClient( NULL ),
mPixelFormat( pixelformat ),
mResourcePolicy( ResourcePolicy::OWNED_DISCARD )
{
- SetupBuffer( width, height, pixelformat, stride ? stride: width, releasePol );
+ SetupBuffer( width, height, pixelformat, stride ? stride: width );
}
BufferImage::~BufferImage()
{
+ if( mTicket )
+ {
+ mTicket->RemoveObserver(*this);
+ mTicket.Reset();
+ }
+
delete[] mInternalBuffer;
}
void BufferImage::SetupBuffer( unsigned int width,
unsigned int height,
Pixel::Format pixelformat,
- unsigned int byteStride,
- ReleasePolicy releasePol )
+ unsigned int byteStride )
{
ThreadLocalStorage& tls = ThreadLocalStorage::Get();
mResourceClient = &tls.GetResourceClient();
mBufferSize = height * mByteStride;
// Respect the desired release policy
- mResourcePolicy = releasePol == Dali::Image::UNUSED ? ResourcePolicy::OWNED_DISCARD : ResourcePolicy::OWNED_RETAIN;
+ mResourcePolicy = ResourcePolicy::OWNED_RETAIN;
}
bool BufferImage::IsDataExternal() const
void BufferImage::Connect()
{
- if ( !mConnectionCount++ )
+ if ( !mConnectionCount++ && !mTicket )
{
RectArea area;
Update( area );
void BufferImage::Disconnect()
{
- if ( mTicket )
- {
- if ( !( --mConnectionCount ) && mReleasePolicy == Dali::Image::UNUSED )
- {
- mTicket->RemoveObserver(*this);
- mTicket.Reset();
- }
- }
+ --mConnectionCount;
}
} // namespace Internal
* @param [in] width image width in pixels
* @param [in] height image height in pixels
* @param [in] pixelformat the pixel format (rgba 32 bit by default)
- * @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
*/
static BufferImagePtr New( unsigned int width,
unsigned int height,
- Pixel::Format pixelformat,
- ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+ Pixel::Format pixelformat );
/**
* @DEPRECATED_1_1.5. Support for externally owned Pixel Buffers is due to be removed TBA. It is recommended that a BufferImage owned Buffer be used instead.
* @param [in] height image height in pixels
* @param [in] pixelformat the pixel format (rgba 32 bit by default)
* @param [in] stride the internal stride of the pixelbuffer in pixels
- * @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
*/
static BufferImagePtr New( PixelBuffer* pixBuf,
unsigned int width,
unsigned int height,
Pixel::Format pixelformat,
- unsigned int stride,
- ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+ unsigned int stride );
/**
* Create a new BufferImage.
* @param [in] width image width in pixels
* @param [in] height image height in pixels
* @param [in] pixelformat the pixel format (rgba 32 bit by default)
- * @param [in] releasePol optionally release memory when image is not visible on screen (default: keep image data until Image object is alive).
*/
BufferImage(unsigned int width,
unsigned int height,
- Pixel::Format pixelformat,
- ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT);
+ Pixel::Format pixelformat );
/**
* Create a new BufferImage, which uses external data source.
* @param [in] height image height in pixels
* @param [in] pixelformat the pixel format (rgba 32 bit by default)
* @param [in] stride the internal stride of the pixelbuffer in pixels
- * @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
*/
BufferImage(PixelBuffer* pixBuf,
unsigned int width,
unsigned int height,
Pixel::Format pixelformat,
- unsigned int stride,
- ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT);
+ unsigned int stride );
protected:
/**
void SetupBuffer( unsigned int width,
unsigned int height,
Pixel::Format pixelformat,
- unsigned int byteStride,
- ReleasePolicy releasePol );
+ unsigned int byteStride );
void CreateHostBitmap();
EncodedBufferImagePtr EncodedBufferImage::New( const uint8_t * const encodedImage,
std::size_t encodedImageByteCount,
ImageDimensions size, FittingMode::Type fittingMode, SamplingMode::Type samplingMode,
- bool orientationCorrection,
- ReleasePolicy releasePol )
+ bool orientationCorrection )
{
DALI_ASSERT_DEBUG( encodedImage && "Null image pointer passed-in for decoding from memory." );
DALI_ASSERT_DEBUG( encodedImageByteCount > 0U && "Zero size passed for image resource in memory buffer." );
// input buffer by reading both ends of it:
DALI_ASSERT_ALWAYS( static_cast<int>( encodedImage[0] + encodedImage[encodedImageByteCount-1] ) != -1 );
- EncodedBufferImagePtr image( new EncodedBufferImage( releasePol ) );
+ EncodedBufferImagePtr image( new EncodedBufferImage() );
image->Initialize(); // Second stage initialization
// Replicate the functionality of ImageFactory::load() without the filesystem caching:
/**
* Construct using the supplied load policy.
*/
- EncodedBufferImage( ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT ) : Image( releasePol ) {}
+ EncodedBufferImage() : Image() {}
public:
/**
* @param [in] encodedImageByteCount The size in bytes of the buffer pointed to
* by encodedImage.
* @param [in] attributes Requested parameters for loading (size, scaling etc.).
- * @param [in] releasePol The ReleasePolicy to apply to image. Since it cannot
- * be recreated by dali, the default of Never will usually make sense.
* @return A pointer to a newly allocated object, or null on error.
*/
static EncodedBufferImagePtr New(const uint8_t * const encodedImage,
ImageDimensions size = ImageDimensions(0, 0),
FittingMode::Type scalingMode = FittingMode::SHRINK_TO_FIT,
SamplingMode::Type samplingMode = SamplingMode::BOX,
- bool orientationCorrection = true,
- const ReleasePolicy releasePol=Dali::Image::NEVER);
+ bool orientationCorrection = true);
};
} // namespace Internal
DALI_ASSERT_DEBUG(mConnectionCount > 0);
--mConnectionCount;
- if (mConnectionCount == 0 && mReleasePolicy == Dali::Image::UNUSED)
+ if (mConnectionCount == 0)
{
// release image memory when it's not visible anymore (decrease ref. count of texture)
mTicket->RemoveObserver(*this);
return mIsNativeFbo;
}
-void FrameBufferImage::SetReleasePolicy( Dali::Image::ReleasePolicy releasePolicy )
-{
- mReleasePolicy = releasePolicy;
-}
-
FrameBufferImage::~FrameBufferImage()
{
}
*/
bool IsNativeFbo() const;
- /**
- * @brief Required for backwards compatibility. Value is just stored but not used internally.
- * @param[in] releasePolicy The release policy (ignored as not supported).
- */
- void SetReleasePolicy( Dali::Image::ReleasePolicy releasePolicy );
-
public: // From Image
/**
* @copydoc Dali::Internal::Image::Connect()
return Vector2( mWidth, mHeight );
}
-Image::Image( ReleasePolicy releasePol )
+Image::Image()
: mWidth( 0 ),
mHeight( 0 ),
- mConnectionCount( 0 ),
- mReleasePolicy( releasePol )
+ mConnectionCount( 0 )
{
}
namespace Internal
{
-typedef Dali::Image::ReleasePolicy ReleasePolicy;
-
class Image;
class ImageFactory;
typedef IntrusivePtr<Image> ImagePtr;
-const ReleasePolicy IMAGE_RELEASE_POLICY_DEFAULT = Dali::Image::NEVER;
-
/**
* Image represents an image resource that can be added to actors etc.
* When the Image object is created, resource loading will be attempted.
public:
/**
- * @copydoc Dali::Image::GetReleasePolicy()
- */
- ReleasePolicy GetReleasePolicy () const { return mReleasePolicy; }
-
- /**
* @copydoc Dali::Image::UploadedSignal()
*/
Dali::Image::ImageSignalType& UploadedSignal() { return mUploaded; }
/**
* Constructor, with default parameters
*/
- Image( ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+ Image();
/**
* Second stage initialization
unsigned int mConnectionCount; ///< number of on-stage objects using this image
- ReleasePolicy mReleasePolicy : 2; ///< 2 bits is enough space
-
private:
Dali::Image::ImageSignalType mUploaded;
TypeRegistration mType( typeid( Dali::NinePatchImage ), typeid( Dali::Image ), NULL );
} // unnamed namespace
-NinePatchImagePtr NinePatchImage::New( const std::string& filename, ReleasePolicy releasePol )
+NinePatchImagePtr NinePatchImage::New( const std::string& filename )
{
- Internal::NinePatchImagePtr internal( new NinePatchImage( filename, releasePol ) );
+ Internal::NinePatchImagePtr internal( new NinePatchImage( filename ) );
internal->Initialize();
return internal;
}
-NinePatchImage::NinePatchImage( const std::string& filename, ReleasePolicy releasePol )
-: ResourceImage( IMAGE_LOAD_POLICY_DEFAULT, releasePol ),
+NinePatchImage::NinePatchImage( const std::string& filename )
+: ResourceImage(),
mParsedBorder(false)
{
ThreadLocalStorage& tls = ThreadLocalStorage::Get();
{
Pixel::Format pixelFormat = mBitmap->GetPixelFormat();
- cropped = BufferImage::New( mWidth-2, mHeight-2, pixelFormat, Dali::Image::NEVER );
+ cropped = BufferImage::New( mWidth-2, mHeight-2, pixelFormat );
Integration::Bitmap::PackedPixelsProfile* srcProfile = mBitmap->GetPackedPixelsProfile();
DALI_ASSERT_DEBUG( srcProfile && "Wrong profile for source bitmap");
*/
// INTERNAL INCLUDES
-#include <dali/public-api/images/nine-patch-image.h>
+#include <dali/devel-api/images/nine-patch-image.h>
#include <dali/internal/event/images/resource-image-impl.h>
#include <dali/internal/event/images/buffer-image-impl.h>
* Also a pixel buffer for image data is allocated.
* Dali has ownership of the buffer.
* @param [in] filename File to load synchronously into buffer
- * @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
*/
- static NinePatchImagePtr New( const std::string& filename,
- ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+ static NinePatchImagePtr New( const std::string& filename );
/**
* Create a new NinePatchImage
* For better performance and portability use power of two dimensions.
* The maximum size of the image is limited by GL_MAX_TEXTURE_SIZE.
* @param [in] filename File to load synchronously into buffer
- * @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
*/
- NinePatchImage( const std::string& filename,
- ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+ NinePatchImage( const std::string& filename );
/**
* Convert Image object to a 9 patch image object if possible.
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
-ResourceImage::ResourceImage( LoadPolicy loadPol, ReleasePolicy releasePol )
-: Image( releasePol ),
- mImageFactory( ThreadLocalStorage::Get().GetImageFactory() ),
- mLoadPolicy(loadPol)
+ResourceImage::ResourceImage()
+: Image(),
+ mImageFactory( ThreadLocalStorage::Get().GetImageFactory() )
{
}
return image;
}
-ResourceImagePtr ResourceImage::New( const std::string& url, const ImageAttributes& attributes, LoadPolicy loadPol, ReleasePolicy releasePol )
+ResourceImagePtr ResourceImage::New( const std::string& url, const ImageAttributes& attributes )
{
ResourceImagePtr image;
if( NinePatchImage::IsNinePatchUrl( url ) )
{
- image = NinePatchImage::New( url, releasePol );
+ image = NinePatchImage::New( url );
}
else
{
- image = new ResourceImage( loadPol, releasePol );
+ image = new ResourceImage();
image->Initialize();
// consider the requested size as natural size, 0 means we don't (yet) know it
image->mWidth = attributes.GetWidth();
image->mHeight = attributes.GetHeight();
image->mRequest = image->mImageFactory.RegisterRequest( url, &attributes );
-
- if( Dali::ResourceImage::IMMEDIATE == loadPol )
- {
- // Trigger loading of the image on a as soon as it can be done
- image->mTicket = image->mImageFactory.Load( *image->mRequest.Get() );
- image->mTicket->AddObserver( *image );
- }
+ image->mTicket = image->mImageFactory.Load( *image->mRequest.Get() );
+ image->mTicket->AddObserver( *image );
}
DALI_LOG_SET_OBJECT_STRING( image, url );
DALI_ASSERT_DEBUG( mConnectionCount > 0 );
--mConnectionCount;
- if( mConnectionCount == 0 && mReleasePolicy == Dali::ResourceImage::UNUSED )
+ if( mConnectionCount == 0 )
{
// release image memory when it's not visible anymore (decrease ref. count of texture)
SetTicket( NULL );
namespace Internal
{
-typedef Dali::ResourceImage::LoadPolicy LoadPolicy;
-
-const LoadPolicy IMAGE_LOAD_POLICY_DEFAULT = Dali::ResourceImage::IMMEDIATE;
-
class ResourceImage;
typedef IntrusivePtr<ResourceImage> ResourceImagePtr;
* @param [in] url The URL of the image file.
* @param [in] attributes requested parameters for loading (size, scaling etc.)
* if width or height is specified as 0, the natural size will be used.
- * @param [in] loadPol controls time of loading a resource from the filesystem (default: load when Image is created).
- * @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
* @return a pointer to a newly created object.
*/
static ResourceImagePtr New( const std::string& url,
- const ImageAttributes& attributes,
- LoadPolicy loadPol = IMAGE_LOAD_POLICY_DEFAULT,
- ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+ const ImageAttributes& attributes );
/**
* @copydoc Dali::ResourceImage::GetLoadingState()
Dali::LoadingState GetLoadingState() const { return mTicket ? mTicket->GetLoadingState() : ResourceLoading; }
/**
- * @copydoc Dali::ResourceImage::GetLoadPolicy()
- */
- LoadPolicy GetLoadPolicy () const { return mLoadPolicy; }
-
- /**
* @copydoc Dali::ResourceImage::LoadingFinishedSignal()
*/
Dali::ResourceImage::ResourceImageSignal& LoadingFinishedSignal() { return mLoadingFinished; }
/**
* Constructor, with default parameters
*/
- ResourceImage( LoadPolicy loadPol = IMAGE_LOAD_POLICY_DEFAULT, ReleasePolicy releasePol = IMAGE_RELEASE_POLICY_DEFAULT );
+ ResourceImage();
private:
Dali::ResourceImage::ResourceImageSignal mLoadingFinished;
- LoadPolicy mLoadPolicy : 2; ///< 2 bits is enough space
-
// Changes scope, should be at end of class
DALI_LOG_OBJECT_STRING_DECLARATION;
};
// INTERNAL INCLUDES
#include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/shader-effects/shader-effect.h> // Dali::ShaderEffect::GeometryHints // TODO: MESH_REWORK REMOVE
#include <dali/devel-api/scripting/scripting.h>
#include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
#include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END
\
$(internal_src_dir)/event/actors/actor-impl.cpp \
$(internal_src_dir)/event/actors/custom-actor-internal.cpp \
- $(internal_src_dir)/event/actors/image-actor-impl.cpp \
$(internal_src_dir)/event/actors/layer-impl.cpp \
$(internal_src_dir)/event/actors/layer-list.cpp \
$(internal_src_dir)/event/actors/camera-actor-impl.cpp \
#include <dali/internal/render/shaders/program.h>
#include <dali/internal/render/data-providers/node-data-provider.h>
#include <dali/internal/render/gl-resources/texture-cache.h>
-#include <dali/public-api/actors/blending.h>
#include <dali/internal/render/gl-resources/gl-texture.h>
namespace Dali
*/
// INTERNAL INCLUDES
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
#include <dali/internal/common/shader-data.h>
#include <dali/internal/update/common/property-owner.h>
#include <dali/internal/update/common/scene-graph-connection-change-propagator.h>
#include <dali/internal/update/manager/render-instruction-processor.h>
// INTERNAL INCLUDES
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
#include <dali/public-api/actors/layer.h>
#include <dali/integration-api/debug.h>
#include <dali/internal/event/actors/layer-impl.h> // for the default sorting function
+++ /dev/null
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/public-api/actors/blending.h>
-
-namespace Dali
-{
-
-const BlendingFactor::Type DEFAULT_BLENDING_SRC_FACTOR_RGB( BlendingFactor::SRC_ALPHA );
-const BlendingFactor::Type DEFAULT_BLENDING_DEST_FACTOR_RGB( BlendingFactor::ONE_MINUS_SRC_ALPHA );
-const BlendingFactor::Type DEFAULT_BLENDING_SRC_FACTOR_ALPHA( BlendingFactor::ONE );
-const BlendingFactor::Type DEFAULT_BLENDING_DEST_FACTOR_ALPHA( BlendingFactor::ONE_MINUS_SRC_ALPHA );
-
-const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_RGB( BlendingEquation::ADD );
-const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_ALPHA( BlendingEquation::ADD );
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_BLENDING_H__
-#define __DALI_BLENDING_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
-namespace Dali
-{
-/**
- * @addtogroup dali_core_actors
- * @{
- */
-
-namespace BlendingMode
-{
-/**
- * @brief Blending mode.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
-enum Type
-{
- OFF, ///< Blending is disabled. @SINCE_1_0.0
- AUTO, ///< Blending is enabled if there is alpha channel. This is the default mode. @SINCE_1_0.0
- ON ///< Blending is enabled. @SINCE_1_0.0
-};
-
-} //namespace BlendingMode
-
-namespace BlendingFactor
-{
-/**
- * @brief Blending Factor.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
-enum Type
-{
- ZERO = 0, ///< ZERO @SINCE_1_0.0
- ONE = 1, ///< ONE @SINCE_1_0.0
- SRC_COLOR = 0x0300, ///< SRC_COLOR @SINCE_1_0.0
- ONE_MINUS_SRC_COLOR = 0x0301, ///< ONE_MINUS_SRC_COLOR @SINCE_1_0.0
- SRC_ALPHA = 0x0302, ///< SRC_ALPHA @SINCE_1_0.0
- ONE_MINUS_SRC_ALPHA = 0x0303, ///< ONE_MINUS_SRC_ALPHA @SINCE_1_0.0
- DST_ALPHA = 0x0304, ///< DST_ALPHA @SINCE_1_0.0
- ONE_MINUS_DST_ALPHA = 0x0305, ///< ONE_MINUS_DST_ALPHA @SINCE_1_0.0
- DST_COLOR = 0x0306, ///< DST_COLOR @SINCE_1_0.0
- ONE_MINUS_DST_COLOR = 0x0307, ///< ONE_MINUS_DST_COLOR @SINCE_1_0.0
- SRC_ALPHA_SATURATE = 0x0308, ///< SRC_ALPHA_SATURATE @SINCE_1_0.0
- CONSTANT_COLOR = 0x8001, ///< CONSTANT_COLOR @SINCE_1_0.0
- ONE_MINUS_CONSTANT_COLOR = 0x8002, ///< ONE_MINUS_CONSTANT_COLOR @SINCE_1_0.0
- CONSTANT_ALPHA = 0x8003, ///< CONSTANT_ALPHA @SINCE_1_0.0
- ONE_MINUS_CONSTANT_ALPHA = 0x8004 ///< ONE_MINUS_CONSTANT_ALPHA @SINCE_1_0.0
-};
-
-} // namespace BlendingFactor
-
-namespace BlendingEquation
-{
-/**
- * @brief Blending Equation.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
-enum Type
-{
- ADD = 0x8006, ///< The source and destination colors are added to each other. @SINCE_1_0.0
- SUBTRACT = 0x800A, ///< Subtracts the destination from the source. @SINCE_1_0.0
- REVERSE_SUBTRACT = 0x800B ///< Subtracts the source from the destination. @SINCE_1_0.0
-};
-
-} // namespace BlendingEquation
-
-DALI_IMPORT_API extern const BlendingFactor::Type DEFAULT_BLENDING_SRC_FACTOR_RGB; ///< BlendingFactor::SRC_ALPHA
-DALI_IMPORT_API extern const BlendingFactor::Type DEFAULT_BLENDING_DEST_FACTOR_RGB; ///< BlendingFactor::ONE_MINUS_SRC_ALPHA
-DALI_IMPORT_API extern const BlendingFactor::Type DEFAULT_BLENDING_SRC_FACTOR_ALPHA; ///< BlendingFactor::ONE
-DALI_IMPORT_API extern const BlendingFactor::Type DEFAULT_BLENDING_DEST_FACTOR_ALPHA; ///< BlendingFactor::ONE_MINUS_SRC_ALPHA
-
-DALI_IMPORT_API extern const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_RGB; ///< BlendingEquation::ADD
-DALI_IMPORT_API extern const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_ALPHA; ///< BlendingEquation::ADD
-
-/**
- * @}
- */
-} // namespace Dali
-
-#endif // __DALI_BLENDING_H__
+++ /dev/null
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/public-api/actors/image-actor.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/event/actors/image-actor-impl.h>
-#include <dali/internal/event/images/image-impl.h>
-#include <dali/internal/event/effects/shader-effect-impl.h>
-#include <dali/public-api/common/dali-common.h>
-
-namespace Dali
-{
-
-const BlendingMode::Type ImageActor::DEFAULT_BLENDING_MODE = BlendingMode::AUTO;
-
-ImageActor::ImageActor()
-{
-}
-
-ImageActor ImageActor::New()
-{
- Internal::ImageActorPtr internal = Internal::ImageActor::New();
- return ImageActor( internal.Get() );
-}
-
-ImageActor ImageActor::New(Image image)
-{
- ImageActor actor = ImageActor::New();
- actor.SetImage( image );
-
- return actor;
-}
-
-ImageActor ImageActor::New(Image image, PixelArea pixelArea)
-{
- ImageActor actor = ImageActor::New();
- actor.SetImage( image );
- actor.SetPixelArea( pixelArea );
-
- return actor;
-}
-
-ImageActor ImageActor::DownCast( BaseHandle handle )
-{
- return ImageActor( dynamic_cast<Dali::Internal::ImageActor*>(handle.GetObjectPtr()) );
-}
-
-ImageActor::~ImageActor()
-{
-}
-
-ImageActor::ImageActor(const ImageActor& copy)
-: Actor(copy)
-{
-}
-
-ImageActor& ImageActor::operator=(const ImageActor& rhs)
-{
- BaseHandle::operator=(rhs);
- return *this;
-}
-
-void ImageActor::SetImage(Image image)
-{
- Internal::ImagePtr imagePtr;
- if( image )
- {
- imagePtr = &GetImplementation(image);
- }
- GetImplementation(*this).SetImage( imagePtr );
-}
-
-Image ImageActor::GetImage()
-{
- Internal::ImagePtr imagePtr( GetImplementation(*this).GetImage() );
- return Dali::Image( imagePtr.Get() );
-}
-
-void ImageActor::SetPixelArea(const PixelArea& pixelArea)
-{
- GetImplementation(*this).SetPixelArea(pixelArea);
-}
-
-ImageActor::PixelArea ImageActor::GetPixelArea() const
-{
- return GetImplementation(*this).GetPixelArea();
-}
-
-void ImageActor::SetStyle(Style style)
-{
- GetImplementation(*this).SetStyle( style );
-}
-
-ImageActor::Style ImageActor::GetStyle() const
-{
- return GetImplementation(*this).GetStyle();
-}
-
-void ImageActor::SetNinePatchBorder(const Vector4& border)
-{
- GetImplementation(*this).SetNinePatchBorder( border );
-}
-
-Vector4 ImageActor::GetNinePatchBorder() const
-{
- return GetImplementation(*this).GetNinePatchBorder();
-}
-
-void ImageActor::SetSortModifier(float modifier)
-{
- GetImplementation(*this).SetSortModifier(modifier);
-}
-
-float ImageActor::GetSortModifier() const
-{
- return GetImplementation(*this).GetSortModifier();
-}
-
-void ImageActor::SetBlendMode( BlendingMode::Type mode )
-{
- GetImplementation(*this).SetBlendMode( mode );
-}
-
-BlendingMode::Type ImageActor::GetBlendMode() const
-{
- return GetImplementation(*this).GetBlendMode();
-}
-
-void ImageActor::SetBlendFunc( BlendingFactor::Type srcFactorRgba, BlendingFactor::Type destFactorRgba )
-{
- GetImplementation(*this).SetBlendFunc( srcFactorRgba, destFactorRgba );
-}
-
-void ImageActor::SetBlendFunc( BlendingFactor::Type srcFactorRgb, BlendingFactor::Type destFactorRgb,
- BlendingFactor::Type srcFactorAlpha, BlendingFactor::Type destFactorAlpha )
-{
- GetImplementation(*this).SetBlendFunc( srcFactorRgb, destFactorRgb, srcFactorAlpha, destFactorAlpha );
-}
-
-void ImageActor::GetBlendFunc( BlendingFactor::Type& srcFactorRgb, BlendingFactor::Type& destFactorRgb,
- BlendingFactor::Type& srcFactorAlpha, BlendingFactor::Type& destFactorAlpha ) const
-{
- GetImplementation(*this).GetBlendFunc( srcFactorRgb, destFactorRgb, srcFactorAlpha, destFactorAlpha );
-}
-
-void ImageActor::SetBlendEquation( BlendingEquation::Type equationRgba )
-{
- GetImplementation(*this).SetBlendEquation( equationRgba );
-}
-
-void ImageActor::SetBlendEquation( BlendingEquation::Type equationRgb, BlendingEquation::Type equationAlpha )
-{
- GetImplementation(*this).SetBlendEquation( equationRgb, equationAlpha );
-}
-
-void ImageActor::GetBlendEquation( BlendingEquation::Type& equationRgb, BlendingEquation::Type& equationAlpha ) const
-{
- GetImplementation(*this).GetBlendEquation( equationRgb, equationAlpha );
-}
-
-void ImageActor::SetBlendColor( const Vector4& color )
-{
- GetImplementation(*this).SetBlendColor( color );
-}
-
-const Vector4& ImageActor::GetBlendColor() const
-{
- return GetImplementation(*this).GetBlendColor();
-}
-
-void ImageActor::SetFilterMode( FilterMode::Type minFilter, FilterMode::Type magFilter )
-{
- GetImplementation(*this).SetFilterMode( minFilter, magFilter );
-}
-
-void ImageActor::GetFilterMode( FilterMode::Type& minFilter, FilterMode::Type& magFilter ) const
-{
- GetImplementation(*this).GetFilterMode( minFilter, magFilter );
-}
-
-void ImageActor::SetShaderEffect(ShaderEffect effect)
-{
- GetImplementation(*this).SetShaderEffect(GetImplementation(effect));
-}
-
-ShaderEffect ImageActor::GetShaderEffect() const
-{
- Internal::ShaderEffectPtr internal = GetImplementation(*this).GetShaderEffect();
-
- return ShaderEffect(internal.Get());
-}
-
-void ImageActor::RemoveShaderEffect()
-{
- GetImplementation(*this).RemoveShaderEffect();
-}
-
-
-ImageActor::ImageActor(Internal::ImageActor* internal)
-: Actor(internal)
-{
-}
-
-void SetShaderEffectRecursively( Actor actor, ShaderEffect effect )
-{
- // only do something if the actor and effect are valid
- if( actor && effect )
- {
- // first remove from this actor
- ImageActor imageActor = ImageActor::DownCast( actor );
- if( imageActor )
- {
- imageActor.SetShaderEffect( effect );
- }
- // then all children recursively
- const unsigned int count = actor.GetChildCount();
- for( unsigned int index = 0; index < count; ++index )
- {
- Actor child( actor.GetChildAt( index ) );
- SetShaderEffectRecursively( child, effect );
- }
- }
-}
-
-void RemoveShaderEffectRecursively( Actor actor )
-{
- // only do something if the actor is valid
- if( actor )
- {
- // first remove from this actor
- ImageActor imageActor = ImageActor::DownCast( actor );
- if( imageActor )
- {
- imageActor.RemoveShaderEffect();
- }
- // then all children recursively
- const unsigned int count = actor.GetChildCount();
- for( unsigned int index = 0; index < count; ++index )
- {
- Actor child( actor.GetChildAt( index ) );
- RemoveShaderEffectRecursively( child );
- }
- }
-}
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_IMAGE_ACTOR_H__
-#define __DALI_IMAGE_ACTOR_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <string>
-
-// INTERNAL INCLUDES
-#include <dali/public-api/actors/actor.h>
-#include <dali/public-api/math/rect.h>
-#include <dali/public-api/images/image.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
-#include <dali/public-api/actors/blending.h>
-#include <dali/public-api/actors/sampling.h>
-
-namespace Dali
-{
-/**
- * @addtogroup dali_core_actors
- * @{
- */
-
-namespace Internal DALI_INTERNAL
-{
-class ImageActor;
-}
-
-/**
- * @DEPRECATED_1_1.11 Use an actor with renderer instead.
- * @brief An actor for displaying images.
- *
- * Allows the developer to add an actor to stage which displays the content of an Image object.
- *
- * By default ImageActor can be viewed from all angles.
- *
- * If an ImageActor is created without setting size, then the actor takes the size of the image -
- * this is the natural size.
- * Setting a size on the ImageActor, e.g through the @ref Actor::SetSize api or through an animation will
- * stop the natural size being used.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release. We do recommend not to use it. Use of ImageActor should be avoided unless shader effects need to be applied.
- */
-class DALI_IMPORT_API ImageActor : public Actor
-{
-public:
-
- /**
- * @brief An enumeration of properties belonging to the ImageActor class
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- struct Property
- {
- enum
- {
- /**
- * @brief name "pixelArea", type Rect<int>
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- PIXEL_AREA = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX,
- /**
- * @DEPRECATED_1_1.11
- * @brief name "style", type std::string
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- STYLE,
- /**
- * @DEPRECATED_1_1.11
- * @brief name "border", type Vector4
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- BORDER,
- /**
- * @brief name "image", type Map {"filename":"", "loadPolicy":...}
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- IMAGE,
- };
- };
-
- /**
- * @DEPRECATED_1_1.11. Only quad style supported.
- *
- * @brief Style determines how the Image is rendered.
- *
- * STYLE_QUAD:
- *
- * 0---------2 0-----------------2
- * | /| | /|
- * | A / | | A / |
- * | / | | / |
- * | / | SCALE (X) | / |
- * | / | --------> | / |
- * | / | | / |
- * | / | | / |
- * | / B | | / B |
- * |/ | |/ |
- * 1---------3 1-----------------3
- *
- * Image is rendered as a textured rectangle. The texture
- * is scaled uniformly as the quad is resized.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- enum Style
- {
- /**
- * @DEPRECATED_1_1.11
- * @brief As a simple quad.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- STYLE_QUAD,
- /**
- * @DEPRECATED_1_1.11
- * @brief As a nine-patch.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- STYLE_NINE_PATCH,
- /**
- * @DEPRECATED_1_1.11
- * @brief As a nine-patch without center section being rendered.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- STYLE_NINE_PATCH_NO_CENTER
- };
-
- /**
- * @brief Pixel area is relative to the top-left (0,0) of the image.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- typedef Rect<int> PixelArea;
-
- static const BlendingMode::Type DEFAULT_BLENDING_MODE; ///< default value is BlendingMode::AUTO
-
- /**
- * @brief Create an uninitialized ImageActor handle.
- *
- * This can be initialized with ImageActor::New(...).
- * Calling member functions with an uninitialized ImageActor handle is not allowed.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- ImageActor();
-
- /**
- * @brief Create an empty image actor object.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return A handle to a newly allocated actor.
- */
- static ImageActor New();
-
- /**
- * @brief Create a image actor object.
- *
- * The actor will take the image's natural size unless a custom size
- * is chosen, e.g. via Actor:SetSize().
- * If the handle is empty, ImageActor will display nothing.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] image The image to display.
- * @return A handle to a newly allocated actor.
- * @pre ImageActor must be initialized.
- */
- static ImageActor New(Image image);
-
- /**
- * @brief Create a image actor object.
- *
- * The actor will take the image's natural size unless a custom size
- * is chosen, e.g. via Actor:SetSize().
- * If the handle is empty, ImageActor will display nothing.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] image The image to display.
- * @param [in] pixelArea The area of the image to display.
- * This in pixels, relative to the top-left (0,0) of the image.
- * @return A handle to a newly allocated actor.
- * @pre ImageActor must be initialized.
- */
- static ImageActor New(Image image, PixelArea pixelArea);
-
- /**
- * @brief Downcast a handle to ImageActor handle.
- *
- *
- * If handle points to a ImageActor the downcast produces valid
- * handle. If not the returned handle is left uninitialized.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] handle Handle to an object
- * @return Handle to a ImageActor or an uninitialized handle
- */
- static ImageActor DownCast( BaseHandle handle );
-
- /**
- * @brief Destructor
- *
- * This is non-virtual since derived Handle types must not contain data or virtual methods.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- ~ImageActor();
-
- /**
- * @brief Copy constructor
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] copy The actor to copy
- */
- ImageActor(const ImageActor& copy);
-
- /**
- * @brief Assignment operator
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] rhs The actor to copy
- * @return A reference to this
- */
- ImageActor& operator=(const ImageActor& rhs);
-
- /**
- * @brief Set the image rendered by the actor.
- *
- * If actor was already displaying a different image, the old image is dropped and actor may
- * temporarily display nothing. Setting an empty image (handle) causes the current image to be
- * dropped and actor displays nothing.
- * The actor will take the image's natural size unless a custom size
- * is chosen, e.g. via Actor::SetSize().
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] image The image to display
- * @pre ImageActor must be initialized.
- */
- void SetImage(Image image);
-
- /**
- * @brief Retrieve the image rendered by the actor.
- *
- * If no image is assigned, an empty handle is returned.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return The image
- */
- Image GetImage();
-
- /**
- * @brief Set a region of the image to display, in pixels.
- *
- * When the image is loaded the actor's size will be reset to the pixelArea,
- * unless a custom size was chosen, e.g. via Actor::SetSize().
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] pixelArea The area of the image to display.
- * This in pixels, relative to the top-left (0,0) of the image.
- * @pre Image must be initialized.
- * @note PixelArea should be inside the image data size. It gets clamped by GL.
- */
- void SetPixelArea(const PixelArea& pixelArea);
-
- /**
- * @brief Retrieve the region of the image to display, in pixels.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return The pixel area, or a default-constructed area if none was set.
- * @pre Image must be initialized.
- */
- PixelArea GetPixelArea() const;
-
- /**
- * @DEPRECATED_1_1.11
- *
- * @brief Set how the image is rendered; the default is STYLE_QUAD.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] style The new style
- * @pre Image must be initialized.
- * @note The style specified is set (so GetStyle will return what's set) but ignored internally.
- */
- void SetStyle(Style style);
-
- /**
- * @DEPRECATED_1_1.11
- *
- * @brief Query how the image is rendered.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return The rendering style
- * @pre Image must be initialized.
- * @note This just returns the style set by SetStyle. In reality, only STYLE_QUAD is supported.
- */
- Style GetStyle() const;
-
- /**
- * @DEPRECATED_1_1.11
- *
- * @brief Set the border used with ImageActor::STYLE_NINE_PATCH.
- *
- * The values are in pixels from the left, top, right, and bottom of the image respectively.
- * i.e. ImageActor::SetNinePatchBorder( Vector4(1,2,3,4) ) sets the left-border to 1, top-border to 2, right-border to 3, and bottom-border to 4 pixels.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] border The new nine-patch border
- */
- void SetNinePatchBorder(const Vector4& border);
-
- /**
- * @DEPRECATED_1_1.11
- *
- * @brief Retrieve the border used with ImageActor::STYLE_NINE_PATCH.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return The nine-patch border.
- */
- Vector4 GetNinePatchBorder() const;
-
-
- /**
- * @brief Allows modification of an actors position in the depth sort algorithm.
- *
- * The offset can be altered for each coplanar actor hence allowing an order of painting.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] depthOffset The offset to be given to the actor. Positive values pushing it up front.
- * @pre The Actor has been initialized.
- * @see Layer::Behavior
- */
- void SetSortModifier(float depthOffset);
-
- /**
- * @brief Retrieves the offset used to modify an actors position in the depth sort algorithm.
- *
- * The offset can be altered for each coplanar actor hence allowing an order of painting.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return The offset that has been given to the actor. Positive values pushing it further back.
- * @pre The Actor has been initialized.
- * @see Layer::Behavior
- */
- float GetSortModifier() const;
-
- /**
- * @brief Sets the blending mode.
- *
- * Possible values are: BlendingMode::OFF, BlendingMode::AUTO and BlendingMode::ON. Default is BlendingMode::AUTO.
- *
- * If blending is disabled (BlendingMode::OFF) fade in and fade out animations do not work.
- *
- * <ul>
- * <li> \e OFF Blending is disabled.
- * <li> \e AUTO Blending is enabled only if the renderable actor has alpha channel.
- * <li> \e ON Blending is enabled.
- * </ul>
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] mode The blending mode
- */
- void SetBlendMode( BlendingMode::Type mode );
-
- /**
- * @brief Retrieves the blending mode.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return The blending mode, one of BlendingMode::OFF, BlendingMode::AUTO or BlendingMode::ON.
- */
- BlendingMode::Type GetBlendMode() const;
-
- /**
- * @brief Specify the pixel arithmetic used when the actor is blended.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] srcFactorRgba Specifies how the red, green, blue, and alpha source blending factors are computed.
- * The options are BlendingFactor::ZERO, ONE, SRC_COLOR, ONE_MINUS_SRC_COLOR, DST_COLOR, ONE_MINUS_DST_COLOR,
- * SRC_ALPHA, ONE_MINUS_SRC_ALPHA, DST_ALPHA, ONE_MINUS_DST_ALPHA, CONSTANT_COLOR, ONE_MINUS_CONSTANT_COLOR,
- * GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, and GL_SRC_ALPHA_SATURATE.
- *
- * @param[in] destFactorRgba Specifies how the red, green, blue, and alpha destination blending factors are computed.
- * The options are BlendingFactor::ZERO, ONE, SRC_COLOR, ONE_MINUS_SRC_COLOR, DST_COLOR, ONE_MINUS_DST_COLOR,
- * SRC_ALPHA, ONE_MINUS_SRC_ALPHA, DST_ALPHA, ONE_MINUS_DST_ALPHA, CONSTANT_COLOR, ONE_MINUS_CONSTANT_COLOR,
- * GL_CONSTANT_ALPHA, and GL_ONE_MINUS_CONSTANT_ALPHA.
- */
- void SetBlendFunc( BlendingFactor::Type srcFactorRgba, BlendingFactor::Type destFactorRgba );
-
- /**
- * @brief Specify the pixel arithmetic used when the actor is blended.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] srcFactorRgb Specifies how the red, green, and blue source blending factors are computed.
- * The options are BlendingFactor::ZERO, ONE, SRC_COLOR, ONE_MINUS_SRC_COLOR, DST_COLOR, ONE_MINUS_DST_COLOR,
- * SRC_ALPHA, ONE_MINUS_SRC_ALPHA, DST_ALPHA, ONE_MINUS_DST_ALPHA, CONSTANT_COLOR, ONE_MINUS_CONSTANT_COLOR,
- * GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, and GL_SRC_ALPHA_SATURATE.
- *
- * @param[in] destFactorRgb Specifies how the red, green, blue, and alpha destination blending factors are computed.
- * The options are BlendingFactor::ZERO, ONE, SRC_COLOR, ONE_MINUS_SRC_COLOR, DST_COLOR, ONE_MINUS_DST_COLOR,
- * SRC_ALPHA, ONE_MINUS_SRC_ALPHA, DST_ALPHA, ONE_MINUS_DST_ALPHA, CONSTANT_COLOR, ONE_MINUS_CONSTANT_COLOR,
- * GL_CONSTANT_ALPHA, and GL_ONE_MINUS_CONSTANT_ALPHA.
- *
- * @param[in] srcFactorAlpha Specifies how the alpha source blending factor is computed.
- * The options are the same as for srcFactorRgb.
- *
- * @param[in] destFactorAlpha Specifies how the alpha source blending factor is computed.
- * The options are the same as for destFactorRgb.
- */
- void SetBlendFunc( BlendingFactor::Type srcFactorRgb, BlendingFactor::Type destFactorRgb,
- BlendingFactor::Type srcFactorAlpha, BlendingFactor::Type destFactorAlpha );
-
- /**
- * @brief Query the pixel arithmetic used when the actor is blended.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[out] srcFactorRgb Specifies how the red, green and blue source blending factors are computed.
- * @param[out] destFactorRgb Specifies how the red, green and blue destination blending factors are computed.
- * @param[out] srcFactorAlpha Specifies how the alpha source blending factor is computed.
- * @param[out] destFactorAlpha Specifies how the alpha destination blending factor is computed.
- */
- void GetBlendFunc( BlendingFactor::Type& srcFactorRgb, BlendingFactor::Type& destFactorRgb,
- BlendingFactor::Type& srcFactorAlpha, BlendingFactor::Type& destFactorAlpha ) const;
-
- /**
- * @brief Specify the equation used when the actor is blended.
- *
- * The options are BlendingEquation::ADD, BlendingEquation::SUBTRACT, or BlendingEquation::REVERSE_SUBTRACT.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] equationRgba The equation used for combining red, green, blue, and alpha components.
- */
- void SetBlendEquation( BlendingEquation::Type equationRgba );
-
- /**
- * @brief Specify the equation used when the actor is blended.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] equationRgb The equation used for combining red, green, and blue components.
- * @param[in] equationAlpha The equation used for combining the alpha component.
- * The options are BlendingEquation::ADD, BlendingEquation::SUBTRACT, or BlendingEquation::REVERSE_SUBTRACT.
- */
- void SetBlendEquation( BlendingEquation::Type equationRgb, BlendingEquation::Type equationAlpha );
-
- /**
- * @brief Query the equation used when the actor is blended.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[out] equationRgb The equation used for combining red, green, and blue components.
- * @param[out] equationAlpha The equation used for combining the alpha component.
- */
- void GetBlendEquation( BlendingEquation::Type& equationRgb, BlendingEquation::Type& equationAlpha ) const;
-
- /**
- * @brief Specify the color used when the actor is blended; the default is Vector4::ZERO.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] color The blend color
- */
- void SetBlendColor( const Vector4& color );
-
- /**
- * @brief Query the color used when the actor is blended.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return The blend color
- */
- const Vector4& GetBlendColor() const;
-
- /**
- * @brief Sets the filtering mode.
- *
- * Possible values are: FilterMode::NEAREST and FilterMode::LINEAR. Default is FilterMode::LINEAR.
- *
- * <ul>
- * <li> \e NEAREST Use nearest filtering
- * <li> \e LINEAR Use linear filtering
- * </ul>
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[in] minFilter The minification filtering mode
- * @param[in] magFilter The magnification filtering mode
- */
- void SetFilterMode( FilterMode::Type minFilter, FilterMode::Type magFilter );
-
- /**
- * @brief Retrieves the filtering mode.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param[out] minFilter The return minification value
- * @param[out] magFilter The return magnification value
- */
- void GetFilterMode( FilterMode::Type& minFilter, FilterMode::Type& magFilter) const;
-
- /**
- * @brief Sets the shader effect for the ImageActor.
- *
- * Shader effects provide special effects like ripple and bend.
- * Setting a shader effect removes any shader effect previously set by @ref ImageActor::SetShaderEffect.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] effect The shader effect
- * @pre The actor has been initialized.
- * @pre Effect has been initialized.
- */
- void SetShaderEffect( ShaderEffect effect );
-
- /**
- * @brief Retrieve the custom shader effect for the ImageActor.
- *
- * If default shader is used an empty handle is returned.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return The shader effect
- * @pre The Actor has been initialized.
- */
- ShaderEffect GetShaderEffect() const;
-
- /**
- * @brief Removes the current shader effect.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @pre The Actor has been initialized.
- */
- void RemoveShaderEffect();
-
-
-public: // Not intended for application developers
-
- explicit DALI_INTERNAL ImageActor(Internal::ImageActor*);
-};
-
-
-/**
- * @brief Sets the shader effect for all ImageActors in a tree of Actors.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] actor Root of a tree of actors
- * @param [in] effect The shader effect
- * @see ImageActor::SetShaderEffect
- *
- */
-DALI_IMPORT_API void SetShaderEffectRecursively( Dali::Actor actor, Dali::ShaderEffect effect );
-
-/**
- * @brief Removes the shader effect from all ImageActors in a tree of Actors.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @param [in] actor Root of a tree of actors
- * @see ImageActor::RemoveShaderEffect
- *
- */
-DALI_IMPORT_API void RemoveShaderEffectRecursively( Dali::Actor actor );
-
-/**
- * @}
- */
-} // namespace Dali
-
-#endif // __DALI_IMAGE_ACTOR_H__
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/actor-enumerations.h>
-#include <dali/public-api/actors/blending.h>
#include <dali/public-api/actors/camera-actor.h>
#include <dali/public-api/actors/custom-actor-impl.h>
#include <dali/public-api/actors/custom-actor.h>
#include <dali/public-api/actors/draw-mode.h>
-#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/actors/sampling.h>
#include <dali/public-api/images/native-image.h>
#include <dali/public-api/images/native-image-interface.h>
#include <dali/public-api/images/resource-image.h>
-#include <dali/public-api/images/nine-patch-image.h>
#include <dali/public-api/images/pixel.h>
#include <dali/public-api/images/pixel-data.h>
#include <dali/public-api/signals/signal-slot-observers.h>
#include <dali/public-api/signals/slot-delegate.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
-
#include <dali/public-api/size-negotiation/relayout-container.h>
#include <dali/public-api/dali-core-version.h>
public_api_src_files = \
$(public_api_src_dir)/actors/actor.cpp \
- $(public_api_src_dir)/actors/blending.cpp \
$(public_api_src_dir)/actors/camera-actor.cpp \
$(public_api_src_dir)/actors/custom-actor.cpp \
$(public_api_src_dir)/actors/custom-actor-impl.cpp \
- $(public_api_src_dir)/actors/image-actor.cpp \
$(public_api_src_dir)/actors/layer.cpp \
$(public_api_src_dir)/animation/animation.cpp \
$(public_api_src_dir)/animation/alpha-function.cpp \
$(public_api_src_dir)/images/buffer-image.cpp \
$(public_api_src_dir)/images/frame-buffer-image.cpp \
$(public_api_src_dir)/images/encoded-buffer-image.cpp \
- $(public_api_src_dir)/images/nine-patch-image.cpp \
$(public_api_src_dir)/images/resource-image.cpp \
$(public_api_src_dir)/images/native-image.cpp \
$(public_api_src_dir)/math/compile-time-math.cpp \
$(public_api_src_dir)/rendering/renderer.cpp \
$(public_api_src_dir)/rendering/sampler.cpp \
$(public_api_src_dir)/rendering/shader.cpp \
- $(public_api_src_dir)/shader-effects/shader-effect.cpp \
$(public_api_src_dir)/signals/callback.cpp \
$(public_api_src_dir)/signals/connection-tracker.cpp \
$(public_api_src_dir)/signals/connection-tracker-interface.cpp \
public_api_core_actors_header_files = \
$(public_api_src_dir)/actors/actor.h \
$(public_api_src_dir)/actors/actor-enumerations.h \
- $(public_api_src_dir)/actors/blending.h \
$(public_api_src_dir)/actors/camera-actor.h \
$(public_api_src_dir)/actors/custom-actor.h \
$(public_api_src_dir)/actors/custom-actor-impl.h \
$(public_api_src_dir)/actors/draw-mode.h \
- $(public_api_src_dir)/actors/image-actor.h \
$(public_api_src_dir)/actors/layer.h \
$(public_api_src_dir)/actors/sampling.h
$(public_api_src_dir)/images/frame-buffer-image.h \
$(public_api_src_dir)/images/image.h \
$(public_api_src_dir)/images/image-operations.h \
- $(public_api_src_dir)/images/nine-patch-image.h \
$(public_api_src_dir)/images/pixel.h \
$(public_api_src_dir)/images/pixel-data.h \
$(public_api_src_dir)/images/resource-image.h \
$(public_api_src_dir)/rendering/sampler.h \
$(public_api_src_dir)/rendering/shader.h
-public_api_core_shader_effects_header_files = \
- $(public_api_src_dir)/shader-effects/shader-effect.h
-
public_api_core_size_negotiation_header_files = \
$(public_api_src_dir)/size-negotiation/relayout-container.h
const BufferImage BufferImage::WHITE()
{
- Internal::BufferImage* internal = new Internal::BufferImage(1,1,Pixel::RGBA8888, Dali::Image::NEVER);
+ Internal::BufferImage* internal = new Internal::BufferImage(1,1,Pixel::RGBA8888);
PixelBuffer* pBuf = internal->GetBuffer();
if ( pBuf )
{
return BufferImage(internal.Get());
}
-BufferImage BufferImage::New(unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy releasePol)
-{
- DALI_ASSERT_ALWAYS( 0u != width && "Invalid BufferImage width requested" );
- DALI_ASSERT_ALWAYS( 0u != height && "Invalid BufferImage height requested" );
-
- Internal::BufferImagePtr internal = Internal::BufferImage::New(width, height, pixelformat, releasePol);
- return BufferImage(internal.Get());
-}
-
BufferImage BufferImage::New(PixelBuffer* pixBuf, unsigned int width, unsigned int height, Pixel::Format pixelformat, unsigned int stride)
{
DALI_ASSERT_ALWAYS( 0u != width && "Invalid BufferImage width requested" );
return BufferImage(internal.Get());
}
-BufferImage BufferImage::New(PixelBuffer* pixBuf, unsigned int width, unsigned int height, Pixel::Format pixelformat, unsigned int stride, ReleasePolicy releasePol)
-{
- DALI_ASSERT_ALWAYS( 0u != width && "Invalid BufferImage width requested" );
- DALI_ASSERT_ALWAYS( 0u != height && "Invalid BufferImage height requested" );
- Internal::BufferImagePtr internal = Internal::BufferImage::New(pixBuf, width, height, pixelformat, stride, releasePol);
- return BufferImage(internal.Get());
-}
-
PixelBuffer* BufferImage::GetBuffer()
{
return GetImplementation(*this).GetBuffer();
Pixel::Format pixelformat=Pixel::RGBA8888);
/**
- * @DEPRECATED_1_1.3. Use New( unsigned int width, unsigned int height ) instead.
- *
- * @brief Create a new BufferImage.
- *
- * Also a pixel buffer for image data is allocated.
- * Dali has ownership of the buffer.
- * For better performance and portability use power of two dimensions.
- * The maximum size of the image is limited by GL_MAX_TEXTURE_SIZE.
- *
- * @SINCE_1_0.0
- * @remarks ReleasePolicy is an experimental feature and might not be supported in the next release.
- * We do recommend not to use this method.
- * Please refer the Remarks of ReleasePolicy for more information.
- * @param [in] width Image width in pixels
- * @param [in] height Image height in pixels
- * @param [in] pixelFormat The pixel format
- * @param [in] releasePolicy Optionally release memory when image is not visible on screen.
- * @return A handle to a new instance of BufferImage
- * @pre width & height are greater than zero
- */
- static BufferImage New(unsigned int width,
- unsigned int height,
- Pixel::Format pixelFormat,
- ReleasePolicy releasePolicy);
-
- /**
* @brief Create a new BufferImage, which uses an external data source.
*
* The PixelBuffer has to be allocated by application.
unsigned int stride=0);
/**
- * @DEPRECATED_1_1.3. Use New( PixelBuffer* pixelBuffer, unsigned int width, unsigned int height ) instead.
- *
- * @brief Create a new BufferImage, which uses an external data source.
- *
- * The PixelBuffer has to be allocated by application.
- *
- * The application holds ownership of the buffer. It must not
- * destroy the PixelBuffer on a staged image if it has called
- * Update() and hasn't received a Image::UploadedSignal, or if it has just
- * added it to the stage and has not received a Image::UploadedSignal.
- *
- * For better performance and portability use power of two dimensions.
- * The maximum size of the image is limited by GL_MAX_TEXTURE_SIZE.
- *
- * @SINCE_1_0.0
- * @remarks ReleasePolicy is an experimental feature and might not be supported in the next release.
- * We do recommend not to use this method.
- * Please refer the Remarks of ReleasePolicy for more information.
- * @param [in] pixelBuffer Pixel buffer. has to be allocated by application.
- * @param [in] width Image width in pixels
- * @param [in] height Image height in pixels
- * @param [in] pixelFormat The pixel format
- * @param [in] stride The internal stride of the pixelbuffer in pixels
- * @param [in] releasePolicy Optionally relase memory when image is not visible on screen.
- * @return A handle to a new instance of BufferImage
- * @pre width & height are greater than zero
- * @note in case releasePolicy is Image::UNUSED, application has to call
- * BufferImage::Update() whenever image is re-added to the stage
- *
- */
- static BufferImage New(PixelBuffer* pixelBuffer,
- unsigned int width,
- unsigned int height,
- Pixel::Format pixelFormat,
- unsigned int stride,
- ReleasePolicy releasePolicy);
-
- /**
* @brief Downcast a handle to BufferImage handle.
*
* If handle points to a BufferImage the downcast produces valid
{
}
-EncodedBufferImage EncodedBufferImage::New( const uint8_t * const encodedImage,
- std::size_t encodedImageByteCount,
- ImageDimensions size, FittingMode::Type fittingMode, SamplingMode::Type samplingMode,
- ReleasePolicy releasePol,
- bool orientationCorrection )
-{
- Internal::EncodedBufferImagePtr internal = Internal::EncodedBufferImage::New( encodedImage, encodedImageByteCount, size, fittingMode, samplingMode, orientationCorrection, releasePol );
- EncodedBufferImage image(internal.Get());
- return image;
-}
-
EncodedBufferImage EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount )
{
ImageDimensions size(0, 0);
FittingMode::Type fittingMode = FittingMode::DEFAULT;
SamplingMode::Type samplingMode = SamplingMode::DEFAULT;
- Internal::EncodedBufferImagePtr internal = Internal::EncodedBufferImage::New( encodedImage, encodedImageByteCount, size, fittingMode, samplingMode, true, Dali::Image::NEVER );
+ Internal::EncodedBufferImagePtr internal = Internal::EncodedBufferImage::New( encodedImage, encodedImageByteCount, size, fittingMode, samplingMode, true );
EncodedBufferImage image( internal.Get() );
return image;
}
ImageDimensions size, FittingMode::Type fittingMode, SamplingMode::Type samplingMode,
bool orientationCorrection )
{
- Internal::EncodedBufferImagePtr internal = Internal::EncodedBufferImage::New( encodedImage, encodedImageByteCount, size, fittingMode, samplingMode, orientationCorrection, Dali::Image::NEVER );
+ Internal::EncodedBufferImagePtr internal = Internal::EncodedBufferImage::New( encodedImage, encodedImageByteCount, size, fittingMode, samplingMode, orientationCorrection );
EncodedBufferImage image(internal.Get());
return image;
}
EncodedBufferImage();
/**
- * @DEPRECATED_1_1.3. Use New(const uint8_t* const, std::size_t,ImageDimensions,FittingMode::Type,SamplingMode::Type,bool) instead.
- *
- * @brief Create an initialised image object from an encoded image buffer in memory.
- *
- * @SINCE_1_0.0
- * @remarks Image::ReleasePolicy is an experimental feature and might not be supported in the next release.
- * We do recommend not to use this method.
- * Please refer the remarks of ReleasePolicy for more information.
- * @param [in] encodedImage The encoded bytes of an image, in a supported
- * image format such as PNG, JPEG, GIF, BMP, KTX, ICO, and WBMP, organised
- * exactly as it would be as a file in the filesystem.
- * The caller retains ownership of this buffer and is free to modify or
- * discard it as soon as the function returns.
- * @param [in] encodedImageByteCount The size in bytes of the buffer pointed to
- * by encodedImage.
- * @param [in] size The width and height to fit the loaded image to.
- * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
- * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size.
- * @param [in] releasePol The releasePolicy to apply to Image. The default value is Image::NEVER.
- * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
- * policy is set, a reload will not be possible, so the Image should never be
- * used once all actors using it have gone off-stage.
- * @return A handle to a newly allocated object.
- */
- static EncodedBufferImage New( const uint8_t * const encodedImage, std::size_t encodedImageByteCount, ImageDimensions size, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, ReleasePolicy releasePol, bool orientationCorrection = true );
-
- /**
* @brief Create an initialised image object from an encoded image buffer in memory.
*
* @SINCE_1_0.0
return FrameBufferImage(internal.Get());
}
-FrameBufferImage FrameBufferImage::New( unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy releasePolicy, RenderBuffer::Format bufferformat )
-{
- Dali::Vector2 stageSize = Stage::GetCurrent().GetSize();
- Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New(
- (0 == width) ? stageSize.width : width,
- (0 == height) ? stageSize.height : height,
- pixelformat,
- bufferformat);
-
- internal->SetReleasePolicy( releasePolicy );
- return FrameBufferImage(internal.Get());
-}
-
-FrameBufferImage FrameBufferImage::New( NativeImageInterface& image, ReleasePolicy releasePolicy )
-{
- Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New( image );
- internal->SetReleasePolicy( releasePolicy );
- return FrameBufferImage(internal.Get());
-}
-
FrameBufferImage FrameBufferImage::New( NativeImageInterface& image )
{
Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New( image );
RenderBuffer::Format bufferFormat = RenderBuffer::COLOR);
/**
- * @DEPRECATED_1_1.3. Use New() instead.
- *
- * @brief Create a new FrameBufferImage.
- *
- * The maximum size of the image is limited by GL_MAX_TEXTURE_SIZE.
- * @SINCE_1_0.0
- * @remarks Image::ReleasePolicy is an experimental feature and might not be supported in the next release.
- * We do recommend not to use this method.
- * Please refer the Remarks of ReleasePolicy for more information.
- * @param [in] width The width in pixels. Setting to zero will use the width of the stage.
- * @param [in] height The height in pixels. Setting to zero will use the height of the stage.
- * @param [in] pixelFormat The pixel format.
- * @param [in] releasePolicy The releasePolicy to apply to the FrameBufferImage.
- * @param [in] bufferFormat The format of the buffers that are going to be created for the FBO, (COLOR and DEPTH buffer as default)
- *
- * @return A handle to a new instance of a FrameBufferImage.
- * @post When the FrameBufferImage is first used as a render target, an exception may be thrown if pixelFormat is not supported on the hardware platform.
- */
- static FrameBufferImage New(unsigned int width, unsigned int height, Pixel::Format pixelFormat, ReleasePolicy releasePolicy,
- RenderBuffer::Format bufferFormat = RenderBuffer::COLOR);
-
- /**
* @brief Create a new FrameBufferImage.
*
* The maximum size of the image is limited by GL_MAX_TEXTURE_SIZE.
static FrameBufferImage New(NativeImageInterface& image);
/**
- * @DEPRECATED_1_1.3. Use New( NativeImageInterface& ) instead.
- *
- * @brief Create a new FrameBufferImage.
- *
- * The maximum size of the image is limited by GL_MAX_TEXTURE_SIZE.
- * @SINCE_1_0.0
- * @remarks Image::ReleasePolicy is an experimental feature and might not be supported in the next release.
- * We do recommend not to use this method.
- * Please refer the remarks of ReleasePolicy for more information.
- * @param [in] image The native image.
- * @param [in] releasePolicy The releasePolicy to apply to the FrameBufferImage.
- *
- * @return A handle to a new instance of a FrameBufferImage.
- * @post When the FrameBufferImage is first used as a render target, an exception may be thrown if the NativeImage cannot be mapped to a texture.
- */
- static FrameBufferImage New(NativeImageInterface& image, ReleasePolicy releasePolicy);
-
- /**
* @brief Downcast a handle to FrameBufferImage handle.
*
* If handle points to a FrameBufferImage object the
return Image( dynamic_cast<Dali::Internal::Image*>(handle.GetObjectPtr()) );
}
-Image::ReleasePolicy Image::GetReleasePolicy() const
-{
- return GetImplementation(*this).GetReleasePolicy();
-}
-
unsigned int Image::GetWidth() const
{
return GetImplementation(*this).GetWidth();
public:
/**
- * @DEPRECATED_1_1.3. Image resource is released as soon as last handle is released.
- * @brief ReleasePolicy controls the way images are deleted from memory.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- enum ReleasePolicy
- {
- UNUSED, ///< release resource once image is not in use anymore (eg. all actors using it become offstage). Reload when resource is required again. @SINCE_1_0.0
- NEVER ///< keep image data for the lifetime of the object. (default) @SINCE_1_0.0
- };
-
- /**
* @brief Type of signal for Image Uploaded.
* @SINCE_1_0.0
*/
static Image DownCast( BaseHandle handle );
/**
- * @DEPRECATED_1_1.3
- *
- * @brief Return resource release policy.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return Resource release policy
- */
- ReleasePolicy GetReleasePolicy() const;
-
- /**
* @brief Returns the width of the image.
*
* Returns either the requested width or the actual loaded width if no specific size was requested.
return ResourceImage( Internal::ResourceImage::New( url, attributes ).Get() );
}
-ResourceImage ResourceImage::New( const std::string& url, LoadPolicy loadPol, ReleasePolicy releasePol, bool orientationCorrection )
-{
- Internal::ImageAttributes attributes = Internal::ImageAttributes::DEFAULT_ATTRIBUTES;
- attributes.SetOrientationCorrection( orientationCorrection );
- return ResourceImage( Internal::ResourceImage::New( url, attributes, loadPol, releasePol ).Get() );
-}
-
ResourceImage ResourceImage::New( const std::string& url, ImageDimensions size, FittingMode::Type scalingMode, SamplingMode::Type samplingMode, bool orientationCorrection )
{
Internal::ImageAttributes attributes = Internal::ImageAttributes::DEFAULT_ATTRIBUTES;
return ResourceImage( Internal::ResourceImage::New( url, attributes ).Get() );
}
-ResourceImage ResourceImage::New( const std::string& url, LoadPolicy loadPol, ReleasePolicy releasePol, ImageDimensions size, FittingMode::Type scalingMode, SamplingMode::Type samplingMode, bool orientationCorrection )
-{
- Internal::ImageAttributes attributes = Internal::ImageAttributes::DEFAULT_ATTRIBUTES;
- attributes.SetSize( Size( size.GetWidth(), size.GetHeight() ) );
- attributes.SetScalingMode( scalingMode );
- attributes.SetFilterMode( samplingMode );
- attributes.SetOrientationCorrection( orientationCorrection );
- return ResourceImage( Internal::ResourceImage::New( url, attributes, loadPol, releasePol ).Get() );
-}
-
ResourceImage ResourceImage::DownCast( BaseHandle handle )
{
return ResourceImage( dynamic_cast<Dali::Internal::ResourceImage*>(handle.GetObjectPtr()) );
}
-ResourceImage::LoadPolicy ResourceImage::GetLoadPolicy() const
-{
- return GetImplementation(*this).GetLoadPolicy();
-}
-
LoadingState ResourceImage::GetLoadingState() const
{
return GetImplementation(*this).GetLoadingState();
public:
/**
- * @DEPRECATED_1_1.3. Image loading starts immediately in the frame when then ResourceImage object is created.
- *
- * @brief LoadPolicy controls the way images are loaded into memory.
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- */
- enum LoadPolicy
- {
- IMMEDIATE, ///< Load image once it is created (default) @SINCE_1_0.0
- ON_DEMAND ///< Delay loading until the image is being used (a related actor is added to Stage) @SINCE_1_0.0
- };
-
- /**
* @brief Type of signal for LoadingFinished and Uploaded.
* @SINCE_1_0.0
*/
static ResourceImage New( const std::string& url, bool orientationCorrection = true );
/**
- * @DEPRECATED_1_1.3. Use New( const std::string& url ) instead.
- *
- * @brief Create an initialised ResourceImage object.
- *
- * @SINCE_1_0.0
- * @REMARK_INTERNET
- * @param [in] url The URL of the image file to use.
- * @param [in] loadPol The LoadPolicy to apply when loading the image resource.
- * @param [in] releasePol The ReleasePolicy to apply to Image.
- * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
- * @return A handle to a newly allocated object
- */
- static ResourceImage New( const std::string& url, LoadPolicy loadPol, ReleasePolicy releasePol, bool orientationCorrection = true );
-
- /**
* @brief Create an initialised ResourceImage object.
*
* @SINCE_1_0.0
SamplingMode::Type samplingMode = SamplingMode::DEFAULT,
bool orientationCorrection = true );
- /**
- * @DEPRECATED_1_1.3. Use New( const std::string& url, ImageDimensions size ) instead.
- *
- * @brief Create an initialised ResourceImage object.
- *
- * @SINCE_1_0.0
- * @REMARK_INTERNET
- * @param [in] url The URL of the image file to use.
- * @param [in] loadPol The LoadPolicy to apply when loading the image resource.
- * @param [in] releasePol The ReleasePolicy to apply to Image.
- * @param [in] size The width and height to fit the loaded image to.
- * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
- * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size.
- * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
- * @return A handle to a newly allocated object
- */
- static ResourceImage New( const std::string& url,
- LoadPolicy loadPol,
- ReleasePolicy releasePol,
- ImageDimensions size,
- FittingMode::Type fittingMode = FittingMode::DEFAULT,
- SamplingMode::Type samplingMode = SamplingMode::DEFAULT,
- bool orientationCorrection = true );
-
///@}
/**
static ResourceImage DownCast( BaseHandle handle );
/**
- * @DEPRECATED_1_1.3
- *
- * @brief Return load policy.
- *
- * @SINCE_1_0.0
- * @remarks This is an experimental feature and might not be supported in the next release.
- * We do recommend not to use it.
- * @return Resource load policy
- */
- LoadPolicy GetLoadPolicy() const;
-
- /**
* @brief Query whether the image data has loaded.
*
* The asynchronous loading begins when the Image object is created.
projects / platform / core / uifw / dali-core.git / commitdiff