Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add debug flag for image loading. fixes #272 #405

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

feat: add debug flag for image loading. fixes #272 #405

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a12479e
fix: multiple updates in node
DnMllr Jun 26, 2015
8492e25
fix: opt-out of default components rather than opt-in
DnMllr Jun 26, 2015
3f93a89
fix: dom-element checks for sizeMode onMount
DnMllr Jun 26, 2015
b2abdbb
Merge branch 'develop' into fix-multi-updates
DnMllr Jun 26, 2015
9dd5120
fix: no default components on scene
DnMllr Jun 27, 2015
f2e7318
Merge pull request #354 from DnMllr/fix-scene-components
DnMllr Jun 27, 2015
460066a
feat: add debug flag for image loading. fixes #272
Jul 7, 2015
21ed688
fix race condition and remove errant logs
Jul 7, 2015
53ee7cc
fix race condition and style
Jul 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 32 additions & 31 deletions core/Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ function Node () {
this._transformID = null;
this._sizeID = null;

if (this.constructor.INIT_DEFAULT_COMPONENTS) this._init();
if (!this.constructor.NO_DEFAULT_COMPONENTS) this._init();
}

Node.RELATIVE_SIZE = 0;
Node.ABSOLUTE_SIZE = 1;
Node.RENDER_SIZE = 2;
Node.DEFAULT_SIZE = 0;
Node.INIT_DEFAULT_COMPONENTS = true;
Node.NO_DEFAULT_COMPONENTS = false;

/**
* Protected method. Initializes a node with a default Transform and Size component
Expand Down Expand Up @@ -201,7 +201,7 @@ Node.prototype.getLocation = function getLocation () {
Node.prototype.getId = Node.prototype.getLocation;

/**
* Globally dispatches the event using the Dispatch. All descendent nodes will
* Dispatches the event using the Dispatch. All descendent nodes will
* receive the dispatched event.
*
* @method emit
Expand Down Expand Up @@ -370,8 +370,10 @@ Node.prototype.getParent = function getParent () {
Node.prototype.requestUpdate = function requestUpdate (requester) {
if (this._inUpdate || !this.isMounted())
return this.requestUpdateOnNextTick(requester);
this._updateQueue.push(requester);
if (!this._requestingUpdate) this._requestUpdate();
if (this._updateQueue.indexOf(requester) === -1) {
this._updateQueue.push(requester);
if (!this._requestingUpdate) this._requestUpdate();
}
return this;
};

Expand All @@ -390,7 +392,8 @@ Node.prototype.requestUpdate = function requestUpdate (requester) {
* @return {Node} this
*/
Node.prototype.requestUpdateOnNextTick = function requestUpdateOnNextTick (requester) {
this._nextUpdateQueue.push(requester);
if (this._nextUpdateQueue.indexOf(requester) === -1)
this._nextUpdateQueue.push(requester);
return this;
};

