Ubujira
/
skinview3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'g-plane-master'

This commit is contained in:
yushijinhun 2018-01-15 19:08:06 +08:00
parent 846c0b9939 2324d04909
commit cd0e159e9c
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
6 changed files with 99 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
package-lock.json generated
View File

@ -852,6 +852,12 @@
"electron-to-chromium": "1.3.30" "electron-to-chromium": "1.3.30"
} }
}, },
"builtin-modules": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
"dev": true
},
"caller-path": { "caller-path": {
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
@ -1044,9 +1050,9 @@
} }
}, },
"doctrine": { "doctrine": {
"version": "2.0.2", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
"integrity": "sha512-y0tm5Pq6ywp3qSTZ1vPgVdAnbDEoeoc5wlOHXoY1c4Wug/a7JvqHIl7BTvwodaHmejWkK/9dSb3sCYfyo/om8A==", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"dev": true, "dev": true,
"requires": { "requires": {
"esutils": "2.0.2" "esutils": "2.0.2"
@ -1074,9 +1080,9 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "4.14.0", "version": "4.15.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz",
"integrity": "sha512-Ul6CSGRjKscEyg0X/EeNs7o2XdnbTEOD1OM8cTjmx85RPcBJQrEhZLevhuJZNAE/vS2iVl5Uhgiqf3h5uLMCJQ==", "integrity": "sha512-zEO/Z1ZUxIQ+MhDVKkVTUYpIPDTEJLXGMrkID+5v1NeQHtCz6FZikWuFRgxE1Q/RV2V4zVl1u3xmpPADHhMZ6A==",
"dev": true, "dev": true,
"requires": { "requires": {
"ajv": "5.5.2", "ajv": "5.5.2",
@ -1085,7 +1091,7 @@
"concat-stream": "1.6.0", "concat-stream": "1.6.0",
"cross-spawn": "5.1.0", "cross-spawn": "5.1.0",
"debug": "3.1.0", "debug": "3.1.0",
"doctrine": "2.0.2", "doctrine": "2.1.0",
"eslint-scope": "3.7.1", "eslint-scope": "3.7.1",
"eslint-visitor-keys": "1.0.0", "eslint-visitor-keys": "1.0.0",
"espree": "3.5.2", "espree": "3.5.2",
@ -2564,6 +2570,12 @@
"is-extglob": "1.0.0" "is-extglob": "1.0.0"
} }
}, },
"is-module": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
"integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
"dev": true
},
"is-number": { "is-number": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@ -2919,6 +2931,12 @@
"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
"dev": true "dev": true
}, },
"path-parse": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
"dev": true
},
"pify": { "pify": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@ -3153,6 +3171,15 @@
"resolve-from": "1.0.1" "resolve-from": "1.0.1"
} }
}, },
"resolve": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
"integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
"dev": true,
"requires": {
"path-parse": "1.0.5"
}
},
"resolve-from": { "resolve-from": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
@ -3179,20 +3206,31 @@
} }
}, },
"rollup": { "rollup": {
"version": "0.50.0", "version": "0.54.0",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-0.50.0.tgz", "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.54.0.tgz",
"integrity": "sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==", "integrity": "sha512-lgW/RpP8e8HdkrgJtFeBwzuWfvj+eo7yWfJ8AXRfi6a3d0DeYxysr4CwvqnTxJbtvcQ19L0L2bLDQkVK1Db4JA==",
"dev": true "dev": true
}, },
"rollup-plugin-babel": { "rollup-plugin-babel": {
"version": "3.0.2", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-3.0.2.tgz", "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-3.0.3.tgz",
"integrity": "sha512-ALGPBFtwJZcYHsNPM6RGJlEncTzAARPvZOGjNPZgDe5hS5t6sJGjiOWibEFVEz5LQN7S7spvCBILaS4N1Cql2w==", "integrity": "sha512-5kzM/Rr4jQSRPLc2eN5NuD+CI/6AAy7S1O18Ogu4U3nq1Q42VJn0C9EMtqnvxtfwf1XrezOtdA9ro1VZI5B0mA==",
"dev": true, "dev": true,
"requires": { "requires": {
"rollup-pluginutils": "1.5.2" "rollup-pluginutils": "1.5.2"
} }
}, },
"rollup-plugin-node-resolve": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.2.tgz",
"integrity": "sha512-ZwmMip/yqw6cmDQJuCQJ1G7gw2z11iGUtQNFYrFZHmqadRHU+OZGC3nOXwXu+UTvcm5lzDspB1EYWrkTgPWybw==",
"dev": true,
"requires": {
"builtin-modules": "1.1.1",
"is-module": "1.0.0",
"resolve": "1.5.0"
}
},
"rollup-plugin-uglify": { "rollup-plugin-uglify": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/rollup-plugin-uglify/-/rollup-plugin-uglify-2.0.1.tgz", "resolved": "https://registry.npmjs.org/rollup-plugin-uglify/-/rollup-plugin-uglify-2.0.1.tgz",
@ -3433,9 +3471,9 @@
"dev": true "dev": true
}, },
"three": { "three": {
"version": "0.87.1", "version": "0.89.0",
"resolved": "https://registry.npmjs.org/three/-/three-0.87.1.tgz", "resolved": "https://registry.npmjs.org/three/-/three-0.89.0.tgz",
"integrity": "sha1-Rmo07cRUNFnO2bnX0na2Uhb+K6g=" "integrity": "sha1-RELYGaYWiHG40ss3rRKiQxDBcPU="
}, },
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",
@ -3480,13 +3518,27 @@
"dev": true "dev": true
}, },
"uglify-es": { "uglify-es": {
"version": "3.1.3", "version": "3.3.7",
"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.7.tgz",
"integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", "integrity": "sha512-fGMnE6SsDRsCjxm78C+lv7MuXsse/dtF7QuTUT43BYf4jlxPjd+XTnGB8YjaCQJ3sv2LT4zk0mwpp9+QJocU6g==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "2.11.0", "commander": "2.13.0",
"source-map": "0.5.7" "source-map": "0.6.1"
},
"dependencies": {
"commander": {
"version": "2.13.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
"integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
"dev": true
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
} }
}, },
"user-home": { "user-home": {

11
package.json
View File

@ -20,16 +20,17 @@
}, },
"homepage": "https://github.com/to2mbn/skinview3d", "homepage": "https://github.com/to2mbn/skinview3d",
"dependencies": { "dependencies": {
"three": "^0.87.1" "three": "^0.89.0"
}, },
"devDependencies": { "devDependencies": {
"babel-cli": "^6.26.0", "babel-cli": "^6.26.0",
"babel-plugin-external-helpers": "^6.22.0", "babel-plugin-external-helpers": "^6.22.0",
"babel-preset-env": "^1.6.1", "babel-preset-env": "^1.6.1",
"eslint": "^4.14.0", "eslint": "^4.15.0",
"rollup": "^0.50.0", "rollup": "^0.54.0",
"rollup-plugin-babel": "^3.0.2", "rollup-plugin-babel": "^3.0.3",
"rollup-plugin-node-resolve": "^3.0.2",
"rollup-plugin-uglify": "^2.0.1", "rollup-plugin-uglify": "^2.0.1",
"uglify-es": "^3.1.3" "uglify-es": "^3.3.7"
} }
} }

