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
Merge "Add more shared C++/JavaScript docs and add JavaScript wrapping guide" into...
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
docs
/
content
/
animation.js
diff --git
a/plugins/dali-script-v8/docs/content/animation.js
b/plugins/dali-script-v8/docs/content/animation.js
index
ec587fe
..
727c139
100644
(file)
--- a/
plugins/dali-script-v8/docs/content/animation.js
+++ b/
plugins/dali-script-v8/docs/content/animation.js
@@
-68,8
+68,8
@@
myActor2.position=[ 100,0,-2000]; // x = 100, y = 0 , z = -2000
function createAnimation() {
var startRotation = new dali.Rotation(180, -180, 0);
function createAnimation() {
var startRotation = new dali.Rotation(180, -180, 0);
- myActor1.
ro
tation = startRotation;
- myActor2.
ro
tation = startRotation;
+ myActor1.
orien
tation = startRotation;
+ myActor2.
orien
tation = startRotation;
dali.stage.add( myActor1 );
dali.stage.add( myActor2 );
dali.stage.add( myActor1 );
dali.stage.add( myActor2 );
@@
-90,7
+90,7
@@
function createAnimation() {
var endRotation = new dali.Rotation(0,0,0);
animOptions.alpha = "easeInOutSine";
var endRotation = new dali.Rotation(0,0,0);
animOptions.alpha = "easeInOutSine";
- anim.animateTo(myActor1, "
ro
tation", endRotation, animOptions);
+ anim.animateTo(myActor1, "
orien
tation", endRotation, animOptions);
// Delay the myActor2 by a second
animOptions.delay = 0.0;
// Delay the myActor2 by a second
animOptions.delay = 0.0;
@@
-99,7
+99,7
@@
function createAnimation() {
// rotate back to correct orientation
animOptions.alpha = "easeInOutSine";
// rotate back to correct orientation
animOptions.alpha = "easeInOutSine";
- anim.animateTo(myActor2, "
ro
tation", endRotation, animOptions);
+ anim.animateTo(myActor2, "
orien
tation", endRotation, animOptions);
return anim;
}
return anim;
}
@@
-118,7
+118,8
@@
The example below does the following with a single animation object:
- rotates the image actor
- magnifies and color shifts the image using a fragment shader
- rotates the image actor
- magnifies and color shifts the image using a fragment shader
-<img src="../assets/img/shader-animation.png">
+![ ](../assets/img/shaders/shader-animation.png)
+
```
```
@@
-209,7
+210,7
@@
var shaderAnim = createShaderAnimation( shaderEffect, color,zoom, duration, dela
// also rotate the imageActor 90 degrees at the same time.
var rotation = new dali.Rotation(90,0,0,1);
// also rotate the imageActor 90 degrees at the same time.
var rotation = new dali.Rotation(90,0,0,1);
-shaderAnim.animateTo(imageActor, "
ro
tation", rotation, { alpha:"linear", duration:duration, delay:delay });
+shaderAnim.animateTo(imageActor, "
orien
tation", rotation, { alpha:"linear", duration:duration, delay:delay });
shaderAnim.play();
shaderAnim.play();