@leafer/image 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/image",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "@leafer/image",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,13 +22,13 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/task": "2.0.1",
-    "@leafer/file": "2.0.1",
-    "@leafer/data": "2.0.1",
-    "@leafer/math": "2.0.1",
-    "@leafer/platform": "2.0.1"
+    "@leafer/task": "2.0.3",
+    "@leafer/file": "2.0.3",
+    "@leafer/data": "2.0.3",
+    "@leafer/math": "2.0.3",
+    "@leafer/platform": "2.0.3"
   },
   "devDependencies": {
-    "@leafer/interface": "2.0.1"
+    "@leafer/interface": "2.0.3"
   }
 }

package/src/ImageManager.ts

@@ -1,7 +1,6 @@
-import { IImageManager, ILeaferImageConfig, ILeaferImage, IExportFileType } from '@leafer/interface'
+import { IImageManager, ILeaferImageConfig, ILeaferImage, IExportFileType, IMultimediaType } from '@leafer/interface'
 import { Creator, Platform } from '@leafer/platform'
 import { FileHelper, Resource } from '@leafer/file'
-import { TaskProcessor } from '@leafer/task'
 
 
 export const ImageManager: IImageManager = {
@@ -10,16 +9,17 @@ export const ImageManager: IImageManager = {
 
     recycledList: [],
 
-    patternTasker: new TaskProcessor({ parallel: 1 }),
+    patternTasker: Resource.queue, // 全局按顺序执行的任务队列，防止阻塞主线程
 
-    get(config: ILeaferImageConfig): ILeaferImage {
+    get(config: ILeaferImageConfig, type?: IMultimediaType): ILeaferImage {
         let image: ILeaferImage = Resource.get(config.url)
-        if (!image) Resource.set(config.url, image = Creator.image(config))
+        if (!image) Resource.set(config.url, image = type === 'film' ? Creator.film(config) : Creator.image(config))
         image.use++
         return image
     },
 
     recycle(image: ILeaferImage): void {
+        if (image.parent) image = image.parent // 存在 image filters 的情况
         image.use--
         setTimeout(() => {
             if (!image.use) {
@@ -57,7 +57,7 @@ export const ImageManager: IImageManager = {
         if (config.format) return config.format === format
         const { url } = config
         if (url.startsWith('data:')) {
-            if (url.startsWith('data:' + FileHelper.mineType(format))) return true
+            if (url.startsWith('data:' + FileHelper.mimeType(format))) return true
         } else {
             if (url.includes('.' + format) || url.includes('.' + FileHelper.upperCaseTypeMap[format])) return true
             else if (format === 'png' && !url.includes('.')) return true // blob: 等无后缀名协议的图片无法分析类型，直接当透明图片处理

package/src/LeaferFilm.ts

@@ -0,0 +1,10 @@
+import { ILeaferFilm } from '@leafer/interface'
+
+import { LeaferImage } from './LeaferImage'
+
+
+export class LeaferFilm extends LeaferImage implements ILeaferFilm {
+
+    public get tag() { return 'Film' }
+
+}

package/src/LeaferImage.ts

@@ -1,4 +1,4 @@
-import { ILeaferImage, ILeaferImageConfig, IFunction, IObject, InnerId, IMatrixData, ICanvasPattern, ILeaferImageCacheCanvas, ILeaferImagePatternPaint, ILeaferImageLevel, ISizeData, IImageCrossOrigin, IImageLOD, IInterlace } from '@leafer/interface'
+import { ILeaferImage, ILeaferImageConfig, IFunction, IObject, InnerId, ILeaf, IMatrixData, ICanvasPattern, ILeaferImageCacheCanvas, ILeaferImagePatternPaint, ILeaferImageLevel, ISizeData, IImageCrossOrigin, IImageLOD, IInterlace } from '@leafer/interface'
 import { Platform } from '@leafer/platform'
 import { Resource } from '@leafer/file'
 import { IncrementId } from '@leafer/math'
@@ -12,6 +12,8 @@ const { IMAGE, create } = IncrementId
 export class LeaferImage implements ILeaferImage {
 
     public readonly innerId: InnerId
+    public get tag() { return 'Image' }
+
     public get url() { return this.config.url }
     public lod?: IImageLOD
     public get crossOrigin(): IImageCrossOrigin { const { crossOrigin } = this.config; return isUndefined(crossOrigin) ? Platform.image.crossOrigin : crossOrigin }
@@ -53,7 +55,7 @@ export class LeaferImage implements ILeaferImage {
     public load(onSuccess?: IFunction, onError?: IFunction, thumbSize?: ISizeData): number {
         if (!this.loading) {
             this.loading = true
-            Resource.tasker.add(async () => await Platform.origin.loadImage(this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
+            Resource.tasker.add(async () => await Platform.origin['load' + this.tag as 'loadImage'](this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
                 if (thumbSize) this.setThumbView(img)
                 this.setView(img)
             }).catch((e) => {
@@ -127,6 +129,10 @@ export class LeaferImage implements ILeaferImage {
         return pattern
     }
 
+    public render(canvas: any, x: number, y: number, width: number, height: number, _leaf: ILeaf, _paint: any, _imageScaleX: number, _imageScaleY: number): void {
+        canvas.drawImage(this.view, x, y, width, height)
+    }
+
     // need rewrite
     public getLoadUrl(_thumbSize?: ISizeData): string { return this.url }
     public setThumbView(_view: number): void { }
@@ -136,8 +142,11 @@ export class LeaferImage implements ILeaferImage {
     public getLevelData(_level: number, _width?: number, _height?: number,): ILeaferImageLevel { return undefined }
     public clearLevels(_checkUse?: boolean): void { }
 
+    public destroyFilter(): void { }
+
     public destroy(): void {
         this.clearLevels()
+        this.destroyFilter()
 
         const { view } = this
         if (view && view.close) view.close() // 可能为 ImageBitmap

package/src/LeaferVideo.ts

@@ -0,0 +1,10 @@
+import { ILeaferVideo } from '@leafer/interface'
+
+import { LeaferImage } from './LeaferImage'
+
+
+export class LeaferVideo extends LeaferImage implements ILeaferVideo {
+
+    public get tag() { return 'Video' }
+
+}

package/src/index.ts

@@ -1,2 +1,4 @@
 export { LeaferImage } from './LeaferImage'
+export { LeaferFilm } from './LeaferFilm'
+export { LeaferVideo } from './LeaferVideo'
 export { ImageManager } from './ImageManager'

package/types/index.d.ts

@@ -1,7 +1,8 @@
-import { ILeaferImage, InnerId, IImageLOD, IImageCrossOrigin, IObject, ILeaferImageConfig, IFunction, ILeaferImageCacheCanvas, ISizeData, IInterlace, IMatrixData, ILeaferImagePatternPaint, ICanvasPattern, ILeaferImageLevel, IImageManager } from '@leafer/interface';
+import { ILeaferImage, InnerId, IImageLOD, IImageCrossOrigin, IObject, ILeaferImageConfig, IFunction, ILeaferImageCacheCanvas, ISizeData, IInterlace, IMatrixData, ILeaferImagePatternPaint, ICanvasPattern, ILeaf, ILeaferImageLevel, ILeaferFilm, ILeaferVideo, IImageManager } from '@leafer/interface';
 
 declare class LeaferImage implements ILeaferImage {
     readonly innerId: InnerId;
+    get tag(): string;
     get url(): string;
     lod?: IImageLOD;
     get crossOrigin(): IImageCrossOrigin;
@@ -26,15 +27,25 @@ declare class LeaferImage implements ILeaferImage {
     getFull(_filters?: IObject): any;
     getCanvas(width: number, height: number, opacity?: number, filters?: IObject, xGap?: number, yGap?: number, smooth?: boolean, interlace?: IInterlace): any;
     getPattern(canvas: any, repeat: string | null, transform?: IMatrixData, paint?: ILeaferImagePatternPaint): ICanvasPattern;
+    render(canvas: any, x: number, y: number, width: number, height: number, _leaf: ILeaf, _paint: any, _imageScaleX: number, _imageScaleY: number): void;
     getLoadUrl(_thumbSize?: ISizeData): string;
     setThumbView(_view: number): void;
     getThumbSize(_lod?: IImageLOD): ISizeData;
     getMinLevel(): number;
     getLevelData(_level: number, _width?: number, _height?: number): ILeaferImageLevel;
     clearLevels(_checkUse?: boolean): void;
+    destroyFilter(): void;
     destroy(): void;
 }
 
+declare class LeaferFilm extends LeaferImage implements ILeaferFilm {
+    get tag(): string;
+}
+
+declare class LeaferVideo extends LeaferImage implements ILeaferVideo {
+    get tag(): string;
+}
+
 declare const ImageManager: IImageManager;
 
-export { ImageManager, LeaferImage };
+export { ImageManager, LeaferFilm, LeaferImage, LeaferVideo };