Comparing version 0.6.0 to 0.6.1
@@ -156,3 +156,4 @@ /** | ||
for (i = 0, len = children.length ; i < len ; i++) | ||
if (children[i]) this.mount(path + '/' + i, children[i]); | ||
if (children[i] && children[i].mount) children[i].mount(path + '/' + i); | ||
else if (children[i]) this.mount(path + '/' + i, children[i]); | ||
} | ||
@@ -201,8 +202,7 @@ | ||
if (node.isMounted()) { | ||
node._setMounted(false); | ||
node._setParent(null); | ||
if (node.onDismount) node.onDismount(path); | ||
for (i = 0, len = children.length ; i < len ; i++) | ||
if (children[i]) this.dismount(path + '/' + i); | ||
if (children[i] && children[i].dismount) children[i].dismount(); | ||
else if (children[i]) this.dismount(path + '/' + i); | ||
@@ -212,7 +212,7 @@ for (i = 0, len = components.length ; i < len ; i++) | ||
components[i].onDismount(); | ||
node._setMounted(false); | ||
node._setParent(null); | ||
} | ||
for (i = 0, len = children.length ; i < len ; i++) | ||
this.deregisterNodeAtPath(children[i], path + '/' + i); | ||
this._nodes[path] = null; | ||
@@ -219,0 +219,0 @@ }; |
/** | ||
* The MIT License (MIT) | ||
* | ||
* | ||
* Copyright (c) 2015 Famous Industries Inc. | ||
* | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
@@ -12,6 +12,6 @@ * of this software and associated documentation files (the "Software"), to deal | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
@@ -29,8 +29,16 @@ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
module.exports = { | ||
Channel: require('./Channel'), | ||
Clock: require('./Clock'), | ||
Commands: require('./Commands'), | ||
Dispatch: require('./Dispatch'), | ||
Event: require('./Event'), | ||
FamousEngine: require('./FamousEngine'), | ||
Node: require('./Node'), | ||
Path: require('./Path'), | ||
PathStore: require('./PathStore'), | ||
Scene: require('./Scene'), | ||
FamousEngine: require('./FamousEngine'), | ||
Dispatch: require('./Dispatch'), | ||
Node: require('./Node') | ||
Size: require('./Size'), | ||
SizeSystem: require('./SizeSystem'), | ||
Transform: require('./Transform'), | ||
TransformSystem: require('./TransformSystem') | ||
}; |
@@ -130,2 +130,5 @@ /** | ||
Node.prototype._setParent = function _setParent (parent) { | ||
if (this._parent && this._parent.getChildren().indexOf(this) !== -1) { | ||
this._parent.removeChild(this); | ||
} | ||
this._parent = parent; | ||
@@ -683,3 +686,3 @@ }; | ||
Dispatch.dismount(this.getLocation() + '/' + index); | ||
if (child.isMounted()) child.dismount(); | ||
@@ -686,0 +689,0 @@ return true; |
@@ -211,3 +211,3 @@ /** | ||
*/ | ||
Size.prototype.getAbsoluteSize = function getAbsoluteSize () { | ||
Size.prototype.getAbsolute = function getAbsolute () { | ||
return this.absoluteSize; | ||
@@ -239,3 +239,3 @@ }; | ||
*/ | ||
Size.prototype.getProportionalSize = function getProportionalSize () { | ||
Size.prototype.getProportional = function getProportional () { | ||
return this.proportionalSize; | ||
@@ -242,0 +242,0 @@ }; |
@@ -164,3 +164,3 @@ /** | ||
function absoluteSizeChanged (node, components, size) { | ||
var absoluteSize = size.getAbsoluteSize(); | ||
var absoluteSize = size.getAbsolute(); | ||
var x = absoluteSize[0]; | ||
@@ -189,3 +189,3 @@ var y = absoluteSize[1]; | ||
function proportionalSizeChanged (node, components, size) { | ||
var proportionalSize = size.getProportionalSize(); | ||
var proportionalSize = size.getProportional(); | ||
var x = proportionalSize[0]; | ||
@@ -192,0 +192,0 @@ var y = proportionalSize[1]; |
@@ -278,5 +278,5 @@ /** | ||
qw = w; | ||
this._lastEuler[0] = null; | ||
this._lastEuler[1] = null; | ||
this._lastEuler[2] = null; | ||
this._lastEulerVals[0] = null; | ||
this._lastEulerVals[1] = null; | ||
this._lastEulerVals[2] = null; | ||
this._lastEuler = false; | ||
@@ -287,5 +287,5 @@ } | ||
if (this._lastEuler) { | ||
x = x == null ? this._lastEuler[0] : x; | ||
y = y == null ? this._lastEuler[1] : y; | ||
z = z == null ? this._lastEuler[2] : z; | ||
x = x == null ? this._lastEulerVals[0] : x; | ||
y = y == null ? this._lastEulerVals[1] : y; | ||
z = z == null ? this._lastEulerVals[2] : z; | ||
} | ||
@@ -330,5 +330,5 @@ else { | ||
this._lastEuler = true; | ||
this._lastEuler[0] = x; | ||
this._lastEuler[1] = y; | ||
this._lastEuler[2] = z; | ||
this._lastEulerVals[0] = x; | ||
this._lastEulerVals[1] = y; | ||
this._lastEulerVals[2] = z; | ||
} | ||
@@ -335,0 +335,0 @@ |
@@ -193,2 +193,3 @@ /** | ||
this.onUpdate(); | ||
this._initialized = false; | ||
@@ -195,0 +196,0 @@ }; |
{ | ||
"name": "famous", | ||
"version": "0.6.0", | ||
"version": "0.6.1", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -267,2 +267,3 @@ /** | ||
this._domRenderer.findTarget(); | ||
while (command != null) { | ||
@@ -269,0 +270,0 @@ if (command === Commands.WITH || command === Commands.TIME) return localIterator - 1; |
@@ -37,7 +37,7 @@ /** | ||
* @property {Function} easeInOut | ||
* @property {Function} easeOutBounc | ||
* @property {Function} easeOutBounce | ||
* @property {Function} spring | ||
* @property {Function} inQuad | ||
* @property {Function} outQuad | ||
* @property {Function} inOutQua | ||
* @property {Function} inOutQuad | ||
* @property {Function} inCubic | ||
@@ -65,3 +65,3 @@ * @property {Function} outCubic | ||
* @property {Function} inBounce | ||
* @property {Function} outBounc | ||
* @property {Function} outBounce | ||
* @property {Function} inOutBounce | ||
@@ -68,0 +68,0 @@ * @property {Function} flat - Useful for delaying the execution of |
@@ -72,7 +72,9 @@ /** | ||
var Xrange = wrap ? Math.PI + (Math.PI / (detailX - 1)) : Math.PI; | ||
var offset = (Math.PI / (detailX - 1)); | ||
var Xrange = wrap ? Math.PI + offset : Math.PI; | ||
var out = []; | ||
for (i = 0; i < detailX + 1; i++) { | ||
theta = i * Xrange / detailX; | ||
theta = (i === 0 ? 0.0001 : i) * Math.PI / detailX; | ||
for (j = 0; j < detailY; j++) { | ||
@@ -352,5 +354,8 @@ phi = j * 2.0 * Xrange / detailY; | ||
uv[0] = this.getAzimuth(vertex) * 0.5 / Math.PI + 0.5; | ||
uv[1] = this.getAltitude(vertex) / Math.PI + 0.5; | ||
var azimuth = this.getAzimuth(vertex); | ||
var altitude = this.getAltitude(vertex); | ||
uv[0] = azimuth * 0.5 / Math.PI + 0.5; | ||
uv[1] = altitude / Math.PI + 0.5; | ||
out.push.apply(out, uv); | ||
@@ -357,0 +362,0 @@ } |
@@ -55,4 +55,2 @@ /** | ||
GeometryHelper.getUniqueFaces(buffers.vertices, buffers.indices); | ||
return new Geometry({ | ||
@@ -59,0 +57,0 @@ buffers: [ |
@@ -42,7 +42,10 @@ /** | ||
this._node = node; | ||
this._id = node.addComponent(this); | ||
this._requestingUpdate = false; | ||
this._color = null; | ||
this.queue = []; | ||
this._color = null; | ||
this.commands = { color: Commands.GL_LIGHT_COLOR }; | ||
this.commands = { | ||
color: Commands.GL_LIGHT_COLOR, | ||
position: Commands.GL_LIGHT_POSITION | ||
}; | ||
this._id = node.addComponent(this); | ||
} | ||
@@ -49,0 +52,0 @@ |
@@ -28,3 +28,2 @@ /** | ||
var Light = require('./Light'); | ||
var Commands = require('../../core/Commands'); | ||
var TransformSystem = require('../../core/TransformSystem'); | ||
@@ -47,3 +46,2 @@ | ||
Light.call(this, node); | ||
this.commands.position = Commands.GL_LIGHT_POSITION; | ||
} | ||
@@ -64,7 +62,9 @@ | ||
* | ||
* @private | ||
* @param {Node} node Node that the component has been associated with | ||
* @param {Number} id ID associated with the node | ||
* | ||
* @return {undefined} undefined | ||
*/ | ||
PointLight.prototype.onMount = function onMount() { | ||
PointLight.prototype.onMount = function onMount(node, id) { | ||
this._id = id; | ||
TransformSystem.makeBreakPointAt(this._node.getLocation()); | ||
@@ -71,0 +71,0 @@ this.onTransformChange(TransformSystem.get(this._node.getLocation())); |
@@ -29,2 +29,3 @@ /** | ||
var TransformSystem = require('../core/TransformSystem'); | ||
var defaultGeometry = new Geometry.Plane(); | ||
@@ -52,6 +53,6 @@ /** | ||
this.value = { | ||
geometry: defaultGeometry, | ||
drawOptions: null, | ||
color: null, | ||
expressions: {}, | ||
geometry: null, | ||
flatShading: null, | ||
@@ -66,3 +67,2 @@ glossiness: null, | ||
} | ||
/** | ||
@@ -69,0 +69,0 @@ * Pass custom options to Mesh, such as a 3 element map |
@@ -329,3 +329,3 @@ /** | ||
if (Array.isArray(uniformValue)) { | ||
if (uniformValue.length) { | ||
for (var i = 0, len = uniformValue.length; i < len; i++) { | ||
@@ -794,5 +794,2 @@ cutout.uniformValues[index][i] = uniformValue[i]; | ||
WebGLRenderer.prototype.updateSize = function updateSize(size) { | ||
this.canvas.width = size[0]; | ||
this.canvas.height = size[1]; | ||
if (size) { | ||
@@ -799,0 +796,0 @@ var pixelRatio = window.devicePixelRatio || 1; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1355375
262
35992