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
Adding Visual namespace and Visual becomes Visual::Base
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
mesh
/
mesh-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
index
e815ae1
..
1f0d9e0
100644
(file)
--- a/
dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
+++ b/
dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
@@
-27,7
+27,7
@@
//INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
//INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
-#include <dali-toolkit/internal/visuals/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-
base-
data-impl.h>
namespace Dali
{
namespace Dali
{
@@
-278,7
+278,7
@@
const char* NORMAL_MAP_FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
} // namespace
MeshVisual::MeshVisual( VisualFactoryCache& factoryCache )
} // namespace
MeshVisual::MeshVisual( VisualFactoryCache& factoryCache )
-: Visual( factoryCache ),
+: Visual
::Base
( factoryCache ),
mShaderType( ALL_TEXTURES ),
mUseTexture( true ),
mUseMipmapping( true ),
mShaderType( ALL_TEXTURES ),
mUseTexture( true ),
mUseMipmapping( true ),
@@
-370,14
+370,14
@@
void MeshVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap )
void MeshVisual::SetSize( const Vector2& size )
{
void MeshVisual::SetSize( const Vector2& size )
{
- Visual::SetSize( size );
+ Visual::
Base::
SetSize( size );
// ToDo: renderer responds to the size change
}
void MeshVisual::SetClipRect( const Rect<int>& clipRect )
{
// ToDo: renderer responds to the size change
}
void MeshVisual::SetClipRect( const Rect<int>& clipRect )
{
- Visual::SetClipRect( clipRect );
+ Visual::
Base::
SetClipRect( clipRect );
//ToDo: renderer responds to the clipRect change
}
//ToDo: renderer responds to the clipRect change
}