@lightningjs/renderer 3.0.0-beta2 → 3.0.0-beta20

package/dist/src/core/CoreNode.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { assertTruthy, getNewId, isProductionEnvironment, mergeColorAlphaPremultiplied, } from '../utils.js';
+import { assertTruthy, getNewId, mergeColorAlphaPremultiplied, } from '../utils.js';
 import {} from './textures/Texture.js';
 import { EventEmitter } from '../common/EventEmitter.js';
 import { copyRect, intersectRect, createBound, boundInsideBound, boundLargeThanBound, createPreloadBounds, } from './lib/utils.js';
@@ -24,6 +24,7 @@ import { Matrix3d } from './lib/Matrix3d.js';
 import { RenderCoords } from './lib/RenderCoords.js';
 import { CoreAnimation } from './animations/CoreAnimation.js';
 import { CoreAnimationController } from './animations/CoreAnimationController.js';
+import { bucketSortByZIndex, incrementalRepositionByZIndex, removeChild, } from './lib/collectionUtils.js';
 export var CoreNodeRenderState;
 (function (CoreNodeRenderState) {
     CoreNodeRenderState[CoreNodeRenderState["Init"] = 0] = "Init";
@@ -31,6 +32,13 @@ export var CoreNodeRenderState;
     CoreNodeRenderState[CoreNodeRenderState["InBounds"] = 4] = "InBounds";
     CoreNodeRenderState[CoreNodeRenderState["InViewport"] = 8] = "InViewport";
 })(CoreNodeRenderState || (CoreNodeRenderState = {}));
+const NO_CLIPPING_RECT = {
+    x: 0,
+    y: 0,
+    width: 0,
+    height: 0,
+    valid: false,
+};
 const CoreNodeRenderStateMap = new Map();
 CoreNodeRenderStateMap.set(CoreNodeRenderState.Init, 'init');
 CoreNodeRenderStateMap.set(CoreNodeRenderState.OutOfBounds, 'outOfBounds');
@@ -43,31 +51,23 @@ export var UpdateType;
      */
     UpdateType[UpdateType["Children"] = 1] = "Children";
     /**
-     * Scale/Rotate transform update
-     *
-     * @remarks
-     * CoreNode Properties Updated:
-     * - `scaleRotateTransform`
-     */
-    UpdateType[UpdateType["ScaleRotate"] = 2] = "ScaleRotate";
-    /**
-     * Translate transform update (x/y/width/height/pivot/mount)
+     * localTransform
      *
      * @remarks
      * CoreNode Properties Updated:
      * - `localTransform`
      */
-    UpdateType[UpdateType["Local"] = 4] = "Local";
+    UpdateType[UpdateType["Local"] = 2] = "Local";
     /**
-     * Global Transform update
+     * globalTransform
      *
-     * @remarks
+     * * @remarks
      * CoreNode Properties Updated:
      * - `globalTransform`
+     * - `renderBounds`
      * - `renderCoords`
-     * - `renderBound`
      */
-    UpdateType[UpdateType["Global"] = 8] = "Global";
+    UpdateType[UpdateType["Global"] = 4] = "Global";
     /**
      * Clipping rect update
      *
@@ -75,23 +75,15 @@ export var UpdateType;
      * CoreNode Properties Updated:
      * - `clippingRect`
      */
-    UpdateType[UpdateType["Clipping"] = 16] = "Clipping";
+    UpdateType[UpdateType["Clipping"] = 8] = "Clipping";
     /**
-     * Calculated ZIndex update
-     *
-     * @remarks
-     * CoreNode Properties Updated:
-     * - `calcZIndex`
-     */
-    UpdateType[UpdateType["CalculatedZIndex"] = 32] = "CalculatedZIndex";
-    /**
-     * Z-Index Sorted Children update
+     * Sort Z-Index Children update
      *
      * @remarks
      * CoreNode Properties Updated:
      * - `children` (sorts children by their `calcZIndex`)
      */
-    UpdateType[UpdateType["ZIndexSortedChildren"] = 64] = "ZIndexSortedChildren";
+    UpdateType[UpdateType["SortZIndexChildren"] = 16] = "SortZIndexChildren";
     /**
      * Premultiplied Colors update
      *
@@ -102,7 +94,7 @@ export var UpdateType;
      * - `premultipliedColorBl`
      * - `premultipliedColorBr`
      */
-    UpdateType[UpdateType["PremultipliedColors"] = 128] = "PremultipliedColors";
+    UpdateType[UpdateType["PremultipliedColors"] = 32] = "PremultipliedColors";
     /**
      * World Alpha update
      *
@@ -110,7 +102,7 @@ export var UpdateType;
      * CoreNode Properties Updated:
      * - `worldAlpha` = `parent.worldAlpha` * `alpha`
      */
-    UpdateType[UpdateType["WorldAlpha"] = 256] = "WorldAlpha";
+    UpdateType[UpdateType["WorldAlpha"] = 64] = "WorldAlpha";
     /**
      * Render State update
      *
@@ -118,7 +110,7 @@ export var UpdateType;
      * CoreNode Properties Updated:
      * - `renderState`
      */
-    UpdateType[UpdateType["RenderState"] = 512] = "RenderState";
+    UpdateType[UpdateType["RenderState"] = 128] = "RenderState";
     /**
      * Is Renderable update
      *
@@ -126,19 +118,23 @@ export var UpdateType;
      * CoreNode Properties Updated:
      * - `isRenderable`
      */
-    UpdateType[UpdateType["IsRenderable"] = 1024] = "IsRenderable";
+    UpdateType[UpdateType["IsRenderable"] = 256] = "IsRenderable";
     /**
      * Render Texture update
      */
-    UpdateType[UpdateType["RenderTexture"] = 2048] = "RenderTexture";
+    UpdateType[UpdateType["RenderTexture"] = 512] = "RenderTexture";
     /**
      * Track if parent has render texture
      */
-    UpdateType[UpdateType["ParentRenderTexture"] = 4096] = "ParentRenderTexture";
+    UpdateType[UpdateType["ParentRenderTexture"] = 1024] = "ParentRenderTexture";
     /**
      * Render Bounds update
      */
-    UpdateType[UpdateType["RenderBounds"] = 8192] = "RenderBounds";
+    UpdateType[UpdateType["RenderBounds"] = 2048] = "RenderBounds";
+    /**
+     * RecalcUniforms
+     */
+    UpdateType[UpdateType["RecalcUniforms"] = 4096] = "RecalcUniforms";
     /**
      * None
      */
@@ -146,11 +142,7 @@ export var UpdateType;
     /**
      * All
      */
-    UpdateType[UpdateType["All"] = 14335] = "All";
-    /**
-     * RecalcUniforms
-     */
-    UpdateType[UpdateType["RecalcUniforms"] = 16384] = "RecalcUniforms";
+    UpdateType[UpdateType["All"] = 7167] = "All";
 })(UpdateType || (UpdateType = {}));
 /**
  * A visual Node in the Renderer scene graph.
@@ -166,10 +158,15 @@ export class CoreNode extends EventEmitter {
     _id = getNewId();
     props;
     hasShaderUpdater = false;
+    hasShaderTimeFn = false;
+    hasColorProps = false;
+    zIndexMin = 0;
+    zIndexMax = 0;
+    previousZIndex = -1;
+    zIndexSortList = [];
     updateType = UpdateType.All;
     childUpdateType = UpdateType.None;
     globalTransform;
-    scaleRotateTransform;
     localTransform;
     sceneGlobalTransform;
     renderCoords;
@@ -184,6 +181,8 @@ export class CoreNode extends EventEmitter {
         height: 0,
         valid: false,
     };
+    textureCoords;
+    updateShaderUniforms = false;
     isRenderable = false;
     renderState = CoreNodeRenderState.Init;
     worldAlpha = 1;
@@ -195,104 +194,152 @@ export class CoreNode extends EventEmitter {
     hasRTTupdates = false;
     parentHasRenderTexture = false;
     rttParent = null;
+    /**
+     * only used when rtt = true
+     */
+    framebufferDimensions = null;
+    destroyed = false;
     constructor(stage, props) {
         super();
         this.stage = stage;
-        this.props = {
-            ...props,
-            parent: null,
-            texture: null,
-            shader: null,
-            src: null,
-            rtt: false,
-        };
+        const p = (this.props = {});
+        //inital update type
+        let initialUpdateType = UpdateType.Local | UpdateType.RenderBounds | UpdateType.RenderState;
+        // Fast-path assign only known keys
+        p.x = props.x;
+        p.y = props.y;
+        p.w = props.w;
+        p.h = props.h;
+        p.alpha = props.alpha;
+        p.autosize = props.autosize;
+        p.clipping = props.clipping;
+        p.color = props.color;
+        p.colorTop = props.colorTop;
+        p.colorBottom = props.colorBottom;
+        p.colorLeft = props.colorLeft;
+        p.colorRight = props.colorRight;
+        p.colorTl = props.colorTl;
+        p.colorTr = props.colorTr;
+        p.colorBl = props.colorBl;
+        p.colorBr = props.colorBr;
+        //check if any color props are set for premultiplied color updates
+        if (props.color > 0 ||
+            props.colorTop > 0 ||
+            props.colorBottom > 0 ||
+            props.colorLeft > 0 ||
+            props.colorRight > 0 ||
+            props.colorTl > 0 ||
+            props.colorTr > 0 ||
+            props.colorBl > 0 ||
+            props.colorBr > 0) {
+            this.hasColorProps = true;
+            initialUpdateType |= UpdateType.PremultipliedColors;
+        }
+        p.scaleX = props.scaleX;
+        p.scaleY = props.scaleY;
+        p.rotation = props.rotation;
+        p.pivotX = props.pivotX;
+        p.pivotY = props.pivotY;
+        p.mountX = props.mountX;
+        p.mountY = props.mountY;
+        p.mount = props.mount;
+        p.pivot = props.pivot;
+        p.zIndex = props.zIndex;
+        p.textureOptions = props.textureOptions;
+        p.data = props.data;
+        p.imageType = props.imageType;
+        p.srcX = props.srcX;
+        p.srcY = props.srcY;
+        p.srcWidth = props.srcWidth;
+        p.srcHeight = props.srcHeight;
+        p.parent = props.parent;
+        p.texture = null;
+        p.shader = null;
+        p.src = null;
+        p.rtt = false;
+        p.boundsMargin = null;
+        // Only set non-default values
+        if (props.zIndex !== 0) {
+            this.zIndex = props.zIndex;
+        }
+        if (props.parent !== null) {
+            props.parent.addChild(this);
+        }
         // Assign props to instances
-        this.parent = props.parent;
         this.texture = props.texture;
         this.shader = props.shader;
         this.src = props.src;
         this.rtt = props.rtt;
-        if (props.boundsMargin) {
-            this.boundsMargin = Array.isArray(props.boundsMargin)
-                ? props.boundsMargin
-                : [
-                    props.boundsMargin,
-                    props.boundsMargin,
-                    props.boundsMargin,
-                    props.boundsMargin,
-                ];
-        }
-        this.setUpdateType(UpdateType.ScaleRotate |
-            UpdateType.Local |
-            UpdateType.RenderBounds |
-            UpdateType.RenderState);
-        if (isProductionEnvironment() === false && props.preventCleanup === true) {
-            console.warn('CoreNode.preventCleanup: Is deprecated and will be removed in upcoming release, please use textureOptions.preventCleanup instead');
-        }
+        this.boundsMargin = props.boundsMargin;
+        this.interactive = props.interactive;
+        this.setUpdateType(initialUpdateType);
         // if the default texture isn't loaded yet, wait for it to load
         // this only happens when the node is created before the stage is ready
-        if (this.stage.defaultTexture &&
-            this.stage.defaultTexture.state !== 'loaded') {
-            this.stage.defaultTexture.once('loaded', () => {
-                this.setUpdateType(UpdateType.IsRenderable);
-            });
+        const dt = this.stage.defaultTexture;
+        if (dt !== null && dt.state !== 'loaded') {
+            dt.once('loaded', () => this.setUpdateType(UpdateType.IsRenderable));
         }
     }
     //#region Textures
     loadTexture() {
-        const { texture } = this.props;
-        assertTruthy(texture);
+        if (this.props.texture === null) {
+            return;
+        }
         // If texture is already loaded / failed, trigger loaded event manually
         // so that users get a consistent event experience.
         // We do this in a microtask to allow listeners to be attached in the same
         // synchronous task after calling loadTexture()
-        queueMicrotask(() => {
-            if (this.textureOptions.preload === true) {
-                this.stage.txManager.loadTexture(texture);
-            }
-            texture.preventCleanup =
-                this.props.textureOptions?.preventCleanup ?? false;
-            texture.on('loaded', this.onTextureLoaded);
-            texture.on('failed', this.onTextureFailed);
-            texture.on('freed', this.onTextureFreed);
-            // If the parent is a render texture, the initial texture status
-            // will be set to freed until the texture is processed by the
-            // Render RTT nodes. So we only need to listen fo changes and
-            // no need to check the texture.state until we restructure how
-            // textures are being processed.
-            if (this.parentHasRenderTexture) {
-                this.notifyParentRTTOfUpdate();
-                return;
-            }
-            if (texture.state === 'loaded') {
-                assertTruthy(texture.dimensions);
-                this.onTextureLoaded(texture, texture.dimensions);
-            }
-            else if (texture.state === 'failed') {
-                assertTruthy(texture.error);
-                this.onTextureFailed(texture, texture.error);
-            }
-            else if (texture.state === 'freed') {
-                this.onTextureFreed(texture);
-            }
-        });
+        queueMicrotask(this.loadTextureTask);
     }
-    unloadTexture() {
-        if (this.texture !== null) {
-            this.texture.off('loaded', this.onTextureLoaded);
-            this.texture.off('failed', this.onTextureFailed);
-            this.texture.off('freed', this.onTextureFreed);
-            this.texture.setRenderableOwner(this, false);
+    /**
+     * Task for queueMicrotask to loadTexture
+     *
+     * @remarks
+     * This method is called in a microtask to release the texture.
+     */
+    loadTextureTask = () => {
+        const texture = this.texture;
+        if (this.textureOptions.preload === true) {
+            this.stage.txManager.loadTexture(texture);
+        }
+        texture.preventCleanup = this.props.textureOptions?.preventCleanup ?? false;
+        texture.on('loaded', this.onTextureLoaded);
+        texture.on('failed', this.onTextureFailed);
+        texture.on('freed', this.onTextureFreed);
+        // If the parent is a render texture, the initial texture status
+        // will be set to freed until the texture is processed by the
+        // Render RTT nodes. So we only need to listen fo changes and
+        // no need to check the texture.state until we restructure how
+        // textures are being processed.
+        if (this.parentHasRenderTexture) {
+            this.notifyParentRTTOfUpdate();
+            return;
         }
-    }
-    autosizeNode(dimensions) {
-        if (this.autosize) {
-            this.width = dimensions.width;
-            this.height = dimensions.height;
+        if (texture.state === 'loaded') {
+            this.onTextureLoaded(texture, texture.dimensions);
+        }
+        else if (texture.state === 'failed') {
+            this.onTextureFailed(texture, texture.error);
+        }
+        else if (texture.state === 'freed') {
+            this.onTextureFreed(texture);
+        }
+    };
+    unloadTexture() {
+        if (this.texture === null) {
+            return;
         }
+        const texture = this.texture;
+        texture.off('loaded', this.onTextureLoaded);
+        texture.off('failed', this.onTextureFailed);
+        texture.off('freed', this.onTextureFreed);
+        texture.setRenderableOwner(this._id, false);
     }
     onTextureLoaded = (_, dimensions) => {
-        this.autosizeNode(dimensions);
+        if (this.autosize === true) {
+            this.w = dimensions.w;
+            this.h = dimensions.h;
+        }
         this.setUpdateType(UpdateType.IsRenderable);
         // Texture was loaded. In case the RAF loop has already stopped, we request
         // a render to ensure the texture is rendered.
@@ -302,29 +349,44 @@ export class CoreNode extends EventEmitter {
             this.notifyParentRTTOfUpdate();
         }
         // ignore 1x1 pixel textures
-        if (dimensions.width > 1 && dimensions.height > 1) {
+        if (dimensions.w > 1 && dimensions.h > 1) {
             this.emit('loaded', {
                 type: 'texture',
                 dimensions,
             });
         }
+        if (this.stage.calculateTextureCoord === true &&
+            this.props.textureOptions !== null) {
+            this.textureCoords = this.stage.renderer.getTextureCoords(this);
+        }
         // Trigger a local update if the texture is loaded and the resizeMode is 'contain'
         if (this.props.textureOptions?.resizeMode?.type === 'contain') {
             this.setUpdateType(UpdateType.Local);
         }
     };
     onTextureFailed = (_, error) => {
+        // immediately set isRenderable to false, so that we handle the error
+        // without waiting for the next frame loop
+        this.isRenderable = false;
+        this.updateTextureOwnership(false);
         this.setUpdateType(UpdateType.IsRenderable);
         // If parent has a render texture, flag that we need to update
         if (this.parentHasRenderTexture) {
             this.notifyParentRTTOfUpdate();
         }
-        this.emit('failed', {
-            type: 'texture',
-            error,
-        });
+        if (this.texture !== null &&
+            this.texture.retryCount > this.texture.maxRetryCount) {
+            this.emit('failed', {
+                type: 'texture',
+                error,
+            });
+        }
     };
     onTextureFreed = () => {
+        // immediately set isRenderable to false, so that we handle the error
+        // without waiting for the next frame loop
+        this.isRenderable = false;
+        this.updateTextureOwnership(false);
         this.setUpdateType(UpdateType.IsRenderable);
         // If parent has a render texture, flag that we need to update
         if (this.parentHasRenderTexture) {
@@ -348,95 +410,86 @@ export class CoreNode extends EventEmitter {
         const parent = this.props.parent;
         if (!parent)
             return;
-        if ((parent.updateType & UpdateType.Children) === 0) {
-            // Inform the parent if it doesn’t already have a child update
-            parent.setUpdateType(UpdateType.Children);
-        }
-    }
-    sortChildren() {
-        this.children.sort((a, b) => a.calcZIndex - b.calcZIndex);
-    }
-    updateScaleRotateTransform() {
-        const { rotation, scaleX, scaleY } = this.props;
-        // optimize simple translation cases
-        if (rotation === 0 && scaleX === 1 && scaleY === 1) {
-            this.scaleRotateTransform = undefined;
-            return;
-        }
-        this.scaleRotateTransform = Matrix3d.rotate(rotation, this.scaleRotateTransform).scale(scaleX, scaleY);
+        parent.setUpdateType(UpdateType.Children);
     }
     updateLocalTransform() {
-        const { x, y, width, height } = this.props;
-        const mountTranslateX = this.props.mountX * width;
-        const mountTranslateY = this.props.mountY * height;
-        if (this.scaleRotateTransform) {
-            const pivotTranslateX = this.props.pivotX * width;
-            const pivotTranslateY = this.props.pivotY * height;
+        const p = this.props;
+        const { x, y, w, h } = p;
+        const mountTranslateX = p.mountX * w;
+        const mountTranslateY = p.mountY * h;
+        if (p.rotation !== 0 || p.scaleX !== 1 || p.scaleY !== 1) {
+            const scaleRotate = Matrix3d.rotate(p.rotation).scale(p.scaleX, p.scaleY);
+            const pivotTranslateX = p.pivotX * w;
+            const pivotTranslateY = p.pivotY * h;
             this.localTransform = Matrix3d.translate(x - mountTranslateX + pivotTranslateX, y - mountTranslateY + pivotTranslateY, this.localTransform)
-                .multiply(this.scaleRotateTransform)
+                .multiply(scaleRotate)
                 .translate(-pivotTranslateX, -pivotTranslateY);
         }
         else {
             this.localTransform = Matrix3d.translate(x - mountTranslateX, y - mountTranslateY, this.localTransform);
         }
         // Handle 'contain' resize mode
-        const texture = this.props.texture;
+        const texture = p.texture;
         if (texture &&
             texture.dimensions &&
-            this.props.textureOptions?.resizeMode?.type === 'contain') {
+            p.textureOptions.resizeMode?.type === 'contain') {
             let resizeModeScaleX = 1;
             let resizeModeScaleY = 1;
             let extraX = 0;
             let extraY = 0;
-            const { width: tw, height: th } = texture.dimensions;
+            const { w: tw, h: th } = texture.dimensions;
             const txAspectRatio = tw / th;
-            const nodeAspectRatio = width / height;
+            const nodeAspectRatio = w / h;
             if (txAspectRatio > nodeAspectRatio) {
                 // Texture is wider than node
                 // Center the node vertically (shift down by extraY)
                 // Scale the node vertically to maintain original aspect ratio
-                const scaleX = width / tw;
+                const scaleX = w / tw;
                 const scaledTxHeight = th * scaleX;
-                extraY = (height - scaledTxHeight) / 2;
-                resizeModeScaleY = scaledTxHeight / height;
+                extraY = (h - scaledTxHeight) / 2;
+                resizeModeScaleY = scaledTxHeight / h;
             }
             else {
                 // Texture is taller than node (or equal)
                 // Center the node horizontally (shift right by extraX)
                 // Scale the node horizontally to maintain original aspect ratio
-                const scaleY = height / th;
+                const scaleY = h / th;
                 const scaledTxWidth = tw * scaleY;
-                extraX = (width - scaledTxWidth) / 2;
-                resizeModeScaleX = scaledTxWidth / width;
+                extraX = (w - scaledTxWidth) / 2;
+                resizeModeScaleX = scaledTxWidth / w;
             }
             // Apply the extra translation and scale to the local transform
             this.localTransform
                 .translate(extraX, extraY)
                 .scale(resizeModeScaleX, resizeModeScaleY);
         }
-        this.setUpdateType(UpdateType.Global);
     }
     /**
      * @todo: test for correct calculation flag
      * @param delta
      */
     update(delta, parentClippingRect) {
-        if (this.updateType & UpdateType.ScaleRotate) {
-            this.updateScaleRotateTransform();
-            this.setUpdateType(UpdateType.Local);
-        }
-        if (this.updateType & UpdateType.Local) {
+        const props = this.props;
+        const parent = props.parent;
+        const parentHasRenderTexture = this.parentHasRenderTexture;
+        const hasParent = props.parent !== null;
+        let newRenderState = null;
+        let updateType = this.updateType;
+        let childUpdateType = this.childUpdateType;
+        let updateParent = false;
+        // reset update type
+        this.updateType = 0;
+        this.childUpdateType = 0;
+        if (updateType & UpdateType.Local) {
             this.updateLocalTransform();
-            this.setUpdateType(UpdateType.Global);
+            updateType |= UpdateType.Global;
+            updateParent = hasParent;
         }
-        const parent = this.props.parent;
-        let renderState = null;
         // Handle specific RTT updates at this node level
-        if (this.updateType & UpdateType.RenderTexture && this.rtt) {
+        if (updateType & UpdateType.RenderTexture && this.rtt === true) {
             this.hasRTTupdates = true;
         }
-        if (this.updateType & UpdateType.Global) {
-            assertTruthy(this.localTransform);
+        if (updateType & UpdateType.Global) {
             if (this.parentHasRenderTexture === true && parent?.rtt === true) {
                 // we are at the start of the RTT chain, so we need to reset the globalTransform
                 // for correct RTT rendering
@@ -460,134 +513,133 @@ export class CoreNode extends EventEmitter {
             }
             this.calculateRenderCoords();
             this.updateBoundingRect();
-            this.setUpdateType(UpdateType.RenderState |
-                UpdateType.Children |
-                UpdateType.RecalcUniforms);
-            this.childUpdateType |= UpdateType.Global;
+            updateType |=
+                UpdateType.RenderState |
+                    UpdateType.Children |
+                    UpdateType.RecalcUniforms;
+            updateParent = hasParent;
+            childUpdateType |= UpdateType.Global;
             if (this.clipping === true) {
-                this.setUpdateType(UpdateType.Clipping | UpdateType.RenderBounds);
-                this.childUpdateType |= UpdateType.RenderBounds;
+                updateType |= UpdateType.Clipping | UpdateType.RenderBounds;
+                updateParent = hasParent;
+                childUpdateType |= UpdateType.RenderBounds;
             }
         }
-        if (this.updateType & UpdateType.RenderBounds) {
+        if (updateType & UpdateType.RenderBounds) {
             this.createRenderBounds();
-            this.setUpdateType(UpdateType.RenderState);
-            this.setUpdateType(UpdateType.Children);
-            this.childUpdateType |= UpdateType.RenderBounds;
-        }
-        if (this.updateType & UpdateType.RenderState) {
-            renderState = this.checkRenderBounds();
-            this.setUpdateType(UpdateType.IsRenderable);
+            updateType |= UpdateType.RenderState | UpdateType.Children;
+            updateParent = hasParent;
+            childUpdateType |= UpdateType.RenderBounds;
+        }
+        if (updateType & UpdateType.RenderState) {
+            newRenderState = this.checkRenderBounds();
+            updateType |= UpdateType.IsRenderable;
+            updateParent = hasParent;
             // if we're not going out of bounds, update the render state
             // this is done so the update loop can finish before we mark a node
             // as out of bounds
-            if (renderState !== CoreNodeRenderState.OutOfBounds) {
-                this.updateRenderState(renderState);
+            if (newRenderState !== CoreNodeRenderState.OutOfBounds) {
+                this.updateRenderState(newRenderState);
             }
         }
-        if (this.updateType & UpdateType.WorldAlpha) {
-            if (parent) {
-                this.worldAlpha = parent.worldAlpha * this.props.alpha;
-            }
-            else {
-                this.worldAlpha = this.props.alpha;
-            }
-            this.setUpdateType(UpdateType.Children |
+        if (updateType & UpdateType.WorldAlpha) {
+            this.worldAlpha = (parent?.worldAlpha ?? 1) * this.props.alpha;
+            updateType |=
                 UpdateType.PremultipliedColors |
-                UpdateType.IsRenderable);
-            this.childUpdateType |= UpdateType.WorldAlpha;
+                    UpdateType.Children |
+                    UpdateType.IsRenderable;
+            updateParent = hasParent;
+            childUpdateType |= UpdateType.WorldAlpha;
         }
-        if (this.updateType & UpdateType.IsRenderable) {
+        if (updateType & UpdateType.IsRenderable) {
             this.updateIsRenderable();
         }
-        if (this.updateType & UpdateType.Clipping) {
+        if (updateType & UpdateType.Clipping) {
             this.calculateClippingRect(parentClippingRect);
-            this.setUpdateType(UpdateType.Children);
-            this.childUpdateType |= UpdateType.Clipping;
-            this.childUpdateType |= UpdateType.RenderBounds;
-        }
-        if (this.updateType & UpdateType.PremultipliedColors) {
-            this.premultipliedColorTl = mergeColorAlphaPremultiplied(this.props.colorTl, this.worldAlpha, true);
-            // If all the colors are the same just sent them all to the same value
-            if (this.props.colorTl === this.props.colorTr &&
-                this.props.colorBl === this.props.colorBr &&
-                this.props.colorTl === this.props.colorBl) {
+            updateType |= UpdateType.Children;
+            updateParent = hasParent;
+            childUpdateType |= UpdateType.Clipping | UpdateType.RenderBounds;
+        }
+        if (updateType & UpdateType.PremultipliedColors) {
+            const alpha = this.worldAlpha;
+            const tl = props.colorTl;
+            const tr = props.colorTr;
+            const bl = props.colorBl;
+            const br = props.colorBr;
+            // Fast equality check (covers all 4 corners)
+            const same = tl === tr && tl === bl && tl === br;
+            const merged = mergeColorAlphaPremultiplied(tl, alpha, true);
+            this.premultipliedColorTl = merged;
+            if (same === true) {
                 this.premultipliedColorTr =
                     this.premultipliedColorBl =
                         this.premultipliedColorBr =
-                            this.premultipliedColorTl;
+                            merged;
             }
             else {
-                this.premultipliedColorTr = mergeColorAlphaPremultiplied(this.props.colorTr, this.worldAlpha, true);
-                this.premultipliedColorBl = mergeColorAlphaPremultiplied(this.props.colorBl, this.worldAlpha, true);
-                this.premultipliedColorBr = mergeColorAlphaPremultiplied(this.props.colorBr, this.worldAlpha, true);
+                this.premultipliedColorTr = mergeColorAlphaPremultiplied(tr, alpha, true);
+                this.premultipliedColorBl = mergeColorAlphaPremultiplied(bl, alpha, true);
+                this.premultipliedColorBr = mergeColorAlphaPremultiplied(br, alpha, true);
             }
         }
-        // No need to update zIndex if there is no parent
-        if (parent !== null && this.updateType & UpdateType.CalculatedZIndex) {
-            this.calculateZIndex();
-            // Tell parent to re-sort children
-            parent.setUpdateType(UpdateType.ZIndexSortedChildren);
-        }
-        if (this.props.strictBounds === true &&
-            this.renderState === CoreNodeRenderState.OutOfBounds) {
-            this.updateType &= ~UpdateType.RenderBounds; // remove render bounds update
+        if (this.renderState === CoreNodeRenderState.OutOfBounds) {
+            // Delay updating children until the node is in bounds
+            this.updateType = updateType;
+            this.childUpdateType = childUpdateType;
             return;
         }
-        if (this.updateType & UpdateType.RecalcUniforms &&
+        if (updateParent === true) {
+            parent.setUpdateType(UpdateType.Children);
+        }
+        if (updateType & UpdateType.RecalcUniforms &&
             this.hasShaderUpdater === true) {
+            this.updateShaderUniforms = true;
+        }
+        if (this.isRenderable === true && this.updateShaderUniforms === true) {
+            this.updateShaderUniforms = false;
             //this exists because the boolean hasShaderUpdater === true
             this.shader.update();
         }
-        if (this.updateType & UpdateType.Children && this.children.length > 0) {
+        if (updateType & UpdateType.Children && this.children.length > 0) {
+            let childClippingRect = this.clippingRect;
+            if (this.rtt === true) {
+                childClippingRect = NO_CLIPPING_RECT;
+            }
             for (let i = 0, length = this.children.length; i < length; i++) {
                 const child = this.children[i];
-                child.setUpdateType(this.childUpdateType);
+                if (childUpdateType !== 0) {
+                    child.setUpdateType(childUpdateType);
+                }
                 if (child.updateType === 0) {
                     continue;
                 }
-                let childClippingRect = this.clippingRect;
-                if (this.rtt === true) {
-                    childClippingRect = {
-                        x: 0,
-                        y: 0,
-                        width: 0,
-                        height: 0,
-                        valid: false,
-                    };
-                }
                 child.update(delta, childClippingRect);
             }
         }
         // If the node has an RTT parent and requires a texture re-render, inform the RTT parent
-        // if (this.parentHasRenderTexture && this.updateType & UpdateType.RenderTexture) {
+        // if (this.parentHasRenderTexture && updateType & UpdateType.RenderTexture) {
         // @TODO have a more scoped down updateType for RTT updates
-        if (this.parentHasRenderTexture && this.updateType > 0) {
+        if (parentHasRenderTexture === true) {
             this.notifyParentRTTOfUpdate();
         }
-        // Sorting children MUST happen after children have been updated so
-        // that they have the oppotunity to update their calculated zIndex.
-        if (this.updateType & UpdateType.ZIndexSortedChildren) {
+        //Resort children if needed
+        if (updateType & UpdateType.SortZIndexChildren) {
             // reorder z-index
             this.sortChildren();
         }
         // If we're out of bounds, apply the render state now
         // this is done so nodes can finish their entire update loop before
         // being marked as out of bounds
-        if (renderState === CoreNodeRenderState.OutOfBounds) {
-            this.updateRenderState(renderState);
+        if (newRenderState === CoreNodeRenderState.OutOfBounds) {
+            this.updateRenderState(newRenderState);
             this.updateIsRenderable();
             if (this.rtt === true &&
-                renderState === CoreNodeRenderState.OutOfBounds) {
+                newRenderState === CoreNodeRenderState.OutOfBounds) {
                 // notify children that we are going out of bounds
                 // we have to do this now before we stop processing the render tree
-                this.notifyChildrenRTTOfUpdate(renderState);
-                // this.childUpdateType |= UpdateType.RenderState;
+                this.notifyChildrenRTTOfUpdate(newRenderState);
             }
         }
-        // reset update type
-        this.updateType = 0;
-        this.childUpdateType = 0;
     }
     findParentRTTNode() {
         let rttNode = this.parent;
@@ -596,13 +648,6 @@ export class CoreNode extends EventEmitter {
         }
         return rttNode;
     }
-    getRTTParentRenderState() {
-        const rttNode = this.rttParent || this.findParentRTTNode();
-        if (!rttNode) {
-            return null;
-        }
-        return rttNode.renderState;
-    }
     notifyChildrenRTTOfUpdate(renderState) {
         for (const child of this.children) {
             // force child to update render state
@@ -628,9 +673,6 @@ export class CoreNode extends EventEmitter {
         }
     }
     checkRenderBounds() {
-        assertTruthy(this.renderBound);
-        assertTruthy(this.strictBound);
-        assertTruthy(this.preloadBound);
         if (boundInsideBound(this.renderBound, this.strictBound)) {
             return CoreNodeRenderState.InViewport;
         }
@@ -642,17 +684,16 @@ export class CoreNode extends EventEmitter {
             return CoreNodeRenderState.InViewport;
         }
         // check if we dont have dimensions, take our parent's render state
-        if (this.parent !== null &&
-            (this.props.width === 0 || this.props.height === 0)) {
+        if (this.parent !== null && (this.props.w === 0 || this.props.h === 0)) {
             return this.parent.renderState;
         }
         return CoreNodeRenderState.OutOfBounds;
     }
     updateBoundingRect() {
-        const transform = this.sceneGlobalTransform || this.globalTransform;
-        const renderCoords = this.sceneRenderCoords || this.renderCoords;
-        assertTruthy(transform);
-        assertTruthy(renderCoords);
+        const transform = (this.sceneGlobalTransform ||
+            this.globalTransform);
+        const renderCoords = (this.sceneRenderCoords ||
+            this.renderCoords);
         if (transform.tb === 0 || transform.tc === 0) {
             this.renderBound = createBound(renderCoords.x1, renderCoords.y1, renderCoords.x3, renderCoords.y3, this.renderBound);
         }
@@ -662,7 +703,6 @@ export class CoreNode extends EventEmitter {
         }
     }
     createRenderBounds() {
-        assertTruthy(this.stage);
         if (this.parent !== null && this.parent.strictBound !== undefined) {
             // we have a parent with a valid bound, copy it
             const parentBound = this.parent.strictBound;
@@ -688,13 +728,13 @@ export class CoreNode extends EventEmitter {
             return;
         }
         // clipping is enabled and we are in bounds create our own bounds
-        const { x, y, width, height } = this.props;
+        const { x, y, w, h } = this.props;
         // Pick the global transform if available, otherwise use the local transform
         // global transform is only available if the node in an RTT chain
         const { tx, ty } = this.sceneGlobalTransform || this.globalTransform || {};
         const _x = tx ?? x;
         const _y = ty ?? y;
-        this.strictBound = createBound(_x, _y, _x + width, _y + height, this.strictBound);
+        this.strictBound = createBound(_x, _y, _x + w, _y + h, this.strictBound);
         this.preloadBound = createPreloadBounds(this.strictBound, this.boundsMargin);
     }
     updateRenderState(renderState) {
@@ -710,6 +750,17 @@ export class CoreNode extends EventEmitter {
             current: renderState,
         });
     }
+    /**
+     * Checks if the node is renderable based on world alpha, dimensions and out of bounds status.
+     */
+    checkBasicRenderability() {
+        if (this.worldAlpha === 0 || this.isOutOfBounds() === true) {
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
     /**
      * Updates the `isRenderable` property based on various conditions.
      */
@@ -723,11 +774,22 @@ export class CoreNode extends EventEmitter {
             return;
         }
         if (this.texture !== null) {
+            // preemptive check for failed textures this will mark the current node as non-renderable
+            // and will prevent further checks until the texture is reloaded or retry is reset on the texture
+            if (this.texture.retryCount > this.texture.maxRetryCount) {
+                // texture has failed to load, we cannot render
+                this.updateTextureOwnership(false);
+                this.setRenderable(false);
+                return;
+            }
             needsTextureOwnership = true;
             // we're only renderable if the texture state is loaded
             newIsRenderable = this.texture.state === 'loaded';
         }
-        else if ((this.hasShader() || this.hasColorProperties() === true) &&
+        else if (
+        // check shader
+        (this.props.shader !== null || this.hasColorProps === true) &&
+            // check dimensions
             this.hasDimensions() === true) {
             // This mean we have dimensions and a color set, so we can render a ColorTexture
             if (this.stage.defaultTexture &&
@@ -738,29 +800,26 @@ export class CoreNode extends EventEmitter {
         this.updateTextureOwnership(needsTextureOwnership);
         this.setRenderable(newIsRenderable);
     }
-    /**
-     * Checks if the node is renderable based on world alpha, dimensions and out of bounds status.
-     */
-    checkBasicRenderability() {
-        if (this.worldAlpha === 0 || this.isOutOfBounds() === true) {
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
     /**
      * Sets the renderable state and triggers changes if necessary.
      * @param isRenderable - The new renderable state
      */
     setRenderable(isRenderable) {
+        const previousIsRenderable = this.isRenderable;
         this.isRenderable = isRenderable;
+        // Emit event if renderable status has changed
+        if (previousIsRenderable !== isRenderable) {
+            this.emit('renderable', {
+                type: 'renderable',
+                isRenderable,
+            });
+        }
     }
     /**
      * Changes the renderable state of the node.
      */
     updateTextureOwnership(isRenderable) {
-        this.texture?.setRenderableOwner(this, isRenderable);
+        this.texture?.setRenderableOwner(this._id, isRenderable);
     }
     /**
      * Checks if the node is out of the viewport bounds.
@@ -772,33 +831,17 @@ export class CoreNode extends EventEmitter {
      * Checks if the node has dimensions (width/height)
      */
     hasDimensions() {
-        return this.props.width !== 0 && this.props.height !== 0;
-    }
-    /**
-     * Checks if the node has any color properties set.
-     */
-    hasColorProperties() {
-        return (this.props.color !== 0 ||
-            this.props.colorTop !== 0 ||
-            this.props.colorBottom !== 0 ||
-            this.props.colorLeft !== 0 ||
-            this.props.colorRight !== 0 ||
-            this.props.colorTl !== 0 ||
-            this.props.colorTr !== 0 ||
-            this.props.colorBl !== 0 ||
-            this.props.colorBr !== 0);
-    }
-    hasShader() {
-        return this.props.shader !== null;
+        return this.props.w !== 0 && this.props.h !== 0;
     }
     calculateRenderCoords() {
-        const { width, height } = this;
-        const { tx, ty, ta, tb, tc, td } = this.globalTransform;
+        const { w, h } = this.props;
+        const g = this.globalTransform;
+        const tx = g.tx, ty = g.ty, ta = g.ta, tb = g.tb, tc = g.tc, td = g.td;
         if (tb === 0 && tc === 0) {
             const minX = tx;
-            const maxX = tx + width * ta;
+            const maxX = tx + w * ta;
             const minY = ty;
-            const maxY = ty + height * td;
+            const maxY = ty + h * td;
             this.renderCoords = RenderCoords.translate(
             //top-left
             minX, minY, 
@@ -814,11 +857,11 @@ export class CoreNode extends EventEmitter {
             //top-left
             tx, ty, 
             //top-right
-            tx + width * ta, ty + width * tc, 
+            tx + w * ta, ty + w * tc, 
             //bottom-right
-            tx + width * ta + height * tb, ty + width * tc + height * td, 
+            tx + w * ta + h * tb, ty + w * tc + h * td, 
             //bottom-left
-            tx + height * tb, ty + height * td, this.renderCoords);
+            tx + h * tb, ty + h * td, this.renderCoords);
         }
         if (this.sceneGlobalTransform === undefined) {
             return;
@@ -826,9 +869,9 @@ export class CoreNode extends EventEmitter {
         const { tx: stx, ty: sty, ta: sta, tb: stb, tc: stc, td: std, } = this.sceneGlobalTransform;
         if (stb === 0 && stc === 0) {
             const minX = stx;
-            const maxX = stx + width * sta;
+            const maxX = stx + w * sta;
             const minY = sty;
-            const maxY = sty + height * std;
+            const maxY = sty + h * std;
             this.sceneRenderCoords = RenderCoords.translate(
             //top-left
             minX, minY, 
@@ -844,11 +887,11 @@ export class CoreNode extends EventEmitter {
             //top-left
             stx, sty, 
             //top-right
-            stx + width * sta, sty + width * stc, 
+            stx + w * sta, sty + w * stc, 
             //bottom-right
-            stx + width * sta + height * stb, sty + width * stc + height * std, 
+            stx + w * sta + h * stb, sty + w * stc + h * std, 
             //bottom-left
-            stx + height * stb, sty + height * std, this.sceneRenderCoords);
+            stx + h * stb, sty + h * std, this.sceneRenderCoords);
         }
     }
     /**
@@ -860,15 +903,14 @@ export class CoreNode extends EventEmitter {
      * Finally, the node's parentClippingRect and clippingRect properties are updated.
      */
     calculateClippingRect(parentClippingRect) {
-        assertTruthy(this.globalTransform);
         const { clippingRect, props, globalTransform: gt } = this;
         const { clipping } = props;
         const isRotated = gt.tb !== 0 || gt.tc !== 0;
         if (clipping === true && isRotated === false) {
             clippingRect.x = gt.tx;
             clippingRect.y = gt.ty;
-            clippingRect.width = this.width * gt.ta;
-            clippingRect.height = this.height * gt.td;
+            clippingRect.width = this.props.w * gt.ta;
+            clippingRect.height = this.props.h * gt.td;
             clippingRect.valid = true;
         }
         else {
@@ -884,84 +926,157 @@ export class CoreNode extends EventEmitter {
             clippingRect.valid = true;
         }
     }
-    calculateZIndex() {
-        const props = this.props;
-        const z = props.zIndex || 0;
-        const p = props.parent?.zIndex || 0;
-        let zIndex = z;
-        if (props.parent?.zIndexLocked) {
-            zIndex = z < p ? z : p;
-        }
-        this.calcZIndex = zIndex;
-    }
     /**
      * Destroy the node and cleanup all resources
      */
     destroy() {
+        if (this.destroyed === true) {
+            return;
+        }
+        this.removeAllListeners();
+        this.destroyed = true;
         this.unloadTexture();
-        this.clippingRect.valid = false;
         this.isRenderable = false;
-        this.renderCoords = undefined;
-        this.renderBound = undefined;
-        this.strictBound = undefined;
-        this.preloadBound = undefined;
-        this.globalTransform = undefined;
-        this.scaleRotateTransform = undefined;
-        this.localTransform = undefined;
-        this.props.texture = null;
-        this.props.shader = null;
+        if (this.hasShaderTimeFn === true) {
+            this.stage.untrackTimedNode(this);
+        }
+        // Kill children
         while (this.children.length > 0) {
-            this.children[0]?.destroy();
+            this.children[0].destroy();
         }
-        // This very action will also remove the node from the parent's children array
-        this.parent = null;
-        if (this.rtt) {
+        const parent = this.parent;
+        if (parent !== null) {
+            parent.removeChild(this);
+        }
+        this.props.parent = null;
+        this.props.texture = null;
+        if (this.rtt === true) {
             this.stage.renderer.removeRTTNode(this);
         }
-        this.removeAllListeners();
+        this.stage.requestRender();
     }
     renderQuads(renderer) {
-        // Prevent quad rendering if parent has a render texture
-        // and renderer is not currently rendering to a texture
-        if (this.parentHasRenderTexture) {
-            if (!renderer.renderToTextureActive) {
-                return;
-            }
-            // Prevent quad rendering if parent render texture is not the active render texture
-            if (this.parentRenderTexture !== renderer.activeRttNode) {
+        if (this.parentHasRenderTexture === true) {
+            const rtt = renderer.renderToTextureActive;
+            if (rtt === false || this.parentRenderTexture !== renderer.activeRttNode)
                 return;
-            }
         }
-        assertTruthy(this.globalTransform);
-        assertTruthy(this.renderCoords);
-        // add to list of renderables to be sorted before rendering
+        const p = this.props;
+        const t = this.globalTransform;
+        const coords = this.renderCoords;
+        const texture = p.texture || this.stage.defaultTexture;
+        const textureCoords = this.textureCoords || this.stage.renderer.defaultTextureCoords;
+        // There is a race condition where the texture can be null
+        // with RTT nodes. Adding this defensively to avoid errors.
+        if (texture && texture.state !== 'loaded') {
+            return;
+        }
         renderer.addQuad({
-            width: this.props.width,
-            height: this.props.height,
+            width: p.w,
+            height: p.h,
             colorTl: this.premultipliedColorTl,
             colorTr: this.premultipliedColorTr,
             colorBl: this.premultipliedColorBl,
             colorBr: this.premultipliedColorBr,
-            // if we do not have a texture, use the default texture
-            // this assumes any renderable node is either a distinct texture or a ColorTexture
-            texture: this.texture || this.stage.defaultTexture,
-            textureOptions: this.textureOptions,
-            zIndex: this.zIndex,
-            shader: this.props.shader,
+            texture,
+            textureOptions: p.textureOptions,
+            textureCoords: textureCoords,
+            shader: p.shader,
             alpha: this.worldAlpha,
             clippingRect: this.clippingRect,
-            tx: this.globalTransform.tx,
-            ty: this.globalTransform.ty,
-            ta: this.globalTransform.ta,
-            tb: this.globalTransform.tb,
-            tc: this.globalTransform.tc,
-            td: this.globalTransform.td,
-            renderCoords: this.renderCoords,
-            rtt: this.rtt,
+            tx: t.tx,
+            ty: t.ty,
+            ta: t.ta,
+            tb: t.tb,
+            tc: t.tc,
+            td: t.td,
+            renderCoords: coords,
+            rtt: p.rtt,
+            zIndex: this.calcZIndex,
             parentHasRenderTexture: this.parentHasRenderTexture,
-            framebufferDimensions: this.framebufferDimensions,
+            framebufferDimensions: this.parentHasRenderTexture
+                ? this.parentFramebufferDimensions
+                : null,
+            time: this.hasShaderTimeFn === true ? this.getTimerValue() : null,
         });
     }
+    getTimerValue() {
+        if (typeof this.shader.time === 'function') {
+            return this.shader.time(this.stage);
+        }
+        return this.stage.elapsedTime;
+    }
+    sortChildren() {
+        const changedCount = this.zIndexSortList.length;
+        if (changedCount === 0) {
+            return;
+        }
+        const children = this.children;
+        let min = Infinity;
+        let max = -Infinity;
+        // find min and max zIndex
+        for (let i = 0; i < children.length; i++) {
+            const zIndex = children[i].props.zIndex;
+            if (zIndex < min) {
+                min = zIndex;
+            }
+            if (zIndex > max) {
+                max = zIndex;
+            }
+        }
+        // update min and max zIndex
+        this.zIndexMin = min;
+        this.zIndexMax = max;
+        // if min and max are the same, no need to sort
+        if (min === max) {
+            return;
+        }
+        const n = children.length;
+        // decide whether to use incremental sort or bucket sort
+        const useIncremental = changedCount <= 2 || changedCount < n * 0.05;
+        // when changed count is less than 2 or 5% of total children, use incremental sort
+        if (useIncremental === true) {
+            incrementalRepositionByZIndex(this.zIndexSortList, children);
+        }
+        else {
+            bucketSortByZIndex(children, min);
+        }
+        this.zIndexSortList.length = 0;
+        this.zIndexSortList = [];
+    }
+    removeChild(node, targetParent = null) {
+        if (targetParent === null &&
+            this.props.rtt === true &&
+            this.parentHasRenderTexture === true) {
+            node.clearRTTInheritance();
+        }
+        removeChild(node, this.children);
+    }
+    addChild(node, previousParent = null) {
+        const inRttCluster = this.props.rtt === true || this.parentHasRenderTexture === true;
+        const children = this.children;
+        const min = this.zIndexMin;
+        const max = this.zIndexMax;
+        const zIndex = node.zIndex;
+        node.parentHasRenderTexture = inRttCluster;
+        if (previousParent !== null) {
+            const previousParentInRttCluster = previousParent.props.rtt === true ||
+                previousParent.parentHasRenderTexture === true;
+            if (inRttCluster === false && previousParentInRttCluster === true) {
+                // update child RTT status
+                node.clearRTTInheritance();
+            }
+        }
+        if (inRttCluster === true) {
+            node.markChildrenWithRTT(this);
+        }
+        children.push(node);
+        if (min !== max || (zIndex !== min && zIndex !== max)) {
+            this.zIndexSortList.push(node);
+            this.setUpdateType(UpdateType.SortZIndexChildren);
+        }
+        this.setUpdateType(UpdateType.Children);
+    }
     //#region Properties
     get id() {
         return this._id;
@@ -983,12 +1098,12 @@ export class CoreNode extends EventEmitter {
     }
     get absX() {
         return (this.props.x +
-            -this.props.width * this.props.mountX +
+            -this.props.w * this.props.mountX +
             (this.props.parent?.absX || this.props.parent?.globalTransform?.tx || 0));
     }
     get absY() {
         return (this.props.y +
-            -this.props.height * this.props.mountY +
+            -this.props.h * this.props.mountY +
             (this.props.parent?.absY ?? 0));
     }
     get y() {
@@ -1000,34 +1115,30 @@ export class CoreNode extends EventEmitter {
             this.setUpdateType(UpdateType.Local);
         }
     }
-    get width() {
-        return this.props.width;
+    get w() {
+        return this.props.w;
     }
-    set width(value) {
-        if (this.props.width !== value) {
-            this.props.width = value;
+    set w(value) {
+        if (this.props.w !== value) {
+            this.props.w = value;
             this.setUpdateType(UpdateType.Local);
-            if (this.props.rtt) {
-                this.texture = this.stage.txManager.createTexture('RenderTexture', {
-                    width: this.width,
-                    height: this.height,
-                });
+            if (this.props.rtt === true) {
+                this.framebufferDimensions.w = value;
+                this.texture = this.stage.txManager.createTexture('RenderTexture', this.framebufferDimensions);
                 this.setUpdateType(UpdateType.RenderTexture);
             }
         }
     }
-    get height() {
-        return this.props.height;
+    get h() {
+        return this.props.h;
     }
-    set height(value) {
-        if (this.props.height !== value) {
-            this.props.height = value;
+    set h(value) {
+        if (this.props.h !== value) {
+            this.props.h = value;
             this.setUpdateType(UpdateType.Local);
-            if (this.props.rtt) {
-                this.texture = this.stage.txManager.createTexture('RenderTexture', {
-                    width: this.width,
-                    height: this.height,
-                });
+            if (this.props.rtt === true) {
+                this.framebufferDimensions.h = value;
+                this.texture = this.stage.txManager.createTexture('RenderTexture', this.framebufferDimensions);
                 this.setUpdateType(UpdateType.RenderTexture);
             }
         }
@@ -1049,7 +1160,7 @@ export class CoreNode extends EventEmitter {
     set scaleX(value) {
         if (this.props.scaleX !== value) {
             this.props.scaleX = value;
-            this.setUpdateType(UpdateType.ScaleRotate);
+            this.setUpdateType(UpdateType.Local);
         }
     }
     get scaleY() {
@@ -1058,7 +1169,7 @@ export class CoreNode extends EventEmitter {
     set scaleY(value) {
         if (this.props.scaleY !== value) {
             this.props.scaleY = value;
-            this.setUpdateType(UpdateType.ScaleRotate);
+            this.setUpdateType(UpdateType.Local);
         }
     }
     get mount() {
@@ -1125,7 +1236,7 @@ export class CoreNode extends EventEmitter {
     set rotation(value) {
         if (this.props.rotation !== value) {
             this.props.rotation = value;
-            this.setUpdateType(UpdateType.ScaleRotate);
+            this.setUpdateType(UpdateType.Local);
         }
     }
     get alpha() {
@@ -1146,9 +1257,18 @@ export class CoreNode extends EventEmitter {
         this.props.autosize = value;
     }
     get boundsMargin() {
-        return (this.props.boundsMargin ??
-            this.parent?.boundsMargin ??
-            this.stage.boundsMargin);
+        const props = this.props;
+        if (props.boundsMargin !== null) {
+            return props.boundsMargin;
+        }
+        const parent = this.parent;
+        if (parent !== null) {
+            const margin = parent.boundsMargin;
+            if (margin !== undefined) {
+                return margin;
+            }
+        }
+        return this.stage.boundsMargin;
     }
     set boundsMargin(value) {
         if (value === this.props.boundsMargin) {
@@ -1177,11 +1297,20 @@ export class CoreNode extends EventEmitter {
         return this.props.color;
     }
     set color(value) {
-        this.colorTop = value;
-        this.colorBottom = value;
-        this.colorLeft = value;
-        this.colorRight = value;
-        this.props.color = value;
+        const p = this.props;
+        if (p.color === value)
+            return;
+        p.color = value;
+        const has = value > 0;
+        this.hasColorProps = has;
+        if (p.colorTop !== value)
+            this.colorTop = value;
+        if (p.colorBottom !== value)
+            this.colorBottom = value;
+        if (p.colorLeft !== value)
+            this.colorLeft = value;
+        if (p.colorRight !== value)
+            this.colorRight = value;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
     get colorTop() {
@@ -1193,6 +1322,7 @@ export class CoreNode extends EventEmitter {
             this.colorTr = value;
         }
         this.props.colorTop = value;
+        this.hasColorProps = value > 0;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
     get colorBottom() {
@@ -1204,6 +1334,7 @@ export class CoreNode extends EventEmitter {
             this.colorBr = value;
         }
         this.props.colorBottom = value;
+        this.hasColorProps = value > 0;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
     get colorLeft() {
@@ -1215,6 +1346,7 @@ export class CoreNode extends EventEmitter {
             this.colorBl = value;
         }
         this.props.colorLeft = value;
+        this.hasColorProps = value > 0;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
     get colorRight() {
@@ -1226,6 +1358,7 @@ export class CoreNode extends EventEmitter {
             this.colorBr = value;
         }
         this.props.colorRight = value;
+        this.hasColorProps = value > 0;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
     get colorTl() {
@@ -1233,6 +1366,7 @@ export class CoreNode extends EventEmitter {
     }
     set colorTl(value) {
         this.props.colorTl = value;
+        this.hasColorProps = value > 0;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
     get colorTr() {
@@ -1240,6 +1374,7 @@ export class CoreNode extends EventEmitter {
     }
     set colorTr(value) {
         this.props.colorTr = value;
+        this.hasColorProps = value > 0;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
     get colorBl() {
@@ -1247,6 +1382,7 @@ export class CoreNode extends EventEmitter {
     }
     set colorBl(value) {
         this.props.colorBl = value;
+        this.hasColorProps = value > 0;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
     get colorBr() {
@@ -1254,28 +1390,38 @@ export class CoreNode extends EventEmitter {
     }
     set colorBr(value) {
         this.props.colorBr = value;
+        this.hasColorProps = value > 0;
         this.setUpdateType(UpdateType.PremultipliedColors);
     }
-    // we're only interested in parent zIndex to test
-    // if we should use node zIndex is higher then parent zIndex
-    get zIndexLocked() {
-        return this.props.zIndexLocked || 0;
-    }
-    set zIndexLocked(value) {
-        this.props.zIndexLocked = value;
-        this.setUpdateType(UpdateType.CalculatedZIndex | UpdateType.Children);
-        for (let i = 0, length = this.children.length; i < length; i++) {
-            this.children[i].setUpdateType(UpdateType.CalculatedZIndex);
-        }
-    }
     get zIndex() {
         return this.props.zIndex;
     }
     set zIndex(value) {
-        this.props.zIndex = value;
-        this.setUpdateType(UpdateType.CalculatedZIndex | UpdateType.Children);
-        for (let i = 0, length = this.children.length; i < length; i++) {
-            this.children[i].setUpdateType(UpdateType.CalculatedZIndex);
+        let sanitizedValue = value;
+        if (isNaN(sanitizedValue) || Number.isFinite(sanitizedValue) === false) {
+            console.warn(`zIndex was set to an invalid value: ${value}, defaulting to 0`);
+            sanitizedValue = 0;
+        }
+        //Clamp to safe integer range
+        if (sanitizedValue > Number.MAX_SAFE_INTEGER) {
+            sanitizedValue = 1000;
+        }
+        else if (sanitizedValue < Number.MIN_SAFE_INTEGER) {
+            sanitizedValue = -1000;
+        }
+        if (this.props.zIndex === sanitizedValue) {
+            return;
+        }
+        this.previousZIndex = this.props.zIndex;
+        this.props.zIndex = sanitizedValue;
+        const parent = this.parent;
+        if (parent !== null) {
+            const min = parent.zIndexMin;
+            const max = parent.zIndexMax;
+            if (min !== max || sanitizedValue < min || sanitizedValue > max) {
+                parent.zIndexSortList.push(this);
+                parent.setUpdateType(UpdateType.SortZIndexChildren);
+            }
         }
     }
     get parent() {
@@ -1288,34 +1434,13 @@ export class CoreNode extends EventEmitter {
         }
         this.props.parent = newParent;
         if (oldParent) {
-            const index = oldParent.children.indexOf(this);
-            assertTruthy(index !== -1, "CoreNode.parent: Node not found in old parent's children!");
-            oldParent.children.splice(index, 1);
-            oldParent.setUpdateType(UpdateType.Children | UpdateType.ZIndexSortedChildren);
-        }
-        if (newParent) {
-            newParent.children.push(this);
-            // Since this node has a new parent, to be safe, have it do a full update.
-            this.setUpdateType(UpdateType.All);
-            // Tell parent that it's children need to be updated and sorted.
-            newParent.setUpdateType(UpdateType.Children | UpdateType.ZIndexSortedChildren);
-            // If the new parent has an RTT enabled, apply RTT inheritance
-            if (newParent.rtt || newParent.parentHasRenderTexture) {
-                this.applyRTTInheritance(newParent);
-            }
+            oldParent.removeChild(this, newParent);
         }
-        this.updateScaleRotateTransform();
-        // fetch render bounds from parent
-        this.setUpdateType(UpdateType.RenderBounds | UpdateType.Children);
-    }
-    get preventCleanup() {
-        return this.props.textureOptions.preventCleanup || false;
-    }
-    set preventCleanup(value) {
-        if (isProductionEnvironment() === false) {
-            console.warn('CoreNode.preventCleanup: Is deprecated and will be removed in upcoming release, please use textureOptions.preventCleanup instead');
+        if (newParent !== null) {
+            newParent.addChild(this, oldParent);
         }
-        this.props.textureOptions.preventCleanup = value;
+        //since this node has a new parent, recalc global and render bounds
+        this.setUpdateType(UpdateType.Global | UpdateType.RenderBounds);
     }
     get rtt() {
         return this.props.rtt;
@@ -1338,10 +1463,11 @@ export class CoreNode extends EventEmitter {
         }
     }
     initRenderTexture() {
-        this.texture = this.stage.txManager.createTexture('RenderTexture', {
-            width: this.width,
-            height: this.height,
-        });
+        this.framebufferDimensions = {
+            w: this.props.w,
+            h: this.props.h,
+        };
+        this.texture = this.stage.txManager.createTexture('RenderTexture', this.framebufferDimensions);
         this.stage.renderer.renderToTexture(this);
     }
     cleanupRenderTexture() {
@@ -1349,6 +1475,7 @@ export class CoreNode extends EventEmitter {
         this.clearRTTInheritance();
         this.hasRTTupdates = false;
         this.texture = null;
+        this.framebufferDimensions = null;
     }
     markChildrenWithRTT(node = null) {
         const parent = node || this;
@@ -1397,10 +1524,17 @@ export class CoreNode extends EventEmitter {
         }
         if (shader.shaderKey !== 'default') {
             this.hasShaderUpdater = shader.update !== undefined;
+            this.hasShaderTimeFn = shader.time !== undefined;
             shader.attachNode(this);
         }
+        if (this.hasShaderTimeFn === true) {
+            this.stage.trackTimedNode(this);
+        }
+        else {
+            this.stage.untrackTimedNode(this);
+        }
         this.props.shader = shader;
-        this.setUpdateType(UpdateType.IsRenderable);
+        this.setUpdateType(UpdateType.IsRenderable | UpdateType.RecalcUniforms);
     }
     get src() {
         return this.props.src;
@@ -1416,8 +1550,8 @@ export class CoreNode extends EventEmitter {
         }
         this.texture = this.stage.txManager.createTexture('ImageTexture', {
             src: imageUrl,
-            width: this.props.width,
-            height: this.props.height,
+            w: this.props.w,
+            h: this.props.h,
             type: this.props.imageType,
             sx: this.props.srcX,
             sy: this.props.srcY,
@@ -1459,16 +1593,14 @@ export class CoreNode extends EventEmitter {
         this.props.srcY = value;
     }
     /**
-     * Returns the framebuffer dimensions of the node.
-     * If the node has a render texture, the dimensions are the same as the node's dimensions.
-     * If the node does not have a render texture, the dimensions are inherited from the parent.
-     * If the node parent has a render texture and the node is a render texture, the nodes dimensions are used.
+     * Returns the framebuffer dimensions of the RTT parent
      */
-    get framebufferDimensions() {
-        if (this.parentHasRenderTexture && !this.rtt && this.parent) {
-            return this.parent.framebufferDimensions;
+    get parentFramebufferDimensions() {
+        if (this.rttParent !== null) {
+            return this.rttParent.framebufferDimensions;
         }
-        return { width: this.width, height: this.height };
+        this.rttParent = this.findParentRTTNode();
+        return this.rttParent.framebufferDimensions;
     }
     /**
      * Returns the parent render texture node if it exists.
@@ -1492,32 +1624,38 @@ export class CoreNode extends EventEmitter {
         }
         const oldTexture = this.props.texture;
         if (oldTexture) {
-            oldTexture.setRenderableOwner(this, false);
             this.unloadTexture();
         }
+        this.textureCoords = undefined;
         this.props.texture = value;
         if (value !== null) {
-            value.setRenderableOwner(this, this.isRenderable);
+            value.setRenderableOwner(this._id, this.isRenderable);
             this.loadTexture();
         }
         this.setUpdateType(UpdateType.IsRenderable);
     }
     set textureOptions(value) {
         this.props.textureOptions = value;
+        if (this.stage.calculateTextureCoord === true && value !== null) {
+            this.textureCoords = this.stage.renderer.getTextureCoords(this);
+        }
     }
     get textureOptions() {
         return this.props.textureOptions;
     }
-    get strictBounds() {
-        return this.props.strictBounds;
-    }
-    set strictBounds(v) {
-        if (v === this.props.strictBounds) {
-            return;
+    set interactive(value) {
+        this.props.interactive = value;
+        // Update Stage's interactive Set
+        if (value === true) {
+            this.stage.interactiveNodes.add(this);
         }
-        this.props.strictBounds = v;
-        this.setUpdateType(UpdateType.RenderBounds | UpdateType.Children);
-        this.childUpdateType |= UpdateType.RenderBounds | UpdateType.Children;
+    }
+    get interactive() {
+        return this.props.interactive;
+    }
+    setRTTUpdates(type) {
+        this.hasRTTupdates = true;
+        this.parent?.setRTTUpdates(type);
     }
     animate(props, settings) {
         const animation = new CoreAnimation(this, props, settings);