From 99fc6ee5bc28b9250ac7345970793bb04f37fb42 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 10:47:08 +0800 Subject: [PATCH 01/12] support 22x17 capes, closing #4 --- src/viewer.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/viewer.js b/src/viewer.js index e0f6018..313ab53 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -132,16 +132,28 @@ class SkinViewer { this.capeImg.crossOrigin = ""; this.capeImg.onerror = () => console.error("Failed loading " + this.capeImg.src); this.capeImg.onload = () => { + let isOldFormat = false; if (this.capeImg.width !== 2 * this.capeImg.height) { - console.error("Bad cape size"); - return; + if (this.capeImg.width * 17 == this.capeImg.height * 22) { + // width/height = 22/17 + isOldFormat = true; + } else { + console.error("Bad cape size"); + return; + } } - this.capeCanvas.width = this.capeImg.width; - this.capeCanvas.height = this.capeImg.height; let capeContext = this.capeCanvas.getContext("2d"); + if (isOldFormat) { + let width = this.capeImg.width * 64 / 22; + this.capeCanvas.width = width; + this.capeCanvas.height = width / 2; + } else { + this.capeCanvas.width = this.capeImg.width; + this.capeCanvas.height = this.capeImg.height; + } capeContext.clearRect(0, 0, this.capeCanvas.width, this.capeCanvas.height); - capeContext.drawImage(this.capeImg, 0, 0, this.capeCanvas.width, this.capeCanvas.height); + capeContext.drawImage(this.capeImg, 0, 0, this.capeImg.width, this.capeImg.height); this.capeTexture.needsUpdate = true; this.capeMaterial.needsUpdate = true; From 000f29aec806eef9a83b0d618dbd31d49fda6558 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 11:14:48 +0800 Subject: [PATCH 02/12] add tslint --- package-lock.json | 84 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 4 ++- tslint.json | 9 +++++ 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 tslint.json diff --git a/package-lock.json b/package-lock.json index 819dadf..81d86f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1064,6 +1064,12 @@ "repeating": "2.0.1" } }, + "diff": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", + "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", + "dev": true + }, "doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -3505,6 +3511,78 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, + "tslib": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", + "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==", + "dev": true + }, + "tslint": { + "version": "5.9.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz", + "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "builtin-modules": "1.1.1", + "chalk": "2.3.0", + "commander": "2.14.1", + "diff": "3.4.0", + "glob": "7.1.2", + "js-yaml": "3.10.0", + "minimatch": "3.0.4", + "resolve": "1.5.0", + "semver": "5.4.1", + "tslib": "1.9.0", + "tsutils": "2.21.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "commander": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz", + "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "tsutils": { + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.21.0.tgz", + "integrity": "sha512-zlOHTYtTwvTiKxUyAU8wiKzPpAgwZrGjb7AY18VUlxuCgBiTMVorIl5HjrCT8V64Hm34RI1BZITJMVQpBLMxVg==", + "dev": true, + "requires": { + "tslib": "1.9.0" + } + }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -3520,6 +3598,12 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, + "typescript": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.1.tgz", + "integrity": "sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw==", + "dev": true + }, "uglify-es": { "version": "3.3.9", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", diff --git a/package.json b/package.json index 38b775e..1dc5496 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "scripts": { "build": "rollup -c tools/rollup.module.js && rollup -c tools/rollup.browser.js && rollup -c tools/rollup.browser.min.js", "prepare": "npm test && rm -rf build && npm run build", - "test": "eslint src/** tools/**" + "test": "eslint src/** tools/** && tslint -c tslint.json types/**.ts" }, "repository": { "type": "git", @@ -33,6 +33,8 @@ "rollup-plugin-babel": "^3.0.3", "rollup-plugin-node-resolve": "^3.0.2", "rollup-plugin-uglify": "^3.0.0", + "tslint": "^5.9.1", + "typescript": "^2.7.1", "uglify-es": "^3.3.9" } } diff --git a/tslint.json b/tslint.json new file mode 100644 index 0000000..4c3a57a --- /dev/null +++ b/tslint.json @@ -0,0 +1,9 @@ +{ + "defaultSeverity": "error", + "extends": [ + "tslint:recommended" + ], + "jsRules": {}, + "rules": {}, + "rulesDirectory": [] +} From 42959b63d737c2fbc34030e7aa0061226a983af9 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 12:29:42 +0800 Subject: [PATCH 03/12] format code --- tslint.json | 16 +++++++++-- types/animation.d.ts | 38 +++++++++++++------------- types/model.d.ts | 46 ++++++++++++++++---------------- types/skinview3d.d.ts | 16 +++++------ types/viewer.d.ts | 62 +++++++++++++++++++++---------------------- 5 files changed, 95 insertions(+), 83 deletions(-) diff --git a/tslint.json b/tslint.json index 4c3a57a..d688899 100644 --- a/tslint.json +++ b/tslint.json @@ -1,9 +1,21 @@ { "defaultSeverity": "error", "extends": [ - "tslint:recommended" + "tslint:latest" ], "jsRules": {}, - "rules": {}, + "rules": { + "indent": [ + true, + "tabs" + ], + "eofline": true, + "linebreak-style": [ + true, + "LF" + ], + "max-classes-per-file": false, + "interface-name": false + }, "rulesDirectory": [] } diff --git a/types/animation.d.ts b/types/animation.d.ts index 7d410ab..b173d58 100644 --- a/types/animation.d.ts +++ b/types/animation.d.ts @@ -1,37 +1,37 @@ -import { PlayerObject } from './model' +import { PlayerObject } from "./model"; -type AnimationFn = (player: PlayerObject, time: number) => void +type AnimationFn = (player: PlayerObject, time: number) => void; interface IAnimation { - play(player: PlayerObject, time: number): void + play(player: PlayerObject, time: number): void; } -export type Animation = AnimationFn | IAnimation +export type Animation = AnimationFn | IAnimation; declare function invokeAnimation( - animation: Animation, - player: PlayerObject, - time: number -): void + animation: Animation, + player: PlayerObject, + time: number, +): void; declare class AnimationHandle implements IAnimation { - readonly animation: Animation - paused: boolean - speed: number + readonly animation: Animation; + paused: boolean; + speed: number; - constructor(animation: Animation) + constructor(animation: Animation); - play(player: PlayerObject, time: number): void + play(player: PlayerObject, time: number): void; - reset(): void + reset(): void; } export class CompositeAnimation implements IAnimation { - private handles: Set + private handles: Set; - constructor() + constructor(); - add(animation: Animation): AnimationHandle + add(animation: Animation): AnimationHandle; - play(player: PlayerObject, time: number): void + play(player: PlayerObject, time: number): void; } -export const WalkAnimation: AnimationFn +export const WalkAnimation: AnimationFn; diff --git a/types/model.d.ts b/types/model.d.ts index 5a48b3c..9f9b875 100644 --- a/types/model.d.ts +++ b/types/model.d.ts @@ -1,35 +1,35 @@ -import * as THREE from 'three' +import * as THREE from "three"; export class SkinObject extends THREE.Group { - readonly head: THREE.Group - readonly body: THREE.Group - readonly rightArm: THREE.Group - readonly leftArm: THREE.Group - readonly rightLeg: THREE.Group - readonly leftLeg: THREE.Group + readonly head: THREE.Group; + readonly body: THREE.Group; + readonly rightArm: THREE.Group; + readonly leftArm: THREE.Group; + readonly rightLeg: THREE.Group; + readonly leftLeg: THREE.Group; - constructor( - isSlim: boolean, - layer1Material: THREE.Material, - layer2Material: THREE.Material - ) + constructor( + isSlim: boolean, + layer1Material: THREE.Material, + layer2Material: THREE.Material, + ); } export class CapeObject extends THREE.Group { - readonly cape: THREE.Mesh + readonly cape: THREE.Mesh; - constructor(capeMaterial: THREE.Material) + constructor(capeMaterial: THREE.Material); } export class PlayerObject extends THREE.Group { - readonly slim: boolean - readonly skin: SkinObject - readonly cape: CapeObject + readonly slim: boolean; + readonly skin: SkinObject; + readonly cape: CapeObject; - constructor( - isSlim: boolean, - layer1Material: THREE.Material, - layer2Material: THREE.Material, - capeMaterial: THREE.Material - ) + constructor( + isSlim: boolean, + layer1Material: THREE.Material, + layer2Material: THREE.Material, + capeMaterial: THREE.Material, + ); } diff --git a/types/skinview3d.d.ts b/types/skinview3d.d.ts index c6c854b..c78e4c5 100644 --- a/types/skinview3d.d.ts +++ b/types/skinview3d.d.ts @@ -1,11 +1,11 @@ export { - CompositeAnimation, - WalkAnimation, - Animation, - AnimationFn, - IAnimation -} from './animation' + CompositeAnimation, + WalkAnimation, + Animation, + AnimationFn, + IAnimation, +} from "./animation"; -export { SkinViewer, SkinControl } from './viewer' +export { SkinViewer, SkinControl } from "./viewer"; -export { SkinObject, CapeObject, PlayerObject } from './model' +export { SkinObject, CapeObject, PlayerObject } from "./model"; diff --git a/types/viewer.d.ts b/types/viewer.d.ts index 1eb5ee9..2294624 100644 --- a/types/viewer.d.ts +++ b/types/viewer.d.ts @@ -1,45 +1,45 @@ -import * as THREE from 'three' -import { CompositeAnimation, WalkAnimation } from './animation' -import { Animation } from './animation' -import { PlayerObject } from './model' +import * as THREE from "three"; +import { CompositeAnimation, WalkAnimation } from "./animation"; +import { Animation } from "./animation"; +import { PlayerObject } from "./model"; interface SkinViewerOptions { - domElement: Element - animation?: Animation - slim?: boolean - skinUrl?: string - capeUrl?: string - width?: number - height?: number + domElement: Element; + animation?: Animation; + slim?: boolean; + skinUrl?: string; + capeUrl?: string; + width?: number; + height?: number; } export class SkinViewer { - skinUrl: string - capeUrl: string - width: number - height: number - readonly domElement: Element - animation: Animation - animationPaused: boolean - animationTime: number - readonly playerObject: PlayerObject - readonly disposed: boolean - readonly camera: THREE.Camera - readonly renderer: THREE.Renderer - readonly scene: THREE.Scene + skinUrl: string; + capeUrl: string; + width: number; + height: number; + readonly domElement: Element; + animation: Animation; + animationPaused: boolean; + animationTime: number; + readonly playerObject: PlayerObject; + readonly disposed: boolean; + readonly camera: THREE.Camera; + readonly renderer: THREE.Renderer; + readonly scene: THREE.Scene; - constructor(options: SkinViewerOptions) + constructor(options: SkinViewerOptions); - setSize(width: number, height: number): void + setSize(width: number, height: number): void; - dispose(): void + dispose(): void; } export class SkinControl { - enableAnimationControl: boolean - readonly skinViewer: SkinViewer + enableAnimationControl: boolean; + readonly skinViewer: SkinViewer; - constructor(skinViewer: SkinViewer) + constructor(skinViewer: SkinViewer); - dispose(): void + dispose(): void; } From d86cfa4c87e2346d3cd2122501822f3d9879d3ef Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 12:37:32 +0800 Subject: [PATCH 04/12] move property `slim` from `PlayerObject` to `SkinObject` --- src/model.js | 26 +++++++++++++------------- types/model.d.ts | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/model.js b/src/model.js index 012c630..6536fe5 100644 --- a/src/model.js +++ b/src/model.js @@ -36,9 +36,11 @@ function addVertices(box, top, bottom, left, front, right, back) { const esp = 0.002; class SkinObject extends THREE.Group { - constructor(isSlim, layer1Material, layer2Material) { + constructor(slim, layer1Material, layer2Material) { super(); + this.slim = slim; + // Head this.head = new THREE.Group(); @@ -105,8 +107,8 @@ class SkinObject extends THREE.Group { this.rightArm = new THREE.Group(); let rightArmPivot = new THREE.Group(); - let rightArmBox = new THREE.BoxGeometry((isSlim ? 3 : 4) - esp, 12 - esp, 4 - esp, 0, 0, 0); - if (isSlim) { + let rightArmBox = new THREE.BoxGeometry((slim ? 3 : 4) - esp, 12 - esp, 4 - esp, 0, 0, 0); + if (slim) { addVertices(rightArmBox, toSkinVertices(44, 16, 47, 20), toSkinVertices(47, 16, 50, 20), @@ -128,8 +130,8 @@ class SkinObject extends THREE.Group { let rightArmMesh = new THREE.Mesh(rightArmBox, layer1Material); rightArmPivot.add(rightArmMesh); - let rightArm2Box = new THREE.BoxGeometry((isSlim ? 3.375 : 4.5) - esp, 13.5 - esp, 4.5 - esp, 0, 0, 0); - if (isSlim) { + let rightArm2Box = new THREE.BoxGeometry((slim ? 3.375 : 4.5) - esp, 13.5 - esp, 4.5 - esp, 0, 0, 0); + if (slim) { addVertices(rightArm2Box, toSkinVertices(44, 32, 47, 36), toSkinVertices(47, 32, 50, 36), @@ -155,7 +157,7 @@ class SkinObject extends THREE.Group { rightArmPivot.position.y = -6; this.rightArm.add(rightArmPivot); this.rightArm.position.y = -4; - this.rightArm.position.x = isSlim ? -5.5 : -6; + this.rightArm.position.x = slim ? -5.5 : -6; this.add(this.rightArm); @@ -163,8 +165,8 @@ class SkinObject extends THREE.Group { this.leftArm = new THREE.Group(); let leftArmPivot = new THREE.Group(); - let leftArmBox = new THREE.BoxGeometry((isSlim ? 3 : 4) - esp, 12 - esp, 4 - esp, 0, 0, 0); - if (isSlim) { + let leftArmBox = new THREE.BoxGeometry((slim ? 3 : 4) - esp, 12 - esp, 4 - esp, 0, 0, 0); + if (slim) { addVertices(leftArmBox, toSkinVertices(36, 48, 39, 52), toSkinVertices(39, 48, 42, 52), @@ -186,8 +188,8 @@ class SkinObject extends THREE.Group { let leftArmMesh = new THREE.Mesh(leftArmBox, layer1Material); leftArmPivot.add(leftArmMesh); - let leftArm2Box = new THREE.BoxGeometry((isSlim ? 3.375 : 4.5) - esp, 13.5 - esp, 4.5 - esp, 0, 0, 0); - if (isSlim) { + let leftArm2Box = new THREE.BoxGeometry((slim ? 3.375 : 4.5) - esp, 13.5 - esp, 4.5 - esp, 0, 0, 0); + if (slim) { addVertices(leftArm2Box, toSkinVertices(52, 48, 55, 52), toSkinVertices(55, 48, 58, 52), @@ -213,7 +215,7 @@ class SkinObject extends THREE.Group { leftArmPivot.position.y = -6; this.leftArm.add(leftArmPivot); this.leftArm.position.y = -4; - this.leftArm.position.x = isSlim ? 5.5 : 6; + this.leftArm.position.x = slim ? 5.5 : 6; this.add(this.leftArm); @@ -315,8 +317,6 @@ class PlayerObject extends THREE.Group { constructor(slim, layer1Material, layer2Material, capeMaterial) { super(); - this.slim = slim; - this.skin = new SkinObject(slim, layer1Material, layer2Material); this.skin.visible = false; this.add(this.skin); diff --git a/types/model.d.ts b/types/model.d.ts index 9f9b875..0119498 100644 --- a/types/model.d.ts +++ b/types/model.d.ts @@ -1,6 +1,7 @@ import * as THREE from "three"; export class SkinObject extends THREE.Group { + readonly slim: boolean; readonly head: THREE.Group; readonly body: THREE.Group; readonly rightArm: THREE.Group; @@ -9,7 +10,7 @@ export class SkinObject extends THREE.Group { readonly leftLeg: THREE.Group; constructor( - isSlim: boolean, + slim: boolean, layer1Material: THREE.Material, layer2Material: THREE.Material, ); @@ -22,12 +23,11 @@ export class CapeObject extends THREE.Group { } export class PlayerObject extends THREE.Group { - readonly slim: boolean; readonly skin: SkinObject; readonly cape: CapeObject; constructor( - isSlim: boolean, + slim: boolean, layer1Material: THREE.Material, layer2Material: THREE.Material, capeMaterial: THREE.Material, From 14fabb3e022ce071633531132a464e1ed32a21b2 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 12:41:14 +0800 Subject: [PATCH 05/12] add missing `public` modifiers --- types/animation.d.ts | 14 +++++++------- types/model.d.ts | 20 ++++++++++---------- types/viewer.d.ts | 36 ++++++++++++++++++------------------ 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/types/animation.d.ts b/types/animation.d.ts index b173d58..8308807 100644 --- a/types/animation.d.ts +++ b/types/animation.d.ts @@ -13,15 +13,15 @@ declare function invokeAnimation( ): void; declare class AnimationHandle implements IAnimation { - readonly animation: Animation; - paused: boolean; - speed: number; + public readonly animation: Animation; + public paused: boolean; + public speed: number; constructor(animation: Animation); - play(player: PlayerObject, time: number): void; + public play(player: PlayerObject, time: number): void; - reset(): void; + public reset(): void; } export class CompositeAnimation implements IAnimation { @@ -29,9 +29,9 @@ export class CompositeAnimation implements IAnimation { constructor(); - add(animation: Animation): AnimationHandle; + public add(animation: Animation): AnimationHandle; - play(player: PlayerObject, time: number): void; + public play(player: PlayerObject, time: number): void; } export const WalkAnimation: AnimationFn; diff --git a/types/model.d.ts b/types/model.d.ts index 0119498..122170e 100644 --- a/types/model.d.ts +++ b/types/model.d.ts @@ -1,13 +1,13 @@ import * as THREE from "three"; export class SkinObject extends THREE.Group { - readonly slim: boolean; - readonly head: THREE.Group; - readonly body: THREE.Group; - readonly rightArm: THREE.Group; - readonly leftArm: THREE.Group; - readonly rightLeg: THREE.Group; - readonly leftLeg: THREE.Group; + public readonly slim: boolean; + public readonly head: THREE.Group; + public readonly body: THREE.Group; + public readonly rightArm: THREE.Group; + public readonly leftArm: THREE.Group; + public readonly rightLeg: THREE.Group; + public readonly leftLeg: THREE.Group; constructor( slim: boolean, @@ -17,14 +17,14 @@ export class SkinObject extends THREE.Group { } export class CapeObject extends THREE.Group { - readonly cape: THREE.Mesh; + public readonly cape: THREE.Mesh; constructor(capeMaterial: THREE.Material); } export class PlayerObject extends THREE.Group { - readonly skin: SkinObject; - readonly cape: CapeObject; + public readonly skin: SkinObject; + public readonly cape: CapeObject; constructor( slim: boolean, diff --git a/types/viewer.d.ts b/types/viewer.d.ts index 2294624..af06710 100644 --- a/types/viewer.d.ts +++ b/types/viewer.d.ts @@ -14,32 +14,32 @@ interface SkinViewerOptions { } export class SkinViewer { - skinUrl: string; - capeUrl: string; - width: number; - height: number; - readonly domElement: Element; - animation: Animation; - animationPaused: boolean; - animationTime: number; - readonly playerObject: PlayerObject; - readonly disposed: boolean; - readonly camera: THREE.Camera; - readonly renderer: THREE.Renderer; - readonly scene: THREE.Scene; + public skinUrl: string; + public capeUrl: string; + public width: number; + public height: number; + public readonly domElement: Element; + public animation: Animation; + public animationPaused: boolean; + public animationTime: number; + public readonly playerObject: PlayerObject; + public readonly disposed: boolean; + public readonly camera: THREE.Camera; + public readonly renderer: THREE.Renderer; + public readonly scene: THREE.Scene; constructor(options: SkinViewerOptions); - setSize(width: number, height: number): void; + public setSize(width: number, height: number): void; - dispose(): void; + public dispose(): void; } export class SkinControl { - enableAnimationControl: boolean; - readonly skinViewer: SkinViewer; + public enableAnimationControl: boolean; + public readonly skinViewer: SkinViewer; constructor(skinViewer: SkinViewer); - dispose(): void; + public dispose(): void; } From 70c2b36339a50a6cfe0e860d8d2fb66ee9ea6ae6 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 12:42:48 +0800 Subject: [PATCH 06/12] change type of `SkinViewer.domElement` to `Node` `Node` is enough for use --- types/viewer.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types/viewer.d.ts b/types/viewer.d.ts index af06710..44b77ab 100644 --- a/types/viewer.d.ts +++ b/types/viewer.d.ts @@ -4,7 +4,7 @@ import { Animation } from "./animation"; import { PlayerObject } from "./model"; interface SkinViewerOptions { - domElement: Element; + domElement: Node; animation?: Animation; slim?: boolean; skinUrl?: string; @@ -18,7 +18,7 @@ export class SkinViewer { public capeUrl: string; public width: number; public height: number; - public readonly domElement: Element; + public readonly domElement: Node; public animation: Animation; public animationPaused: boolean; public animationTime: number; From 741dc9e3efc2c893b3f2b1d7a93346a7983b9014 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 12:44:12 +0800 Subject: [PATCH 07/12] export invokeAnimation() --- src/skinview3d.js | 2 +- types/animation.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skinview3d.js b/src/skinview3d.js index cffcaab..b6d47d2 100644 --- a/src/skinview3d.js +++ b/src/skinview3d.js @@ -25,4 +25,4 @@ export { SkinObject, CapeObject, PlayerObject } from "./model"; export { SkinViewer, SkinControl } from "./viewer"; -export { CompositeAnimation, WalkAnimation } from "./animation"; +export { invokeAnimation, CompositeAnimation, WalkAnimation } from "./animation"; diff --git a/types/animation.d.ts b/types/animation.d.ts index 8308807..20e8620 100644 --- a/types/animation.d.ts +++ b/types/animation.d.ts @@ -6,7 +6,7 @@ interface IAnimation { } export type Animation = AnimationFn | IAnimation; -declare function invokeAnimation( +export function invokeAnimation( animation: Animation, player: PlayerObject, time: number, From 1ec9d098d95df90c5af0e02d1fc374e735fa96b2 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 12:44:49 +0800 Subject: [PATCH 08/12] change `AnimationHandle` to interface --- types/animation.d.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/types/animation.d.ts b/types/animation.d.ts index 20e8620..fb4b9fe 100644 --- a/types/animation.d.ts +++ b/types/animation.d.ts @@ -12,16 +12,12 @@ export function invokeAnimation( time: number, ): void; -declare class AnimationHandle implements IAnimation { - public readonly animation: Animation; - public paused: boolean; - public speed: number; +export interface AnimationHandle extends IAnimation { + readonly animation: Animation; + paused: boolean; + speed: number; - constructor(animation: Animation); - - public play(player: PlayerObject, time: number): void; - - public reset(): void; + reset(): void; } export class CompositeAnimation implements IAnimation { From 733e1713162e08dae6efb98d738f17d6df48d8c7 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 12:54:27 +0800 Subject: [PATCH 09/12] remove `CompositeAnimation.handles` --- types/animation.d.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/types/animation.d.ts b/types/animation.d.ts index fb4b9fe..b31350b 100644 --- a/types/animation.d.ts +++ b/types/animation.d.ts @@ -21,8 +21,6 @@ export interface AnimationHandle extends IAnimation { } export class CompositeAnimation implements IAnimation { - private handles: Set; - constructor(); public add(animation: Animation): AnimationHandle; From ce1f58f4c666c676b79a8381c29db46bfb6f4001 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Fri, 9 Feb 2018 12:55:04 +0800 Subject: [PATCH 10/12] sort members --- types/animation.d.ts | 4 ++-- types/skinview3d.d.ts | 14 +++----------- types/viewer.d.ts | 15 +++++++-------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/types/animation.d.ts b/types/animation.d.ts index b31350b..8fa4d62 100644 --- a/types/animation.d.ts +++ b/types/animation.d.ts @@ -1,9 +1,9 @@ import { PlayerObject } from "./model"; -type AnimationFn = (player: PlayerObject, time: number) => void; -interface IAnimation { +export interface IAnimation { play(player: PlayerObject, time: number): void; } +export type AnimationFn = (player: PlayerObject, time: number) => void; export type Animation = AnimationFn | IAnimation; export function invokeAnimation( diff --git a/types/skinview3d.d.ts b/types/skinview3d.d.ts index c78e4c5..43581bc 100644 --- a/types/skinview3d.d.ts +++ b/types/skinview3d.d.ts @@ -1,11 +1,3 @@ -export { - CompositeAnimation, - WalkAnimation, - Animation, - AnimationFn, - IAnimation, -} from "./animation"; - -export { SkinViewer, SkinControl } from "./viewer"; - -export { SkinObject, CapeObject, PlayerObject } from "./model"; +export * from "./model"; +export * from "./animation"; +export * from "./viewer"; diff --git a/types/viewer.d.ts b/types/viewer.d.ts index 44b77ab..f4bafd6 100644 --- a/types/viewer.d.ts +++ b/types/viewer.d.ts @@ -1,9 +1,8 @@ import * as THREE from "three"; -import { CompositeAnimation, WalkAnimation } from "./animation"; import { Animation } from "./animation"; import { PlayerObject } from "./model"; -interface SkinViewerOptions { +export interface SkinViewerOptions { domElement: Node; animation?: Animation; slim?: boolean; @@ -14,19 +13,19 @@ interface SkinViewerOptions { } export class SkinViewer { - public skinUrl: string; - public capeUrl: string; + public readonly domElement: Node; + public readonly disposed: boolean; public width: number; public height: number; - public readonly domElement: Node; + public skinUrl: string; + public capeUrl: string; public animation: Animation; public animationPaused: boolean; public animationTime: number; public readonly playerObject: PlayerObject; - public readonly disposed: boolean; - public readonly camera: THREE.Camera; - public readonly renderer: THREE.Renderer; public readonly scene: THREE.Scene; + public readonly camera: THREE.PerspectiveCamera; + public readonly renderer: THREE.Renderer; constructor(options: SkinViewerOptions); From ef9664476fa8639b2d4e42670b44093596703d96 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sat, 10 Feb 2018 14:05:07 +0800 Subject: [PATCH 11/12] Change license to MIT --- .eslintrc.js | 1 - LICENSE | 696 ++----------------------------------------- package-lock.json | 40 +++ package.json | 12 +- src/skinview3d.js | 25 -- tools/rollup-util.js | 15 +- 6 files changed, 85 insertions(+), 704 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 2543be5..22c9049 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,6 +1,5 @@ module.exports = { "env": { - "browser": true, "es6": true }, "extends": "eslint:recommended", diff --git a/LICENSE b/LICENSE index 9cecc1d..2d3e05c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,22 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +MIT License + +Original work Copyright (c) 2014-2018 Kent Rasmussen +Modified work Copyright (c) 2017-2018 Haowei Wen, Sean Boult, Pig Fang and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/package-lock.json b/package-lock.json index 81d86f6..d7457c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -979,6 +979,12 @@ "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", "dev": true }, + "commenting": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/commenting/-/commenting-1.0.4.tgz", + "integrity": "sha1-0UCvMmNPy97k1xOWk0wfzawUflA=", + "dev": true + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -2763,6 +2769,15 @@ "yallist": "2.1.2" } }, + "magic-string": { + "version": "0.22.4", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.4.tgz", + "integrity": "sha512-kxBL06p6iO2qPBHsqGK2b3cRwiRGpnmSuVWNhwHcMX7qJOUr1HvricYP1LZOCdkQBUp0jiWg2d6WJwR3vYgByw==", + "dev": true, + "requires": { + "vlq": "0.2.3" + } + }, "micromatch": { "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", @@ -2815,6 +2830,12 @@ "minimist": "0.0.8" } }, + "moment": { + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", + "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=", + "dev": true + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -3241,6 +3262,19 @@ "rollup-pluginutils": "1.5.2" } }, + "rollup-plugin-license": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-0.5.0.tgz", + "integrity": "sha1-XnBzdftY0pV1JToNKOl+QYgmgvc=", + "dev": true, + "requires": { + "commenting": "1.0.4", + "lodash": "4.17.4", + "magic-string": "0.22.4", + "mkdirp": "0.5.1", + "moment": "2.18.1" + } + }, "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", @@ -3649,6 +3683,12 @@ "user-home": "1.1.1" } }, + "vlq": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz", + "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==", + "dev": true + }, "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", diff --git a/package.json b/package.json index 1dc5496..26499f5 100644 --- a/package.json +++ b/package.json @@ -8,14 +8,19 @@ "scripts": { "build": "rollup -c tools/rollup.module.js && rollup -c tools/rollup.browser.js && rollup -c tools/rollup.browser.min.js", "prepare": "npm test && rm -rf build && npm run build", - "test": "eslint src/** tools/** && tslint -c tslint.json types/**.ts" + "test": "eslint --env browser src/** && eslint --env node tools/** && tslint -c tslint.json types/**.ts" }, "repository": { "type": "git", "url": "git+https://github.com/to2mbn/skinview3d.git" }, - "author": "yushijinhun", - "license": "GPL-3.0", + "author": "Haowei Wen (https://github.com/yushijinhun)", + "contributors": [ + "Sean Boult (https://github.com/Hacksore)", + "Pig Fang (https://github.com/g-plane)", + "Kent Rasmussen (https://github.com/earthiverse)" + ], + "license": "MIT", "bugs": { "url": "https://github.com/to2mbn/skinview3d/issues" }, @@ -31,6 +36,7 @@ "eslint": "^4.16.0", "rollup": "^0.55.3", "rollup-plugin-babel": "^3.0.3", + "rollup-plugin-license": "^0.5.0", "rollup-plugin-node-resolve": "^3.0.2", "rollup-plugin-uglify": "^3.0.0", "tslint": "^5.9.1", diff --git a/src/skinview3d.js b/src/skinview3d.js index b6d47d2..b5d5c86 100644 --- a/src/skinview3d.js +++ b/src/skinview3d.js @@ -1,28 +1,3 @@ -/** - * @license - * skinview3d - * - * Copyright (C) 2017 the original author or authors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * - * @author yushijinhun - * @author Hacksore - * @author Kent Rasmussen - */ - export { SkinObject, CapeObject, PlayerObject } from "./model"; export { SkinViewer, SkinControl } from "./viewer"; export { invokeAnimation, CompositeAnimation, WalkAnimation } from "./animation"; diff --git a/tools/rollup-util.js b/tools/rollup-util.js index 4de8ae6..9757cbb 100644 --- a/tools/rollup-util.js +++ b/tools/rollup-util.js @@ -1,12 +1,14 @@ import uglify from "rollup-plugin-uglify"; import babel from "rollup-plugin-babel"; import resolve from "rollup-plugin-node-resolve"; +import license from "rollup-plugin-license"; +import fs from "fs"; let buildType = config => { let options = { input: "src/skinview3d.js", output: [], - external:[ + external: [ "three" ], plugins: [ @@ -58,6 +60,17 @@ let buildType = config => { }) ); } + + options.plugins.push( + license({ + sourcemap: true, + banner: ` + skinview3d (https://github.com/to2mbn/skinview3d) + + ${fs.readFileSync("LICENSE").toString()} + ` + }) + ); return options; }; export { buildType }; From bac67fdb5e91e97f109ce4361f4514c332a53b80 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sat, 10 Feb 2018 21:21:38 +0800 Subject: [PATCH 12/12] fix license badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07eb5dc..81e6094 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ skinview3d [![Travis](https://img.shields.io/travis/to2mbn/skinview3d.svg?style=flat-square)](https://travis-ci.org/to2mbn/skinview3d) [![npm](https://img.shields.io/npm/v/skinview3d.svg?style=flat-square)](https://www.npmjs.com/package/skinview3d) -[![license](https://img.shields.io/github/license/to2mbn/skinview3d.svg?style=flat-square)](https://github.com/to2mbn/skinview3d/blob/master/LICENSE) +[![license](https://img.shields.io/badge/license-MIT-yellowgreen.svg?style=flat-square)](https://github.com/to2mbn/skinview3d/blob/master/LICENSE) [![Gitter chat](https://img.shields.io/gitter/room/TechnologyAdvice/Stardust.svg?style=flat-square)](https://gitter.im/skinview3d/Lobby) Three.js powered Minecraft skin viewer.