Merge remote-tracking branch 'upstream/master'

.eslintrc.yaml

@@ -6,6 +6,9 @@ extends:
   - 'eslint:recommended'
   - 'plugin:@typescript-eslint/eslint-recommended'
   - 'plugin:@typescript-eslint/recommended'
+ignorePatterns:
+  - bundles/**/*
+  - libs/**/*
 rules:
   '@typescript-eslint/no-inferrable-types': off
   '@typescript-eslint/interface-name-prefix': off

package.json

@@ -38,21 +38,22 @@
 		"bundles"
 	],
 	"dependencies": {
+		"@types/three": "^0.129.1",
 		"@james090500/skinview-utils": "^0.6.1",
-		"three": "^0.125.2"
+		"three": "^0.129.0"
 	},
 	"devDependencies": {
-		"@rollup/plugin-node-resolve": "^11.2.0",
-		"@rollup/plugin-typescript": "^8.2.0",
-		"@typescript-eslint/eslint-plugin": "^4.15.2",
-		"@typescript-eslint/parser": "^4.15.2",
-		"@yushijinhun/three-minifier-rollup": "^0.2.0",
-		"eslint": "^7.20.0",
+		"@rollup/plugin-node-resolve": "^13.0.0",
+		"@rollup/plugin-typescript": "^8.2.1",
+		"@typescript-eslint/eslint-plugin": "^4.28.0",
+		"@typescript-eslint/parser": "^4.28.0",
+		"@yushijinhun/three-minifier-rollup": "^0.3.0",
+		"eslint": "^7.29.0",
 		"local-web-server": "^4.2.1",
 		"npm-run-all": "^4.1.5",
 		"rimraf": "^3.0.2",
-		"rollup": "^2.39.1",
+		"rollup": "^2.52.3",
 		"rollup-plugin-terser": "^7.0.2",
-		"typescript": "^4.1.5"
+		"typescript": "^4.3.4"
 	}
 }

src/fxaa.ts

@@ -1,5 +1,5 @@
 import { EffectComposer } from "three/examples/jsm/postprocessing/EffectComposer.js";
-import { Pass } from "three/examples/jsm/postprocessing/Pass.js";
+import { FullScreenQuad } from "three/examples/jsm/postprocessing/Pass.js";
 import { RenderPass } from "three/examples/jsm/postprocessing/RenderPass.js";
 import { ShaderPass } from "three/examples/jsm/postprocessing/ShaderPass.js";
 import { FXAAShader } from "three/examples/jsm/shaders/FXAAShader.js";
@@ -46,6 +46,6 @@ export class FXAASkinViewer extends SkinViewer {
 
     dispose(): void {
         super.dispose();
-        (this.fxaaPass.fsQuad as Pass.FullScreenQuad).dispose();
+        (this.fxaaPass.fsQuad as FullScreenQuad).dispose();
     }
 }

src/viewer.ts

@@ -22,6 +22,7 @@ export interface SkinViewerOptions {
 	width?: number;
 	height?: number;
 	skin?: RemoteImage | TextureSource;
+	model?: ModelType | "auto-detect";
 	cape?: RemoteImage | TextureSource;
 	ears?: RemoteImage | TextureSource;
 
@@ -120,7 +121,7 @@ export class SkinViewer {
 		this.scene.add(this.playerObject);
 ``
 		if (options.skin !== undefined) {
-			this.loadSkin(options.skin);
+			this.loadSkin(options.skin, options.model);
 		}
 		if (options.cape !== undefined) {
 			this.loadCape(options.cape);