mirror of
https://github.com/openseadragon/openseadragon.git
synced 2024-11-25 06:36:11 +03:00
Working tiledimage-level transparency in a single pass.
This commit is contained in:
parent
174c4c709a
commit
31f9a71109
@ -97,6 +97,11 @@ $.WebGL = class WebGL extends OpenSeadragon.DrawerBase {
|
|||||||
|
|
||||||
const engine = new $.WebGLModule($.extend(this.options, {
|
const engine = new $.WebGLModule($.extend(this.options, {
|
||||||
uniqueId: "openseadragon",
|
uniqueId: "openseadragon",
|
||||||
|
"2.0": {
|
||||||
|
canvasOptions: {
|
||||||
|
stencil: true
|
||||||
|
}
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
engine.addRenderingSpecifications({
|
engine.addRenderingSpecifications({
|
||||||
@ -116,7 +121,7 @@ $.WebGL = class WebGL extends OpenSeadragon.DrawerBase {
|
|||||||
this.renderer = engine;
|
this.renderer = engine;
|
||||||
this.renderer.setDataBlendingEnabled(true);
|
this.renderer.setDataBlendingEnabled(true);
|
||||||
|
|
||||||
// const gl = this.renderer.gl;
|
const gl = this.renderer.gl;
|
||||||
// this._renderToTexture = gl.createTexture();
|
// this._renderToTexture = gl.createTexture();
|
||||||
// gl.activeTexture(gl.TEXTURE0);
|
// gl.activeTexture(gl.TEXTURE0);
|
||||||
// gl.bindTexture(gl.TEXTURE_2D, this._renderToTexture);
|
// gl.bindTexture(gl.TEXTURE_2D, this._renderToTexture);
|
||||||
@ -138,6 +143,10 @@ $.WebGL = class WebGL extends OpenSeadragon.DrawerBase {
|
|||||||
// gl.bindFramebuffer(gl.FRAMEBUFFER, this._glFrameBuffer);
|
// gl.bindFramebuffer(gl.FRAMEBUFFER, this._glFrameBuffer);
|
||||||
// gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this._renderToTexture, 0);
|
// gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this._renderToTexture, 0);
|
||||||
|
|
||||||
|
gl.enable(gl.STENCIL_TEST);
|
||||||
|
gl.stencilMask(0xff);
|
||||||
|
gl.stencilFunc(gl.GREATER, 1, 0xff);
|
||||||
|
gl.stencilOp(gl.KEEP, gl.KEEP, gl.REPLACE);
|
||||||
return engine.canvas;
|
return engine.canvas;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -153,10 +162,11 @@ $.WebGL = class WebGL extends OpenSeadragon.DrawerBase {
|
|||||||
zoom: this.viewport.getZoom(true)
|
zoom: this.viewport.getZoom(true)
|
||||||
};
|
};
|
||||||
|
|
||||||
let flipMultiplier = this.viewport.flipped ? -1 : 1;
|
|
||||||
|
// let flipMultiplier = this.viewport.flipped ? -1 : 1;
|
||||||
// calculate view matrix for viewer
|
// calculate view matrix for viewer
|
||||||
let posMatrix = $.Mat3.makeTranslation(-viewport.center.x, -viewport.center.y);
|
let posMatrix = $.Mat3.makeTranslation(-viewport.center.x, -viewport.center.y);
|
||||||
let scaleMatrix = $.Mat3.makeScaling(2 / viewport.bounds.width * flipMultiplier, -2 / viewport.bounds.height);
|
let scaleMatrix = $.Mat3.makeScaling(2 / viewport.bounds.width, -2 / viewport.bounds.height);
|
||||||
let rotMatrix = $.Mat3.makeRotation(-viewport.rotation);
|
let rotMatrix = $.Mat3.makeRotation(-viewport.rotation);
|
||||||
let viewMatrix = scaleMatrix.multiply(rotMatrix).multiply(posMatrix);
|
let viewMatrix = scaleMatrix.multiply(rotMatrix).multiply(posMatrix);
|
||||||
|
|
||||||
@ -169,6 +179,12 @@ $.WebGL = class WebGL extends OpenSeadragon.DrawerBase {
|
|||||||
for (const tiledImage of tiledImages) {
|
for (const tiledImage of tiledImages) {
|
||||||
let tilesToDraw = tiledImage.getTilesToDraw();
|
let tilesToDraw = tiledImage.getTilesToDraw();
|
||||||
|
|
||||||
|
if (tilesToDraw.length === 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
gl.clear(gl.STENCIL_BUFFER_BIT);
|
||||||
|
|
||||||
let overallMatrix = viewMatrix;
|
let overallMatrix = viewMatrix;
|
||||||
let imageRotation = tiledImage.getRotation(true);
|
let imageRotation = tiledImage.getRotation(true);
|
||||||
// if needed, handle the tiledImage being rotated
|
// if needed, handle the tiledImage being rotated
|
||||||
@ -187,7 +203,7 @@ $.WebGL = class WebGL extends OpenSeadragon.DrawerBase {
|
|||||||
//todo better access to the rendering context
|
//todo better access to the rendering context
|
||||||
const shader = this.renderer.specification(0).shaders.renderShader._renderContext;
|
const shader = this.renderer.specification(0).shaders.renderShader._renderContext;
|
||||||
// iterate over tiles and add data for each one to the buffers
|
// iterate over tiles and add data for each one to the buffers
|
||||||
for (let tileIndex = 0; tileIndex < tilesToDraw.length; tileIndex++){
|
for (let tileIndex = tilesToDraw.length - 1; tileIndex >= 0; tileIndex--){
|
||||||
const tile = tilesToDraw[tileIndex].tile;
|
const tile = tilesToDraw[tileIndex].tile;
|
||||||
|
|
||||||
const matrix = this._getTileMatrix(tile, tiledImage, overallMatrix);
|
const matrix = this._getTileMatrix(tile, tiledImage, overallMatrix);
|
||||||
@ -264,6 +280,7 @@ $.WebGL = class WebGL extends OpenSeadragon.DrawerBase {
|
|||||||
let localMatrix = t1.multiply($.Mat3.makeScaling(-1, 1)).multiply(t2);
|
let localMatrix = t1.multiply($.Mat3.makeScaling(-1, 1)).multiply(t2);
|
||||||
matrix = matrix.multiply(localMatrix);
|
matrix = matrix.multiply(localMatrix);
|
||||||
}
|
}
|
||||||
|
|
||||||
let overallMatrix = viewMatrix.multiply(matrix);
|
let overallMatrix = viewMatrix.multiply(matrix);
|
||||||
return overallMatrix.values;
|
return overallMatrix.values;
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,6 @@ $.WebGLModule = class extends $.EventSource {
|
|||||||
this.visualisationInUse = function(visualisation) { };
|
this.visualisationInUse = function(visualisation) { };
|
||||||
this.visualisationChanged = function(oldVis, newVis) { };
|
this.visualisationChanged = function(oldVis, newVis) { };
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Debug mode.
|
* Debug mode.
|
||||||
* @member {boolean}
|
* @member {boolean}
|
||||||
@ -124,12 +123,15 @@ $.WebGLModule = class extends $.EventSource {
|
|||||||
try {
|
try {
|
||||||
const canvas = document.createElement("canvas");
|
const canvas = document.createElement("canvas");
|
||||||
for (let version of [this.webGlPreferredVersion, "2.0", "1.0"]) {
|
for (let version of [this.webGlPreferredVersion, "2.0", "1.0"]) {
|
||||||
|
const contextOpts = incomingOptions[version] || {};
|
||||||
|
|
||||||
const Context = $.WebGLModule.determineContext(version);
|
const Context = $.WebGLModule.determineContext(version);
|
||||||
let glContext = Context && Context.create(canvas);
|
//todo documment this
|
||||||
|
let glContext = Context && Context.create(canvas, contextOpts.canvasOptions || {});
|
||||||
|
|
||||||
if (glContext) {
|
if (glContext) {
|
||||||
this.gl = glContext;
|
this.gl = glContext;
|
||||||
const contextOpts = incomingOptions[version] || {};
|
|
||||||
const readGlProp = function(prop, defaultValue) {
|
const readGlProp = function(prop, defaultValue) {
|
||||||
return glContext[contextOpts[prop] || defaultValue] || glContext[defaultValue];
|
return glContext[contextOpts[prop] || defaultValue] || glContext[defaultValue];
|
||||||
};
|
};
|
||||||
|
@ -60,9 +60,10 @@ $.WebGLModule.WebGLImplementation = class {
|
|||||||
/**
|
/**
|
||||||
* Static context creation (to avoid class instantiation in case of missing support)
|
* Static context creation (to avoid class instantiation in case of missing support)
|
||||||
* @param canvas
|
* @param canvas
|
||||||
|
* @param options desired options used in the canvas webgl context creation
|
||||||
* @return {WebGLRenderingContextBase} //todo base is not common to all, remove from docs
|
* @return {WebGLRenderingContextBase} //todo base is not common to all, remove from docs
|
||||||
*/
|
*/
|
||||||
static create(canvas) {
|
static create(canvas, options) {
|
||||||
throw("::create() must be implemented!");
|
throw("::create() must be implemented!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -184,8 +185,10 @@ $.WebGLModule.WebGL20 = class extends $.WebGLModule.WebGLImplementation {
|
|||||||
return "2.0";
|
return "2.0";
|
||||||
}
|
}
|
||||||
|
|
||||||
static create(canvas) {
|
static create(canvas, options) {
|
||||||
return canvas.getContext('webgl2', { premultipliedAlpha: true, alpha: true });
|
options.alpha = true;
|
||||||
|
options.premultipliedAlpha = true;
|
||||||
|
return canvas.getContext('webgl2', options);
|
||||||
}
|
}
|
||||||
|
|
||||||
//todo try to implement on the global scope version-independntly
|
//todo try to implement on the global scope version-independntly
|
||||||
|
Loading…
Reference in New Issue
Block a user