2
src/model.js
View File

@ -1,4 +1,4 @@
import THREE from "three"; import * as THREE from "three";
function toFaceVertices(x1, y1, x2, y2, w, h) { function toFaceVertices(x1, y1, x2, y2, w, h) {
return [ return [

2
src/orbit_controls.js
View File

@ -1,4 +1,4 @@
import THREE from "three"; import * as THREE from "three";
class OrbitControls extends THREE.EventDispatcher { class OrbitControls extends THREE.EventDispatcher {
/** /**

2
src/viewer.js
View File

@ -1,4 +1,4 @@
import THREE from "three"; import * as THREE from "three";
import { PlayerObject } from "./model"; import { PlayerObject } from "./model";
import { OrbitControls } from "./orbit_controls"; import { OrbitControls } from "./orbit_controls";
import { invokeAnimation } from "./animation"; import { invokeAnimation } from "./animation";

26
tools/rollup-util.js
View File

@ -1,17 +1,18 @@
import uglify from "rollup-plugin-uglify"; import uglify from "rollup-plugin-uglify";
import { minify } from "uglify-es"; import { minify } from "uglify-es";
import babel from "rollup-plugin-babel"; import babel from "rollup-plugin-babel";
import resolve from "rollup-plugin-node-resolve";
let buildType = config => { let buildType = config => {
let options = { let options = {
input: "src/skinview3d.js", input: "src/skinview3d.js",
indent: "\t",
sourcemap: true,
external: ["three"],
globals: {
three: "THREE"
},
output: [], output: [],
plugins: [] external:[
"three"
],
plugins: [
resolve()
]
}; };
switch (config.format) { switch (config.format) {
@ -19,14 +20,21 @@ let buildType = config => {
options.output.push({ options.output.push({
format: "umd", format: "umd",
name: "skinview3d", name: "skinview3d",
file: `build/skinview3d${config.postfix}.js` file: `build/skinview3d${config.postfix}.js`,
indent: "\t",
sourcemap: true,
globals: {
"three": "THREE"
}
}); });
break; break;
case "es": case "es":
options.output.push({ options.output.push({
format: "es", format: "es",
file: `build/skinview3d${config.postfix}.js` file: `build/skinview3d${config.postfix}.js`,
indent: "\t",
sourcemap: true,
}); });
break; break;