Loading index.html +19 −2 Changes for index.html: 19 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -11,7 +11,7 @@ </script> </head> <body v-scope> <div class="body-content"> <div class="body-content" :style="{cursor: cursor}"> <h1 class="title" title="Image Viewer with Online Interactive Relighting">IVOIRe</h1> <header class="navbar" v-cloak> Loading Loading @@ -91,13 +91,30 @@ <input type="range" name="ambiant" id="input-ambiant" min="0" max="1" value="0" step=".01"/> </div> <span v-show="phase === 'render'"> <button class="btn-dark btn-icon" id="button-reset-controls" v-icon="reset" @click="fn.resetControls"></button> <button class="btn-dark btn-icon" id="button-reset-controls" v-icon="reset" @click="fn.resetControls"></button> <label for="button-reset-controls" v-t="controls.reset"></label> </span> <span v-show="phase === 'render'"> <button id="button-export" class="btn-dark btn-icon" @click="fn.setExportMode" v-icon="export"></button> <label for="button-export" v-t="export.button"></label> </span> <div class="export-panel" v-show="phase === 'export'"> <span>X: </span> <span>{{ Math.round(exportParams.offset[0]) }}</span> <span>Y: </span> <span>{{ Math.round(exportParams.offset[1]) }}</span> <span>Width: </span> <span>{{ Math.round(exportParams.size[0]) }}</span> <span>Height: </span> <span>{{ Math.round(exportParams.size[1]) }}</span> <span>Reset</span> <button v-icon="zoom-fit" @click="fn.setExportParams()"></button> <span>Reset to view</span> <button v-icon="zoom-fit" @click="fn.setExportParams('view')"></button> <span>Reset to full</span> <button v-icon="zoom-fit" @click="fn.setExportParams('full')"></button> </div> <div class="description-container"> <div v-if="description"> <h3 v-t="controls.description"></h3> Loading src/app.ts +55 −51 Changes for src/app.ts: 55 added lines, 51 removed lines. Original line number Diff line number Diff line import { ExportRectProgram, LightballProgram, RelightProgram, RenderData, resizeCanvasToDisplaySize, ExportRectProgram, WebGLCanvasRenderingContext, SHADER_UPDATE_EVENT, shaderUpdateNotify, WebGLCanvasRenderingContext } from './gl-program.ts'; import { ControlUpdateEvent, getStateDefaults, LIGHT_ANGLE_DEFAULTS, State } from './control.ts'; import { arraysEq, catchError, clamp, DEBUG, exportValues, getLightSourceVec, matToString, roundTo, VERBOSE, VERBOSE } from './utils.ts'; import { DownloadManager } from './download.ts'; import { Dataset, MemoryDataset, SingleDataset, TiledDataset } from './dataset.ts'; Loading Loading @@ -203,6 +204,7 @@ export class App { this.exportImage, this.onExportDialogClose, this.downloadExportImage, this.setExportParams, ] as Array<(..._: any[]) => any> ) .map((m) => [m.name, m.bind(this)] as const) Loading @@ -215,6 +217,7 @@ export class App { server: new Array<{ id: string; name: LocString }>(), memory: new Array<{ id: string; name: LocString }>(), }, cursor: null as string | null, datasetsDisabled: false, dataset: '', requestFullscreen: null as (() => void) | null, Loading @@ -225,6 +228,7 @@ export class App { description: null as LocString | null, output: null as string | null, exportParams: App.DEFAULT_EXPORT_PARAMS, pointerState: this.state.pointerState, raw: () => rx, // Function to un-proxify the rx object }; return rx as Omit<typeof rx, 'raw'> & { raw: () => typeof rx }; Loading Loading @@ -704,6 +708,7 @@ export class App { zoom: 1, }; } else throw new Error(`Unknown argument from = ${from}`); this.requestRender(); } private exportImage() { Loading Loading @@ -783,62 +788,58 @@ export class App { * @param x horizontal coordinate of the quadrant * @param y vertical coordinate of the quadrant * @param value position to set the given quadrant to * @param keepRatio whether aspect ratio should be kept unmodified by the operation // * @param keepRatio whether aspect ratio should be kept unmodified by the operation */ private setExportWindowQuadrant([x, y]: [0 | 1 | 2, 0 | 1 | 2], value: vec2, keepRatio = false) { const params = this.rx.exportParams; const prev = structuredClone(this.rx.raw().exportParams); const curVal = this.getExportWindowQuadrant([x, y]); const diff = vec2.sub([0, 0], value, curVal); if (x === 1 && y === 1) { private setExportWindowQuadrant([qx, qy]: [0 | 1 | 2, 0 | 1 | 2], value: vec2) { if (!this.source) return; const curVal = this.getExportWindowQuadrant([qx, qy]); const diff = vec2.sub(curVal, value, curVal), xy = this.rx.exportParams.offset, wh = this.rx.exportParams.size, total = this.source.totalSize; if (qx === 1 && qy === 1) { // Center params.offset[0] += diff[0]; params.offset[1] += diff[1]; } else if (x === 1) { const nh = params.size[1] + diff[1] * (y - 1); if (y === 0) { params.offset[1] += diff[1]; // Bottom } if (keepRatio){ const nw = (params.size[0] * nh) / params.size[1] params.offset[0] += (params.size[0] - nw) / 2; params.size[0] = nw; } params.size[1] = nh; } else if (y === 1) { const nw = params.size[0] + diff[0] * (x - 1); if (x === 0) { params.offset[0] += diff[0]; // Left } if (keepRatio){ const nh = (params.size[1] * nw) / params.size[0]; params.offset[1] += (params.size[1] - nh) / 2; params.size[1] = nh; } params.size[0] = nw; this.rx.exportParams.offset = [ clamp(Math.round(xy[0] + diff[0]), 0, total[0] - wh[0]), clamp(Math.round(xy[1] + diff[1]), 0, total[1] - wh[1])]; return; } // Switch from offset/size to start/end coordinates let xyMin = [xy[0], xy[1]] as [number, number], xyMax = [xy[0] + wh[0], xy[1] + wh[1]] as [number, number]; if (qx === 1 || qy === 1) { // Middle column or row const ax = qy === 1 ? 0 : 1; if (qx === 0 || qy === 0) { // Left or bottom xyMin[ax] = clamp(Math.round(xyMin[ax] + diff[ax]), 0, xyMax[ax] - 1); } else { // Right or top xyMax[ax] = clamp(Math.round(xyMax[ax] + diff[ax]), xyMin[ax] + 1, total[ax]); } } else { // Corner params.size[0] += diff[0] * (x - 1); params.size[1] += diff[1] * (y - 1); if (x === 0) params.offset[0] += diff[0]; if (y === 0) params.offset[1] += diff[1]; } console.debug( `setExportWindowQuadrant(${[x, y]}, ${[roundTo(value)]}): cur:\t ${roundTo(curVal, 0).join(' : ')} new:\t ${roundTo(value, 0).join(' : ')} dif:\t ${roundTo(diff, 0).join(' : ')} pre:\t offset=${roundTo(prev.offset, 0)}, size=${roundTo(prev.size, 0)} par:\t offset=${roundTo(this.rx.exportParams.offset, 0)}, size=${roundTo(this.rx.exportParams.size, 0)}`, ); for (const ax of [0, 1] as const) { if ([qx, qy][ax] === 0) { // Left or bottom xyMin[ax] = clamp(Math.round(xyMin[ax] + diff[ax]), 0, xyMax[ax] - 1); } else { // Right or top xyMax[ax] = clamp(Math.round(xyMax[ax] + diff[ax]), xyMin[ax] + 1, total[ax]); } } } this.rx.exportParams.offset = xyMin; this.rx.exportParams.size = [xyMax[0] - xyMin[0], xyMax[1] - xyMin[1]]; } private getQuadrantCursor(xy: [0 | 1 | 2, 0 | 1 | 2] | null): string | null { return xy && [ ['sw-resize', 'w-resize', 'nw-resize'], ['s-resize', 'move', 'n-resize'], ['se-resize', 'e-resize', 'ne-resize'], ][xy[0]][xy[1]]; } private bindPointerEvents() { const onPointerEvent = (ev: PointerEvent | WheelEvent) => { const viewport = this.state.viewport!; const pointerState = this.state.pointerState; const pointerState = this.rx.pointerState; if (!this.source) return; let lightball = pointerState.dragging Loading Loading @@ -914,6 +915,7 @@ export class App { pointerState.overLightball = lightball; pointerState.origin = texPos; pointerState.exportWindowHover = exportWindowPart(texPos); this.rx.cursor = this.getQuadrantCursor(pointerState.exportWindowHover); if (pointerState.exportWindowHover) { vec2.sub( pointerState.origin, Loading @@ -921,7 +923,6 @@ export class App { this.getExportWindowQuadrant(pointerState.exportWindowHover), ); } console.log(structuredClone(pointerState)); doUpdate(); window.addEventListener('wheel', onPointerEvent, { passive: false }); } Loading @@ -930,6 +931,8 @@ export class App { doUpdate(); pointerState.overLightball = lightball; pointerState.dragging = false; pointerState.exportWindowHover = exportWindowPart(viewport.screenToTexture(evpos)); this.rx.cursor = this.getQuadrantCursor(pointerState.exportWindowHover); canvas.setPointerCapture(ev.pointerId); window.removeEventListener('wheel', onPointerEvent); } else if (ev instanceof PointerEvent && ev.type === 'pointermove') Loading @@ -940,6 +943,7 @@ export class App { const windowPart = exportWindowPart(viewport.screenToTexture(evpos)); if (!arraysEq(windowPart, pointerState.exportWindowHover)) { pointerState.exportWindowHover = windowPart; this.rx.cursor = this.getQuadrantCursor(windowPart); this.requestRender(); } if (lightball !== pointerState.overLightball) { Loading src/shaders/exportRect.frag +5 −1 Changes for src/shaders/exportRect.frag: 5 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -16,17 +16,21 @@ float rectDist(vec2 pos, vec4 rect) { void main(void) { float dist = rectDist(vVertexCoord, uExportRect); bool inRender = bool(rectDist(vVertexCoord, uRenderRect) <= 0.); if (dist < 0.) { vec4 windowPart = vec4(uExportRect.xy + vec2(uWindowPartHover.xy) * uExportRect.zw / 3., uExportRect.zw / 3.); if (uWindowPartHover.z != 0 && rectDist(vVertexCoord, windowPart) <= 0.) { // Export window quadrant hover gl_FragColor = vec4(0., 0., 0., float(uWindowPartHover.z) * .2); } else { discard; // Inside export rectangle } } else if (dist <= uLineWidth * 4.) { gl_FragColor = uColor; } else if (rectDist(vVertexCoord, uRenderRect) <= 0.) { if (!inRender) // Full opacity outside of render area gl_FragColor.a = 1.; } else if (inRender) { // In render area, outside of export window gl_FragColor = vec4(0., 0., 0., mod((vVertexCoord.x + vVertexCoord.y) / (uLineWidth * 8.), 2.) > 1. ? .2 : .1); } else { Loading src/style.sass +4 −0 Changes for src/style.sass: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -141,6 +141,10 @@ body right: 0 top: 0 .export-panel display: grid grid-template-columns: 1fr 1fr .title margin-bottom: 40px Loading src/utils.ts +13 −0 Changes for src/utils.ts: 13 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -118,6 +118,19 @@ export interface WebGLSizedTexture extends WebGLTexture { }; } export function clamp(val: number, min: number, max: number): number; export function clamp(val: number[], min: number[], max: number[]): number[]; export function clamp(val: number | number[], min: number | number[], max: number | number[]): number | number[] { if (typeof val === 'number') { return Math.max(min as number, Math.min(max as number , val)); } else { const minArr = min as number[], maxArr = max as number[]; if (val.length !== minArr.length || val.length !== maxArr.length) throw new Error("clamp() requires all arrays to be equally sized"); return val.map((v, i) => clamp(v, minArr[i], maxArr[i])) as number[]; } } export function loadTexture( gl: WebGLRenderingContext, img: ImageBitmap | OffscreenCanvas | Uint8Array, Loading Loading
index.html +19 −2 Changes for index.html: 19 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -11,7 +11,7 @@ </script> </head> <body v-scope> <div class="body-content"> <div class="body-content" :style="{cursor: cursor}"> <h1 class="title" title="Image Viewer with Online Interactive Relighting">IVOIRe</h1> <header class="navbar" v-cloak> Loading Loading @@ -91,13 +91,30 @@ <input type="range" name="ambiant" id="input-ambiant" min="0" max="1" value="0" step=".01"/> </div> <span v-show="phase === 'render'"> <button class="btn-dark btn-icon" id="button-reset-controls" v-icon="reset" @click="fn.resetControls"></button> <button class="btn-dark btn-icon" id="button-reset-controls" v-icon="reset" @click="fn.resetControls"></button> <label for="button-reset-controls" v-t="controls.reset"></label> </span> <span v-show="phase === 'render'"> <button id="button-export" class="btn-dark btn-icon" @click="fn.setExportMode" v-icon="export"></button> <label for="button-export" v-t="export.button"></label> </span> <div class="export-panel" v-show="phase === 'export'"> <span>X: </span> <span>{{ Math.round(exportParams.offset[0]) }}</span> <span>Y: </span> <span>{{ Math.round(exportParams.offset[1]) }}</span> <span>Width: </span> <span>{{ Math.round(exportParams.size[0]) }}</span> <span>Height: </span> <span>{{ Math.round(exportParams.size[1]) }}</span> <span>Reset</span> <button v-icon="zoom-fit" @click="fn.setExportParams()"></button> <span>Reset to view</span> <button v-icon="zoom-fit" @click="fn.setExportParams('view')"></button> <span>Reset to full</span> <button v-icon="zoom-fit" @click="fn.setExportParams('full')"></button> </div> <div class="description-container"> <div v-if="description"> <h3 v-t="controls.description"></h3> Loading
src/app.ts +55 −51 Changes for src/app.ts: 55 added lines, 51 removed lines. Original line number Diff line number Diff line import { ExportRectProgram, LightballProgram, RelightProgram, RenderData, resizeCanvasToDisplaySize, ExportRectProgram, WebGLCanvasRenderingContext, SHADER_UPDATE_EVENT, shaderUpdateNotify, WebGLCanvasRenderingContext } from './gl-program.ts'; import { ControlUpdateEvent, getStateDefaults, LIGHT_ANGLE_DEFAULTS, State } from './control.ts'; import { arraysEq, catchError, clamp, DEBUG, exportValues, getLightSourceVec, matToString, roundTo, VERBOSE, VERBOSE } from './utils.ts'; import { DownloadManager } from './download.ts'; import { Dataset, MemoryDataset, SingleDataset, TiledDataset } from './dataset.ts'; Loading Loading @@ -203,6 +204,7 @@ export class App { this.exportImage, this.onExportDialogClose, this.downloadExportImage, this.setExportParams, ] as Array<(..._: any[]) => any> ) .map((m) => [m.name, m.bind(this)] as const) Loading @@ -215,6 +217,7 @@ export class App { server: new Array<{ id: string; name: LocString }>(), memory: new Array<{ id: string; name: LocString }>(), }, cursor: null as string | null, datasetsDisabled: false, dataset: '', requestFullscreen: null as (() => void) | null, Loading @@ -225,6 +228,7 @@ export class App { description: null as LocString | null, output: null as string | null, exportParams: App.DEFAULT_EXPORT_PARAMS, pointerState: this.state.pointerState, raw: () => rx, // Function to un-proxify the rx object }; return rx as Omit<typeof rx, 'raw'> & { raw: () => typeof rx }; Loading Loading @@ -704,6 +708,7 @@ export class App { zoom: 1, }; } else throw new Error(`Unknown argument from = ${from}`); this.requestRender(); } private exportImage() { Loading Loading @@ -783,62 +788,58 @@ export class App { * @param x horizontal coordinate of the quadrant * @param y vertical coordinate of the quadrant * @param value position to set the given quadrant to * @param keepRatio whether aspect ratio should be kept unmodified by the operation // * @param keepRatio whether aspect ratio should be kept unmodified by the operation */ private setExportWindowQuadrant([x, y]: [0 | 1 | 2, 0 | 1 | 2], value: vec2, keepRatio = false) { const params = this.rx.exportParams; const prev = structuredClone(this.rx.raw().exportParams); const curVal = this.getExportWindowQuadrant([x, y]); const diff = vec2.sub([0, 0], value, curVal); if (x === 1 && y === 1) { private setExportWindowQuadrant([qx, qy]: [0 | 1 | 2, 0 | 1 | 2], value: vec2) { if (!this.source) return; const curVal = this.getExportWindowQuadrant([qx, qy]); const diff = vec2.sub(curVal, value, curVal), xy = this.rx.exportParams.offset, wh = this.rx.exportParams.size, total = this.source.totalSize; if (qx === 1 && qy === 1) { // Center params.offset[0] += diff[0]; params.offset[1] += diff[1]; } else if (x === 1) { const nh = params.size[1] + diff[1] * (y - 1); if (y === 0) { params.offset[1] += diff[1]; // Bottom } if (keepRatio){ const nw = (params.size[0] * nh) / params.size[1] params.offset[0] += (params.size[0] - nw) / 2; params.size[0] = nw; } params.size[1] = nh; } else if (y === 1) { const nw = params.size[0] + diff[0] * (x - 1); if (x === 0) { params.offset[0] += diff[0]; // Left } if (keepRatio){ const nh = (params.size[1] * nw) / params.size[0]; params.offset[1] += (params.size[1] - nh) / 2; params.size[1] = nh; } params.size[0] = nw; this.rx.exportParams.offset = [ clamp(Math.round(xy[0] + diff[0]), 0, total[0] - wh[0]), clamp(Math.round(xy[1] + diff[1]), 0, total[1] - wh[1])]; return; } // Switch from offset/size to start/end coordinates let xyMin = [xy[0], xy[1]] as [number, number], xyMax = [xy[0] + wh[0], xy[1] + wh[1]] as [number, number]; if (qx === 1 || qy === 1) { // Middle column or row const ax = qy === 1 ? 0 : 1; if (qx === 0 || qy === 0) { // Left or bottom xyMin[ax] = clamp(Math.round(xyMin[ax] + diff[ax]), 0, xyMax[ax] - 1); } else { // Right or top xyMax[ax] = clamp(Math.round(xyMax[ax] + diff[ax]), xyMin[ax] + 1, total[ax]); } } else { // Corner params.size[0] += diff[0] * (x - 1); params.size[1] += diff[1] * (y - 1); if (x === 0) params.offset[0] += diff[0]; if (y === 0) params.offset[1] += diff[1]; } console.debug( `setExportWindowQuadrant(${[x, y]}, ${[roundTo(value)]}): cur:\t ${roundTo(curVal, 0).join(' : ')} new:\t ${roundTo(value, 0).join(' : ')} dif:\t ${roundTo(diff, 0).join(' : ')} pre:\t offset=${roundTo(prev.offset, 0)}, size=${roundTo(prev.size, 0)} par:\t offset=${roundTo(this.rx.exportParams.offset, 0)}, size=${roundTo(this.rx.exportParams.size, 0)}`, ); for (const ax of [0, 1] as const) { if ([qx, qy][ax] === 0) { // Left or bottom xyMin[ax] = clamp(Math.round(xyMin[ax] + diff[ax]), 0, xyMax[ax] - 1); } else { // Right or top xyMax[ax] = clamp(Math.round(xyMax[ax] + diff[ax]), xyMin[ax] + 1, total[ax]); } } } this.rx.exportParams.offset = xyMin; this.rx.exportParams.size = [xyMax[0] - xyMin[0], xyMax[1] - xyMin[1]]; } private getQuadrantCursor(xy: [0 | 1 | 2, 0 | 1 | 2] | null): string | null { return xy && [ ['sw-resize', 'w-resize', 'nw-resize'], ['s-resize', 'move', 'n-resize'], ['se-resize', 'e-resize', 'ne-resize'], ][xy[0]][xy[1]]; } private bindPointerEvents() { const onPointerEvent = (ev: PointerEvent | WheelEvent) => { const viewport = this.state.viewport!; const pointerState = this.state.pointerState; const pointerState = this.rx.pointerState; if (!this.source) return; let lightball = pointerState.dragging Loading Loading @@ -914,6 +915,7 @@ export class App { pointerState.overLightball = lightball; pointerState.origin = texPos; pointerState.exportWindowHover = exportWindowPart(texPos); this.rx.cursor = this.getQuadrantCursor(pointerState.exportWindowHover); if (pointerState.exportWindowHover) { vec2.sub( pointerState.origin, Loading @@ -921,7 +923,6 @@ export class App { this.getExportWindowQuadrant(pointerState.exportWindowHover), ); } console.log(structuredClone(pointerState)); doUpdate(); window.addEventListener('wheel', onPointerEvent, { passive: false }); } Loading @@ -930,6 +931,8 @@ export class App { doUpdate(); pointerState.overLightball = lightball; pointerState.dragging = false; pointerState.exportWindowHover = exportWindowPart(viewport.screenToTexture(evpos)); this.rx.cursor = this.getQuadrantCursor(pointerState.exportWindowHover); canvas.setPointerCapture(ev.pointerId); window.removeEventListener('wheel', onPointerEvent); } else if (ev instanceof PointerEvent && ev.type === 'pointermove') Loading @@ -940,6 +943,7 @@ export class App { const windowPart = exportWindowPart(viewport.screenToTexture(evpos)); if (!arraysEq(windowPart, pointerState.exportWindowHover)) { pointerState.exportWindowHover = windowPart; this.rx.cursor = this.getQuadrantCursor(windowPart); this.requestRender(); } if (lightball !== pointerState.overLightball) { Loading
src/shaders/exportRect.frag +5 −1 Changes for src/shaders/exportRect.frag: 5 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -16,17 +16,21 @@ float rectDist(vec2 pos, vec4 rect) { void main(void) { float dist = rectDist(vVertexCoord, uExportRect); bool inRender = bool(rectDist(vVertexCoord, uRenderRect) <= 0.); if (dist < 0.) { vec4 windowPart = vec4(uExportRect.xy + vec2(uWindowPartHover.xy) * uExportRect.zw / 3., uExportRect.zw / 3.); if (uWindowPartHover.z != 0 && rectDist(vVertexCoord, windowPart) <= 0.) { // Export window quadrant hover gl_FragColor = vec4(0., 0., 0., float(uWindowPartHover.z) * .2); } else { discard; // Inside export rectangle } } else if (dist <= uLineWidth * 4.) { gl_FragColor = uColor; } else if (rectDist(vVertexCoord, uRenderRect) <= 0.) { if (!inRender) // Full opacity outside of render area gl_FragColor.a = 1.; } else if (inRender) { // In render area, outside of export window gl_FragColor = vec4(0., 0., 0., mod((vVertexCoord.x + vVertexCoord.y) / (uLineWidth * 8.), 2.) > 1. ? .2 : .1); } else { Loading
src/style.sass +4 −0 Changes for src/style.sass: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -141,6 +141,10 @@ body right: 0 top: 0 .export-panel display: grid grid-template-columns: 1fr 1fr .title margin-bottom: 40px Loading
src/utils.ts +13 −0 Changes for src/utils.ts: 13 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -118,6 +118,19 @@ export interface WebGLSizedTexture extends WebGLTexture { }; } export function clamp(val: number, min: number, max: number): number; export function clamp(val: number[], min: number[], max: number[]): number[]; export function clamp(val: number | number[], min: number | number[], max: number | number[]): number | number[] { if (typeof val === 'number') { return Math.max(min as number, Math.min(max as number , val)); } else { const minArr = min as number[], maxArr = max as number[]; if (val.length !== minArr.length || val.length !== maxArr.length) throw new Error("clamp() requires all arrays to be equally sized"); return val.map((v, i) => clamp(v, minArr[i], maxArr[i])) as number[]; } } export function loadTexture( gl: WebGLRenderingContext, img: ImageBitmap | OffscreenCanvas | Uint8Array, Loading