projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for TEXTURE url type in VisualUrl
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
npatch
/
npatch-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
9b94eb5
..
7be7301
--- a/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
+++ b/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,10
+19,10
@@
#include "npatch-visual.h"
// EXTERNAL INCLUDES
#include "npatch-visual.h"
// EXTERNAL INCLUDES
-#include <dali/integration-api/platform-abstraction.h>
#include <dali/public-api/images/buffer-image.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/devel-api/images/texture-set-image.h>
#include <dali/public-api/images/buffer-image.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/devel-api/images/texture-set-image.h>
+#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
@@
-111,7
+111,6
@@
const char* VERTEX_SHADER_3X3 = DALI_COMPOSE_SHADER(
vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n
vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n
- mediump vec2 scale = vec2( length( uModelMatrix[ 0 ].xyz ), length( uModelMatrix[ 1 ].xyz ) );\n
mediump vec2 size = visualSize.xy;\n
\n
mediump vec2 fixedFactor = vec2( uFixed[ int( ( aPosition.x + 1.0 ) * 0.5 ) ].x, uFixed[ int( ( aPosition.y + 1.0 ) * 0.5 ) ].y );\n
mediump vec2 size = visualSize.xy;\n
\n
mediump vec2 fixedFactor = vec2( uFixed[ int( ( aPosition.x + 1.0 ) * 0.5 ) ].x, uFixed[ int( ( aPosition.y + 1.0 ) * 0.5 ) ].y );\n
@@
-234,7
+233,7
@@
void RegisterStretchProperties( Renderer& renderer, const char * uniformName, co
/////////////////NPatchVisual////////////////
/////////////////NPatchVisual////////////////
-NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const
std::string
& imageUrl, const Property::Map& properties )
+NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const
VisualUrl
& imageUrl, const Property::Map& properties )
{
NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) );
nPatchVisual->mImageUrl = imageUrl;
{
NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) );
nPatchVisual->mImageUrl = imageUrl;
@@
-243,7
+242,7
@@
NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const std::
return nPatchVisual;
}
return nPatchVisual;
}
-NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const
std::string
& imageUrl )
+NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const
VisualUrl
& imageUrl )
{
NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) );
nPatchVisual->mImageUrl = imageUrl;
{
NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) );
nPatchVisual->mImageUrl = imageUrl;
@@
-254,8
+253,8
@@
NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const std::
NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, NinePatchImage image )
{
NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) );
NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, NinePatchImage image )
{
NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) );
-
nPatchVisual->mImageUrl = image.GetUrl(
);
-
+
VisualUrl visualUrl( image.GetUrl()
);
+ nPatchVisual->mImageUrl = visualUrl;
return nPatchVisual;
}
return nPatchVisual;
}
@@
-263,10
+262,11
@@
void NPatchVisual::GetNaturalSize( Vector2& naturalSize )
{
naturalSize.x = 0u;
naturalSize.y = 0u;
{
naturalSize.x = 0u;
naturalSize.y = 0u;
+
// load now if not already loaded
// load now if not already loaded
- if( NPatchLoader::UNINITIALIZED_ID == mId )
+ if( NPatchLoader::UNINITIALIZED_ID == mId
&& mImageUrl.IsLocalResource()
)
{
{
- mId = mLoader.Load( mImageUrl, mBorder );
+ mId = mLoader.Load( mImageUrl
.GetUrl()
, mBorder );
}
const NPatchLoader::Data* data;
if( mLoader.GetNPatchData( mId, data ) )
}
const NPatchLoader::Data* data;
if( mLoader.GetNPatchData( mId, data ) )
@@
-304,9
+304,9
@@
void NPatchVisual::DoSetProperties( const Property::Map& propertyMap )
void NPatchVisual::DoSetOnStage( Actor& actor )
{
// load when first go on stage
void NPatchVisual::DoSetOnStage( Actor& actor )
{
// load when first go on stage
- if( NPatchLoader::UNINITIALIZED_ID == mId )
+ if( NPatchLoader::UNINITIALIZED_ID == mId
&& mImageUrl.IsLocalResource()
)
{
{
- mId = mLoader.Load( mImageUrl, mBorder );
+ mId = mLoader.Load( mImageUrl
.GetUrl()
, mBorder );
}
Geometry geometry = CreateGeometry();
}
Geometry geometry = CreateGeometry();
@@
-316,6
+316,9
@@
void NPatchVisual::DoSetOnStage( Actor& actor )
ApplyTextureAndUniforms();
actor.AddRenderer( mImpl->mRenderer );
ApplyTextureAndUniforms();
actor.AddRenderer( mImpl->mRenderer );
+
+ // npatch loaded and ready to display
+ ResourceReady();
}
void NPatchVisual::DoSetOffStage( Actor& actor )
}
void NPatchVisual::DoSetOffStage( Actor& actor )
@@
-336,7
+339,7
@@
void NPatchVisual::DoCreatePropertyMap( Property::Map& map ) const
{
map.Clear();
map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::DevelVisual::N_PATCH );
{
map.Clear();
map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::DevelVisual::N_PATCH );
- map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl );
+ map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl
.GetUrl()
);
map.Insert( Toolkit::ImageVisual::Property::BORDER_ONLY, mBorderOnly );
map.Insert( Toolkit::DevelImageVisual::Property::BORDER, mBorder );
}
map.Insert( Toolkit::ImageVisual::Property::BORDER_ONLY, mBorderOnly );
map.Insert( Toolkit::DevelImageVisual::Property::BORDER, mBorder );
}
@@
-440,10
+443,17
@@
Shader NPatchVisual::CreateShader()
}
hints = mImpl->mCustomShader->mHints;
}
hints = mImpl->mCustomShader->mHints;
+ /* Apply Custom Vertex Shader only if image is 9-patch */
if( ( xStretchCount == 1 && yStretchCount == 1 ) ||
( xStretchCount == 0 && yStretchCount == 0 ) )
{
if( ( xStretchCount == 1 && yStretchCount == 1 ) ||
( xStretchCount == 0 && yStretchCount == 0 ) )
{
- shader = Shader::New( VERTEX_SHADER_3X3, fragmentShader, hints );
+ const char* vertexShader = VERTEX_SHADER_3X3;
+
+ if( !mImpl->mCustomShader->mVertexShader.empty() )
+ {
+ vertexShader = mImpl->mCustomShader->mVertexShader.c_str();
+ }
+ shader = Shader::New( vertexShader, fragmentShader, hints );
}
else if( xStretchCount > 0 || yStretchCount > 0)
{
}
else if( xStretchCount > 0 || yStretchCount > 0)
{
@@
-491,7
+501,7
@@
void NPatchVisual::ApplyTextureAndUniforms()
}
else
{
}
else
{
- DALI_LOG_ERROR("The N patch image '%s' is not a valid N patch image\n", mImageUrl.c_str() );
+ DALI_LOG_ERROR("The N patch image '%s' is not a valid N patch image\n", mImageUrl.
GetUrl().
c_str() );
TextureSet textureSet = TextureSet::New();
mImpl->mRenderer.SetTextures( textureSet );
Image croppedImage = VisualFactoryCache::GetBrokenVisualImage();
TextureSet textureSet = TextureSet::New();
mImpl->mRenderer.SetTextures( textureSet );
Image croppedImage = VisualFactoryCache::GetBrokenVisualImage();