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
Cleanup of Visual::Base::SetSize
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
wireframe
/
wireframe-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
index
b65f67c
..
493988e
100644
(file)
--- a/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
+++ b/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
@@
-20,7
+20,7
@@
#include "wireframe-visual.h"
// INTERNAL INCLUDES
#include "wireframe-visual.h"
// INTERNAL INCLUDES
-#include <dali-toolkit/
public-api/visuals/
visual-properties.h>
+#include <dali-toolkit/
devel-api/visual-factory/devel-
visual-properties.h>
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
@@
-93,7
+93,7
@@
void WireframeVisual::DoSetOnStage( Actor& actor )
void WireframeVisual::DoCreatePropertyMap( Property::Map& map ) const
{
map.Clear();
void WireframeVisual::DoCreatePropertyMap( Property::Map& map ) const
{
map.Clear();
- map.Insert( Toolkit::Visual
::
Property::TYPE, Toolkit::Visual::WIREFRAME );
+ map.Insert( Toolkit::VisualProperty::TYPE, Toolkit::Visual::WIREFRAME );
}
void WireframeVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue )
}
void WireframeVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue )
@@
-150,6
+150,15
@@
Geometry WireframeVisual::CreateQuadWireframeGeometry()
return geometry;
}
return geometry;
}
+void WireframeVisual::OnSetTransform()
+{
+ if( mImpl->mRenderer )
+ {
+ //Register transform properties
+ mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT );
+ }
+}
+
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit