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
Text selection refactoring
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
primitive
/
primitive-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
index
2bf5e41
..
21c9064
100644
(file)
--- a/
dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
+++ b/
dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
@@
-20,9
+20,8
@@
// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
-#include <dali/
public
-api/common/stage.h>
+#include <dali/
devel
-api/common/stage.h>
#include <dali/public-api/common/constants.h>
#include <dali/public-api/common/constants.h>
-#include <dali/devel-api/object/handle-devel.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
@@
-399,7
+398,7
@@
void PrimitiveVisual::GetNaturalSize( Vector2& naturalSize )
naturalSize.y = mObjectDimensions.y;
}
naturalSize.y = mObjectDimensions.y;
}
-void PrimitiveVisual::DoSetOnS
tag
e( Actor& actor )
+void PrimitiveVisual::DoSetOnS
cen
e( Actor& actor )
{
InitializeRenderer();
{
InitializeRenderer();
@@
-458,7
+457,7
@@
void PrimitiveVisual::InitializeRenderer()
// Register transform properties
mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT );
// Register transform properties
mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT );
- mImpl->mMixColorIndex =
DevelHandle::RegisterProperty( mImpl->mRenderer,
Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) );
+ mImpl->mMixColorIndex =
mImpl->mRenderer.RegisterProperty(
Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) );
}
void PrimitiveVisual::UpdateShaderUniforms()
}
void PrimitiveVisual::UpdateShaderUniforms()
@@
-537,7
+536,7
@@
void PrimitiveVisual::CreateGeometry()
Property::Map vertexFormat;
vertexFormat[POSITION] = Property::VECTOR3;
vertexFormat[NORMAL] = Property::VECTOR3;
Property::Map vertexFormat;
vertexFormat[POSITION] = Property::VECTOR3;
vertexFormat[NORMAL] = Property::VECTOR3;
-
PropertyBuffer surfaceVertices = Property
Buffer::New( vertexFormat );
+
VertexBuffer surfaceVertices = Vertex
Buffer::New( vertexFormat );
surfaceVertices.SetData( &vertices[0], vertices.Size() );
mGeometry.AddVertexBuffer( surfaceVertices );
surfaceVertices.SetData( &vertices[0], vertices.Size() );
mGeometry.AddVertexBuffer( surfaceVertices );