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
Added PropertyValue Array as a class
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-view-carousel-effect-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
index
4f467f2
..
f17eb78
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
@@
-89,7
+89,7
@@
public:
void VisibilityConstraint( bool& current, const PropertyInputContainer& inputs )
{
const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
void VisibilityConstraint( bool& current, const PropertyInputContainer& inputs )
{
const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
- Vector2 position( inputs[0]->GetVector3()
+ inputs[3]->GetVector3
());
+ Vector2 position( inputs[0]->GetVector3()
.GetVectorXY() + inputs[3]->GetVector2
());
Vector2 scaledSize( inputs[2]->GetVector3() * inputs[1]->GetVector3());
Vector2 domain( inputs[4]->GetVector3() );
Vector2 scaledSize( inputs[2]->GetVector3() * inputs[1]->GetVector3());
Vector2 domain( inputs[4]->GetVector3() );
@@
-124,7
+124,7
@@
public:
}
const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
}
const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
- Vector2 position(
inputs[0]->GetVector3() + inputs[3]->GetVector3
());
+ Vector2 position(
inputs[0]->GetVector3().GetVectorXY() + inputs[3]->GetVector2
());
Vector2 scaledSize(inputs[2]->GetVector3() * inputs[1]->GetVector3());
Vector2 domain(inputs[4]->GetVector3());
Vector2 scaledSize(inputs[2]->GetVector3() * inputs[1]->GetVector3());
Vector2 domain(inputs[4]->GetVector3());
@@
-144,8
+144,8
@@
public:
angle *= activate;
angle *= activate;
- current = Quaternion(
-angle.x, Vector3::YAXIS
) *
- Quaternion(
angle.y, Vector3::XAXIS
) *
+ current = Quaternion(
Radian( -angle.x ), Vector3::YAXIS
) *
+ Quaternion(
Radian( angle.y ), Vector3::XAXIS
) *
current;
}
current;
}
@@
-168,7
+168,7
@@
public:
return;
}
return;
}
- position
+= inputs[2]->GetVector3
();
+ position
.GetVectorXY() += inputs[2]->GetVector2
();
const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
Vector2 scaledSize(inputs[1]->GetVector3() * inputs[0]->GetVector3());
const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
Vector2 scaledSize(inputs[1]->GetVector3() * inputs[0]->GetVector3());