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-ShaderEffects.cpp;h=336efb5dba2c25c8ad7ac9b9bfafacdd219fa747;hp=5c2d497eac08b23fb9fa6b380256a9dd25444319;hb=5e351965bad7e1de2e94027548b022bac692603c;hpb=4b3b7f4169b809c086e09323960271f187e3558a diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp index 5c2d497..336efb5 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -21,31 +21,14 @@ #include #include -#include -#include -#include -#include -#include #include -#include #include #include -#include -#include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include using namespace Dali; +using namespace Dali::Toolkit; int UtcDaliCreateAlphaDiscardEffect(void) { @@ -54,99 +37,34 @@ int UtcDaliCreateAlphaDiscardEffect(void) Property::Map effect = Toolkit::CreateAlphaDiscardEffect(); DALI_TEST_CHECK( !effect.Empty() ); - Property::Value* customShaderValue = effect.Find( "shader" ); + Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER ); DALI_TEST_CHECK( customShaderValue ); Property::Map customShader; DALI_TEST_CHECK( customShaderValue->Get( customShader ) ); - Property::Value* vertexShaderValue = customShader.Find( "vertexShader" ); + Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER ); DALI_TEST_CHECK( !vertexShaderValue ); - Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" ); + Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER ); DALI_TEST_CHECK( fragmentShaderValue ); std::string fragmentShader; DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) ); DALI_TEST_CHECK( !fragmentShader.empty() ); - Property::Value* gridXValue = customShader.Find( "subdivideGridX" ); + Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X ); DALI_TEST_CHECK( !gridXValue ); - Property::Value* gridYValue = customShader.Find( "subdivideGridY" ); + Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y ); DALI_TEST_CHECK( !gridYValue ); - Property::Value* hintsValue = customShader.Find( "hints" ); + Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS ); DALI_TEST_CHECK( !hintsValue ); END_TEST; } -int UtcDaliCreateBendyEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateBendyEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateBlindEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateBlindEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateBouncingEffect(void) -{ - ToolkitTestApplication application; - - Vector4 color(1.0f,1.0f,1.0f,1.0f); - - ShaderEffect effect = Toolkit::CreateBouncingEffect(color); - DALI_TEST_CHECK( effect ); - - Property::Value value = effect.GetProperty( effect.GetPropertyIndex("uAssignedColor")); - DALI_TEST_EQUALS( value.Get(), color, TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliCreateCarouselEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateCarouselEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateDisplacementEffectDisplaced(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateDisplacementEffect(Toolkit::DISPLACEMENT_EFFECT_DISPLACED); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateDisplacementEffectFixed(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateDisplacementEffect(Toolkit::DISPLACEMENT_EFFECT_FIXED); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - int UtcDaliCreateDissolveEffect( bool highPrecision ) { ToolkitTestApplication application; @@ -154,46 +72,46 @@ int UtcDaliCreateDissolveEffect( bool highPrecision ) Property::Map effect = Toolkit::CreateDissolveEffect( highPrecision ); DALI_TEST_CHECK( !effect.Empty() ); - Property::Value* customShaderValue = effect.Find( "shader" ); + Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER ); DALI_TEST_CHECK( customShaderValue ); Property::Map customShader; DALI_TEST_CHECK( customShaderValue->Get( customShader ) ); - Property::Value* vertexShaderValue = customShader.Find( "vertexShader" ); + Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER ); DALI_TEST_CHECK( vertexShaderValue ); std::string vertexShader; DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) ); DALI_TEST_CHECK( !vertexShader.empty() ); - Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" ); + Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER ); DALI_TEST_CHECK( fragmentShaderValue ); std::string fragmentShader; DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) ); DALI_TEST_CHECK( !fragmentShader.empty() ); - Property::Value* gridXValue = customShader.Find( "subdivideGridX" ); + Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X ); DALI_TEST_CHECK( gridXValue ); int gridX = 0; DALI_TEST_CHECK( gridXValue->Get( gridX ) ); DALI_TEST_CHECK( gridX > 1 ); - Property::Value* gridYValue = customShader.Find( "subdivideGridY" ); + Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y ); DALI_TEST_CHECK( gridYValue ); int gridY = 0; DALI_TEST_CHECK( gridYValue->Get( gridY ) ); DALI_TEST_CHECK( gridY > 1 ); - Property::Value* hintsValue = customShader.Find( "hints" ); + Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS ); DALI_TEST_CHECK( hintsValue ); - std::string hints; + int hints;; DALI_TEST_CHECK( hintsValue->Get( hints ) ); - DALI_TEST_CHECK( hints == "outputIsTransparent" ); + DALI_TEST_CHECK( hints == Shader::Hint::OUTPUT_IS_TRANSPARENT ); Actor actor = Actor::New(); Toolkit::DissolveEffectSetCentralLine( actor, Vector2::ONE, Vector2::ONE, 0.0f ); @@ -212,16 +130,6 @@ int UtcDaliCreateDissolveEffectMediumPrecision(void) return UtcDaliCreateDissolveEffect(false); } -int UtcDaliCreateDissolveLocalEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateDissolveLocalEffect(0); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - int UtcDaliCreateDissolveEffect(void) { ToolkitTestApplication application; @@ -229,31 +137,31 @@ int UtcDaliCreateDissolveEffect(void) Property::Map effect = Toolkit::CreateDistanceFieldEffect(); DALI_TEST_CHECK( !effect.Empty() ); - Property::Value* customShaderValue = effect.Find( "shader" ); + Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER ); DALI_TEST_CHECK( customShaderValue ); Property::Map customShader; DALI_TEST_CHECK( customShaderValue->Get( customShader ) ); - Property::Value* vertexShaderValue = customShader.Find( "vertexShader" ); + Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER ); DALI_TEST_CHECK( !vertexShaderValue ); - Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" ); + Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER ); DALI_TEST_CHECK( fragmentShaderValue ); std::string fragmentShader; DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) ); DALI_TEST_CHECK( !fragmentShader.empty() ); - Property::Value* gridXValue = customShader.Find( "subdivideGridX" ); + Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X ); DALI_TEST_CHECK( !gridXValue ); - Property::Value* hintsValue = customShader.Find( "hints" ); + Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS ); DALI_TEST_CHECK( hintsValue ); - std::string hints; + int hints;; DALI_TEST_CHECK( hintsValue->Get( hints ) ); - DALI_TEST_CHECK( hints == "outputIsTransparent" ); + DALI_TEST_CHECK( hints == Shader::Hint::OUTPUT_IS_TRANSPARENT ); END_TEST; } @@ -265,66 +173,34 @@ int UtcDaliCreateImageRegionEffect(void) Property::Map effect = Toolkit::CreateImageRegionEffect(); DALI_TEST_CHECK( !effect.Empty() ); - Property::Value* customShaderValue = effect.Find( "shader" ); + Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER ); DALI_TEST_CHECK( customShaderValue ); Property::Map customShader; DALI_TEST_CHECK( customShaderValue->Get( customShader ) ); - Property::Value* vertexShaderValue = customShader.Find( "vertexShader" ); + Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER ); DALI_TEST_CHECK( vertexShaderValue ); std::string vertexShader; DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) ); DALI_TEST_CHECK( !vertexShader.empty() ); - Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" ); + Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER ); DALI_TEST_CHECK( !fragmentShaderValue ); - Property::Value* gridXValue = customShader.Find( "subdivideGridX" ); + Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X ); DALI_TEST_CHECK( !gridXValue ); - Property::Value* gridYValue = customShader.Find( "subdivideGridY" ); + Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y ); DALI_TEST_CHECK( !gridYValue ); - Property::Value* hintsValue = customShader.Find( "hints" ); + Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS ); DALI_TEST_CHECK( !hintsValue ); END_TEST; } -int UtcDaliCreateIrisEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateIrisEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateMaskEffect(void) -{ - ToolkitTestApplication application; - - BufferImage image = CreateBufferImage(); - ShaderEffect effect = Toolkit::CreateMaskEffect(image); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateMirrorEffect(void) -{ - ToolkitTestApplication application; - - BufferImage image = CreateBufferImage(); - ShaderEffect effect = Toolkit::CreateMirrorEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - int UtcDaliCreateMotionBlurEffect(void) { ToolkitTestApplication application; @@ -332,46 +208,46 @@ int UtcDaliCreateMotionBlurEffect(void) Property::Map effect = Toolkit::CreateMotionBlurEffect(); DALI_TEST_CHECK( !effect.Empty() ); - Property::Value* customShaderValue = effect.Find( "shader" ); + Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER ); DALI_TEST_CHECK( customShaderValue ); Property::Map customShader; DALI_TEST_CHECK( customShaderValue->Get( customShader ) ); - Property::Value* vertexShaderValue = customShader.Find( "vertexShader" ); + Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER ); DALI_TEST_CHECK( vertexShaderValue ); std::string vertexShader; DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) ); DALI_TEST_CHECK( !vertexShader.empty() ); - Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" ); + Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER ); DALI_TEST_CHECK( fragmentShaderValue ); std::string fragmentShader; DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) ); DALI_TEST_CHECK( !fragmentShader.empty() ); - Property::Value* gridXValue = customShader.Find( "subdivideGridX" ); + Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X ); DALI_TEST_CHECK( gridXValue ); int gridX = 0; DALI_TEST_CHECK( gridXValue->Get( gridX ) ); DALI_TEST_CHECK( gridX > 1 ); - Property::Value* gridYValue = customShader.Find( "subdivideGridY" ); + Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y ); DALI_TEST_CHECK( gridYValue ); int gridY = 0; DALI_TEST_CHECK( gridYValue->Get( gridY ) ); DALI_TEST_CHECK( gridY > 1 ); - Property::Value* hintsValue = customShader.Find( "hints" ); + Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS ); DALI_TEST_CHECK( hintsValue ); - std::string hints; + int hints;; DALI_TEST_CHECK( hintsValue->Get( hints ) ); - DALI_TEST_CHECK( hints == "outputIsTransparent" ); + DALI_TEST_CHECK( hints == Shader::Hint::OUTPUT_IS_TRANSPARENT ); unsigned int sampleCount( 4 ); Actor actor = Actor::New(); @@ -395,46 +271,46 @@ int UtcDaliCreateMotionStretchEffect(void) Property::Map effect = Toolkit::CreateMotionStretchEffect(); DALI_TEST_CHECK( !effect.Empty() ); - Property::Value* customShaderValue = effect.Find( "shader" ); + Property::Value* customShaderValue = effect.Find( Toolkit::Visual::Property::SHADER ); DALI_TEST_CHECK( customShaderValue ); Property::Map customShader; DALI_TEST_CHECK( customShaderValue->Get( customShader ) ); - Property::Value* vertexShaderValue = customShader.Find( "vertexShader" ); + Property::Value* vertexShaderValue = customShader.Find( Visual::Shader::Property::VERTEX_SHADER ); DALI_TEST_CHECK( vertexShaderValue ); std::string vertexShader; DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) ); DALI_TEST_CHECK( !vertexShader.empty() ); - Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" ); + Property::Value* fragmentShaderValue = customShader.Find( Visual::Shader::Property::FRAGMENT_SHADER ); DALI_TEST_CHECK( fragmentShaderValue ); std::string fragmentShader; DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) ); DALI_TEST_CHECK( !fragmentShader.empty() ); - Property::Value* gridXValue = customShader.Find( "subdivideGridX" ); + Property::Value* gridXValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_X ); DALI_TEST_CHECK( gridXValue ); int gridX = 0; DALI_TEST_CHECK( gridXValue->Get( gridX ) ); DALI_TEST_CHECK( gridX > 1 ); - Property::Value* gridYValue = customShader.Find( "subdivideGridY" ); + Property::Value* gridYValue = customShader.Find( Visual::Shader::Property::SUBDIVIDE_GRID_Y ); DALI_TEST_CHECK( gridYValue ); int gridY = 0; DALI_TEST_CHECK( gridYValue->Get( gridY ) ); DALI_TEST_CHECK( gridY > 1 ); - Property::Value* hintsValue = customShader.Find( "hints" ); + Property::Value* hintsValue = customShader.Find( Visual::Shader::Property::HINTS ); DALI_TEST_CHECK( hintsValue ); - std::string hints; + int hints;; DALI_TEST_CHECK( hintsValue->Get( hints ) ); - DALI_TEST_CHECK( hints == "outputIsTransparent" ); + DALI_TEST_CHECK( hints == Shader::Hint::OUTPUT_IS_TRANSPARENT ); Actor actor = Actor::New(); Toolkit::SetMotionStretchProperties( actor ); @@ -447,134 +323,3 @@ int UtcDaliCreateMotionStretchEffect(void) END_TEST; } - -int UtcDaliCreateOverlayEffect(void) -{ - ToolkitTestApplication application; - - BufferImage image = CreateBufferImage(); - ShaderEffect effect = Toolkit::CreateOverlayEffect(image); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateQuadraticBezier(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateQuadraticBezier(3,false); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateQuadraticBezierFilled(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateQuadraticBezier(3,true); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateRipple2DEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateRipple2DEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateRippleEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateRippleEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateShearEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateShearEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliSoftButtonEffectElliptical(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateSoftButtonEffect(Toolkit::SOFT_BUTTON_ELLIPTICAL); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliSoftButtonEffectRectangular(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateSoftButtonEffect(Toolkit::SOFT_BUTTON_RECTANGULAR); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliSoftButtonEffectFixed(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateSoftButtonEffect(Toolkit::SOFT_BUTTON_FIXED); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateSpotEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateSpotEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliCreateSquareDissolveEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateSquareDissolveEffect(); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliSwirlEffect(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateSwirlEffect(false); - DALI_TEST_CHECK( effect ); - - END_TEST; -} - -int UtcDaliSwirlEffectWrap(void) -{ - ToolkitTestApplication application; - - ShaderEffect effect = Toolkit::CreateSwirlEffect(true); - DALI_TEST_CHECK( effect ); - - END_TEST; -}