From: Adeel Kazmi Date: Tue, 25 Aug 2020 17:24:46 +0000 (+0000) Subject: Merge "KeyEvent class pimpling" into devel/master X-Git-Tag: dali_1.9.27~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0c7f77d8059be211a48fb5b838f4c68cbaa644e4;hp=286089d715eb4c5e704884284cce67549685dbc5 Merge "KeyEvent class pimpling" into devel/master --- diff --git a/automated-tests/resources/InterpolationTest.gltf b/automated-tests/resources/InterpolationTest.gltf new file mode 100644 index 0000000..95dfadb --- /dev/null +++ b/automated-tests/resources/InterpolationTest.gltf @@ -0,0 +1,1439 @@ +{ + "accessors" : [ + { + "bufferView" : 0, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 1, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 2, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 3, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 4, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 5, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 6, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 7, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 8, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 9, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 10, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 11, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 12, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 13, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 14, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 15, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 16, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 17, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 18, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 19, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 20, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 21, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 22, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 23, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 24, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 25, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 26, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 27, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 28, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 29, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 30, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 31, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 32, + "componentType" : 5126, + "count" : 24, + "max" : [ + 1, + 1, + 1 + ], + "min" : [ + -1, + -1, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 33, + "componentType" : 5126, + "count" : 24, + "type" : "VEC3" + }, + { + "bufferView" : 34, + "componentType" : 5126, + "count" : 24, + "type" : "VEC2" + }, + { + "bufferView" : 35, + "componentType" : 5121, + "count" : 36, + "type" : "SCALAR" + }, + { + "bufferView" : 36, + "componentType" : 5126, + "count" : 4, + "max" : [ + 1, + 0, + 1 + ], + "min" : [ + -1, + 0, + -1 + ], + "type" : "VEC3" + }, + { + "bufferView" : 37, + "componentType" : 5126, + "count" : 4, + "type" : "VEC3" + }, + { + "bufferView" : 38, + "componentType" : 5126, + "count" : 4, + "type" : "VEC2" + }, + { + "bufferView" : 39, + "componentType" : 5121, + "count" : 6, + "type" : "SCALAR" + }, + { + "bufferView" : 40, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.6666666666666667 + ], + "min" : [ + 0.041666666666666664 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 41, + "componentType" : 5126, + "count" : 5, + "type" : "VEC3" + }, + { + "bufferView" : 42, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.6666666666666667 + ], + "min" : [ + 0.041666666666666664 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 43, + "componentType" : 5126, + "count" : 15, + "type" : "VEC3" + }, + { + "bufferView" : 44, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.6666666666666667 + ], + "min" : [ + 0.041666666666666664 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 45, + "componentType" : 5126, + "count" : 15, + "type" : "VEC3" + }, + { + "bufferView" : 46, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.7083333333333333 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 47, + "componentType" : 5126, + "count" : 5, + "type" : "VEC4" + }, + { + "bufferView" : 48, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.7083333333333333 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 49, + "componentType" : 5126, + "count" : 15, + "type" : "VEC4" + }, + { + "bufferView" : 50, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.7083333333333333 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 51, + "componentType" : 5126, + "count" : 5, + "type" : "VEC4" + }, + { + "bufferView" : 52, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.7083333333333333 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 53, + "componentType" : 5126, + "count" : 5, + "type" : "VEC3" + }, + { + "bufferView" : 54, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.6666666666666667 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 55, + "componentType" : 5126, + "count" : 15, + "type" : "VEC3" + }, + { + "bufferView" : 56, + "componentType" : 5126, + "count" : 5, + "max" : [ + 1.6666666666666667 + ], + "min" : [ + 0 + ], + "type" : "SCALAR" + }, + { + "bufferView" : 57, + "componentType" : 5126, + "count" : 5, + "type" : "VEC3" + } + ], + "animations" : [ + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 0, + "path" : "scale" + } + } + ], + "name" : "Step Scale", + "samplers" : [ + { + "input" : 40, + "interpolation" : "STEP", + "output" : 41 + } + ] + }, + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 3, + "path" : "scale" + } + } + ], + "name" : "Linear Scale", + "samplers" : [ + { + "input" : 40, + "interpolation" : "LINEAR", + "output" : 41 + } + ] + }, + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 4, + "path" : "scale" + } + } + ], + "name" : "CubicSpline Scale", + "samplers" : [ + { + "input" : 44, + "interpolation" : "CUBICSPLINE", + "output" : 45 + } + ] + }, + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 5, + "path" : "rotation" + } + } + ], + "name" : "Step Rotation", + "samplers" : [ + { + "input" : 46, + "interpolation" : "STEP", + "output" : 47 + } + ] + }, + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 6, + "path" : "rotation" + } + } + ], + "name" : "CubicSpline Rotation", + "samplers" : [ + { + "input" : 48, + "interpolation" : "CUBICSPLINE", + "output" : 49 + } + ] + }, + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 7, + "path" : "rotation" + } + } + ], + "name" : "Linear Rotation", + "samplers" : [ + { + "input" : 50, + "interpolation" : "LINEAR", + "output" : 51 + } + ] + }, + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 8, + "path" : "translation" + } + } + ], + "name" : "Step Translation", + "samplers" : [ + { + "input" : 52, + "interpolation" : "STEP", + "output" : 53 + } + ] + }, + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 9, + "path" : "translation" + } + } + ], + "name" : "CubicSpline Translation", + "samplers" : [ + { + "input" : 54, + "interpolation" : "CUBICSPLINE", + "output" : 55 + } + ] + }, + { + "channels" : [ + { + "sampler" : 0, + "target" : { + "node" : 10, + "path" : "translation" + } + } + ], + "name" : "Linear Translation", + "samplers" : [ + { + "input" : 56, + "interpolation" : "LINEAR", + "output" : 57 + } + ] + } + ], + "asset" : { + "generator" : "Khronos Blender glTF 2.0 I/O", + "version" : "2.0" + }, + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 0 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 288 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 576 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 768 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 804 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 1092 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 1380 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 1572 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 1608 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 1896 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 2184 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 2376 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 2412 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 2700 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 2988 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 3180 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 3216 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 3504 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 3792 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 3984 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 4020 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 4308 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 4596 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 4788 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 4824 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 5112 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 5400 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 5592 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 5628 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 5916 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 6204 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 6396 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 6432 + }, + { + "buffer" : 0, + "byteLength" : 288, + "byteOffset" : 6720 + }, + { + "buffer" : 0, + "byteLength" : 192, + "byteOffset" : 7008 + }, + { + "buffer" : 0, + "byteLength" : 36, + "byteOffset" : 7200 + }, + { + "buffer" : 0, + "byteLength" : 48, + "byteOffset" : 7236 + }, + { + "buffer" : 0, + "byteLength" : 48, + "byteOffset" : 7284 + }, + { + "buffer" : 0, + "byteLength" : 32, + "byteOffset" : 7332 + }, + { + "buffer" : 0, + "byteLength" : 6, + "byteOffset" : 7364 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 7372 + }, + { + "buffer" : 0, + "byteLength" : 60, + "byteOffset" : 7392 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 7452 + }, + { + "buffer" : 0, + "byteLength" : 180, + "byteOffset" : 7472 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 7652 + }, + { + "buffer" : 0, + "byteLength" : 180, + "byteOffset" : 7672 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 7852 + }, + { + "buffer" : 0, + "byteLength" : 80, + "byteOffset" : 7872 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 7952 + }, + { + "buffer" : 0, + "byteLength" : 240, + "byteOffset" : 7972 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 8212 + }, + { + "buffer" : 0, + "byteLength" : 80, + "byteOffset" : 8232 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 8312 + }, + { + "buffer" : 0, + "byteLength" : 60, + "byteOffset" : 8332 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 8392 + }, + { + "buffer" : 0, + "byteLength" : 180, + "byteOffset" : 8412 + }, + { + "buffer" : 0, + "byteLength" : 20, + "byteOffset" : 8592 + }, + { + "buffer" : 0, + "byteLength" : 60, + "byteOffset" : 8612 + } + ], + "buffers" : [ + { + "byteLength" : 8672, + "uri" : "interpolation.bin" + } + ], + "extensions" : {}, + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "l.jpg", + "uri" : "l.jpg" + } + ], + "materials" : [ + { + "name" : "Material", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.001", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.002", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.007", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.006", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.008", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.004", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.005", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.003", + "pbrMetallicRoughness" : { + "baseColorFactor" : [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1 + ], + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + }, + { + "name" : "Material.009", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0, + "texCoord" : 0 + }, + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + } + ], + "meshes" : [ + { + "name" : "Cube", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 1, + "POSITION" : 0, + "TEXCOORD_0" : 2 + }, + "indices" : 3, + "material" : 0 + } + ] + }, + { + "name" : "Cube.001", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 5, + "POSITION" : 4, + "TEXCOORD_0" : 6 + }, + "indices" : 7, + "material" : 1 + } + ] + }, + { + "name" : "Cube.002", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 9, + "POSITION" : 8, + "TEXCOORD_0" : 10 + }, + "indices" : 11, + "material" : 2 + } + ] + }, + { + "name" : "Cube.003", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 13, + "POSITION" : 12, + "TEXCOORD_0" : 14 + }, + "indices" : 15, + "material" : 3 + } + ] + }, + { + "name" : "Cube.004", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 17, + "POSITION" : 16, + "TEXCOORD_0" : 18 + }, + "indices" : 19, + "material" : 4 + } + ] + }, + { + "name" : "Cube.005", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 21, + "POSITION" : 20, + "TEXCOORD_0" : 22 + }, + "indices" : 23, + "material" : 5 + } + ] + }, + { + "name" : "Cube.006", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 25, + "POSITION" : 24, + "TEXCOORD_0" : 26 + }, + "indices" : 27, + "material" : 6 + } + ] + }, + { + "name" : "Cube.008", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 29, + "POSITION" : 28, + "TEXCOORD_0" : 30 + }, + "indices" : 31, + "material" : 7 + } + ] + }, + { + "name" : "Cube.009", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 33, + "POSITION" : 32, + "TEXCOORD_0" : 34 + }, + "indices" : 35, + "material" : 8 + } + ] + }, + { + "name" : "Plane.001", + "primitives" : [ + { + "attributes" : { + "NORMAL" : 37, + "POSITION" : 36, + "TEXCOORD_0" : 38 + }, + "indices" : 39, + "material" : 9 + } + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "Cube" + }, + { + "name" : "Light", + "rotation" : [ + 0.16907575726509094, + 0.7558802962303162, + -0.27217137813568115, + 0.570947527885437 + ], + "scale" : [ + 1, + 1, + 0.9999999403953552 + ], + "translation" : [ + 0.18540644645690918, + 5.903861999511719, + 8.732584953308105 + ] + }, + { + "name" : "Camera", + "rotation" : [ + 0.6819981932640076, + 0, + 0, + 0.7313538193702698 + ], + "scale" : [ + 1, + 0.39365354180336, + 1 + ], + "translation" : [ + 0.31374117732048035, + 4.958309173583984, + 29.236623764038086 + ] + }, + { + "mesh" : 1, + "name" : "Cube.001", + "translation" : [ + -3.2963297367095947, + 0, + 6.461143493652344e-05 + ] + }, + { + "mesh" : 2, + "name" : "Cube.002", + "translation" : [ + 3.3401193618774414, + 0, + 0.008944988250732422 + ] + }, + { + "mesh" : 3, + "name" : "Cube.003", + "translation" : [ + 0, + 3.356412410736084, + 0 + ] + }, + { + "mesh" : 4, + "name" : "Cube.004", + "rotation" : [ + 0, + 0, + -0.006683696992695332, + 0.9999777674674988 + ], + "translation" : [ + 3.33506178855896, + 3.356412410736084, + 0 + ] + }, + { + "mesh" : 5, + "name" : "Cube.005", + "rotation" : [ + 0, + 0, + -0.03925982117652893, + 0.9992290735244751 + ], + "scale" : [ + 0.9999999403953552, + 0.9999999403953552, + 1 + ], + "translation" : [ + -3.311399221420288, + 3.356412410736084, + 0 + ] + }, + { + "mesh" : 6, + "name" : "Cube.006", + "translation" : [ + 0, + 6.665226459503174, + 0 + ] + }, + { + "mesh" : 7, + "name" : "Cube.008", + "translation" : [ + 3.3051798343658447, + 6.734194278717041, + 0 + ] + }, + { + "mesh" : 8, + "name" : "Cube.009", + "translation" : [ + -3.2975807189941406, + 6.958913326263428, + 0 + ] + }, + { + "mesh" : 9, + "name" : "Plane", + "rotation" : [ + 0.7071068286895752, + 0, + 0, + 0.7071068286895752 + ], + "scale" : [ + 4.218648433685303, + 1, + 0.3652837574481964 + ], + "translation" : [ + 0, + -1.7941787242889404, + 1.0036747455596924 + ] + } + ], + "scene" : 0, + "scenes" : [ + { + "name" : "Scene", + "nodes" : [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ] + } + ], + "textures" : [ + { + "source" : 0 + } + ] +} diff --git a/automated-tests/resources/interpolation.bin b/automated-tests/resources/interpolation.bin new file mode 100644 index 0000000..fade9d2 Binary files /dev/null and b/automated-tests/resources/interpolation.bin differ diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp index 61bbc5c..987916c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp @@ -277,6 +277,21 @@ int UtcDaliBuilderAnimationP(void) " \"duration\": 3" " }" " }]" + " }," + " \"pathAnimation2\": {" + " \"duration\": 3.0," + " \"endAction\": \"BAKE_FINAL\"," + " \"disconnectAction\": \"DISCARD\"," + " \"properties\": [{" + " \"actor\": \"greeting\"," + " \"path\":\"path0\"," + " \"forward\":[1,0,0]," + " \"alphaFunction\": \"EASE_IN_OUT\"," + " \"timePeriod\": {" + " \"delay\": 0," + " \"duration\": 3" + " }" + " }]" " }" " }," " \"stage\": [{" @@ -313,6 +328,10 @@ int UtcDaliBuilderAnimationP(void) DALI_TEST_CHECK( anim ); + anim = builder.CreateAnimation("pathAnimation2"); + + DALI_TEST_CHECK( anim ); + // trigger play // Emit touch event and check that our quit method is called Integration::TouchEvent touchEvent; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp index 7c8dad4..5d49b98 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp @@ -42,7 +42,8 @@ namespace * Donated by Norbert Nopper for glTF testing. * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/AnimatedCube */ -const char* TEST_GLTF_FILE_NAME = TEST_RESOURCE_DIR "/AnimatedCube.gltf"; +const char* TEST_GLTF_FILE_NAME[] = {TEST_RESOURCE_DIR "/AnimatedCube.gltf", + TEST_RESOURCE_DIR "/InterpolationTest.gltf"}; /** * For the diffuse and specular cube map texture. * These textures are based off version of Wave engine sample @@ -87,7 +88,7 @@ int UtcDaliScene3dViewCopyConstructorP(void) TestApplication application; // Initialize an object, ref count == 1 - Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME ); + Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] ); Scene3dView copy( scene3dView ); DALI_TEST_CHECK( copy ); @@ -99,7 +100,7 @@ int UtcDaliScene3dViewCopyConstructor2P(void) TestApplication application; // Initialize an object, ref count == 1 - Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME, TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE, Vector4::ONE ); + Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0], TEST_DIFFUSE_TEXTURE, TEST_SPECULAR_TEXTURE, Vector4::ONE ); Scene3dView copy( scene3dView ); DALI_TEST_CHECK( copy ); @@ -110,7 +111,7 @@ int UtcDaliScene3dViewAssignmentOperatorP(void) { TestApplication application; - Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME ); + Scene3dView scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] ); Scene3dView copy( scene3dView ); DALI_TEST_CHECK( copy ); @@ -128,7 +129,7 @@ int UtcDaliScene3dViewNewP(void) Scene3dView scene3dView; DALI_TEST_CHECK( !scene3dView ); - scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME ); + scene3dView = Scene3dView::New( TEST_GLTF_FILE_NAME[0] ); DALI_TEST_CHECK( scene3dView ); END_TEST; @@ -150,7 +151,7 @@ int UtcDaliScene3dViewDownCast(void) ToolkitTestApplication application; tet_infoline(" UtcDaliScene3dViewDownCast"); - Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME ); + Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] ); BaseHandle handle(view); Toolkit::Scene3dView scene3dView = Toolkit::Scene3dView::DownCast( handle ); @@ -165,7 +166,7 @@ int UtcDaliScene3dViewSetLight(void) ToolkitTestApplication application; tet_infoline(" UtcDaliScene3dViewSetLight"); - Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME ); + Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] ); bool lightSet = view.SetLight( Scene3dView::LightType::DIRECTIONAL_LIGHT, Vector3( 1.0, 1.0, -1.0 ), Vector3( 0.3, 0.3, 0.3 ) ); DALI_TEST_CHECK( lightSet ); @@ -180,7 +181,7 @@ int UtcDaliScene3dViewGetCamera(void) ToolkitTestApplication application; tet_infoline(" UtcDaliScene3dViewGetCamera"); - Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME ); + Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] ); CameraActor camera = view.GetDefaultCamera(); DALI_TEST_CHECK( camera ); @@ -202,10 +203,13 @@ int UtcDaliScene3dViewAnimations(void) ToolkitTestApplication application; tet_infoline(" UtcDaliScene3dViewAnimations"); - Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME ); + for( auto filename : TEST_GLTF_FILE_NAME ) + { + Toolkit::Scene3dView view = Toolkit::Scene3dView::New( filename ); - bool playAnimation = view.PlayAnimations(); - DALI_TEST_CHECK( playAnimation ); + bool playAnimation = view.PlayAnimations(); + DALI_TEST_CHECK( playAnimation ); + } END_TEST; } @@ -215,7 +219,7 @@ int UtcDaliScene3dViewAnimations2(void) ToolkitTestApplication application; tet_infoline(" UtcDaliScene3dViewAnimations2"); - Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME ); + Toolkit::Scene3dView view = Toolkit::Scene3dView::New( TEST_GLTF_FILE_NAME[0] ); bool animated = true; unsigned int animationCount = view.GetAnimationCount(); diff --git a/dali-toolkit/internal/builder/builder-animations.cpp b/dali-toolkit/internal/builder/builder-animations.cpp index d3b843a..c917d06 100644 --- a/dali-toolkit/internal/builder/builder-animations.cpp +++ b/dali-toolkit/internal/builder/builder-animations.cpp @@ -176,15 +176,15 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D { if("BAKE" == *endAction) { - animation.SetEndAction( Animation::Bake ); + animation.SetEndAction( Animation::BAKE ); } else if("DISCARD" == *endAction) { - animation.SetEndAction( Animation::Discard ); + animation.SetEndAction( Animation::DISCARD ); } else if("BAKE_FINAL" == *endAction) { - animation.SetEndAction( Animation::BakeFinal ); + animation.SetEndAction( Animation::BAKE_FINAL ); } } @@ -192,15 +192,15 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D { if("BAKE" == *endAction) { - animation.SetDisconnectAction( Animation::Bake ); + animation.SetDisconnectAction( Animation::BAKE ); } else if("DISCARD" == *endAction) { - animation.SetDisconnectAction( Animation::Discard ); + animation.SetDisconnectAction( Animation::DISCARD ); } else if("BAKE_FINAL" == *endAction) { - animation.SetDisconnectAction( Animation::BakeFinal ); + animation.SetDisconnectAction( Animation::BAKE_FINAL ); } } diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp index 35bdd42..1132e95 100644 --- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp +++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp @@ -1776,10 +1776,10 @@ bool Loader::LoadAnimation( Scene3dView& scene3dView ) } Animation animation = Animation::New( duration ); - Animation::Interpolation interpolation = Animation::Interpolation::Linear; + Animation::Interpolation interpolation = Animation::Interpolation::LINEAR; if( animationInfo.samplerArray[currentChannel.sampler].interpolation == "CUBICSPLINE" ) { - interpolation = Animation::Interpolation::Cubic; + interpolation = Animation::Interpolation::CUBIC; } if( animationInfo.samplerArray[currentChannel.sampler].interpolation == "STEP" ) { diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp index 920e8cd..22f1156 100644 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -338,7 +338,7 @@ void TextScroller::StartScrolling( Actor scrollingTextActor, float scrollAmount, Shader shader = mRenderer.GetShader(); mScrollAnimation = Animation::New( scrollDuration ); mScrollAnimation.AnimateTo( Property( shader, mScrollDeltaIndex ), scrollAmount, TimePeriod( mLoopDelay, scrollDuration ) ); - mScrollAnimation.SetEndAction( Animation::Discard ); + mScrollAnimation.SetEndAction( Animation::DISCARD ); mScrollAnimation.SetLoopCount( loopCount ); mScrollAnimation.FinishedSignal().Connect( this, &TextScroller::AutoScrollAnimationFinished ); mScrollAnimation.Play();