scratchfoundation/scratch-render
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-render.git synced 2025-08-28 22:30:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add more flexibility to draw-time object filtering

Browse source 
The `_drawThese` call now takes both a list of Drawable IDs for positive
filtering and a filter function for negative filtering.
This commit is contained in:
Christopher Willis-Ford 2016-06-01 16:17:56 -07:00
parent 137e4a642e
commit 25d8148ec4
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Drawable.js
View file

@ -95,6 +95,12 @@ Drawable._effectConverter = {
}
};
/**
* @callback Drawable~idFilterFunc
* @param {int} drawableID The ID to filter.
* @return {bool} True if the ID passes the filter, otherwise false.
*/
/**
* An invalid Drawable ID which can be used to signify absence, etc.
* @type {int}
@ -107,6 +113,11 @@ Drawable.NONE = -1;
*/
Drawable.EFFECTS = Object.keys(Drawable._effectConverter);
/**
* The available draw modes.
* @readonly
* @enum {string}
*/
Drawable.DRAW_MODE = {
default: 'default',
pick: 'pick'

20
src/index.js
View file

@ -115,24 +115,30 @@ RenderWebGL.prototype.draw = function () {
gl.enable(gl.BLEND);
gl.blendFuncSeparate(gl.ONE, gl.ONE_MINUS_SRC_ALPHA, gl.ZERO, gl.ONE);
this._drawExcept(Drawable.DRAW_MODE.default, null, this._projection);
this._drawThese(
this._drawables, Drawable.DRAW_MODE.default, this._projection);
};
/**
* Draw all Drawables, with the possible exception of
* @param {int[]} drawables The Drawable IDs to draw, possibly this._drawables.
* @param {Drawable.DRAW_MODE} drawMode Draw normally or for picking, etc.
* @param {int} skipID The Drawable to skip, if any.
* @param {module:twgl/m4.Mat4} projection The projection matrix to use.
* @param {Drawable~idFilterFunc} [filter] An optional filter function.
* @private
*/
RenderWebGL.prototype._drawExcept = function(drawMode, skipID, projection) {
RenderWebGL.prototype._drawThese = function(
drawables, drawMode, projection, filter) {
var gl = this._gl;
var currentShader = null;
var numDrawables = this._drawables.length;
var numDrawables = drawables.length;
for (var drawableIndex = 0; drawableIndex < numDrawables; ++drawableIndex) {
var drawableID = this._drawables[drawableIndex];
if (drawableID == skipID) continue;
var drawableID = drawables[drawableIndex];
// If we have a filter, check whether the ID fails
if (filter && !filter(drawableID)) continue;
var drawable = Drawable.getDrawableByID(drawableID);
// TODO: check if drawable is inside the viewport before anything else
@ -314,7 +320,7 @@ RenderWebGL.prototype.pick = function (
var projection = twgl.m4.ortho(
pickLeft, pickRight, pickTop, pickBottom, -1, 1);
this._drawExcept(Drawable.DRAW_MODE.pick, null, projection);
this._drawThese(this._drawables, Drawable.DRAW_MODE.pick, projection);
var pixels = new Uint8Array(touchWidth * touchHeight * 4);
gl.readPixels(