DALI_TEST_CHECK( typeValue );
DALI_TEST_CHECK( (Toolkit::Align::Type)typeValue->Get<int>() == Toolkit::Align::TOP_BEGIN );
}
+ {
+ Property::Value* typeValue = map->Find( Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE );
+ DALI_TEST_CHECK( typeValue );
+ DALI_TEST_CHECK( typeValue->Get<Vector2>() == Vector2(0.0f,0.0f) );
+ }
END_TEST;
}
transform.Insert( Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) );
transform.Insert( Visual::Transform::Property::ORIGIN, "CENTER" );
transform.Insert( Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::BOTTOM_END );
+ transform.Insert( DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(50.0f, 50.0f) );
visual.SetTransformAndSize( transform, Vector2(100, 100) );
DALI_TEST_CHECK( typeValue );
DALI_TEST_EQUALS( (Toolkit::Align::Type)typeValue->Get<int>(), Toolkit::Align::BOTTOM_END, TEST_LOCATION );
}
+ {
+ Property::Value* typeValue = map->Find( Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE );
+ DALI_TEST_CHECK( typeValue );
+ DALI_TEST_EQUALS( typeValue->Get<Vector2>(),Vector2(50.0f,50.0f), TEST_LOCATION );
+ }
//Put the visual on the stage
DummyControl actor = DummyControl::New(true);
Vector2 anchorPoint = renderer.GetProperty<Vector2>( index );
DALI_TEST_EQUALS( anchorPoint, Vector2(-0.5f,-0.5f), TEST_LOCATION );
+ index = renderer.GetPropertyIndex( "extraSize" );
+ DALI_TEST_CHECK( index != Property::INVALID_INDEX );
+ Vector2 extraSize = renderer.GetProperty<Vector2>( index );
+ DALI_TEST_EQUALS( extraSize, Vector2(50.0f,50.0f), TEST_LOCATION );
+
//Set a new transform
transform.Clear();
transform = DefaultTransform();
transform.Insert( Visual::Transform::Property::OFFSET, Vector2(20.0f, 20.0f) );
transform.Insert( Visual::Transform::Property::SIZE, Vector2(100.0f, 100.0f) );
transform.Insert( Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) );
+ transform.Insert( DevelVisual::Transform::Property::EXTRA_SIZE, Vector2(0.5f, 0.5f) );
visual.SetTransformAndSize( transform, Vector2(100, 100) );
application.SendNotification();
application.Render(0);
anchorPoint = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "anchorPoint" ) );
DALI_TEST_EQUALS( anchorPoint, Vector2(0.5f,0.5f), TEST_LOCATION );
+
+ extraSize = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "extraSize" ) );
+ DALI_TEST_EQUALS( extraSize, Vector2(0.5f,0.5f), TEST_LOCATION );
}
int UtcDaliVisualSetTransform0(void)
transformMap["offsetPolicy"] = Vector2( Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE );
transformMap["anchorPoint"] = Align::CENTER;
transformMap["origin"] = Align::CENTER;
+ transformMap["extraSize"] = Vector2( 0.0f, 50.0f );
properties[Visual::Property::TRANSFORM] = transformMap;
properties[Visual::Property::TYPE] = Visual::IMAGE;
Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
DALI_TEST_EQUALS( vertexShader, vertex->Get<std::string>(), TEST_LOCATION );
+ Vector2 extraSize = renderer.GetProperty<Vector2>( renderer.GetPropertyIndex( "extraSize" ) );
+ DALI_TEST_EQUALS( extraSize, Vector2(0.0f, 50.0f), TEST_LOCATION );
+
END_TEST;
}
# Install the pdb file.
IF( ENABLE_DEBUG )
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.pdb DESTINATION ${BIN_DIR} )
ENDIF()
ELSE()
# Install the library so file and symlinks
} // namespace Property
+
/**
* @brief The values of this enum determine how the visual should be fit to the view
*/
FILL, ///< The visual should be stretched to fill, not preserving aspect ratio
};
+/**
+ * @brief Devel Visual Transform for the offset or size.
+ */
+namespace Transform
+{
+
+/**
+ * @brief Visual Transform Property.
+ */
+namespace Property
+{
+
+/**
+ * @brief Enumeration for the type of Transform Property.
+ */
+enum Type
+{
+ SIZE_POLICY = Dali::Toolkit::Visual::Transform::Property::SIZE_POLICY,
+
+ /**
+ * @brief Extra size value that will be added to the computed visual size.
+ * @details Name "extraSize", type Vector2.
+ *
+ * @note It is an absolute value.
+ * The property can be used when a user want to set a visual size as a combined value of `relative` and `absolute`.
+ * For example, when a user want to set a visual size to (ControlSize * 2 + 10),
+ * The transform map will be,
+ * transformMap.Add( Transform::Property::SIZE, Vector2( 2.0f, 2.0f ) )
+ * .Add( Transform::Property::SIZE_POLICY, Vector2( Transform::Policy::Relative, Transform::Policy::Relative ) )
+ * .Add( Transform::Property::EXTRA_SIZE, Vector2( 10.0f, 10.0f ) );
+ */
+ EXTRA_SIZE = SIZE_POLICY + 1,
+};
+
+} // namespace Property
+
+} // namespace Transform
+
} // namespace DevelVisual
} // namespace Toolkit
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
+ uniform mediump vec2 extraSize;\n
vec4 ComputeVertexPosition()\n
{\n
- vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n
+ vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n
}\n
//Visual size and offset
uniform mediump vec2 offset;\n
uniform mediump vec2 size;\n
+ uniform mediump vec2 extraSize;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
\n
vec4 ComputeVertexPosition()\n
{\n
- vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n
+ vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
vRectSize = visualSize / 2.0 - cornerRadius;\n
vPosition = aPosition* visualSize;\n
//Visual size and offset
uniform mediump vec2 offset;\n
uniform mediump vec2 size;\n
+ uniform mediump vec2 extraSize;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
\n
vec4 ComputeVertexPosition()\n
{\n
- vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + blurRadius * 2.0;\n
+ vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize + blurRadius * 2.0;\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
vRectSize = visualSize / 2.0;\n
vPosition = aPosition* visualSize;\n
- /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+/*
+ * Copyright (c) 2020 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.
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
+ uniform mediump vec2 extraSize;\n
\n
vec4 ComputeVertexPosition()\n
{\n
- vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n
+ vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n
}\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
uniform mediump float cornerRadius;\n
+ uniform mediump vec2 extraSize;\n
\n
vec4 ComputeVertexPosition()\n
{\n
- vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n
+ vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
- vRectSize = visualSize / 2.0 - cornerRadius;\n
+ vRectSize = visualSize * 0.5 - cornerRadius;\n
vPosition = aPosition* visualSize;\n
return vec4( vPosition + anchorPoint*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n
}\n
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
uniform mediump float cornerRadius;\n
+ uniform lowp float preMultipliedAlpha;\n
\n
void main()\n
{\n
mediump float dist = length( max( abs( vPosition ), vRectSize ) - vRectSize ) - cornerRadius;\n
+ mediump float opacity = 1.0 - smoothstep( -1.0, 1.0, dist );\n
gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor * vec4( mixColor, 1.0 );\n
- gl_FragColor.a *= smoothstep( 1.0, -1.0, dist );\n
+ gl_FragColor.a *= opacity;\n
+ gl_FragColor.rgb *= mix( 1.0, opacity, preMultipliedAlpha );\n
}\n
);
}
case Dali::Pixel::RGB16F:
case Dali::Pixel::RGB32F:
+ case Dali::Pixel::DEPTH_UNSIGNED_INT:
+ case Dali::Pixel::DEPTH_FLOAT:
+ case Dali::Pixel::DEPTH_STENCIL:
{
DALI_LOG_ERROR("Pixel format not compatible.\n");
byteOffset=0;
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
+ uniform mediump vec2 extraSize;\n
void main()\n
{\n
mediump vec2 fixedTotal = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].x, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].x );\n
mediump vec2 stretchTotal = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].y, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].y );\n
\n
- vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n
+ vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
\n
mediump vec4 gridPosition = vec4( fixedFactor + ( visualSize.xy - fixedTotal ) * stretch / stretchTotal, 0.0, 1.0 );\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
+ uniform mediump vec2 extraSize;\n
\n
void main()\n
{\n
- vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n
+ vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
\n
mediump vec2 size = visualSize.xy;\n
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/internal/helpers/property-helper.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
Internal::Visual::Base::Impl::Transform::Transform()
: mOffset( 0.0f,0.0f ),
mSize( 1.0f,1.0f ),
+ mExtraSize( 0.0f,0.0f ),
mOffsetSizeMode( 0.0f,0.0f,0.0f,0.0f ),
mOrigin( Toolkit::Align::TOP_BEGIN ),
mAnchorPoint( Toolkit::Align::TOP_BEGIN )
// Set default values
mOffset = Vector2( 0.0f,0.0f );
mSize = Vector2( 1.0f,1.0f );
+ mExtraSize = Vector2( 0.0f,0.0f );
mOffsetSizeMode = Vector4( 0.0f,0.0f,0.0f,0.0f );
mOrigin = Toolkit::Align::TOP_BEGIN;
mAnchorPoint = Toolkit::Align::TOP_BEGIN;
}
break;
}
+ case Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE:
+ {
+ keyValue.second.Get( mExtraSize );
+ break;
+ }
}
}
else // Key type is STRING
mOffsetSizeMode.w = policy.y;
}
}
+ else if( keyValue.first == "extraSize" )
+ {
+ keyValue.second.Get( mExtraSize );
+ }
}
}
}
.Add( Toolkit::Visual::Transform::Property::ORIGIN, mOrigin )
.Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, mAnchorPoint )
.Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( mOffsetSizeMode.x, mOffsetSizeMode.y ) )
- .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( mOffsetSizeMode.z, mOffsetSizeMode.w ) );
+ .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( mOffsetSizeMode.z, mOffsetSizeMode.w ) )
+ .Add( Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE, mExtraSize );
}
void Internal::Visual::Base::Impl::Transform::RegisterUniforms( Dali::Renderer renderer, Toolkit::Direction::Type direction )
renderer.RegisterProperty( OFFSET_SIZE_MODE, mOffsetSizeMode );
renderer.RegisterProperty( ORIGIN, PointToVector2( mOrigin, direction ) - Vector2(0.5,0.5) );
renderer.RegisterProperty( ANCHOR_POINT, Vector2(0.5,0.5) - PointToVector2( mAnchorPoint, direction ) );
+ renderer.RegisterProperty( EXTRA_SIZE, mExtraSize );
}
Vector2 Internal::Visual::Base::Impl::Transform::GetVisualSize( const Vector2& controlSize )
{
- return Vector2( Lerp( mOffsetSizeMode.x, mSize.x * controlSize.x, mSize.x ),
- Lerp( mOffsetSizeMode.y, mSize.y * controlSize.y, mSize.y ) );
+ return Vector2( Lerp( mOffsetSizeMode.z, mSize.x * controlSize.x, mSize.x ) ,
+ Lerp( mOffsetSizeMode.w, mSize.y * controlSize.y, mSize.y ) ) + mExtraSize;
}
-
} // namespace Internal
} // namespace Toolkit
Vector2 mOffset;
Vector2 mSize;
+ Vector2 mExtraSize;
Vector4 mOffsetSizeMode;
Toolkit::Align::Type mOrigin;
Toolkit::Align::Type mAnchorPoint;
const char * const OFFSET_SIZE_MODE( "offsetSizeMode" );
const char * const ORIGIN( "origin" );
const char * const ANCHOR_POINT( "anchorPoint" );
+const char * const EXTRA_SIZE( "extraSize" );
// Premultipled alpha
const char * const PREMULTIPLIED_ALPHA( "premultipliedAlpha" );
extern const char * const OFFSET_SIZE_MODE;
extern const char * const ORIGIN;
extern const char * const ANCHOR_POINT;
+extern const char * const EXTRA_SIZE;
// Premultiplied alpha
extern const char * const PREMULTIPLIED_ALPHA;
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 9;
-const unsigned int TOOLKIT_MICRO_VERSION = 8;
+const unsigned int TOOLKIT_MICRO_VERSION = 9;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
Name: dali-toolkit
Summary: Dali 3D engine Toolkit
-Version: 1.9.8
+Version: 1.9.9
Release: 1
Group: System/Libraries
License: Apache-2.0 and BSD-3-Clause and MIT