Expand Down Expand Up @@ -440,7 +443,7 @@ Node.prototype.getOpacity = function getOpacity () {
* @return {Float32Array} An array representing the mount point.
*/
Node.prototype.getMountPoint = function getMountPoint () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._transformID).getMountPoint();
else if (this.isMounted())
return TransformSystem.get(this.getLocation()).getMountPoint();
Expand All @@ -455,7 +458,7 @@ Node.prototype.getMountPoint = function getMountPoint () {
* @return {Float32Array} An array representing the align.
*/
Node.prototype.getAlign = function getAlign () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._transformID).getAlign();
else if (this.isMounted())
return TransformSystem.get(this.getLocation()).getAlign();
Expand All @@ -470,7 +473,7 @@ Node.prototype.getAlign = function getAlign () {
* @return {Float32Array} An array representing the origin.
*/
Node.prototype.getOrigin = function getOrigin () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._transformID).getOrigin();
else if (this.isMounted())
return TransformSystem.get(this.getLocation()).getOrigin();
Expand All @@ -485,7 +488,7 @@ Node.prototype.getOrigin = function getOrigin () {
* @return {Float32Array} An array representing the position.
*/
Node.prototype.getPosition = function getPosition () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._transformID).getPosition();
else if (this.isMounted())
return TransformSystem.get(this.getLocation()).getPosition();
Expand All @@ -500,7 +503,7 @@ Node.prototype.getPosition = function getPosition () {
* @return {Float32Array} an array of four values, showing the rotation as a quaternion
*/
Node.prototype.getRotation = function getRotation () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._transformID).getRotation();
else if (this.isMounted())
return TransformSystem.get(this.getLocation()).getRotation();
Expand All @@ -515,7 +518,7 @@ Node.prototype.getRotation = function getRotation () {
* @return {Float32Array} an array showing the current scale vector
*/
Node.prototype.getScale = function getScale () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._transformID).getScale();
else if (this.isMounted())
return TransformSystem.get(this.getLocation()).getScale();
Expand All @@ -530,7 +533,7 @@ Node.prototype.getScale = function getScale () {
* @return {Float32Array} an array of numbers showing the current size mode
*/
Node.prototype.getSizeMode = function getSizeMode () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._sizeID).getSizeMode();
else if (this.isMounted())
return SizeSystem.get(this.getLocation()).getSizeMode();
Expand All @@ -545,7 +548,7 @@ Node.prototype.getSizeMode = function getSizeMode () {
* @return {Float32Array} a vector 3 showing the current proportional size
*/
Node.prototype.getProportionalSize = function getProportionalSize () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._sizeID).getProportional();
else if (this.isMounted())
return SizeSystem.get(this.getLocation()).getProportional();
Expand All @@ -560,7 +563,7 @@ Node.prototype.getProportionalSize = function getProportionalSize () {
* @return {Float32Array} a vector 3 showing the current differential size
*/
Node.prototype.getDifferentialSize = function getDifferentialSize () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._sizeID).getDifferential();
else if (this.isMounted())
return SizeSystem.get(this.getLocation()).getDifferential();
Expand All @@ -575,7 +578,7 @@ Node.prototype.getDifferentialSize = function getDifferentialSize () {
* @return {Float32Array} a vector 3 showing the current absolute size of the node
*/
Node.prototype.getAbsoluteSize = function getAbsoluteSize () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._sizeID).getAbsolute();
else if (this.isMounted())
return SizeSystem.get(this.getLocation()).getAbsolute();
Expand All @@ -592,7 +595,7 @@ Node.prototype.getAbsoluteSize = function getAbsoluteSize () {
* @return {Float32Array} a vector 3 showing the current render size
*/
Node.prototype.getRenderSize = function getRenderSize () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._sizeID).getRender();
else if (this.isMounted())
return SizeSystem.get(this.getLocation()).getRender();
Expand All @@ -607,7 +610,7 @@ Node.prototype.getRenderSize = function getRenderSize () {
* @return {Float32Array} a vector 3 of the final calculated side of the node
*/
Node.prototype.getSize = function getSize () {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
return this.getComponent(this._sizeID).get();
else if (this.isMounted())
return SizeSystem.get(this.getLocation()).get();
Expand Down Expand Up @@ -885,7 +888,7 @@ Node.prototype.hide = function hide () {
* @return {Node} this
*/
Node.prototype.setAlign = function setAlign (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._transformID).setAlign(x, y, z);
else if (this.isMounted())
TransformSystem.get(this.getLocation()).setAlign(x, y, z);
Expand All @@ -906,7 +909,7 @@ Node.prototype.setAlign = function setAlign (x, y, z) {
* @return {Node} this
*/
Node.prototype.setMountPoint = function setMountPoint (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._transformID).setMountPoint(x, y, z);
else if (this.isMounted())
TransformSystem.get(this.getLocation()).setMountPoint(x, y, z);
Expand All @@ -927,7 +930,7 @@ Node.prototype.setMountPoint = function setMountPoint (x, y, z) {
* @return {Node} this
*/
Node.prototype.setOrigin = function setOrigin (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._transformID).setOrigin(x, y, z);
else if (this.isMounted())
TransformSystem.get(this.getLocation()).setOrigin(x, y, z);
Expand All @@ -948,7 +951,7 @@ Node.prototype.setOrigin = function setOrigin (x, y, z) {
* @return {Node} this
*/
Node.prototype.setPosition = function setPosition (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._transformID).setPosition(x, y, z);
else if (this.isMounted())
TransformSystem.get(this.getLocation()).setPosition(x, y, z);
Expand All @@ -972,7 +975,7 @@ Node.prototype.setPosition = function setPosition (x, y, z) {
* @return {Node} this
*/
Node.prototype.setRotation = function setRotation (x, y, z, w) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._transformID).setRotation(x, y, z, w);
else if (this.isMounted())
TransformSystem.get(this.getLocation()).setRotation(x, y, z, w);
Expand All @@ -993,7 +996,7 @@ Node.prototype.setRotation = function setRotation (x, y, z, w) {
* @return {Node} this
*/
Node.prototype.setScale = function setScale (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._transformID).setScale(x, y, z);
else if (this.isMounted())
TransformSystem.get(this.getLocation()).setScale(x, y, z);
Expand Down Expand Up @@ -1054,7 +1057,7 @@ Node.prototype.setOpacity = function setOpacity (val) {
* @return {Node} this
*/
Node.prototype.setSizeMode = function setSizeMode (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._sizeID).setSizeMode(x, y, z);
else if (this.isMounted())
SizeSystem.get(this.getLocation()).setSizeMode(x, y, z);
Expand All @@ -1076,7 +1079,7 @@ Node.prototype.setSizeMode = function setSizeMode (x, y, z) {
* @return {Node} this
*/
Node.prototype.setProportionalSize = function setProportionalSize (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._sizeID).setProportional(x, y, z);
else if (this.isMounted())
SizeSystem.get(this.getLocation()).setProportional(x, y, z);
Expand All @@ -1103,7 +1106,7 @@ Node.prototype.setProportionalSize = function setProportionalSize (x, y, z) {
* @return {Node} this
*/
Node.prototype.setDifferentialSize = function setDifferentialSize (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._sizeID).setDifferential(x, y, z);
else if (this.isMounted())
SizeSystem.get(this.getLocation()).setDifferential(x, y, z);
Expand All @@ -1123,7 +1126,7 @@ Node.prototype.setDifferentialSize = function setDifferentialSize (x, y, z) {
* @return {Node} this
*/
Node.prototype.setAbsoluteSize = function setAbsoluteSize (x, y, z) {
if (this.constructor.INIT_DEFAULT_COMPONENTS)
if (!this.constructor.NO_DEFAULT_COMPONENTS)
this.getComponent(this._sizeID).setAbsolute(x, y, z);
else if (this.isMounted())
SizeSystem.get(this.getLocation()).setAbsolute(x, y, z);
Expand Down Expand Up @@ -1170,8 +1173,6 @@ Node.prototype.update = function update (time){
var queue = this._updateQueue;
var item;

if (this.onUpdate) this.onUpdate();

while (nextQueue.length) queue.unshift(nextQueue.pop());

while (queue.length) {
Expand Down Expand Up @@ -1208,7 +1209,7 @@ Node.prototype.mount = function mount (path) {
if (this.isMounted())
throw new Error('Node is already mounted at: ' + this.getLocation());

if (this.constructor.INIT_DEFAULT_COMPONENTS){
if (!this.constructor.NO_DEFAULT_COMPONENTS){
TransformSystem.registerTransformAtPath(path, this.getComponent(this._transformID));
SizeSystem.registerSizeAtPath(path, this.getComponent(this._sizeID));
}
Expand Down
1 change: 1 addition & 0 deletions core/Scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function Scene (selector, updater) {
// Scene inherits from node
Scene.prototype = Object.create(Node.prototype);
Scene.prototype.constructor = Scene;
Scene.NO_DEFAULT_COMPONENTS = true;

/**
* Scene getUpdater function returns the passed in updater
Expand Down
3 changes: 1 addition & 2 deletions dom-renderables/DOMElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ function DOMElement(node, options) {
this._id = node ? node.addComponent(this) : null;
this._node = node;

this.onSizeModeChange.apply(this, node.getSizeMode());

this._callbacks = new CallbackStore();

this.setProperty('display', node.isShown() ? 'block' : 'none');
Expand Down Expand Up @@ -172,6 +170,7 @@ DOMElement.prototype.onMount = function onMount(node, id) {
this._id = id;
this._UIEvents = node.getUIEvents().slice(0);
TransformSystem.makeBreakPointAt(node.getLocation());
this.onSizeModeChange.apply(this, node.getSizeMode());
this.draw();
this.setAttribute('data-fa-path', node.getLocation());
};
Expand Down
2 changes: 1 addition & 1 deletion webgl-materials/Material.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function Material(name, chunk, inputs, options) {
this.attributes = options.attributes;

if (options.texture) {
this.texture = options.texture.__isATexture__ ? options.texture : TextureRegistry.register(null, options.texture);
this.texture = options.texture.__isATexture__ ? options.texture : TextureRegistry.register(null, options.texture, options);
}

this._id = Material.id++;
Expand Down
12 changes: 10 additions & 2 deletions webgl-renderers/TextureManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ TextureManager.prototype.register = function register(input, slot) {
if (!texture) {

texture = new Texture(this.gl, options);
texture.setImage(this._checkerboard);

//if (options.debug) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove commented out lines

texture.setImage(this._checkerboard);
//}

// Add texture to registry

Expand All @@ -108,7 +111,8 @@ TextureManager.prototype.register = function register(input, slot) {
texture: texture,
source: source,
id: textureId,
slot: slot
slot: slot,
debug: options.debug
};

// Handle array
Expand Down Expand Up @@ -188,6 +192,10 @@ function loadImage (input, callback) {
TextureManager.prototype.bindTexture = function bindTexture(id) {
var spec = this.registry[id];

if (! spec.isLoaded && ! spec.debug) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One line

return true;
}

if (this._activeTexture !== spec.slot) {
this.gl.activeTexture(this.gl.TEXTURE0 + spec.slot);
this._activeTexture = spec.slot;
Expand Down
6 changes: 5 additions & 1 deletion webgl-renderers/WebGLRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,11 @@ WebGLRenderer.prototype.drawMeshes = function drawMeshes() {
if (!buffers) continue;

var j = mesh.textures.length;
while (j--) this.textureManager.bindTexture(mesh.textures[j]);
var loading;

while (j--) loading = loading || this.textureManager.bindTexture(mesh.textures[j]);

if (loading) {console.log(123); continue} ;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

....


if (mesh.options) this.handleOptions(mesh.options, mesh);

Expand Down