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 "Remove Atlas parameter for TextureManager cache system" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
resources
/
AnimatedCube.gltf
diff --git
a/automated-tests/resources/AnimatedCube.gltf
b/automated-tests/resources/AnimatedCube.gltf
index
455120d
..
807c07e
100644
(file)
--- a/
automated-tests/resources/AnimatedCube.gltf
+++ b/
automated-tests/resources/AnimatedCube.gltf
@@
-322,7
+322,7
@@
},
{
"mesh" : 1,
},
{
"mesh" : 1,
- "name" : "AnimatedCube
2
"
+ "name" : "AnimatedCube"
},
{
},
{
@@
-333,7
+333,7
@@
"camera" : 1,
"translation" : [ 0.5, 0.5, 3.0 ],
"children": [
"camera" : 1,
"translation" : [ 0.5, 0.5, 3.0 ],
"children": [
- 4
+ 4
, 5, 6, 7
]
},
{
]
},
{
@@
-356,6
+356,18
@@
0.0,
1.0
]
0.0,
1.0
]
+ },
+ {
+ "camera" : 3,
+ "translation" : [ 0.0, 0.0, 0.0 ]
+ },
+ {
+ "camera" : 4,
+ "translation" : [ 0.0, 0.0, 0.0 ]
+ },
+ {
+ "camera" : 5,
+ "translation" : [ 0.0, 0.0, 0.0 ]
}
],
"scene" : 0,
}
],
"scene" : 0,
@@
-403,6
+415,30
@@
"zfar": 100.0,
"znear": 0.01
}
"zfar": 100.0,
"znear": 0.01
}
+ },
+ {
+ "type": "perspective",
+ "perspective": {
+ "aspectRatio": 1.0,
+ "yfov": 0.7,
+ "znear": 0.01
+ }
+ },
+ {
+ "type": "perspective",
+ "perspective": {
+ "aspectRatio": 1.0,
+ "zfar": 100.0,
+ "znear": 0.01
+ }
+ },
+ {
+ "type": "orthographic",
+ "orthographic": {
+ "xmag": 1.0,
+ "ymag": 1.0,
+ "znear": 0.01
+ }
}
],
"samplers": [
}
],
"samplers": [