github/scratch-render
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #285 from kchadha/layer-ordering

Browse Source 
Layer ordering
This commit is contained in:
kchadha
2018-05-25 09:31:37 -04:00
committed by GitHub
parent 4a737352d6 d8f82b21ec
commit 7f53a4a19e
4 changed files with 137 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -41,10 +41,11 @@
"jsdoc": "^3.5.5",
"json": "^9.0.4",
"linebreak": "0.3.0",
"minilog": "3.1.0",
"raw-loader": "^0.5.1",
"scratch-storage": "^0.4.0",
"scratch-svg-renderer": "0.1.0-prerelease.20180524210316",
"scratch-vm": "0.1.0-prerelease.1527198751",
"scratch-vm": "0.1.0-prerelease.1527254075",
"tap": "^11.0.0",
"travis-after-all": "^1.4.4",
"twgl.js": "4.4.0",

143
src/RenderWebGL.js
View File

@@ -12,6 +12,7 @@ const ShaderManager = require('./ShaderManager');
const SVGSkin = require('./SVGSkin');
const SVGTextBubble = require('./util/svg-text-bubble');
const EffectTransform = require('./EffectTransform');
const log = require('./util/log');
const __isTouchingDrawablesPoint = twgl.v3.create();
const __candidatesBounds = new Rectangle();
@@ -120,6 +121,22 @@ class RenderWebGL extends EventEmitter {
/** @type {Array<int>} */
this._drawList = [];
// A list of layer group names in the order they should appear
// from furthest back to furthest in front.
/** @type {Array<String>} */
this._groupOrdering = [];
/**
* @typedef LayerGroup
* @property {int} groupIndex The relative position of this layer group in the group ordering
* @property {int} drawListOffset The absolute position of this layer group in the draw list
* This number gets updated as drawables get added to or deleted from the draw list.
*/
// Map of group name to layer group
/** @type {Object.<string, LayerGroup>} */
this._layerGroups = {};
/** @type {int} */
this._nextDrawableId = RenderConstants.ID_NONE + 1;
@@ -360,31 +377,100 @@ class RenderWebGL extends EventEmitter {
/**
* Create a new Drawable and add it to the scene.
* @param {string} group Layer group to add the drawable to
* @returns {int} The ID of the new Drawable.
*/
createDrawable () {
createDrawable (group) {
if (!group || !this._layerGroups.hasOwnProperty(group)) {
log.warn('Cannot create a drawable without a known layer group');
return;
}
const drawableID = this._nextDrawableId++;
const drawable = new Drawable(drawableID);
this._allDrawables[drawableID] = drawable;
this._drawList.push(drawableID);
this._addToDrawList(drawableID, group);
drawable.skin = null;
return drawableID;
}
/**
* Set the layer group ordering for the renderer.
* @param {Array<string>} groupOrdering The ordered array of layer group
* names
*/
setLayerGroupOrdering (groupOrdering) {
this._groupOrdering = groupOrdering;
for (let i = 0; i < this._groupOrdering.length; i++) {
this._layerGroups[this._groupOrdering[i]] = {
groupIndex: i,
drawListOffset: 0
};
}
}
_addToDrawList (drawableID, group) {
const currentLayerGroup = this._layerGroups[group];
const currentGroupOrderingIndex = currentLayerGroup.groupIndex;
const drawListOffset = this._endIndexForKnownLayerGroup(currentLayerGroup);
this._drawList.splice(drawListOffset, 0, drawableID);
this._updateOffsets('add', currentGroupOrderingIndex);
}
_updateOffsets (updateType, currentGroupOrderingIndex) {
for (let i = currentGroupOrderingIndex + 1; i < this._groupOrdering.length; i++) {
const laterGroupName = this._groupOrdering[i];
if (updateType === 'add') {
this._layerGroups[laterGroupName].drawListOffset++;
} else if (updateType === 'delete'){
this._layerGroups[laterGroupName].drawListOffset--;
}
}
}
// Given a layer group, return the index where it ends (non-inclusive),
// e.g. the returned index does not have a drawable from this layer group in it)
_endIndexForKnownLayerGroup (layerGroup) {
const groupIndex = layerGroup.groupIndex;
if (groupIndex === this._groupOrdering.length - 1) {
return this._drawList.length;
}
return this._layerGroups[this._groupOrdering[groupIndex + 1]].drawListOffset;
}
/**
* Destroy a Drawable, removing it from the scene.
* @param {int} drawableID The ID of the Drawable to remove.
* @param {string} group Group name that the drawable belongs to
*/
destroyDrawable (drawableID) {
destroyDrawable (drawableID, group) {
if (!group || !this._layerGroups.hasOwnProperty(group)) {
log.warn('Cannot destroy drawable without known layer group.');
return;
}
const drawable = this._allDrawables[drawableID];
drawable.dispose();
delete this._allDrawables[drawableID];
let index;
while ((index = this._drawList.indexOf(drawableID)) >= 0) {
const currentLayerGroup = this._layerGroups[group];
const endIndex = this._endIndexForKnownLayerGroup(currentLayerGroup);
let index = currentLayerGroup.drawListOffset;
while (index < endIndex) {
if (this._drawList[index] === drawableID) {
break;
}
index++;
}
if (index < endIndex) {
this._drawList.splice(index, 1);
this._updateOffsets('delete', currentLayerGroup.groupIndex);
} else {
log.warn('Could not destroy drawable that could not be found in layer group.');
return;
}
}
@@ -397,28 +483,55 @@ class RenderWebGL extends EventEmitter {
* "go to front": setDrawableOrder(id, Infinity);
* @param {int} drawableID ID of Drawable to reorder.
* @param {number} order New absolute order or relative order adjusment.
* @param {string=} group Name of layer group drawable belongs to.
* Reordering will not take place if drawable cannot be found within the bounds
* of the layer group.
* @param {boolean=} optIsRelative If set, `order` refers to a relative change.
* @param {number=} optMin If set, order constrained to be at least `optMin`.
* @return {?number} New order if changed, or null.
*/
setDrawableOrder (drawableID, order, optIsRelative, optMin) {
const oldIndex = this._drawList.indexOf(drawableID);
if (oldIndex >= 0) {
setDrawableOrder (drawableID, order, group, optIsRelative, optMin) {
if (!group || !this._layerGroups.hasOwnProperty(group)) {
log.warn('Cannot set the order of a drawable without a known layer group.');
return;
}
const currentLayerGroup = this._layerGroups[group];
const startIndex = currentLayerGroup.drawListOffset;
const endIndex = this._endIndexForKnownLayerGroup(currentLayerGroup);
let oldIndex = startIndex;
while (oldIndex < endIndex) {
if (this._drawList[oldIndex] === drawableID) {
break;
}
oldIndex++;
}
if (oldIndex < endIndex) {
// Remove drawable from the list.
const drawable = this._drawList.splice(oldIndex, 1)[0];
if (order === 0) {
return oldIndex;
}
const _ = this._drawList.splice(oldIndex, 1)[0];
// Determine new index.
let newIndex = order;
if (optIsRelative) {
newIndex += oldIndex;
}
if (optMin) {
newIndex = Math.max(newIndex, optMin);
}
newIndex = Math.max(newIndex, 0);
const possibleMin = (optMin || 0) + startIndex;
const min = (possibleMin >= startIndex && possibleMin < endIndex) ? possibleMin : startIndex;
newIndex = Math.max(newIndex, min);
newIndex = Math.min(newIndex, endIndex);
// Insert at new index.
this._drawList.splice(newIndex, 0, drawable);
return this._drawList.indexOf(drawable);
this._drawList.splice(newIndex, 0, drawableID);
return newIndex;
}
return null;
}

5
src/playground/index.html
View File

@@ -38,15 +38,16 @@
var canvas = document.getElementById('scratch-stage');
var fudge = 90;
var renderer = new ScratchRender(canvas);
renderer.setLayerGroupOrdering(['group1']);
var drawableID = renderer.createDrawable();
var drawableID = renderer.createDrawable('group1');
renderer.updateDrawableProperties(drawableID, {
position: [0, 0],
scale: [100, 100],
direction: 90
});
var drawableID2 = renderer.createDrawable();
var drawableID2 = renderer.createDrawable('group1');
var wantBitmapSkin = false;
// Bitmap (squirrel)

4
src/util/log.js Normal file
View File

@@ -0,0 +1,4 @@
const minilog = require('minilog');
minilog.enable();
module.exports = minilog('scratch-render');