Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

feat(webgl-image): add tile rendering support for large images (#101)

Timothy Yin2f86029fcd2d
diff --git a/app/components/photo/ProgressiveImage.vue b/app/components/photo/ProgressiveImage.vue
index 5f9bc08c..550aab39 100644
--- a/app/components/photo/ProgressiveImage.vue
+++ b/app/components/photo/ProgressiveImage.vue
@@ -6,6 +6,7 @@ import type { ImageLoaderManager } from '~/libs/image-loader-manager'
interface Props {
src: string
thumbnailSrc?: string
+ thumbhash?: string | null
alt?: string
width?: number
height?: number
@@ -29,6 +30,7 @@ const props = withDefaults(defineProps<Props>(), {
enableZoom: true,
isCurrentImage: true,
thumbnailSrc: '',
+ thumbhash: null,
alt: 'Image',
width: undefined,
height: undefined,
@@ -45,12 +47,13 @@ const props = withDefaults(defineProps<Props>(), {
const containerRef = ref<HTMLDivElement>()
-// state
const highResLoaded = ref(false)
const highResRendered = ref(false)
const hasError = ref(false)
const currentSrc = ref<string | null>()
+const isDev = computed(() => import.meta.env.DEV)
+
// 使用 WebGLImageViewer 的引用
const webglViewerRef = ref()
const loaderManagerRef = ref<ImageLoaderManager | null>(null)
@@ -156,11 +159,21 @@ onUnmounted(() => {
class="relative w-full h-full flex items-center justify-center"
>
<!-- 缩略图 (加载时显示) -->
- <img
+ <!-- <img
+ v-if="showThumbnail"
+ :src="thumbnailSrc"
+ :alt="alt"
+ class="absolute inset-0 w-full h-full object-contain"
+ /> -->
+ <!-- use <ThumbImage /> instead -->
+ <ThumbImage
v-if="showThumbnail"
:src="thumbnailSrc"
+ :thumbhash="thumbhash"
:alt="alt"
class="absolute inset-0 w-full h-full object-contain"
+ thumbhash-class="opacity-50"
+ image-contain
/>
<!-- WebGL 图片查看器 -->
@@ -181,6 +194,7 @@ onUnmounted(() => {
:pinch="{ step: 0.2 }"
:double-click="{ mode: 'toggle', step: 2.4, animationTime: 400 }"
:panning="{ velocityDisabled: false }"
+ :debug="isDev"
@zoom-change="handleZoomChange"
@loading-state-change="handleWebGLStateChange"
/>
diff --git a/app/components/photo/Viewer.vue b/app/components/photo/Viewer.vue
index 126c99ce..03590f11 100644
--- a/app/components/photo/Viewer.vue
+++ b/app/components/photo/Viewer.vue
@@ -708,6 +708,7 @@ const swiperModules = [Navigation, Keyboard, Virtual]
:is-current-image="index === currentIndex"
:src="photo.originalUrl!"
:thumbnail-src="photo.thumbnailUrl!"
+ :thumbhash="photo.thumbnailHash"
:alt="photo.title || ''"
:width="
index === currentIndex
diff --git a/app/components/ui/ThumbImage.vue b/app/components/ui/ThumbImage.vue
index e30b70ee..cc6367a2 100644
--- a/app/components/ui/ThumbImage.vue
+++ b/app/components/ui/ThumbImage.vue
@@ -8,17 +8,21 @@ const props = withDefaults(
alt: string
thumbhash?: string | null
class?: string
+ thumbhashClass?: string
style?: CSSProperties
threshold?: number | number[]
rootMargin?: string
+ imageContain?: boolean
lazy?: boolean
}>(),
{
thumbhash: null,
class: '',
+ thumbhashClass: '',
style: undefined,
threshold: 0.1,
rootMargin: '50px',
+ imageContain: false,
lazy: true,
},
)
@@ -74,7 +78,7 @@ const onError = () => {
<ThumbHash
v-if="thumbhash"
:thumbhash="thumbhash"
- class="absolute inset-0 scale-110 blur-sm"
+ :class="twMerge('absolute inset-0 scale-110 blur-sm', thumbhashClass)"
/>
<img
@@ -84,7 +88,8 @@ const onError = () => {
:alt="alt"
:class="
twMerge(
- 'absolute inset-0 w-full h-full object-cover transition-opacity duration-300',
+ 'absolute inset-0 w-full h-full transition-opacity duration-300',
+ imageContain ? 'object-contain' : 'object-cover',
isLoaded ? 'opacity-100' : 'opacity-0',
)
"
diff --git a/app/pages/dashboard/photos.vue b/app/pages/dashboard/photos.vue
index d2acf0f6..03d646e7 100644
--- a/app/pages/dashboard/photos.vue
+++ b/app/pages/dashboard/photos.vue
@@ -1762,11 +1762,11 @@ onUnmounted(() => {
</p>
<div class="flex justify-center gap-2 mt-4">
<UButton
+ v-if="previewImage"
variant="soft"
color="info"
size="sm"
icon="tabler:external-link"
- v-if="previewImage"
@click="openInNewTab(previewImage.src)"
>
{{ $t('dashboard.photos.table.columns.thumbnail.action') }}
diff --git a/packages/webgl-image/src/components/DebugInfo.vue b/packages/webgl-image/src/components/DebugInfo.vue
index d0691855..a79acda8 100644
--- a/packages/webgl-image/src/components/DebugInfo.vue
+++ b/packages/webgl-image/src/components/DebugInfo.vue
@@ -65,6 +65,15 @@ const getShortImageSrc = (src: string): string => {
<div>原始高度: {{ debugInfo.imageHeight }}</div>
</div>
+ <div class="debug-section">
+ <h4>瓦片信息</h4>
+ <div>启用瓦片: {{ debugInfo.tileEnabled ? '是' : '否' }}</div>
+ <div>使用瓦片渲染: {{ debugInfo.useTiles ? '是' : '否' }}</div>
+ <div>总瓦片数: {{ debugInfo.totalTiles }}</div>
+ <div>可见瓦片数: {{ debugInfo.visibleTiles }}</div>
+ <div>配置瓦片尺寸: {{ debugInfo.tileSize }}</div>
+ </div>
+
<div class="debug-section">
<h4>WebGL信息</h4>
<div>最大纹理尺寸: {{ debugInfo.maxTextureSize }}</div>
diff --git a/packages/webgl-image/src/components/WebGLImageViewer.vue b/packages/webgl-image/src/components/WebGLImageViewer.vue
index 362a3aea..1ac5c579 100644
--- a/packages/webgl-image/src/components/WebGLImageViewer.vue
+++ b/packages/webgl-image/src/components/WebGLImageViewer.vue
@@ -39,6 +39,10 @@ const props = withDefaults(defineProps<WebGLImageViewerProps>(), {
duration: 400,
easing: (t: number) => 1 - Math.pow(1 - t, 3), // easeOutCubic
}),
+ tile: () => ({
+ enabled: true,
+ size: DEFAULT_CONFIG.tileSize,
+ }),
})
const emit = defineEmits<WebGLImageViewerEmits>()
@@ -74,6 +78,8 @@ const config = computed<EngineConfig>(() => ({
panningDisabled: props.panning?.disabled ?? DEFAULT_CONFIG.panningDisabled,
velocityDisabled:
props.panning?.velocityDisabled ?? DEFAULT_CONFIG.velocityDisabled,
+ tileEnabled: props.tile?.enabled ?? DEFAULT_CONFIG.tileEnabled,
+ tileSize: props.tile?.size ?? DEFAULT_CONFIG.tileSize,
alignmentAnimation: {
...DEFAULT_CONFIG.alignmentAnimation,
...props.alignmentAnimation,
diff --git a/packages/webgl-image/src/constants.ts b/packages/webgl-image/src/constants.ts
index 035c2236..ed565e31 100644
--- a/packages/webgl-image/src/constants.ts
+++ b/packages/webgl-image/src/constants.ts
@@ -16,6 +16,8 @@ export const DEFAULT_CONFIG = {
debug: false,
limitToBounds: true,
smooth: true,
+ tileEnabled: true,
+ tileSize: 1024,
alignmentAnimation: {
duration: 300,
easing: (t: number) => 1 - Math.pow(1 - t, 4), // easeOutQuart
diff --git a/packages/webgl-image/src/core/WebGLImageViewerEngine.ts b/packages/webgl-image/src/core/WebGLImageViewerEngine.ts
index 0356050d..5fef7e45 100644
--- a/packages/webgl-image/src/core/WebGLImageViewerEngine.ts
+++ b/packages/webgl-image/src/core/WebGLImageViewerEngine.ts
@@ -25,13 +25,31 @@ import {
import { createProgram } from '../shaders'
import ImageDecoderWorkerRaw from '../workers/image-decoder.worker?raw'
+interface Tile {
+ x: number
+ y: number
+ width: number
+ height: number
+ texture: WebGLTexture | null
+}
+
+const TILE_DEBUG_BORDER_PX = 2.4
+const TILE_DEBUG_BORDER_COLOR: [number, number, number, number] = [
+ 0.4,
+ 0.7,
+ 0.9,
+ 0.25,
+]
+
export class WebGLImageViewerEngine {
private canvas: HTMLCanvasElement
private gl: WebGLRenderingContext
private config: EngineConfig
- private image: HTMLImageElement | null = null
+ private image: HTMLImageElement | HTMLCanvasElement | ImageBitmap | null = null
private texture: WebGLTexture | null = null
private program: WebGLProgram | null = null
+ private tiles: Tile[] = []
+ private useTiles = false
// Web Workers
private worker: Worker | null = null
@@ -63,6 +81,9 @@ export class WebGLImageViewerEngine {
private matrixLocation: WebGLUniformLocation | null = null
private resolutionLocation: WebGLUniformLocation | null = null
private imageLocation: WebGLUniformLocation | null = null
+ private tileDebugLocation: WebGLUniformLocation | null = null
+ private tileBorderColorLocation: WebGLUniformLocation | null = null
+ private tileBorderWidthLocation: WebGLUniformLocation | null = null
// 事件监听器
private throttledRender: () => void
@@ -147,6 +168,15 @@ export class WebGLImageViewerEngine {
'u_resolution',
)
this.imageLocation = gl.getUniformLocation(this.program, 'u_image')
+ this.tileDebugLocation = gl.getUniformLocation(this.program, 'u_debugTiles')
+ this.tileBorderColorLocation = gl.getUniformLocation(
+ this.program,
+ 'u_tileBorderColor',
+ )
+ this.tileBorderWidthLocation = gl.getUniformLocation(
+ this.program,
+ 'u_tileBorderWidth',
+ )
// 创建缓冲区
this.createBuffers()
@@ -188,14 +218,27 @@ export class WebGLImageViewerEngine {
}
private handleWorkerImageLoaded(payload: any) {
- this.emitLoadingStateChange(true, LoadingState.TEXTURE_LOADING)
const { imageBitmap } = payload
try {
this.image = imageBitmap
- this.createTexture(imageBitmap)
- // imageBitmap.close()
- this.updatePositionBuffer()
+
+ const shouldUseTiles = this.shouldUseTiles(imageBitmap)
+ let usingTiles = false
+
+ if (shouldUseTiles) {
+ this.emitLoadingStateChange(true, LoadingState.TILE_LOADING)
+ usingTiles = this.createTiles(imageBitmap)
+ }
+
+ if (!usingTiles) {
+ this.emitLoadingStateChange(true, LoadingState.TEXTURE_LOADING)
+ this.createTexture(imageBitmap)
+ } else {
+ this.updatePositionBuffer()
+ }
+
+ this.useTiles = usingTiles
if (this.config.centerOnInit) {
this.centerImage()
@@ -343,6 +386,10 @@ export class WebGLImageViewerEngine {
): WebGLTexture | null {
const { gl } = this
+ // 清理瓦片数据
+ this.cleanupTiles()
+ this.useTiles = false
+
// 清理旧纹理
if (this.texture) {
gl.deleteTexture(this.texture)
@@ -417,7 +464,190 @@ export class WebGLImageViewerEngine {
return this.texture
}
- private resize(): void {
+ private cleanupTiles(): void {
+ if (!this.tiles.length) return
+
+ const { gl } = this
+ for (const tile of this.tiles) {
+ if (tile.texture) {
+ gl.deleteTexture(tile.texture)
+ }
+ }
+
+ this.tiles = []
+ }
+
+ private shouldUseTiles(
+ source: { width: number; height: number } | null,
+ ): boolean {
+ if (!source) return false
+
+ const maxTextureSize = getMaxTextureSize(this.gl)
+ if (source.width > maxTextureSize || source.height > maxTextureSize) {
+ return true
+ }
+
+ if (!this.config.tileEnabled) return false
+
+ return (
+ source.width > this.config.tileSize || source.height > this.config.tileSize
+ )
+ }
+
+ private createTiles(
+ imageSource: HTMLCanvasElement | HTMLImageElement | ImageBitmap,
+ ): boolean {
+ const { gl } = this
+
+ // 清理旧资源
+ if (this.texture) {
+ gl.deleteTexture(this.texture)
+ this.texture = null
+ }
+ this.cleanupTiles()
+
+ const maxTextureSize = getMaxTextureSize(gl)
+ const baseTileSize = Math.max(
+ 1,
+ Math.min(this.config.tileSize, maxTextureSize),
+ )
+
+ const width =
+ (imageSource as HTMLCanvasElement).width ??
+ (imageSource as HTMLImageElement).width ??
+ (imageSource as ImageBitmap).width
+ const height =
+ (imageSource as HTMLCanvasElement).height ??
+ (imageSource as HTMLImageElement).height ??
+ (imageSource as ImageBitmap).height
+
+ if (!width || !height) {
+ return false
+ }
+
+ const columns = Math.ceil(width / baseTileSize)
+ const rows = Math.ceil(height / baseTileSize)
+ const offscreen = document.createElement('canvas')
+ const tiles: Tile[] = []
+ const disposeTiles = () => {
+ for (const tile of tiles) {
+ if (tile.texture) {
+ gl.deleteTexture(tile.texture)
+ }
+ }
+ }
+
+ try {
+ for (let row = 0; row < rows; row++) {
+ for (let col = 0; col < columns; col++) {
+ const startX = col * baseTileSize
+ const startY = row * baseTileSize
+ const tileWidth = Math.min(baseTileSize, width - startX)
+ const tileHeight = Math.min(baseTileSize, height - startY)
+
+ if (tileWidth <= 0 || tileHeight <= 0) continue
+
+ offscreen.width = tileWidth
+ offscreen.height = tileHeight
+ const ctx = offscreen.getContext('2d')
+ if (!ctx) {
+ console.warn(
+ 'Failed to acquire 2D context for tile rendering, falling back to single texture.',
+ )
+ disposeTiles()
+ this.cleanupTiles()
+ return false
+ }
+
+ ctx.clearRect(0, 0, tileWidth, tileHeight)
+ ctx.drawImage(
+ imageSource as CanvasImageSource,
+ startX,
+ startY,
+ tileWidth,
+ tileHeight,
+ 0,
+ 0,
+ tileWidth,
+ tileHeight,
+ )
+
+ const texture = gl.createTexture()
+ if (!texture) {
+ console.warn(
+ 'Failed to create tile texture, falling back to single texture rendering.',
+ )
+ disposeTiles()
+ this.cleanupTiles()
+ return false
+ }
+
+ gl.bindTexture(gl.TEXTURE_2D, texture)
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE)
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
+ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
+ gl.texImage2D(
+ gl.TEXTURE_2D,
+ 0,
+ gl.RGBA,
+ gl.RGBA,
+ gl.UNSIGNED_BYTE,
+ offscreen,
+ )
+
+ tiles.push({
+ x: startX,
+ y: startY,
+ width: tileWidth,
+ height: tileHeight,
+ texture,
+ })
+ }
+ }
+ } catch (error) {
+ console.warn('Failed to create tiles, falling back to single texture.', error)
+ disposeTiles()
+ this.cleanupTiles()
+ return false
+ } finally {
+ gl.bindTexture(gl.TEXTURE_2D, null)
+ }
+
+ this.tiles = tiles
+ this.useTiles = this.tiles.length > 0
+
+ return this.useTiles
+ }
+
+ private getVisibleTiles(): Tile[] {
+ if (!this.useTiles || !this.tiles.length) {
+ return []
+ }
+
+ const scale = this.transform.scale
+ if (!isFinite(scale) || scale <= 0) {
+ return this.tiles
+ }
+
+ const viewLeft = (-this.transform.translateX) / scale
+ const viewTop = (-this.transform.translateY) / scale
+ const viewRight = (this.canvas.width - this.transform.translateX) / scale
+ const viewBottom = (this.canvas.height - this.transform.translateY) / scale
+
+ return this.tiles.filter((tile) => {
+ const tileRight = tile.x + tile.width
+ const tileBottom = tile.y + tile.height
+ return (
+ tileRight >= viewLeft &&
+ tile.x <= viewRight &&
+ tileBottom >= viewTop &&
+ tile.y <= viewBottom
+ )
+ })
+ }
+
+ public resize(): void {
const rect = this.canvas.getBoundingClientRect()
const dpr = window.devicePixelRatio || 1
@@ -431,8 +661,22 @@ export class WebGLImageViewerEngine {
this.gl.viewport(0, 0, this.canvas.width, this.canvas.height)
+ if (this.image) {
+ const prevTranslateX = this.transform.translateX
+ const prevTranslateY = this.transform.translateY
+
+ this.constrainToBounds()
+
+ if (
+ prevTranslateX !== this.transform.translateX ||
+ prevTranslateY !== this.transform.translateY
+ ) {
+ this.emitTransformChange()
+ }
+ }
+
// 只有在图像已加载时才渲染
- if (this.image && this.texture) {
+ if (this.image && (this.texture || this.useTiles)) {
this.throttledRender()
}
}
@@ -531,35 +775,26 @@ export class WebGLImageViewerEngine {
}
private render(): void {
- if (!this.program || !this.texture) return
+ if (!this.program) return
+ if (!this.texture && !this.useTiles) return
+ if (this.useTiles && !this.tiles.length) return
const { gl } = this
try {
- // 检查 WebGL 上下文是否仍然有效
if (gl.isContextLost()) {
console.warn('WebGL context is lost, skipping render')
return
}
- // 更新动画
this.updateAnimation()
- // 清除画布
gl.clear(gl.COLOR_BUFFER_BIT)
-
- // 使用着色器程序
gl.useProgram(this.program)
- // 设置统一变量
- gl.uniform2f(
- this.resolutionLocation,
- this.canvas.width,
- this.canvas.height,
- )
+ gl.uniform2f(this.resolutionLocation, this.canvas.width, this.canvas.height)
gl.uniform1i(this.imageLocation, 0)
- // 设置变换矩阵
const matrix = createTransformMatrix(
this.transform.scale,
this.transform.translateX,
@@ -567,24 +802,90 @@ export class WebGLImageViewerEngine {
)
gl.uniformMatrix3fv(this.matrixLocation, false, matrix)
- // 绑定纹理
- gl.activeTexture(gl.TEXTURE0)
- gl.bindTexture(gl.TEXTURE_2D, this.texture)
+ if (!this.positionBuffer || !this.texCoordBuffer) {
+ return
+ }
- // 设置位置属性
- gl.bindBuffer(gl.ARRAY_BUFFER, this.positionBuffer)
- gl.enableVertexAttribArray(this.positionLocation)
- gl.vertexAttribPointer(this.positionLocation, 2, gl.FLOAT, false, 0, 0)
+ const showDebugBorder =
+ !!this.config.debug && (!!this.texture || this.useTiles)
- // 设置纹理坐标属性
+ if (this.tileDebugLocation) {
+ gl.uniform1i(this.tileDebugLocation, showDebugBorder ? 1 : 0)
+ }
+
+ if (this.tileBorderColorLocation) {
+ const [r, g, b, a] = TILE_DEBUG_BORDER_COLOR
+ gl.uniform4f(this.tileBorderColorLocation, r, g, b, a)
+ }
+
+ if (!showDebugBorder && this.tileBorderWidthLocation) {
+ gl.uniform2f(this.tileBorderWidthLocation, 0, 0)
+ }
+
+ const borderWidthLocation = this.tileBorderWidthLocation
+
+ // 设置纹理坐标属性(瓦片和整体纹理共用)
gl.bindBuffer(gl.ARRAY_BUFFER, this.texCoordBuffer)
gl.enableVertexAttribArray(this.texCoordLocation)
gl.vertexAttribPointer(this.texCoordLocation, 2, gl.FLOAT, false, 0, 0)
- // 绘制
- gl.drawArrays(gl.TRIANGLES, 0, 6)
+ // 设置位置属性缓冲
+ gl.bindBuffer(gl.ARRAY_BUFFER, this.positionBuffer)
+ gl.enableVertexAttribArray(this.positionLocation)
+ gl.vertexAttribPointer(this.positionLocation, 2, gl.FLOAT, false, 0, 0)
+
+ gl.activeTexture(gl.TEXTURE0)
+
+ if (this.useTiles) {
+ const visibleTiles = this.getVisibleTiles()
+ for (const tile of visibleTiles) {
+ if (!tile.texture) continue
+
+ if (showDebugBorder && borderWidthLocation) {
+ const tileWidth = Math.max(tile.width, 1)
+ const tileHeight = Math.max(tile.height, 1)
+ gl.uniform2f(
+ borderWidthLocation,
+ TILE_DEBUG_BORDER_PX / tileWidth,
+ TILE_DEBUG_BORDER_PX / tileHeight,
+ )
+ }
+
+ const positions = new Float32Array([
+ tile.x,
+ tile.y,
+ tile.x + tile.width,
+ tile.y,
+ tile.x,
+ tile.y + tile.height,
+ tile.x,
+ tile.y + tile.height,
+ tile.x + tile.width,
+ tile.y,
+ tile.x + tile.width,
+ tile.y + tile.height,
+ ])
+
+ gl.bindBuffer(gl.ARRAY_BUFFER, this.positionBuffer)
+ gl.bufferData(gl.ARRAY_BUFFER, positions, gl.DYNAMIC_DRAW)
+ gl.bindTexture(gl.TEXTURE_2D, tile.texture)
+ gl.drawArrays(gl.TRIANGLES, 0, 6)
+ }
+ } else {
+ if (showDebugBorder && borderWidthLocation && this.image) {
+ const imageWidth = Math.max(this.image.width, 1)
+ const imageHeight = Math.max(this.image.height, 1)
+ gl.uniform2f(
+ borderWidthLocation,
+ TILE_DEBUG_BORDER_PX / imageWidth,
+ TILE_DEBUG_BORDER_PX / imageHeight,
+ )
+ }
+
+ gl.bindTexture(gl.TEXTURE_2D, this.texture)
+ gl.drawArrays(gl.TRIANGLES, 0, 6)
+ }
- // 检查 WebGL 错误
const error = gl.getError()
if (error !== gl.NO_ERROR) {
console.error('WebGL rendering error:', error)
@@ -947,8 +1248,23 @@ export class WebGLImageViewerEngine {
// 如果有图像,重新加载
if (this.image) {
- this.createTexture(this.image)
- this.updatePositionBuffer()
+ let usingTiles = this.useTiles
+
+ if (usingTiles) {
+ const recreated = this.createTiles(this.image)
+ if (!recreated) {
+ this.createTexture(this.image)
+ usingTiles = false
+ }
+ } else {
+ this.createTexture(this.image)
+ }
+
+ this.useTiles = usingTiles && this.tiles.length > 0
+
+ if (this.useTiles) {
+ this.updatePositionBuffer()
+ }
this.render()
}
} catch (error) {
@@ -1097,6 +1413,12 @@ export class WebGLImageViewerEngine {
public getDebugInfo(): DebugInfo | null {
if (!this.image) return null
+ const visibleTiles = this.useTiles ? this.getVisibleTiles() : []
+ const imageSrc =
+ 'src' in this.image && typeof this.image.src === 'string'
+ ? this.image.src
+ : ''
+
return {
scale: this.transform.scale,
relativeScale: this.transform.scale / this.initialScale,
@@ -1111,7 +1433,12 @@ export class WebGLImageViewerEngine {
isLoading: this.isLoadingTexture,
loadingState: this.currentLoadingState,
currentQuality: this.currentQuality,
- imageSrc: this.image.src || '',
+ imageSrc,
+ tileEnabled: this.config.tileEnabled,
+ useTiles: this.useTiles,
+ totalTiles: this.tiles.length,
+ visibleTiles: visibleTiles.length,
+ tileSize: this.config.tileSize,
}
}
@@ -1146,7 +1473,7 @@ export class WebGLImageViewerEngine {
canvas.width = this.image.width
canvas.height = this.image.height
- ctx.drawImage(this.image, 0, 0)
+ ctx.drawImage(this.image as CanvasImageSource, 0, 0)
// 转换为 blob
const blob = await new Promise<Blob | null>((resolve) => {
@@ -1182,6 +1509,8 @@ export class WebGLImageViewerEngine {
gl.deleteTexture(this.texture)
this.texture = null
}
+ this.cleanupTiles()
+ this.useTiles = false
if (this.positionBuffer) {
gl.deleteBuffer(this.positionBuffer)
this.positionBuffer = null
diff --git a/packages/webgl-image/src/shaders.ts b/packages/webgl-image/src/shaders.ts
index e52ea74c..8931c5ff 100644
--- a/packages/webgl-image/src/shaders.ts
+++ b/packages/webgl-image/src/shaders.ts
@@ -37,11 +37,25 @@ export const FRAGMENT_SHADER_SOURCE = `
precision mediump float;
uniform sampler2D u_image;
+ uniform bool u_debugTiles;
+ uniform vec4 u_tileBorderColor;
+ uniform vec2 u_tileBorderWidth;
varying vec2 v_texCoord;
void main() {
- gl_FragColor = texture2D(u_image, v_texCoord);
+ vec4 color = texture2D(u_image, v_texCoord);
+
+ if (u_debugTiles) {
+ float left = 1.0 - step(u_tileBorderWidth.x, v_texCoord.x);
+ float right = 1.0 - step(u_tileBorderWidth.x, 1.0 - v_texCoord.x);
+ float top = 1.0 - step(u_tileBorderWidth.y, v_texCoord.y);
+ float bottom = 1.0 - step(u_tileBorderWidth.y, 1.0 - v_texCoord.y);
+ float border = clamp(max(max(left, right), max(top, bottom)), 0.0, 1.0);
+ color = mix(color, u_tileBorderColor, border);
+ }
+
+ gl_FragColor = color;
}
`
diff --git a/packages/webgl-image/src/types/index.ts b/packages/webgl-image/src/types/index.ts
index 247057dd..c9bd5042 100644
--- a/packages/webgl-image/src/types/index.ts
+++ b/packages/webgl-image/src/types/index.ts
@@ -54,6 +54,13 @@ export interface WebGLImageViewerProps {
duration: number
easing: (t: number) => number
}
+ /** Tile rendering configuration */
+ tile?: {
+ /** Enable tile rendering */
+ enabled?: boolean
+ /** Tile size in pixels */
+ size?: number
+ }
}
export interface WebGLImageViewerEmits {
@@ -116,6 +123,11 @@ export interface DebugInfo {
loadingState: LoadingState
currentQuality: 'high' | 'medium' | 'low' | 'unknown'
imageSrc: string
+ tileEnabled: boolean
+ useTiles: boolean
+ totalTiles: number
+ visibleTiles: number
+ tileSize: number
}
export interface TouchState {
@@ -151,6 +163,8 @@ export interface EngineConfig {
debug: boolean
limitToBounds?: boolean
smooth?: boolean
+ tileEnabled: boolean
+ tileSize: number
alignmentAnimation?: {
duration: number
easing: (t: number) => number
diff --git a/packages/webgl-image/tsconfig.json b/packages/webgl-image/tsconfig.json
index 6c740c49..fcdc4fe4 100644
--- a/packages/webgl-image/tsconfig.json
+++ b/packages/webgl-image/tsconfig.json
@@ -21,6 +21,7 @@
"declaration": true,
"declarationMap": true,
"sourceMap": true,
+ "ignoreDeprecations": "6.0",
"baseUrl": ".",
"paths": {
"@/*": [