Working transpiling via "npm run buildtest" command
There is an issue witht the slim detection causing standard arms to load incorrectly, likely something caused by moving object properties around
This commit is contained in:
Sean Boult
parent
1765eb6ce5
commit
b2932c96bb
|
|
@ -11,4 +11,3 @@ quote_type = double
|
|||
[*.{yml,yaml}]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/three.js/92/three.min.js"></script>
|
||||
|
||||
<!-- need to bundle into one single js file -->
|
||||
<script type="text/javascript" src="../build/skinview3d.js"></script>
|
||||
|
||||
<script>
|
||||
let skinViewer = new skinview3d.SkinViewer({
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
skinViewer.animation = new skinview3d.CompositeAnimation();
|
||||
|
||||
let walk = skinViewer.animation.add(skinview3d.WalkingAnimation);
|
||||
walk.speed = 1.5;
|
||||
//walk.speed = 1.5;
|
||||
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -397,6 +397,25 @@
|
|||
"acorn": "^5.0.3"
|
||||
}
|
||||
},
|
||||
"acorn-node": {
|
||||
"version": "1.5.2",
|
||||
"resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz",
|
||||
"integrity": "sha512-krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"acorn": "^5.7.1",
|
||||
"acorn-dynamic-import": "^3.0.0",
|
||||
"xtend": "^4.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"acorn": {
|
||||
"version": "5.7.1",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
|
||||
"integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"addressparser": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
|
||||
|
|
@ -1757,12 +1776,147 @@
|
|||
"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
|
||||
"dev": true
|
||||
},
|
||||
"browser-pack": {
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
|
||||
"integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"JSONStream": "^1.0.3",
|
||||
"combine-source-map": "~0.8.0",
|
||||
"defined": "^1.0.0",
|
||||
"safe-buffer": "^5.1.1",
|
||||
"through2": "^2.0.0",
|
||||
"umd": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"browser-resolve": {
|
||||
"version": "1.11.3",
|
||||
"resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
|
||||
"integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"resolve": "1.1.7"
|
||||
},
|
||||
"dependencies": {
|
||||
"resolve": {
|
||||
"version": "1.1.7",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
|
||||
"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"browser-stdout": {
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
|
||||
"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
|
||||
"dev": true
|
||||
},
|
||||
"browserify": {
|
||||
"version": "16.2.2",
|
||||
"resolved": "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz",
|
||||
"integrity": "sha512-fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"JSONStream": "^1.0.3",
|
||||
"assert": "^1.4.0",
|
||||
"browser-pack": "^6.0.1",
|
||||
"browser-resolve": "^1.11.0",
|
||||
"browserify-zlib": "~0.2.0",
|
||||
"buffer": "^5.0.2",
|
||||
"cached-path-relative": "^1.0.0",
|
||||
"concat-stream": "^1.6.0",
|
||||
"console-browserify": "^1.1.0",
|
||||
"constants-browserify": "~1.0.0",
|
||||
"crypto-browserify": "^3.0.0",
|
||||
"defined": "^1.0.0",
|
||||
"deps-sort": "^2.0.0",
|
||||
"domain-browser": "^1.2.0",
|
||||
"duplexer2": "~0.1.2",
|
||||
"events": "^2.0.0",
|
||||
"glob": "^7.1.0",
|
||||
"has": "^1.0.0",
|
||||
"htmlescape": "^1.1.0",
|
||||
"https-browserify": "^1.0.0",
|
||||
"inherits": "~2.0.1",
|
||||
"insert-module-globals": "^7.0.0",
|
||||
"labeled-stream-splicer": "^2.0.0",
|
||||
"mkdirp": "^0.5.0",
|
||||
"module-deps": "^6.0.0",
|
||||
"os-browserify": "~0.3.0",
|
||||
"parents": "^1.0.1",
|
||||
"path-browserify": "~0.0.0",
|
||||
"process": "~0.11.0",
|
||||
"punycode": "^1.3.2",
|
||||
"querystring-es3": "~0.2.0",
|
||||
"read-only-stream": "^2.0.0",
|
||||
"readable-stream": "^2.0.2",
|
||||
"resolve": "^1.1.4",
|
||||
"shasum": "^1.0.0",
|
||||
"shell-quote": "^1.6.1",
|
||||
"stream-browserify": "^2.0.0",
|
||||
"stream-http": "^2.0.0",
|
||||
"string_decoder": "^1.1.1",
|
||||
"subarg": "^1.0.0",
|
||||
"syntax-error": "^1.1.1",
|
||||
"through2": "^2.0.0",
|
||||
"timers-browserify": "^1.0.1",
|
||||
"tty-browserify": "0.0.1",
|
||||
"url": "~0.11.0",
|
||||
"util": "~0.10.1",
|
||||
"vm-browserify": "^1.0.0",
|
||||
"xtend": "^4.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"buffer": {
|
||||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz",
|
||||
"integrity": "sha512-YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"base64-js": "^1.0.2",
|
||||
"ieee754": "^1.1.4"
|
||||
}
|
||||
},
|
||||
"events": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
|
||||
"integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==",
|
||||
"dev": true
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"safe-buffer": "~5.1.0"
|
||||
}
|
||||
},
|
||||
"timers-browserify": {
|
||||
"version": "1.4.2",
|
||||
"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
|
||||
"integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"process": "~0.11.0"
|
||||
}
|
||||
},
|
||||
"tty-browserify": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
|
||||
"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
|
||||
"dev": true
|
||||
},
|
||||
"vm-browserify": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
|
||||
"integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"browserify-aes": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
|
||||
|
|
@ -1958,6 +2112,12 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"cached-path-relative": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
|
||||
"integrity": "sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=",
|
||||
"dev": true
|
||||
},
|
||||
"caller-path": {
|
||||
"version": "0.1.0",
|
||||
"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
|
||||
|
|
@ -2215,6 +2375,26 @@
|
|||
"lodash": "^4.5.0"
|
||||
}
|
||||
},
|
||||
"combine-source-map": {
|
||||
"version": "0.8.0",
|
||||
"resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
|
||||
"integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"convert-source-map": "~1.1.0",
|
||||
"inline-source-map": "~0.6.0",
|
||||
"lodash.memoize": "~3.0.3",
|
||||
"source-map": "~0.5.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"convert-source-map": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
|
||||
"integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"combined-stream": {
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
|
||||
|
|
@ -2718,6 +2898,12 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"defined": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
|
||||
"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
|
||||
"dev": true
|
||||
},
|
||||
"degenerator": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
|
||||
|
|
@ -2772,6 +2958,18 @@
|
|||
"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
|
||||
"dev": true
|
||||
},
|
||||
"deps-sort": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
|
||||
"integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"JSONStream": "^1.0.3",
|
||||
"shasum": "^1.0.0",
|
||||
"subarg": "^1.0.0",
|
||||
"through2": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"des.js": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
|
||||
|
|
@ -2797,6 +2995,25 @@
|
|||
"repeating": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"detective": {
|
||||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz",
|
||||
"integrity": "sha512-TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"acorn-node": "^1.3.0",
|
||||
"defined": "^1.0.0",
|
||||
"minimist": "^1.1.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"minimist": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
||||
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"di": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
|
||||
|
|
@ -2860,6 +3077,15 @@
|
|||
"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
|
||||
"dev": true
|
||||
},
|
||||
"duplexer2": {
|
||||
"version": "0.1.4",
|
||||
"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
|
||||
"integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"readable-stream": "^2.0.2"
|
||||
}
|
||||
},
|
||||
"duplexify": {
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
|
||||
|
|
@ -3946,14 +4172,12 @@
|
|||
"balanced-match": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"balanced-match": "^1.0.0",
|
||||
"concat-map": "0.0.1"
|
||||
|
|
@ -3968,20 +4192,17 @@
|
|||
"code-point-at": {
|
||||
"version": "1.1.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"concat-map": {
|
||||
"version": "0.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"console-control-strings": {
|
||||
"version": "1.1.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"core-util-is": {
|
||||
"version": "1.0.2",
|
||||
|
|
@ -4098,8 +4319,7 @@
|
|||
"inherits": {
|
||||
"version": "2.0.3",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"ini": {
|
||||
"version": "1.3.5",
|
||||
|
|
@ -4111,7 +4331,6 @@
|
|||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"number-is-nan": "^1.0.0"
|
||||
}
|
||||
|
|
@ -4126,7 +4345,6 @@
|
|||
"version": "3.0.4",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
}
|
||||
|
|
@ -4134,14 +4352,12 @@
|
|||
"minimist": {
|
||||
"version": "0.0.8",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"minipass": {
|
||||
"version": "2.2.4",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"safe-buffer": "^5.1.1",
|
||||
"yallist": "^3.0.0"
|
||||
|
|
@ -4160,7 +4376,6 @@
|
|||
"version": "0.5.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"minimist": "0.0.8"
|
||||
}
|
||||
|
|
@ -4248,8 +4463,7 @@
|
|||
"number-is-nan": {
|
||||
"version": "1.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"object-assign": {
|
||||
"version": "4.1.1",
|
||||
|
|
@ -4261,7 +4475,6 @@
|
|||
"version": "1.4.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"wrappy": "1"
|
||||
}
|
||||
|
|
@ -4383,7 +4596,6 @@
|
|||
"version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"code-point-at": "^1.0.0",
|
||||
"is-fullwidth-code-point": "^1.0.0",
|
||||
|
|
@ -4524,6 +4736,12 @@
|
|||
"is-property": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"get-assigned-identifiers": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
|
||||
"integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==",
|
||||
"dev": true
|
||||
},
|
||||
"get-func-name": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
|
||||
|
|
@ -4847,6 +5065,12 @@
|
|||
"integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
|
||||
"dev": true
|
||||
},
|
||||
"htmlescape": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
|
||||
"integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=",
|
||||
"dev": true
|
||||
},
|
||||
"http-assert": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.3.0.tgz",
|
||||
|
|
@ -5024,6 +5248,15 @@
|
|||
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
|
||||
"dev": true
|
||||
},
|
||||
"inline-source-map": {
|
||||
"version": "0.6.2",
|
||||
"resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
|
||||
"integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"source-map": "~0.5.3"
|
||||
}
|
||||
},
|
||||
"inquirer": {
|
||||
"version": "5.2.0",
|
||||
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
|
||||
|
|
@ -5097,6 +5330,24 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"insert-module-globals": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz",
|
||||
"integrity": "sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"JSONStream": "^1.0.3",
|
||||
"acorn-node": "^1.5.2",
|
||||
"combine-source-map": "^0.8.0",
|
||||
"concat-stream": "^1.6.1",
|
||||
"is-buffer": "^1.1.0",
|
||||
"path-is-absolute": "^1.0.1",
|
||||
"process": "~0.11.0",
|
||||
"through2": "^2.0.0",
|
||||
"undeclared-identifiers": "^1.1.2",
|
||||
"xtend": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"invariant": {
|
||||
"version": "2.2.2",
|
||||
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
|
||||
|
|
@ -5390,6 +5641,12 @@
|
|||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"is-utf8": {
|
||||
"version": "0.2.1",
|
||||
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
|
||||
"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
|
||||
"dev": true
|
||||
},
|
||||
"is-windows": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
|
||||
|
|
@ -5480,6 +5737,15 @@
|
|||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"json-stable-stringify": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
|
||||
"integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"jsonify": "~0.0.0"
|
||||
}
|
||||
},
|
||||
"json-stable-stringify-without-jsonify": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
|
||||
|
|
@ -5829,8 +6095,7 @@
|
|||
"balanced-match": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
|
|
@ -5855,8 +6120,7 @@
|
|||
"concat-map": {
|
||||
"version": "0.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"console-control-strings": {
|
||||
"version": "1.1.0",
|
||||
|
|
@ -6762,6 +7026,25 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"labeled-stream-splicer": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
|
||||
"integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"inherits": "^2.0.1",
|
||||
"isarray": "^2.0.4",
|
||||
"stream-splicer": "^2.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"isarray": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
|
||||
"integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"levn": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
|
||||
|
|
@ -6909,6 +7192,12 @@
|
|||
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.memoize": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
|
||||
"integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.padend": {
|
||||
"version": "4.6.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
|
||||
|
|
@ -7730,6 +8019,29 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"module-deps": {
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz",
|
||||
"integrity": "sha512-NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"JSONStream": "^1.0.3",
|
||||
"browser-resolve": "^1.7.0",
|
||||
"cached-path-relative": "^1.0.0",
|
||||
"concat-stream": "~1.6.0",
|
||||
"defined": "^1.0.0",
|
||||
"detective": "^5.0.2",
|
||||
"duplexer2": "^0.1.2",
|
||||
"inherits": "^2.0.1",
|
||||
"parents": "^1.0.0",
|
||||
"readable-stream": "^2.0.2",
|
||||
"resolve": "^1.4.0",
|
||||
"stream-combiner2": "^1.1.1",
|
||||
"subarg": "^1.0.0",
|
||||
"through2": "^2.0.0",
|
||||
"xtend": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"moment": {
|
||||
"version": "2.22.2",
|
||||
"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
|
||||
|
|
@ -8382,6 +8694,15 @@
|
|||
"readable-stream": "^2.1.5"
|
||||
}
|
||||
},
|
||||
"parents": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
|
||||
"integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"path-platform": "~0.11.15"
|
||||
}
|
||||
},
|
||||
"parse-asn1": {
|
||||
"version": "5.1.1",
|
||||
"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
|
||||
|
|
@ -8490,6 +8811,12 @@
|
|||
"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
|
||||
"dev": true
|
||||
},
|
||||
"path-platform": {
|
||||
"version": "0.11.15",
|
||||
"resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
|
||||
"integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
|
||||
"dev": true
|
||||
},
|
||||
"path-proxy": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz",
|
||||
|
|
@ -8906,6 +9233,15 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"read-only-stream": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
|
||||
"integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"readable-stream": "^2.0.2"
|
||||
}
|
||||
},
|
||||
"read-pkg": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
|
||||
|
|
@ -9506,6 +9842,16 @@
|
|||
"safe-buffer": "^5.0.1"
|
||||
}
|
||||
},
|
||||
"shasum": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
|
||||
"integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"json-stable-stringify": "~0.0.0",
|
||||
"sha.js": "~2.4.4"
|
||||
}
|
||||
},
|
||||
"shebang-command": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
|
||||
|
|
@ -9539,6 +9885,12 @@
|
|||
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
|
||||
"dev": true
|
||||
},
|
||||
"simple-concat": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
|
||||
"integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=",
|
||||
"dev": true
|
||||
},
|
||||
"slack-node": {
|
||||
"version": "0.2.0",
|
||||
"resolved": "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz",
|
||||
|
|
@ -9951,6 +10303,16 @@
|
|||
"duplexer": "~0.1.1"
|
||||
}
|
||||
},
|
||||
"stream-combiner2": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
|
||||
"integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"duplexer2": "~0.1.0",
|
||||
"readable-stream": "^2.0.2"
|
||||
}
|
||||
},
|
||||
"stream-each": {
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
|
||||
|
|
@ -10065,6 +10427,16 @@
|
|||
"integrity": "sha1-LcT04bk2+xPz6zmi3vGTJ5jQeks=",
|
||||
"dev": true
|
||||
},
|
||||
"stream-splicer": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz",
|
||||
"integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"inherits": "^2.0.1",
|
||||
"readable-stream": "^2.0.2"
|
||||
}
|
||||
},
|
||||
"stream-via": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/stream-via/-/stream-via-1.0.4.tgz",
|
||||
|
|
@ -10192,6 +10564,23 @@
|
|||
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
|
||||
"dev": true
|
||||
},
|
||||
"subarg": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
|
||||
"integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"minimist": "^1.1.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"minimist": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
||||
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"supports-color": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
|
||||
|
|
@ -10204,6 +10593,15 @@
|
|||
"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
|
||||
"dev": true
|
||||
},
|
||||
"syntax-error": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
|
||||
"integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"acorn-node": "^1.2.0"
|
||||
}
|
||||
},
|
||||
"table": {
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz",
|
||||
|
|
@ -10461,6 +10859,52 @@
|
|||
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
|
||||
"dev": true
|
||||
},
|
||||
"tsconfig": {
|
||||
"version": "5.0.3",
|
||||
"resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-5.0.3.tgz",
|
||||
"integrity": "sha1-X0J45wGACWeo/Dg/0ZZIh48qbjo=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"any-promise": "^1.3.0",
|
||||
"parse-json": "^2.2.0",
|
||||
"strip-bom": "^2.0.0",
|
||||
"strip-json-comments": "^2.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"parse-json": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
|
||||
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"error-ex": "^1.2.0"
|
||||
}
|
||||
},
|
||||
"strip-bom": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
|
||||
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-utf8": "^0.2.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"tsify": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/tsify/-/tsify-4.0.0.tgz",
|
||||
"integrity": "sha512-A33g5azPh2KDo/gbcSHpSo2m8l5FYC3SdjD5qNpBT+LP758HIGXT6cLko+aJhyFDRU5nCT/zQvfIq/5GQNRsoA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"convert-source-map": "^1.1.0",
|
||||
"fs.realpath": "^1.0.0",
|
||||
"object-assign": "^4.1.0",
|
||||
"semver": "^5.1.0",
|
||||
"through2": "^2.0.0",
|
||||
"tsconfig": "^5.0.3"
|
||||
}
|
||||
},
|
||||
"tslib": {
|
||||
"version": "1.9.0",
|
||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
|
||||
|
|
@ -10666,6 +11110,24 @@
|
|||
"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
|
||||
"dev": true
|
||||
},
|
||||
"umd": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
|
||||
"integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
|
||||
"dev": true
|
||||
},
|
||||
"undeclared-identifiers": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz",
|
||||
"integrity": "sha512-13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"acorn-node": "^1.3.0",
|
||||
"get-assigned-identifiers": "^1.2.0",
|
||||
"simple-concat": "^1.0.0",
|
||||
"xtend": "^4.0.1"
|
||||
}
|
||||
},
|
||||
"underscore": {
|
||||
"version": "1.7.0",
|
||||
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
|
||||
|
|
@ -11271,8 +11733,7 @@
|
|||
"balanced-match": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
|
|
@ -11297,8 +11758,7 @@
|
|||
"concat-map": {
|
||||
"version": "0.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
"dev": true
|
||||
},
|
||||
"console-control-strings": {
|
||||
"version": "1.1.0",
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@
|
|||
"lint": "eslint src/** tools/** && tslint -c tslint.json types/**.ts",
|
||||
"dev": "npm-run-all --parallel watch serve",
|
||||
"watch": "rollup -w -c tools/rollup.browser.js",
|
||||
"test": "tsc -p tsconfig.json",
|
||||
"test": "karma start && npm run lint",
|
||||
"buildtest": "tsc --p tsconfig.json && rollup -c tools/rollup.browser.js",
|
||||
"serve": "ws"
|
||||
},
|
||||
"repository": {
|
||||
|
|
@ -61,7 +62,6 @@
|
|||
"tslint": "^5.10.0",
|
||||
"typescript": "^2.8.3",
|
||||
"uglify-es": "^3.3.10",
|
||||
"url-loader": "^1.0.1",
|
||||
"webpack": "^4.15.1"
|
||||
"url-loader": "^1.0.1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import { PlayerObject } from "./model"
|
||||
|
||||
function invokeAnimation(animation, player, time) {
|
||||
function invokeAnimation(animation: Animation, player: PlayerObject, time: number) {
|
||||
if (animation instanceof CompositeAnimation) {
|
||||
animation.play(player, time);
|
||||
} else if (animation instanceof Function) {
|
||||
|
|
@ -12,9 +12,11 @@ function invokeAnimation(animation, player, time) {
|
|||
|
||||
interface IAnimation {
|
||||
play(player: PlayerObject, time: number): void;
|
||||
|
||||
}
|
||||
|
||||
type AnimationFn = (player: PlayerObject, time: number) => void;
|
||||
type Animation = AnimationFn | IAnimation;
|
||||
|
||||
class AnimationHandle implements IAnimation {
|
||||
animation: Animation;
|
||||
paused = false;
|
||||
|
|
@ -25,11 +27,11 @@ class AnimationHandle implements IAnimation {
|
|||
private _speed: number = 1.0;
|
||||
private _lastChangeX: number = null;
|
||||
|
||||
constructor(animation) {
|
||||
|
||||
constructor(animation: Animation) {
|
||||
this.animation = animation;
|
||||
}
|
||||
|
||||
play(player, time) {
|
||||
play(player: PlayerObject, time: number) {
|
||||
if (this._lastChange === null) {
|
||||
this._lastChange = time;
|
||||
this._lastChangeX = 0;
|
||||
|
|
@ -59,25 +61,24 @@ class AnimationHandle implements IAnimation {
|
|||
}
|
||||
|
||||
class CompositeAnimation {
|
||||
handle: AnimationHandle;
|
||||
|
||||
handles: Set<AnimationHandle>;
|
||||
|
||||
constructor() {
|
||||
this.handles = new Set();
|
||||
}
|
||||
add(animation) {
|
||||
this.handle = new AnimationHandle(animation);
|
||||
this.handle
|
||||
this.handle.remove = () => this.handles.delete(this.handle);
|
||||
this.handles.add(this.handle);
|
||||
return this.handle;
|
||||
add(animation: Animation) {
|
||||
const handle = new AnimationHandle(animation);
|
||||
handle.remove = () => this.handles.delete(handle);
|
||||
this.handles.add(handle);
|
||||
return handle;
|
||||
}
|
||||
play(player, time) {
|
||||
play(player: PlayerObject, time: number) {
|
||||
this.handles.forEach(handle => handle.play(player, time));
|
||||
}
|
||||
}
|
||||
|
||||
let WalkingAnimation = (player, time) => {
|
||||
let WalkingAnimation: Animation = (player: PlayerObject, time: number) => {
|
||||
let skin = player.skin;
|
||||
|
||||
// Multiply by animation's natural speed
|
||||
|
|
@ -103,7 +104,7 @@ let WalkingAnimation = (player, time) => {
|
|||
player.cape.rotation.x = Math.sin(time / 1.5) * 0.06 + basicCapeRotationX;
|
||||
};
|
||||
|
||||
let RunningAnimation = (player, time) => {
|
||||
let RunningAnimation: Animation = (player: PlayerObject, time: number) => {
|
||||
let skin = player.skin;
|
||||
|
||||
time *= 15;
|
||||
|
|
@ -136,7 +137,7 @@ let RunningAnimation = (player, time) => {
|
|||
// You shouldn't glance right and left when running dude :P
|
||||
};
|
||||
|
||||
let RotatingAnimation = (player, time) => {
|
||||
let RotatingAnimation: Animation = (player: PlayerObject, time: number) => {
|
||||
player.rotation.y = time;
|
||||
};
|
||||
|
||||
|
|
|
|||
41
src/model.ts
41
src/model.ts
|
|
@ -1,7 +1,7 @@
|
|||
import * as THREE from "three";
|
||||
|
||||
// TODO move to a util class
|
||||
function toFaceVertices(x1, y1, x2, y2, w, h) {
|
||||
function toFaceVertices(x1: number, y1: number, x2: number, y2: number, w: number, h: number) {
|
||||
return [
|
||||
new THREE.Vector2(x1 / w, 1.0 - y2 / h),
|
||||
new THREE.Vector2(x2 / w, 1.0 - y2 / h),
|
||||
|
|
@ -11,17 +11,19 @@ function toFaceVertices(x1, y1, x2, y2, w, h) {
|
|||
}
|
||||
|
||||
// TODO move to a util class
|
||||
function toSkinVertices(x1, y1, x2, y2) {
|
||||
function toSkinVertices(x1: number, y1: number, x2: number, y2: number) {
|
||||
return toFaceVertices(x1, y1, x2, y2, 64.0, 64.0);
|
||||
}
|
||||
|
||||
// TODO move to a util class
|
||||
function toCapeVertices(x1, y1, x2, y2) {
|
||||
function toCapeVertices(x1: number, y1: number, x2: number, y2: number) {
|
||||
return toFaceVertices(x1, y1, x2, y2, 64.0, 32.0);
|
||||
}
|
||||
|
||||
// TODO move to a util class
|
||||
function setVertices(box, top, bottom, left, front, right, back) {
|
||||
function setVertices(box: THREE.BoxGeometry, top: Array<THREE.Vector2>, bottom: Array<THREE.Vector2>,
|
||||
left: Array<THREE.Vector2>, front: Array<THREE.Vector2>, right: Array<THREE.Vector2>, back: Array<THREE.Vector2>) {
|
||||
|
||||
box.faceVertexUvs[0] = [];
|
||||
box.faceVertexUvs[0][0] = [right[3], right[0], right[2]];
|
||||
box.faceVertexUvs[0][1] = [right[0], right[1], right[2]];
|
||||
|
|
@ -42,7 +44,7 @@ const esp = 0.002;
|
|||
|
||||
class SkinObject extends THREE.Group {
|
||||
|
||||
// parts
|
||||
// body parts
|
||||
head: THREE.Group;
|
||||
body: THREE.Group;
|
||||
rightArm: THREE.Group;
|
||||
|
|
@ -50,11 +52,10 @@ class SkinObject extends THREE.Group {
|
|||
rightLeg: THREE.Group;
|
||||
leftLeg: THREE.Group;
|
||||
|
||||
modelListeners: Array<Function>;
|
||||
private modelListeners: Array<Function>;
|
||||
private _slim = false;
|
||||
|
||||
slim = false;
|
||||
|
||||
constructor(layer1Material, layer2Material) {
|
||||
constructor(layer1Material: THREE.MeshBasicMaterial, layer2Material: THREE.MeshBasicMaterial) {
|
||||
super();
|
||||
|
||||
this.modelListeners = []; // called when model(slim property) is changed
|
||||
|
|
@ -342,23 +343,23 @@ class SkinObject extends THREE.Group {
|
|||
this.slim = false;
|
||||
}
|
||||
|
||||
// get slim() {
|
||||
// return this._slim;
|
||||
// }
|
||||
get slim() {
|
||||
return this._slim;
|
||||
}
|
||||
|
||||
// set slim(value) {
|
||||
// if (this._slim !== value) {
|
||||
// this._slim = value;
|
||||
// this.modelListeners.forEach(listener => listener());
|
||||
// }
|
||||
// }
|
||||
set slim(value) {
|
||||
if (this._slim !== value) {
|
||||
this._slim = value;
|
||||
this.modelListeners.forEach(listener => listener());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class CapeObject extends THREE.Group {
|
||||
|
||||
cape: THREE.Mesh;
|
||||
|
||||
constructor(capeMaterial) {
|
||||
constructor(capeMaterial: THREE.MeshBasicMaterial) {
|
||||
super();
|
||||
|
||||
// back = outside
|
||||
|
|
@ -384,7 +385,7 @@ class PlayerObject extends THREE.Group {
|
|||
skin: SkinObject;
|
||||
cape: CapeObject;
|
||||
|
||||
constructor(layer1Material, layer2Material, capeMaterial) {
|
||||
constructor(layer1Material: THREE.MeshBasicMaterial, layer2Material: THREE.MeshBasicMaterial, capeMaterial: THREE.MeshBasicMaterial) {
|
||||
super();
|
||||
|
||||
this.skin = new SkinObject(layer1Material, layer2Material);
|
||||
|
|
|
|||
|
|
@ -689,4 +689,3 @@ export function createOrbitControls(skinViewer) {
|
|||
|
||||
return control;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ class SkinViewer {
|
|||
|
||||
if (this.detectModel) {
|
||||
this.playerObject.skin.slim = isSlimSkin(this.skinCanvas);
|
||||
console.log("Loading Slim: " + this.playerObject.skin.slim);
|
||||
}
|
||||
|
||||
this.skinTexture.needsUpdate = true;
|
||||
|
|
@ -100,19 +101,10 @@ class SkinViewer {
|
|||
this.playerObject.cape.visible = true;
|
||||
};
|
||||
|
||||
|
||||
if (options.skinUrl) this.skinImg.src = options.skinUrl;
|
||||
if (options.capeUrl) this.capeImg.src = options.capeUrl;
|
||||
if (options.width) {
|
||||
this.setSize(options.width, this.renderer.getSize().height);
|
||||
}
|
||||
if (options.height) {
|
||||
this.setSize(this.renderer.getSize().width, options.height);
|
||||
}
|
||||
// if (options.skinUrl) this.skinUrl = options.skinUrl;
|
||||
// if (options.capeUrl) this.capeUrl = options.capeUrl;
|
||||
// if (options.width) this.width = options.width;
|
||||
// if (options.height) this.height = options.height;
|
||||
if (options.skinUrl) this.skinUrl = options.skinUrl;
|
||||
if (options.capeUrl) this.capeUrl = options.capeUrl;
|
||||
if (options.width) this.width = options.width;
|
||||
if (options.height) this.height = options.height;
|
||||
|
||||
let draw = () => {
|
||||
if (this.disposed) return;
|
||||
|
|
@ -142,37 +134,37 @@ class SkinViewer {
|
|||
this.capeTexture.dispose();
|
||||
}
|
||||
|
||||
// get skinUrl() {
|
||||
// return this.skinImg.src;
|
||||
// }
|
||||
get skinUrl() {
|
||||
return this.skinImg.src;
|
||||
}
|
||||
|
||||
// set skinUrl(url) {
|
||||
// this.skinImg.src = url;
|
||||
// }
|
||||
set skinUrl(url) {
|
||||
this.skinImg.src = url;
|
||||
}
|
||||
|
||||
// get capeUrl() {
|
||||
// return this.capeImg.src;
|
||||
// }
|
||||
get capeUrl() {
|
||||
return this.capeImg.src;
|
||||
}
|
||||
|
||||
// set capeUrl(url) {
|
||||
// this.capeImg.src = url;
|
||||
// }
|
||||
set capeUrl(url) {
|
||||
this.capeImg.src = url;
|
||||
}
|
||||
|
||||
// get width() {
|
||||
// return this.renderer.getSize().width;
|
||||
// }
|
||||
get width() {
|
||||
return this.renderer.getSize().width;
|
||||
}
|
||||
|
||||
// set width(newWidth) {
|
||||
// this.setSize(newWidth, this.height);
|
||||
// }
|
||||
set width(newWidth) {
|
||||
this.setSize(newWidth, this.height);
|
||||
}
|
||||
|
||||
// get height() {
|
||||
// return this.renderer.getSize().height;
|
||||
// }
|
||||
get height() {
|
||||
return this.renderer.getSize().height;
|
||||
}
|
||||
|
||||
// set height(newHeight) {
|
||||
// this.setSize(this.width, newHeight);
|
||||
// }
|
||||
set height(newHeight) {
|
||||
this.setSize(this.width, newHeight);
|
||||
}
|
||||
}
|
||||
|
||||
export { SkinViewer };
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import fs from "fs";
|
|||
|
||||
let buildType = config => {
|
||||
let options = {
|
||||
input: "dist/skinview3d.js",
|
||||
input: "build/skinview3d.js",
|
||||
output: [],
|
||||
external: [
|
||||
"three"
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"outDir": "./build/",
|
||||
"module": "none",
|
||||
"sourceMap": true,
|
||||
"target": "es3",
|
||||
"module": "es2015",
|
||||
"target": "es5",
|
||||
"typeRoots": [
|
||||
"node_modules/@types"
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in New Issue