X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-CubeTransitionEffect.cpp;h=8d8cefb6018a0795704a774d31cfdff177442ca8;hp=e759409d5c103f16d3cbb603b4197b863e8fe91c;hb=8db599ebe35a704d4adfd70040c33ce8e31e8d64;hpb=3f3cb4f8020f60d4d5dc672ddc426cb73126f80d diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp index e759409..8d8cefb 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp @@ -24,7 +24,8 @@ #include #include #include - +#include +#include using namespace Dali; @@ -77,14 +78,14 @@ void Wait(ToolkitTestApplication& application, float durationToPass) class TransitionCompletedCallback : public Dali::ConnectionTracker { public: - TransitionCompletedCallback( bool& signalReceived, CubeTransitionEffect& effect, Image& image ) + TransitionCompletedCallback( bool& signalReceived, CubeTransitionEffect& effect, Texture& image ) : mSignalVerified( signalReceived ), mCurrentEffect( effect ), mActorTransitTo( image ) { } - void Callback( CubeTransitionEffect effect, Image image ) + void Callback( CubeTransitionEffect effect, Texture image ) { tet_infoline( "Verifying TransitionCompletedSignal" ); @@ -101,7 +102,7 @@ public: bool& mSignalVerified; CubeTransitionEffect& mCurrentEffect; - Image& mActorTransitTo; + Texture& mActorTransitTo; }; } // namespace @@ -257,13 +258,13 @@ int UtcDaliCubeTransitionEffectGetRoot(void) unsigned int totalNum = NUM_ROWS*NUM_COLUMNS; - Image image = BufferImage::New( 40, 40 ) ; + Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 ); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS ); waveEffect.SetSize( VIEW_AREA_SIZE ); Stage::GetCurrent().Add( waveEffect ); - waveEffect.SetCurrentImage( image ); - waveEffect.SetTargetImage( image ); + waveEffect.SetCurrentTexture( texture ); + waveEffect.SetTargetTexture( texture ); application.SendNotification(); application.Render(); @@ -289,7 +290,7 @@ int UtcDaliCubeTransitionEffectIsTransitioning(void) tet_infoline(" UtcDaliCubeTransitionEffectIsTransiting "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image image = BufferImage::New( 40, 40 ) ; + Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 ); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS ); waveEffect.SetSize( VIEW_AREA_SIZE ); @@ -299,8 +300,8 @@ int UtcDaliCubeTransitionEffectIsTransitioning(void) waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT ); DALI_TEST_CHECK( !waveEffect.IsTransitioning() ); - waveEffect.SetCurrentImage( image ); - waveEffect.SetTargetImage( image ); + waveEffect.SetCurrentTexture( texture ); + waveEffect.SetTargetTexture( texture ); //transition is started waveEffect.StartTransition(); DALI_TEST_CHECK( waveEffect.IsTransitioning() ); @@ -316,8 +317,8 @@ int UtcDaliCubeTransitionEffectIsTransitioning(void) crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT ); DALI_TEST_CHECK( !crossEffect.IsTransitioning() ); - crossEffect.SetCurrentImage( image ); - crossEffect.SetTargetImage( image ); + crossEffect.SetCurrentTexture( texture ); + crossEffect.SetTargetTexture( texture ); //transition is started crossEffect.StartTransition(false); DALI_TEST_CHECK( crossEffect.IsTransitioning() ); @@ -332,8 +333,8 @@ int UtcDaliCubeTransitionEffectIsTransitioning(void) foldEffect.SetTransitionDuration( TRANSITION_DURATION ); DALI_TEST_CHECK( !foldEffect.IsTransitioning() ); - foldEffect.SetCurrentImage( image ); - foldEffect.SetTargetImage( image ); + foldEffect.SetCurrentTexture( texture ); + foldEffect.SetTargetTexture( texture ); //transition is started foldEffect.StartTransition(true); DALI_TEST_CHECK(foldEffect.IsTransitioning() ); @@ -345,17 +346,17 @@ int UtcDaliCubeTransitionEffectIsTransitioning(void) } //Test common codes in base class -int UtcDaliCubeTransitionEffectSetCurrentImage(void) +int UtcDaliCubeTransitionEffectSetCurrentTexture(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliCubeTransitionEffectSetCurrentImage "); + tet_infoline(" UtcDaliCubeTransitionEffectSetCurrentTexture "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image image = BufferImage::New( 40, 40 ) ; + Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 ); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS ); waveEffect.SetSize( VIEW_AREA_SIZE ); - waveEffect.SetCurrentImage( image ); + waveEffect.SetCurrentTexture( texture ); Stage::GetCurrent().Add( waveEffect ); @@ -384,20 +385,19 @@ int UtcDaliCubeTransitionEffectSetCurrentImage(void) } //Test common codes in base class -int UtcDaliCubeTransitionEffectSetTargetImage(void) +int UtcDaliCubeTransitionEffectSetTargetTexture(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliCubeTransitionEffectSetTargetImage "); + tet_infoline(" UtcDaliCubeTransitionEffectSetTargetTexture "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image image = BufferImage::New( 30, 30 ); - + Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 ); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS ); waveEffect.SetSize( VIEW_AREA_SIZE ); Stage::GetCurrent().Add( waveEffect ); - waveEffect.SetCurrentImage( image ); - waveEffect.SetTargetImage( image ); + waveEffect.SetCurrentTexture( texture ); + waveEffect.SetTargetTexture( texture ); Stage::GetCurrent().Add( waveEffect ); @@ -430,13 +430,17 @@ int UtcDaliCubeTransitionWaveEffectStartTransition(void) tet_infoline(" UtcDaliCubeTransitionWaveEffectStartTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image image = ResourceImage::New( "Image.jpg" ); + + Devel::PixelBuffer pixelBuffer = LoadImageFromFile(TEST_RESOURCE_DIR "/gallery-small-1.jpg"); + PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer ); + Texture texture = Texture::New( TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() ); + texture.Upload( pixelData ); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS ); waveEffect.SetSize( VIEW_AREA_SIZE ); waveEffect.SetTransitionDuration( TRANSITION_DURATION ); waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT ); - waveEffect.SetCurrentImage( image ); + waveEffect.SetCurrentTexture( texture ); Stage::GetCurrent().Add( waveEffect ); @@ -448,27 +452,27 @@ int UtcDaliCubeTransitionWaveEffectStartTransition(void) Actor cube = waveEffect.GetChildAt(0).GetChildAt(0); //check the cube rotation value and color values just before the end of different transitions - waveEffect.SetTargetImage( image ); + waveEffect.SetTargetTexture( texture ); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - waveEffect.SetTargetImage( image ); + waveEffect.SetTargetTexture( texture ); waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - waveEffect.SetTargetImage( image ); + waveEffect.SetTargetTexture( texture ); waveEffect.StartTransition(false); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - waveEffect.SetTargetImage( image ); + waveEffect.SetTargetTexture( texture ); waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); @@ -483,14 +487,18 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void) tet_infoline(" UtcDaliCubeTransitionCrossEffectStartTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image image = ResourceImage::New( "Image.jpg" ); + + Devel::PixelBuffer pixelBuffer = LoadImageFromFile(TEST_RESOURCE_DIR "/gallery-small-1.jpg"); + PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer ); + Texture texture = Texture::New( TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() ); + texture.Upload( pixelData ); CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS ); crossEffect.SetSize( VIEW_AREA_SIZE ); crossEffect.SetTransitionDuration( TRANSITION_DURATION ); crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT ); - crossEffect.SetCurrentImage( image ); - crossEffect.SetTargetImage( image ); + crossEffect.SetCurrentTexture( texture ); + crossEffect.SetTargetTexture( texture ); Stage::GetCurrent().Add( crossEffect ); @@ -510,7 +518,7 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - crossEffect.SetTargetImage( image ); + crossEffect.SetTargetTexture( texture ); crossEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); @@ -519,7 +527,7 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - crossEffect.SetTargetImage( image ); + crossEffect.SetTargetTexture( texture ); crossEffect.StartTransition(false); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); @@ -527,7 +535,7 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - crossEffect.SetTargetImage( image ); + crossEffect.SetTargetTexture( texture ); crossEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); @@ -543,13 +551,12 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void) tet_infoline(" UtcDaliCubeTransitionFoldEffectStartTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image image = BufferImage::New( 30, 30 ); - + Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 ); CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS ); foldEffect.SetSize( VIEW_AREA_SIZE ); foldEffect.SetTransitionDuration( TRANSITION_DURATION ); - foldEffect.SetCurrentImage( image ); - foldEffect.SetTargetImage( image ); + foldEffect.SetCurrentTexture( texture ); + foldEffect.SetTargetTexture( texture ); Stage::GetCurrent().Add( foldEffect ); @@ -568,7 +575,7 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - foldEffect.SetTargetImage( image ); + foldEffect.SetTargetTexture( texture ); foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); @@ -577,7 +584,7 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - foldEffect.SetTargetImage( image ); + foldEffect.SetTargetTexture( texture ); foldEffect.StartTransition(false); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); @@ -585,7 +592,7 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(),FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); - foldEffect.SetTargetImage( image ); + foldEffect.SetTargetTexture( texture ); foldEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_BEFORE_END_DURATION ); DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); @@ -601,9 +608,9 @@ int UtcDaliCubeTransitionEffectSignalTransitionCompleted(void) tet_infoline(" UtcDaliCubeTransitionEffectSignalTransitionCompleted "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image firstImage = BufferImage::New( 30, 30 ); - Image secondImage = BufferImage::New( 20, 20 ); - Image thirdImage = BufferImage::New( 40, 40 ); + Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 ); + Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 ); + Texture thirdTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 ); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS ); waveEffect.SetSize( VIEW_AREA_SIZE ); @@ -624,61 +631,61 @@ int UtcDaliCubeTransitionEffectSignalTransitionCompleted(void) bool signalVerified = false; CubeTransitionEffect currentEffect; - Image actorTransitTo; + Texture actorTransitTo; TransitionCompletedCallback callback(signalVerified, currentEffect, actorTransitTo); waveEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback ); crossEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback ); foldEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback ); - //check that the wave effect is used to transit to secondImage + //check that the wave effect is used to transit to secondTexture currentEffect = waveEffect; - actorTransitTo = secondImage; - waveEffect.SetCurrentImage( firstImage ); - waveEffect.SetTargetImage( secondImage ); + actorTransitTo = secondTexture; + waveEffect.SetCurrentTexture( firstTexture ); + waveEffect.SetTargetTexture( secondTexture ); waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_DURATION ); DALI_TEST_CHECK(callback.mSignalVerified); callback.Reset(); - //check that the wave effect is used to transit to thirdImage - actorTransitTo = thirdImage; - waveEffect.SetTargetImage( thirdImage ); + //check that the wave effect is used to transit to thirdTexture + actorTransitTo = thirdTexture; + waveEffect.SetTargetTexture( thirdTexture ); waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_DURATION ); DALI_TEST_CHECK(callback.mSignalVerified); callback.Reset(); - //check that the cross effect is used to transit to secondImage + //check that the cross effect is used to transit to secondTexture currentEffect = crossEffect; - actorTransitTo = secondImage; - crossEffect.SetCurrentImage( thirdImage ); - crossEffect.SetTargetImage( secondImage ); + actorTransitTo = secondTexture; + crossEffect.SetCurrentTexture( thirdTexture ); + crossEffect.SetTargetTexture( secondTexture ); crossEffect.StartTransition(true); Wait( application, TRANSITION_DURATION ); DALI_TEST_CHECK(callback.mSignalVerified); callback.Reset(); - //check that the cross effect is used to transit to firstImage - actorTransitTo = firstImage; - crossEffect.SetTargetImage( firstImage ); + //check that the cross effect is used to transit to firstTexture + actorTransitTo = firstTexture; + crossEffect.SetTargetTexture( firstTexture ); crossEffect.StartTransition(false); Wait( application, TRANSITION_DURATION ); DALI_TEST_CHECK(callback.mSignalVerified); callback.Reset(); - //check that the fold effect is used to transit to secondImage + //check that the fold effect is used to transit to secondTexture currentEffect = foldEffect; - actorTransitTo = secondImage; - foldEffect.SetCurrentImage( firstImage ); - foldEffect.SetTargetImage( secondImage ); + actorTransitTo = secondTexture; + foldEffect.SetCurrentTexture( firstTexture ); + foldEffect.SetTargetTexture( secondTexture ); foldEffect.StartTransition(); Wait( application, TRANSITION_DURATION ); DALI_TEST_CHECK( callback.mSignalVerified ); callback.Reset(); - //check that the fold effect is used to transit to thirdImage - actorTransitTo = thirdImage; - foldEffect.SetTargetImage( thirdImage ); + //check that the fold effect is used to transit to thirdTexture + actorTransitTo = thirdTexture; + foldEffect.SetTargetTexture( thirdTexture ); foldEffect.StartTransition( false ); Wait( application, TRANSITION_DURATION ); DALI_TEST_CHECK( callback.mSignalVerified ); @@ -691,8 +698,8 @@ int UtcDaliCubeTransitionEffectPauseResumeTransition(void) tet_infoline(" UtcDaliCubeTransitionEffectPauseResumeTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image firstImage = BufferImage::New( 30, 30 ); - Image secondImage = BufferImage::New( 20, 20 ); + Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 ); + Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 ); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS ); waveEffect.SetSize( VIEW_AREA_SIZE ); @@ -713,16 +720,16 @@ int UtcDaliCubeTransitionEffectPauseResumeTransition(void) bool signalVerified = false; CubeTransitionEffect currentEffect; - Image actorTransitTo; + Texture actorTransitTo; TransitionCompletedCallback callback(signalVerified, currentEffect, actorTransitTo); waveEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback ); crossEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback ); foldEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback ); currentEffect = waveEffect; - actorTransitTo = secondImage; - waveEffect.SetCurrentImage( firstImage ); - waveEffect.SetTargetImage( secondImage ); + actorTransitTo = secondTexture; + waveEffect.SetCurrentTexture( firstTexture ); + waveEffect.SetTargetTexture( secondTexture ); // start transition; transit for 0.5*duration; pause for 0.5*duration; // resume for 0.25*duration; pause for 0.25*duration; resume for another 0.25*duration; // only until now the transition finished signal can be received @@ -744,9 +751,9 @@ int UtcDaliCubeTransitionEffectPauseResumeTransition(void) callback.Reset(); currentEffect = crossEffect; - actorTransitTo = firstImage; - crossEffect.SetCurrentImage( secondImage ); - crossEffect.SetTargetImage( firstImage ); + actorTransitTo = firstTexture; + crossEffect.SetCurrentTexture( secondTexture ); + crossEffect.SetTargetTexture( firstTexture ); // start transition; transit for 0.25*duration; pause for 0.2*duration; // resume for 0.5*duration; pause for 0.2*duration; resume for another 0.25*duration; // only until now the transition finished signal can be received @@ -768,9 +775,9 @@ int UtcDaliCubeTransitionEffectPauseResumeTransition(void) callback.Reset(); currentEffect = foldEffect; - actorTransitTo = secondImage; - foldEffect.SetCurrentImage( firstImage ); - foldEffect.SetTargetImage( secondImage ); + actorTransitTo = secondTexture; + foldEffect.SetCurrentTexture( firstTexture ); + foldEffect.SetTargetTexture( secondTexture ); // start transition; transit for 0.5*duration; pause for 0.5*duration; // resume for 0.25*duration; pause for 0.25*duration; resume for another 0.25*duration; // only until now the transition finished signal can be received @@ -798,15 +805,15 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void) tet_infoline(" UtcDaliCubeTransitionWaveEffectStopTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image firstImage = BufferImage::New( 30, 30 ); - Image secondImage = BufferImage::New( 20, 20 ); + Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 ); + Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 ); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS ); waveEffect.SetSize( VIEW_AREA_SIZE ); waveEffect.SetTransitionDuration( TRANSITION_DURATION ); waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT ); - waveEffect.SetCurrentImage( firstImage ); - waveEffect.SetTargetImage( secondImage ); + waveEffect.SetCurrentTexture( firstTexture ); + waveEffect.SetTargetTexture( secondTexture ); Stage::GetCurrent().Add( waveEffect ); @@ -826,7 +833,7 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void) DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - waveEffect.SetTargetImage( firstImage ); + waveEffect.SetTargetTexture( firstTexture ); waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_DURATION*0.4f ); waveEffect.StopTransition(); @@ -836,7 +843,7 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void) DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - waveEffect.SetTargetImage( secondImage ); + waveEffect.SetTargetTexture( secondTexture ); waveEffect.StartTransition(false); Wait( application, TRANSITION_DURATION*0.6f ); waveEffect.StopTransition(); @@ -846,7 +853,7 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void) DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - waveEffect.SetTargetImage( firstImage ); + waveEffect.SetTargetTexture( firstTexture ); waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_DURATION*0.8f ); waveEffect.StopTransition(); @@ -864,15 +871,15 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void) tet_infoline(" UtcDaliCubeTransitionCrossEffectStopTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image firstImage = BufferImage::New( 30, 30 ); - Image secondImage = BufferImage::New( 20, 20 ); + Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 ); + Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 ); CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS ); crossEffect.SetSize( VIEW_AREA_SIZE ); crossEffect.SetTransitionDuration( TRANSITION_DURATION ); crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT ); - crossEffect.SetCurrentImage( firstImage ); - crossEffect.SetTargetImage( secondImage ); + crossEffect.SetCurrentTexture( firstTexture ); + crossEffect.SetTargetTexture( secondTexture ); Stage::GetCurrent().Add( crossEffect ); @@ -894,7 +901,7 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - crossEffect.SetTargetImage( firstImage ); + crossEffect.SetTargetTexture( firstTexture ); crossEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_DURATION*0.4f ); crossEffect.StopTransition(); @@ -905,7 +912,7 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - crossEffect.SetTargetImage( secondImage ); + crossEffect.SetTargetTexture( secondTexture ); crossEffect.StartTransition(false); Wait( application, TRANSITION_DURATION*0.6f ); crossEffect.StopTransition(); @@ -916,7 +923,7 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - crossEffect.SetTargetImage( firstImage ); + crossEffect.SetTargetTexture( firstTexture ); crossEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_DURATION*0.8f ); crossEffect.StopTransition(); @@ -935,14 +942,14 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void) tet_infoline(" UtcDaliCubeTransitionFoldEffectStopTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - Image firstImage = BufferImage::New( 30, 30 ); - Image secondImage = BufferImage::New( 20, 20 ); + Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 ); + Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 ); CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS ); foldEffect.SetSize( VIEW_AREA_SIZE ); foldEffect.SetTransitionDuration( TRANSITION_DURATION ); - foldEffect.SetCurrentImage( firstImage ); - foldEffect.SetTargetImage( secondImage ); + foldEffect.SetCurrentTexture( firstTexture ); + foldEffect.SetTargetTexture( secondTexture ); Stage::GetCurrent().Add( foldEffect ); @@ -965,7 +972,7 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - foldEffect.SetTargetImage( firstImage ); + foldEffect.SetTargetTexture( firstTexture ); foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_DURATION*0.4f ); foldEffect.StopTransition(); @@ -976,7 +983,7 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - foldEffect.SetTargetImage( secondImage ); + foldEffect.SetTargetTexture( secondTexture ); foldEffect.StartTransition(false); Wait( application, TRANSITION_DURATION*0.6f ); foldEffect.StopTransition(); @@ -987,7 +994,7 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void) DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - foldEffect.SetTargetImage( firstImage ); + foldEffect.SetTargetTexture( firstTexture ); foldEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_DURATION*0.8f ); foldEffect.StopTransition();