diff --git a/CHANGES.md b/CHANGES.md index d73f00e02aee..05793036077d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,6 +32,7 @@ Change Log * Added 'Video' Sandcastle showcase to demonstrate video materials. * Added `createOpenStreetMapImageryProvider` function to replace the `OpenStreetMapImageryProvider` class. This function returns a constructed `UrlTemplateImageryProvider`. * Fixed an issue with tile selection when below the surface of the ellipsoid. [#3170](https://github.com/AnalyticalGraphicsInc/cesium/issues/3170) +* Fixed an issue with loading skeletons for skinned glTF models. [#3224](https://github.com/AnalyticalGraphicsInc/cesium/pull/3224) ### 1.15 - 2015-11-02 diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js index 31c401cb897b..add7b3c5ee2c 100644 --- a/Source/Scene/Model.js +++ b/Source/Scene/Model.js @@ -1712,16 +1712,17 @@ define([ return attributeLocations; } - function searchForest(forest, jointName) { + function searchForest(forest, jointName, nodes) { var length = forest.length; for (var i = 0; i < length; ++i) { var stack = [forest[i]]; // Push root node of tree while (stack.length > 0) { - var n = stack.pop(); + var id = stack.pop(); + var n = nodes[id]; if (n.jointName === jointName) { - return n; + return id; } var children = n.children; @@ -1755,19 +1756,20 @@ define([ // 1. Find nodes with the names in node.skeletons (the node's skeletons) // 2. These nodes form the root nodes of the forest to search for each joint in skin.jointNames. This search uses jointName, not the node's name. - + // 3. Search for the joint name among the gltf node hierarchy instead of the runtime node hierarchy. Child links aren't set up yet for runtime nodes. var forest = []; var gltfSkeletons = node.skeletons; var skeletonsLength = gltfSkeletons.length; for (var k = 0; k < skeletonsLength; ++k) { - forest.push(runtimeNodes[gltfSkeletons[k]]); + forest.push(gltfSkeletons[k]); } var gltfJointNames = skins[node.skin].jointNames; var jointNamesLength = gltfJointNames.length; for (var i = 0; i < jointNamesLength; ++i) { var jointName = gltfJointNames[i]; - skinnedNode.joints.push(searchForest(forest, jointName)); + var jointNode = runtimeNodes[searchForest(forest, jointName, nodes)]; + skinnedNode.joints.push(jointNode); } } } diff --git a/Specs/Data/Models/rigged-simple/rigged-simple.dae b/Specs/Data/Models/rigged-simple/rigged-simple.dae new file mode 100644 index 000000000000..7dfc7b864b19 --- /dev/null +++ b/Specs/Data/Models/rigged-simple/rigged-simple.dae @@ -0,0 +1,224 @@ + + + + + Blender User + Blender 2.76.0 commit date:2015-09-17, commit time:14:48, hash:c586e30 + + 2015-11-20T07:35:07 + 2015-11-20T07:35:07 + + Z_UP + + + + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + 0.2796354 0.64 0.2109439 1 + + + 0.5 0.5 0.5 1 + + + 50 + + + 1 + + + + + + + + + + + + + + + + 0 -0.4500797 4.575077 0 -0.9999996 -4.575077 0.08780616 -0.4414315 4.575077 0.1950903 -0.9807848 -4.575077 0.1722379 -0.4158194 4.575077 0.3826835 -0.9238791 -4.575077 0.2500507 -0.3742277 4.575077 0.5555703 -0.8314692 -4.575077 0.3182541 -0.3182546 4.575077 0.7071068 -0.7071064 -4.575077 0.3742272 -0.2500511 4.575077 0.8314697 -0.5555698 -4.575077 0.415819 -0.1722384 4.575077 0.9238795 -0.382683 -4.575077 0.4414311 -0.08780664 4.575077 0.9807853 -0.1950899 -4.575077 0.4500792 -5.90665e-7 4.575077 1 3.24468e-7 -4.575077 0.4414311 0.08780544 4.575077 0.9807853 0.1950906 -4.575077 0.415819 0.1722372 4.575077 0.9238796 0.3826836 -4.575077 0.3742272 0.25005 4.575077 0.8314697 0.5555706 -4.575077 0.3182541 0.3182535 4.575077 0.7071068 0.7071072 -4.575077 0.2500506 0.3742266 4.575077 0.5555702 0.8314701 -4.575077 0.1722378 0.4158184 4.575077 0.3826833 0.9238801 -4.575077 0.08780604 0.4414305 4.575077 0.1950901 0.9807857 -4.575077 0 0.4500786 4.575077 -3.25841e-7 1 -4.575077 -0.08780616 0.4414305 4.575077 -0.1950907 0.9807856 -4.575077 -0.1722379 0.4158183 4.575077 -0.3826839 0.9238798 -4.575077 -0.2500507 0.3742265 4.575077 -0.5555707 0.8314697 -4.575077 -0.3182542 0.3182533 4.575077 -0.7071073 0.7071068 -4.575077 -0.3742272 0.2500498 4.575077 -0.83147 0.5555701 -4.575077 -0.4158191 0.1722369 4.575077 -0.9238799 0.382683 -4.575077 -0.441431 0.08780515 4.575077 -0.9807854 0.1950898 -4.575077 -0.4500791 -9.91281e-7 4.575077 -1 -5.65633e-7 -4.575077 -0.4414309 -0.08780711 4.575077 -0.9807851 -0.1950909 -4.575077 -0.4158186 -0.1722388 4.575077 -0.9238791 -0.3826841 -4.575077 -0.3742268 -0.2500516 4.575077 -0.8314689 -0.5555709 -4.575077 -0.3182535 -0.318255 4.575077 -0.7071059 -0.7071073 -4.575077 -0.25005 -0.3742281 4.575077 -0.5555691 -0.83147 -4.575077 -0.1722372 -0.4158197 4.575077 -0.3826821 -0.9238797 -4.575077 -0.08780533 -0.4414317 4.575077 -0.1950888 -0.9807851 -4.575077 0 -0.4893852 0 0.0954743 -0.4799818 0 0.1872796 -0.4521329 0 0.2718878 -0.4069089 0 0.3460475 -0.3460476 0 0.4069089 -0.2718879 0 0.4521329 -0.1872797 0 0.4799817 -0.09547442 0 0.4893851 -1.82465e-7 0 0.4799817 0.09547406 0 0.4521329 0.1872793 0 0.4069089 0.2718876 0 0.3460475 0.3460473 0 0.2718878 0.4069086 0 0.1872795 0.4521327 0 0.09547418 0.4799815 0 0 0.4893849 0 -0.09547442 0.4799815 0 -0.1872797 0.4521325 0 -0.2718879 0.4069085 0 -0.3460476 0.3460471 0 -0.4069089 0.2718873 0 -0.4521329 0.187279 0 -0.4799817 0.0954737 0 -0.489385 -6.18067e-7 0 -0.4799815 -0.09547489 0 -0.4521325 -0.1872802 0 -0.4069084 -0.2718884 0 -0.346047 -0.3460481 0 -0.2718871 -0.4069093 0 -0.1872788 -0.4521332 0 -0.09547346 -0.479982 0 + + + + + + + + + + 0 -0.7646421 -0.6444553 0.1491492 -0.7499578 -0.6444516 0.1947121 -0.9790236 0.06000059 0.292622 -0.7064375 -0.6444522 0.3819756 -0.9222227 0.0600003 0.424803 -0.6357854 -0.6444529 0.5545668 -0.8299732 0.06000095 0.5406855 -0.5406855 -0.6444522 0.7058328 -0.7058328 0.06000202 0.6357854 -0.424803 -0.6444529 0.8299732 -0.5545668 0.06000095 0.7064375 -0.292622 -0.6444522 0.9222227 -0.3819756 0.0600003 0.7499396 -0.1491761 -0.6444665 0.9790179 -0.1947415 0.06000024 0.7646547 0 -0.6444402 0.9981984 0 0.06000113 0.7499578 0.1491492 -0.6444516 0.9790179 0.1947415 0.06000024 0.7064375 0.292622 -0.6444522 0.9222227 0.3819756 0.0600003 0.6357854 0.424803 -0.6444529 0.8299732 0.5545668 0.06000095 0.5406855 0.5406855 -0.6444522 0.7058328 0.7058328 0.06000202 0.424803 0.6357854 -0.6444529 0.5545668 0.8299732 0.06000095 0.292622 0.7064375 -0.6444522 0.3819756 0.9222227 0.0600003 0.1491492 0.7499578 -0.6444516 0.1947121 0.9790236 0.06000059 0 0.7646421 -0.6444553 0 0.9981984 0.06000113 -0.1491791 0.7499544 -0.6444487 -0.1947415 0.9790179 0.06000024 -0.292622 0.7064375 -0.6444522 -0.3819756 0.9222227 0.0600003 -0.4247946 0.6357728 -0.6444708 -0.5545668 0.8299732 0.06000095 -0.5406855 0.5406855 -0.6444522 -0.7058482 0.7058176 0.06000071 -0.6357854 0.424803 -0.6444529 -0.8299732 0.5545668 0.06000095 -0.7064375 0.292622 -0.6444522 -0.9222227 0.3819756 0.0600003 -0.7499578 0.1491492 -0.6444516 -0.9790236 0.1947121 0.06000059 -0.764627 0 -0.6444731 -0.9981984 0 0.06000113 -0.7499544 -0.1491791 -0.6444487 -0.9790179 -0.1947415 0.06000024 -0.7064375 -0.292622 -0.6444522 -0.9222227 -0.3819756 0.0600003 -0.6357728 -0.4247946 -0.6444708 -0.5406855 -0.5406855 -0.6444522 -0.7058176 -0.7058482 0.06000071 -0.424803 -0.6357854 -0.6444529 -0.5545668 -0.8299732 0.06000095 -0.292622 -0.7064375 -0.6444522 -0.3819756 -0.9222227 0.0600003 -0.1491492 -0.7499578 -0.6444516 0 -0.9981984 0.06000113 -0.1947121 -0.9790236 0.06000059 0.1414259 0.7110054 0.688818 -0.7110054 0.1414259 0.688818 0.7110054 -0.1414259 0.688818 -0.1414259 -0.7110054 0.688818 0 -0.7249431 0.6888089 -0.2774153 -0.6697643 0.688808 -0.4027618 -0.6027541 0.6888182 -0.8299732 -0.5545668 0.06000095 -0.5126032 -0.5126032 0.6888221 -0.6027541 -0.4027618 0.6888182 -0.6697475 -0.2774211 0.6888222 -0.7110054 -0.1414259 0.688818 -0.7249431 0 0.6888089 -0.6697334 0.2774152 0.6888381 -0.6027541 0.4027618 0.6888182 -0.5126032 0.5126032 0.6888221 -0.4027618 0.6027541 0.6888182 -0.2774211 0.6697475 0.6888222 -0.1414259 0.7110054 0.688818 0 0.7249431 0.6888089 0.2774153 0.6697643 0.688808 0.4027618 0.6027541 0.6888182 0.5126032 0.5126032 0.6888221 0.6027541 0.4027618 0.6888182 0.6697475 0.2774211 0.6888222 0.7110054 0.1414259 0.688818 0.7249583 0 0.6887928 0.6697334 -0.2774152 0.6888381 0.6027541 -0.4027618 0.6888182 0.5126032 -0.5126032 0.6888221 0.4027618 -0.6027541 0.6888182 0.2774153 -0.6697643 0.688808 0.1414259 -0.7110054 0.688818 + + + + + + + + + + + + + + + 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 +

1 0 3 1 65 2 3 1 5 3 66 4 5 3 7 5 67 6 7 5 9 7 68 8 9 7 11 9 69 10 11 9 13 11 70 12 13 11 15 13 71 14 15 13 17 15 72 16 17 15 19 17 73 18 19 17 21 19 74 20 21 19 23 21 75 22 23 21 25 23 76 24 25 23 27 25 77 26 27 25 29 27 78 28 29 27 31 29 79 30 31 29 33 31 80 32 33 31 35 33 81 34 35 33 37 35 82 36 37 35 39 37 83 38 39 37 41 39 84 40 41 39 43 41 85 42 43 41 45 43 86 44 45 43 47 45 87 46 47 45 49 47 88 48 88 48 49 47 51 49 89 50 51 49 53 51 90 52 53 51 55 53 55 53 57 54 92 55 57 54 59 56 93 57 59 56 61 58 94 59 37 35 21 19 53 51 63 60 1 0 64 61 61 58 63 60 95 62 30 63 46 64 14 65 94 59 95 62 62 66 95 62 64 61 0 67 93 57 94 59 60 68 92 55 93 57 58 69 91 70 92 55 56 71 90 52 91 70 54 72 89 50 90 52 52 73 88 48 89 50 50 74 87 46 88 48 48 75 86 44 87 46 46 64 85 42 86 44 44 76 84 40 85 42 42 77 83 38 84 40 40 78 82 36 83 38 38 79 81 34 82 36 36 80 80 32 81 34 34 81 79 30 80 32 32 82 78 28 79 30 30 63 77 26 78 28 28 83 76 24 77 26 26 84 75 22 76 24 24 85 74 20 75 22 22 86 73 18 74 20 20 87 72 16 73 18 18 88 71 14 72 16 16 89 70 12 71 14 14 65 69 10 70 12 12 90 68 8 69 10 10 91 67 6 68 8 8 92 66 4 67 6 6 93 65 2 66 4 4 94 64 61 65 2 2 95 64 61 1 0 65 2 65 2 3 1 66 4 66 4 5 3 67 6 67 6 7 5 68 8 68 8 9 7 69 10 69 10 11 9 70 12 70 12 13 11 71 14 71 14 15 13 72 16 72 16 17 15 73 18 73 18 19 17 74 20 74 20 21 19 75 22 75 22 23 21 76 24 76 24 25 23 77 26 77 26 27 25 78 28 78 28 29 27 79 30 79 30 31 29 80 32 80 32 33 31 81 34 81 34 35 33 82 36 82 36 37 35 83 38 83 38 39 37 84 40 84 40 41 39 85 42 85 42 43 41 86 44 86 44 45 43 87 46 87 46 47 45 88 48 89 50 88 48 51 49 90 52 89 50 53 51 91 70 90 52 55 53 91 70 55 53 92 55 92 55 57 54 93 57 93 57 59 56 94 59 5 3 3 1 1 0 1 0 63 60 5 3 61 58 59 56 57 54 57 54 55 53 53 51 53 51 51 49 49 47 49 47 47 45 53 51 45 43 43 41 41 39 41 39 39 37 37 35 37 35 35 33 33 31 33 31 31 29 29 27 29 27 27 25 25 23 25 23 23 21 21 19 21 19 19 17 17 15 17 15 15 13 21 19 13 11 11 9 9 7 9 7 7 5 5 3 5 3 63 60 61 58 61 58 57 54 53 51 53 51 47 45 45 43 45 43 41 39 37 35 37 35 33 31 21 19 29 27 25 23 21 19 21 19 15 13 13 11 13 11 9 7 5 3 5 3 61 58 53 51 53 51 45 43 37 35 33 31 29 27 21 19 21 19 13 11 5 3 5 3 53 51 21 19 95 62 63 60 64 61 94 59 61 58 95 62 62 66 0 67 2 95 2 95 4 94 6 93 6 93 8 92 10 91 10 91 12 90 14 65 14 65 16 89 18 88 18 88 20 87 14 65 22 86 24 85 30 63 26 84 28 83 30 63 30 63 32 82 38 79 34 81 36 80 38 79 38 79 40 78 42 77 42 77 44 76 46 64 46 64 48 75 50 74 50 74 52 73 46 64 54 72 56 71 58 69 58 69 60 68 62 66 62 66 2 95 14 65 6 93 10 91 14 65 14 65 20 87 22 86 24 85 26 84 30 63 32 82 34 81 38 79 38 79 42 77 46 64 46 64 52 73 54 72 54 72 58 69 46 64 2 95 6 93 14 65 14 65 22 86 30 63 30 63 38 79 46 64 46 64 58 69 62 66 62 66 14 65 46 64 60 68 94 59 62 66 62 66 95 62 0 67 58 69 93 57 60 68 56 71 92 55 58 69 54 72 91 70 56 71 52 73 90 52 54 72 50 74 89 50 52 73 48 75 88 48 50 74 46 64 87 46 48 75 44 76 86 44 46 64 42 77 85 42 44 76 40 78 84 40 42 77 38 79 83 38 40 78 36 80 82 36 38 79 34 81 81 34 36 80 32 82 80 32 34 81 30 63 79 30 32 82 28 83 78 28 30 63 26 84 77 26 28 83 24 85 76 24 26 84 22 86 75 22 24 85 20 87 74 20 22 86 18 88 73 18 20 87 16 89 72 16 18 88 14 65 71 14 16 89 12 90 70 12 14 65 10 91 69 10 12 90 8 92 68 8 10 91 6 93 67 6 8 92 4 94 66 4 6 93 2 95 65 2 4 94 0 67 64 61 2 95

+ + + + + + + + 0.04166662 1.041667 2.083333 + + + + + + + + 1 0 0 0 0 0.006681787 -0.9999776 -3.15606e-7 0 0.9999776 0.006681859 -4.18033 0 0 0 1 1 0 0 0 0 0.006681787 -0.9999776 -3.15606e-7 0 0.9999776 0.006681859 -4.18033 0 0 0 1 1 0 0 0 0 0.006681787 -0.9999776 -3.15606e-7 0 0.9999776 0.006681859 -4.18033 0 0 0 1 + + + + + + + + LINEAR LINEAR LINEAR + + + + + + + + + + + + + + + + 0.04166662 1.041667 2.083333 + + + + + + + + 0.9999998 -5.8274e-4 1.39481e-6 0 5.82741e-4 0.9999914 -0.004104212 4.187171 9.96895e-7 0.004104212 0.9999917 0 0 0 0 1 0.9999998 -5.8274e-4 1.39479e-6 0 4.81644e-4 0.8278579 0.5609376 4.187171 -3.28036e-4 -0.5609376 0.8278582 0 0 0 0 1 0.9999998 -5.8274e-4 1.39481e-6 0 5.82741e-4 0.9999914 -0.004104212 4.187171 9.96895e-7 0.004104212 0.9999917 0 0 0 0 1 + + + + + + + + LINEAR LINEAR LINEAR + + + + + + + + + + + + + + + + + + 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 + + Bone Bone_001 + + + + + + + + 1 0 0 0 0 0.006681859 0.9999777 4.180237 0 -0.9999778 0.00668174 0.02793174 0 0 0 1 0.9999999 2.89692e-6 5.82735e-4 -4.01262e-6 -5.8274e-4 0.002577662 0.9999966 -0.00681883 1.39481e-6 -0.9999967 0.002577602 0.02795994 0 0 0 1 + + + + + + + + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386019 0.2613982 0.7386019 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386019 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386019 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386018 0.2613982 0.7386019 0.2613982 0.7386018 0.2613982 0.7386019 0.2613982 0.7386018 0.2613982 0.7386019 0.2613982 + + + + + + + + + + + + + + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 + 1 0 0 1 1 2 0 3 1 4 0 5 1 6 0 7 1 8 0 9 1 10 0 11 1 12 0 13 1 14 0 15 1 16 0 17 1 18 0 19 1 20 0 21 1 22 0 23 1 24 0 25 1 26 0 27 1 28 0 29 1 30 0 31 1 32 0 33 1 34 0 35 1 36 0 37 1 38 0 39 1 40 0 41 1 42 0 43 1 44 0 45 1 46 0 47 1 48 0 49 1 50 0 51 1 52 0 53 1 54 0 55 1 56 0 57 1 58 0 59 1 60 0 61 1 62 0 63 0 64 1 65 0 66 1 67 0 68 1 69 0 70 1 71 0 72 1 73 0 74 1 75 0 76 1 77 0 78 1 79 0 80 1 81 0 82 1 83 0 84 1 85 0 86 1 87 0 88 1 89 0 90 1 91 0 92 1 93 0 94 1 95 0 96 1 97 0 98 1 99 0 100 1 101 0 102 1 103 0 104 1 105 0 106 1 107 0 108 1 109 0 110 1 111 0 112 1 113 0 114 1 115 0 116 1 117 0 118 1 119 0 120 1 121 0 122 1 123 0 124 1 125 0 126 1 127 + + + + + + + + 0 0 0 + 0 0 1 0 + 0 1 0 0 + 1 0 0 0 + 1 1 1 + + 1 0 0 0 0 0.006681787 -0.9999776 -3.15606e-7 0 0.9999776 0.006681859 -4.18033 0 0 0 1 + + 0.9999998 -5.8274e-4 1.39481e-6 0 5.82741e-4 0.9999914 -0.004104212 4.187171 9.96895e-7 0.004104212 0.9999917 0 0 0 0 1 + + + + + 0 0 0 + 0 0 1 0 + 0 1 0 0 + 1 0 0 0 + 1 1 1 + + #Bone + + + + + + + + + + + + + \ No newline at end of file diff --git a/Specs/Data/Models/rigged-simple/rigged-simple.gltf b/Specs/Data/Models/rigged-simple/rigged-simple.gltf new file mode 100644 index 000000000000..1b2a8d95195b --- /dev/null +++ b/Specs/Data/Models/rigged-simple/rigged-simple.gltf @@ -0,0 +1,588 @@ +{ + "accessors": { + "IBM_Armature_Cylinder-skin": { + "bufferView": "bufferView_43", + "byteOffset": 0, + "componentType": 5126, + "count": 2, + "type": "MAT4" + }, + "accessor_16": { + "bufferView": "bufferView_44", + "byteOffset": 0, + "byteStride": 0, + "componentType": 5123, + "count": 564, + "type": "SCALAR" + }, + "accessor_18": { + "bufferView": "bufferView_45", + "byteOffset": 0, + "byteStride": 12, + "componentType": 5126, + "count": 96, + "max": [ + 1, + 1, + 4.575079917907715 + ], + "min": [ + -1, + -1, + -4.575079917907715 + ], + "type": "VEC3" + }, + "accessor_20": { + "bufferView": "bufferView_45", + "byteOffset": 1152, + "byteStride": 12, + "componentType": 5126, + "count": 96, + "max": [ + 0.9981979727745056, + 0.9981979727745056, + 0.688838005065918 + ], + "min": [ + -0.9981979727745056, + -0.9981979727745056, + -0.6444730162620544 + ], + "type": "VEC3" + }, + "accessor_37": { + "bufferView": "bufferView_45", + "byteOffset": 2304, + "byteStride": 16, + "componentType": 5126, + "count": 96, + "max": [ + 1, + 0.26139798760414124, + 0, + 0 + ], + "min": [ + 0.7386019825935364, + 0, + 0, + 0 + ], + "type": "VEC4" + }, + "accessor_40": { + "bufferView": "bufferView_45", + "byteOffset": 3840, + "byteStride": 16, + "componentType": 5126, + "count": 96, + "max": [ + 1, + 1, + 0, + 0 + ], + "min": [ + 0, + 0, + 0, + 0 + ], + "type": "VEC4" + }, + "animAccessor_0": { + "bufferView": "bufferView_43", + "byteOffset": 128, + "componentType": 5126, + "count": 3, + "type": "SCALAR" + }, + "animAccessor_1": { + "bufferView": "bufferView_43", + "byteOffset": 140, + "componentType": 5126, + "count": 3, + "type": "VEC3" + }, + "animAccessor_2": { + "bufferView": "bufferView_43", + "byteOffset": 176, + "componentType": 5126, + "count": 3, + "type": "VEC3" + }, + "animAccessor_3": { + "bufferView": "bufferView_43", + "byteOffset": 212, + "componentType": 5126, + "count": 3, + "type": "VEC4" + }, + "animAccessor_4": { + "bufferView": "bufferView_43", + "byteOffset": 260, + "componentType": 5126, + "count": 3, + "type": "VEC3" + }, + "animAccessor_5": { + "bufferView": "bufferView_43", + "byteOffset": 296, + "componentType": 5126, + "count": 3, + "type": "VEC3" + }, + "animAccessor_6": { + "bufferView": "bufferView_43", + "byteOffset": 332, + "componentType": 5126, + "count": 3, + "type": "VEC4" + } + }, + "animations": { + "animation_0": { + "channels": [ + { + "sampler": "animation_0_scale_sampler", + "target": { + "id": "Bone", + "path": "scale" + } + }, + { + "sampler": "animation_0_translation_sampler", + "target": { + "id": "Bone", + "path": "translation" + } + }, + { + "sampler": "animation_0_rotation_sampler", + "target": { + "id": "Bone", + "path": "rotation" + } + } + ], + "parameters": { + "TIME": "animAccessor_0", + "rotation": "animAccessor_3", + "scale": "animAccessor_1", + "translation": "animAccessor_2" + }, + "samplers": { + "animation_0_rotation_sampler": { + "input": "TIME", + "interpolation": "LINEAR", + "output": "rotation" + }, + "animation_0_scale_sampler": { + "input": "TIME", + "interpolation": "LINEAR", + "output": "scale" + }, + "animation_0_translation_sampler": { + "input": "TIME", + "interpolation": "LINEAR", + "output": "translation" + } + } + }, + "animation_1": { + "channels": [ + { + "sampler": "animation_1_scale_sampler", + "target": { + "id": "Bone_001", + "path": "scale" + } + }, + { + "sampler": "animation_1_translation_sampler", + "target": { + "id": "Bone_001", + "path": "translation" + } + }, + { + "sampler": "animation_1_rotation_sampler", + "target": { + "id": "Bone_001", + "path": "rotation" + } + } + ], + "parameters": { + "TIME": "animAccessor_0", + "rotation": "animAccessor_6", + "scale": "animAccessor_4", + "translation": "animAccessor_5" + }, + "samplers": { + "animation_1_rotation_sampler": { + "input": "TIME", + "interpolation": "LINEAR", + "output": "rotation" + }, + "animation_1_scale_sampler": { + "input": "TIME", + "interpolation": "LINEAR", + "output": "scale" + }, + "animation_1_translation_sampler": { + "input": "TIME", + "interpolation": "LINEAR", + "output": "translation" + } + } + } + }, + "asset": { + "generator": "collada2gltf@", + "premultipliedAlpha": true, + "profile": { + "api": "WebGL", + "version": "1.0.2" + }, + "version": 1 + }, + "bufferViews": { + "bufferView_43": { + "buffer": "input", + "byteLength": 380, + "byteOffset": 0 + }, + "bufferView_44": { + "buffer": "input", + "byteLength": 1128, + "byteOffset": 380, + "target": 34963 + }, + "bufferView_45": { + "buffer": "input", + "byteLength": 5376, + "byteOffset": 1508, + "target": 34962 + } + }, + "buffers": { + "input": { + "byteLength": 6884, + "type": "arraybuffer", + "uri": "data:application/octet-stream;base64,AACAPwAAAAAAAAAAAAAAAAAAAACB89o7j/5/vwAAAAAAAAAAj/5/P3/y2jsAAAAAAAAAAIbEhUAF0eQ8AACAPwAAgD8Fwxi6TjW7NQAAAAC1aEI29e0oO87/f78AAAAAr8IYOs7/fz/07Cg7AAAAACWkhrZ+cN+7KQzlPAAAgD+Zqio9cVWFP0dVBUAAAIA/AwCAPwMAgD8AAIA/AwCAPwMAgD8AAIA/AwCAPwMAgD8AAAAAj3CptEPFhcAAAAAAj3CptEPFhcAAAAAAj3CptEPFhcDfaTQ/AAAAAAAAAACDnzU/32k0PwAAAAAAAAAAg581P99pND8AAAAAAAAAAIOfNT8BAIA/+f9/PwQAgD8BAIA/AwCAPwEAgD8BAIA/+f9/PwQAgD8AAAAATP2FQAAAAAAAAAAATP2FQAAAAAAAAAAATP2FQAAAAACvfAY7E6HVMyTDmDnc/38/vDWWvqWqtDi37pE5LLx0P698BjsTodUzJMOYOdz/fz8AAAEAAgABAAMABAADAAUABgAFAAcACAAHAAkACgAJAAsADAALAA0ADgANAA8AEAAPABEAEgARABMAFAATABUAFgAVABcAGAAXABkAGgAZABsAHAAbAB0AHgAdAB8AIAAfACEAIgAhACMAJAAjACUAJgAlACcAKAAnACkAKgApACsALAArAC0ALgAtAC8AMAAwAC8AMQAyADEAMwA0ADMANQA1ADYANwA2ADgAOQA4ADoAOwAjABMAMwA8AAAAPQA6ADwAPgA/AEAAQQA7AD4AQgA+AD0AQwA5ADsARAA3ADkARQBGADcARwA0AEYASAAyADQASQAwADIASgAuADAASwAsAC4AQAAqACwATAAoACoATQAmACgATgAkACYATwAiACQAUAAgACIAUQAeACAAUgAcAB4APwAaABwAUwAYABoAVAAWABgAVQAUABYAVgASABQAVwAQABIAWAAOABAAWQAMAA4AQQAKAAwAWgAIAAoAWwAGAAgAXAAEAAYAXQACAAQAXgA9AAIAXwA9AAAAAgACAAEABAAEAAMABgAGAAUACAAIAAcACgAKAAkADAAMAAsADgAOAA0AEAAQAA8AEgASABEAFAAUABMAFgAWABUAGAAYABcAGgAaABkAHAAcABsAHgAeAB0AIAAgAB8AIgAiACEAJAAkACMAJgAmACUAKAAoACcAKgAqACkALAAsACsALgAuAC0AMAAyADAAMQA0ADIAMwBGADQANQBGADUANwA3ADYAOQA5ADgAOwADAAEAAAAAADwAAwA6ADgANgA2ADUAMwAzADEALwAvAC0AMwArACkAJwAnACUAIwAjACEAHwAfAB0AGwAbABkAFwAXABUAEwATABEADwAPAA0AEwALAAkABwAHAAUAAwADADwAOgA6ADYAMwAzAC0AKwArACcAIwAjAB8AEwAbABcAEwATAA0ACwALAAcAAwADADoAMwAzACsAIwAfABsAEwATAAsAAwADADMAEwA+ADwAPQA7ADoAPgBCAEMAXwBfAF4AXQBdAFwAWwBbAFoAQQBBAFkAWABYAFcAQQBWAFUAPwBUAFMAPwA/AFIATwBRAFAATwBPAE4ATQBNAEwAQABAAEsASgBKAEkAQABIAEcARQBFAEQAQgBCAF8AQQBdAFsAQQBBAFcAVgBVAFQAPwBSAFEATwBPAE0AQABAAEkASABIAEUAQABfAF0AQQBBAFYAPwA/AE8AQABAAEUAQgBCAEEAQABEADsAQgBCAD4AQwBFADkARABHADcARQBIAEYARwBJADQASABKADIASQBLADAASgBAAC4ASwBMACwAQABNACoATABOACgATQBPACYATgBQACQATwBRACIAUABSACAAUQA/AB4AUgBTABwAPwBUABoAUwBVABgAVABWABYAVQBXABQAVgBYABIAVwBZABAAWABBAA4AWQBaAAwAQQBbAAoAWgBcAAgAWwBdAAYAXABeAAQAXQBfAAIAXgBDAD0AXwAAAAAAAACAvw5nksCsxUc+uhR7vw5nksAIiMM9M8D1vgAAAAAo78M+VoNsvw5nksBUxj8++n3nvgAAAADWOQ4/J9tUvw5nksDnNIs+YFbQvgAAAAD3BDU/5gQ1vw5nksA0LbE+NC2xvgAAAAA321Q/1jkOvw5nksBgVtA+5zSLvgAAAABWg2w/B+/Dvg5nksD6fec+VMY/vgAAAAC6FHs/rMVHvg5nksAzwPU+FYjDvQAAAAAAAIA/izKuNA5nksCskPo+metDtAAAAAC6FHs/78VHPg5nksAzwPU+7YfDPQAAAABmg2w/KO/DPg5nksD6fec+EcY/PgAAAAA321Q/5zkOPw5nksBgVtA+5zSLPgAAAAD3BDU/9wQ1Pw5nksA0LbE+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AACAPwAAAAAAAAAAAAAAAAUVPT/11YU+AAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAABRU9P/XVhT4AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAFFT0/9dWFPgAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAUVPT/11YU+AAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAABRU9P/XVhT4AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAABRU9P/XVhT4AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAFFT0/9dWFPgAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAUVPT/11YU+AAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAABRU9P/XVhT4AAAAAAAAAAAUVPT/11YU+AAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAABRU9P/XVhT4AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAA=" + } + }, + "materials": { + "Material_001-effect": { + "name": "Material_001", + "technique": "technique0", + "values": { + "ambient": [ + 0, + 0, + 0, + 1 + ], + "diffuse": [ + 0.2796350121498108, + 0.6399999856948853, + 0.21094399690628052, + 1 + ], + "emission": [ + 0, + 0, + 0, + 1 + ], + "shininess": 50, + "specular": [ + 0.5, + 0.5, + 0.5, + 1 + ] + } + } + }, + "meshes": { + "Cylinder-mesh": { + "name": "Cylinder", + "primitives": [ + { + "attributes": { + "JOINT": "accessor_40", + "NORMAL": "accessor_20", + "POSITION": "accessor_18", + "WEIGHT": "accessor_37" + }, + "indices": "accessor_16", + "material": "Material_001-effect", + "mode": 4 + } + ] + } + }, + "nodes": { + "Armature": { + "children": [ + "Bone" + ], + "matrix": [ + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1 + ], + "name": "Armature" + }, + "Bone": { + "children": [ + "Bone_001" + ], + "jointName": "Bone", + "name": "Bone", + "rotation": [ + 0.7047404646873474, + 0, + 0, + 0.7094652056694031 + ], + "scale": [ + 1, + 1.0000003576278687, + 1.0000003576278687 + ], + "translation": [ + 0, + -0.00000031560600177726883, + -4.1803297996521 + ] + }, + "Bone_001": { + "children": [], + "jointName": "Bone_001", + "name": "Bone.001", + "rotation": [ + 0.002052109455689788, + 0.00000009947884649363914, + 0.0002913709031417966, + 0.9999978542327881 + ], + "scale": [ + 1.0000001192092896, + 0.9999995827674866, + 1.0000004768371582 + ], + "translation": [ + 0, + 4.187170028686523, + 0 + ] + }, + "Cylinder": { + "children": [], + "matrix": [ + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1 + ], + "meshes": [ + "Cylinder-mesh" + ], + "name": "Cylinder", + "skeletons": [ + "Bone" + ], + "skin": "Armature_Cylinder-skin" + }, + "node_4": { + "children": [ + "Armature", + "Cylinder" + ], + "matrix": [ + 1, + 0, + 0, + 0, + 0, + 0, + -1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1 + ], + "name": "Y_UP_Transform" + } + }, + "programs": { + "program_0": { + "attributes": [ + "a_joint", + "a_normal", + "a_position", + "a_weight" + ], + "fragmentShader": "input0FS", + "vertexShader": "input0VS" + } + }, + "scene": "defaultScene", + "scenes": { + "defaultScene": { + "nodes": [ + "node_4" + ] + } + }, + "shaders": { + "input0FS": { + "type": 35632, + "uri": "data:text/plain;base64,cHJlY2lzaW9uIGhpZ2hwIGZsb2F0Owp2YXJ5aW5nIHZlYzMgdl9ub3JtYWw7CnVuaWZvcm0gdmVjNCB1X2FtYmllbnQ7CnVuaWZvcm0gdmVjNCB1X2RpZmZ1c2U7CnVuaWZvcm0gdmVjNCB1X2VtaXNzaW9uOwp1bmlmb3JtIHZlYzQgdV9zcGVjdWxhcjsKdW5pZm9ybSBmbG9hdCB1X3NoaW5pbmVzczsKdm9pZCBtYWluKHZvaWQpIHsKdmVjMyBub3JtYWwgPSBub3JtYWxpemUodl9ub3JtYWwpOwp2ZWM0IGNvbG9yID0gdmVjNCgwLiwgMC4sIDAuLCAwLik7CnZlYzQgZGlmZnVzZSA9IHZlYzQoMC4sIDAuLCAwLiwgMS4pOwp2ZWM0IGVtaXNzaW9uOwp2ZWM0IGFtYmllbnQ7CnZlYzQgc3BlY3VsYXI7CmFtYmllbnQgPSB1X2FtYmllbnQ7CmRpZmZ1c2UgPSB1X2RpZmZ1c2U7CmVtaXNzaW9uID0gdV9lbWlzc2lvbjsKc3BlY3VsYXIgPSB1X3NwZWN1bGFyOwpkaWZmdXNlLnh5eiAqPSBtYXgoZG90KG5vcm1hbCx2ZWMzKDAuLDAuLDEuKSksIDAuKTsKY29sb3IueHl6ICs9IGRpZmZ1c2UueHl6Owpjb2xvci54eXogKz0gZW1pc3Npb24ueHl6Owpjb2xvciA9IHZlYzQoY29sb3IucmdiICogZGlmZnVzZS5hLCBkaWZmdXNlLmEpOwpnbF9GcmFnQ29sb3IgPSBjb2xvcjsKfQo=" + }, + "input0VS": { + "type": 35633, + "uri": "data:text/plain;base64,cHJlY2lzaW9uIGhpZ2hwIGZsb2F0OwphdHRyaWJ1dGUgdmVjMyBhX3Bvc2l0aW9uOwphdHRyaWJ1dGUgdmVjMyBhX25vcm1hbDsKdmFyeWluZyB2ZWMzIHZfbm9ybWFsOwphdHRyaWJ1dGUgdmVjNCBhX2pvaW50OwphdHRyaWJ1dGUgdmVjNCBhX3dlaWdodDsKdW5pZm9ybSBtYXQ0IHVfam9pbnRNYXRbMl07CnVuaWZvcm0gbWF0MyB1X25vcm1hbE1hdHJpeDsKdW5pZm9ybSBtYXQ0IHVfbW9kZWxWaWV3TWF0cml4Owp1bmlmb3JtIG1hdDQgdV9wcm9qZWN0aW9uTWF0cml4Owp2b2lkIG1haW4odm9pZCkgewptYXQ0IHNraW5NYXQgPSBhX3dlaWdodC54ICogdV9qb2ludE1hdFtpbnQoYV9qb2ludC54KV07CnNraW5NYXQgKz0gYV93ZWlnaHQueSAqIHVfam9pbnRNYXRbaW50KGFfam9pbnQueSldOwpza2luTWF0ICs9IGFfd2VpZ2h0LnogKiB1X2pvaW50TWF0W2ludChhX2pvaW50LnopXTsKc2tpbk1hdCArPSBhX3dlaWdodC53ICogdV9qb2ludE1hdFtpbnQoYV9qb2ludC53KV07CnZlYzQgcG9zID0gdV9tb2RlbFZpZXdNYXRyaXggKiBza2luTWF0ICogdmVjNChhX3Bvc2l0aW9uLDEuMCk7CnZfbm9ybWFsID0gdV9ub3JtYWxNYXRyaXggKiBtYXQzKHNraW5NYXQpKiBhX25vcm1hbDsKZ2xfUG9zaXRpb24gPSB1X3Byb2plY3Rpb25NYXRyaXggKiBwb3M7Cn0K" + } + }, + "skins": { + "Armature_Cylinder-skin": { + "bindShapeMatrix": [ + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1 + ], + "inverseBindMatrices": "IBM_Armature_Cylinder-skin", + "jointNames": [ + "Bone", + "Bone_001" + ], + "name": "Armature" + } + }, + "techniques": { + "technique0": { + "attributes": { + "a_joint": "joint", + "a_normal": "normal", + "a_position": "position", + "a_weight": "weight" + }, + "parameters": { + "ambient": { + "type": 35666 + }, + "diffuse": { + "type": 35666 + }, + "emission": { + "type": 35666 + }, + "joint": { + "semantic": "JOINT", + "type": 35666 + }, + "jointMat": { + "count": 2, + "semantic": "JOINTMATRIX", + "type": 35676 + }, + "modelViewMatrix": { + "semantic": "MODELVIEW", + "type": 35676 + }, + "normal": { + "semantic": "NORMAL", + "type": 35665 + }, + "normalMatrix": { + "semantic": "MODELVIEWINVERSETRANSPOSE", + "type": 35675 + }, + "position": { + "semantic": "POSITION", + "type": 35665 + }, + "projectionMatrix": { + "semantic": "PROJECTION", + "type": 35676 + }, + "shininess": { + "type": 5126 + }, + "specular": { + "type": 35666 + }, + "weight": { + "semantic": "WEIGHT", + "type": 35666 + } + }, + "program": "program_0", + "states": { + "enable": [ + 2929, + 2884 + ] + }, + "uniforms": { + "u_ambient": "ambient", + "u_diffuse": "diffuse", + "u_emission": "emission", + "u_jointMat": "jointMat", + "u_modelViewMatrix": "modelViewMatrix", + "u_normalMatrix": "normalMatrix", + "u_projectionMatrix": "projectionMatrix", + "u_shininess": "shininess", + "u_specular": "specular" + } + } + } +} \ No newline at end of file diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js index 88bcbf5d638e..aa360ec95f7a 100644 --- a/Specs/Scene/ModelSpec.js +++ b/Specs/Scene/ModelSpec.js @@ -62,6 +62,7 @@ defineSuite([ var cesiumAir_0_8Url = './Data/Models/CesiumAir/Cesium_Air_0_8.gltf'; var animBoxesUrl = './Data/Models/anim-test-1-boxes/anim-test-1-boxes.gltf'; var riggedFigureUrl = './Data/Models/rigged-figure-test/rigged-figure-test.gltf'; + var riggedSimpleUrl = './Data/Models/rigged-simple/rigged-simple.gltf'; var boxConstantUrl = './Data/Models/MaterialsCommon/BoxConstant.gltf'; var boxLambertUrl = './Data/Models/MaterialsCommon/BoxLambert.gltf'; @@ -1154,6 +1155,13 @@ defineSuite([ riggedFigureModel.show = false; }); + it('renders riggedSimple', function() { + return loadModel(riggedSimpleUrl).then(function(m) { + expect(m).toBeDefined(); + verifyRender(m); + }); + }); + it('should load a model where WebGL shader optimizer removes an attribute (linux)', function() { var url = './Data/Models/test-shader-optimize/test-shader-optimize.gltf'; return loadModel(url).then(function(m) {