@lightningjs/renderer 0.3.3 → 0.3.4

package/src/render-drivers/main/MainOnlyNode.ts

@@ -30,8 +30,8 @@ import { CoreAnimationController } from '../../core/animations/CoreAnimationCont
 import { CoreNode } from '../../core/CoreNode.js';
 import type {
   RendererMain,
-  ShaderDesc,
-  TextureDesc,
+  ShaderRef,
+  TextureRef,
 } from '../../main-api/RendererMain.js';
 import type { IAnimationSettings } from '../../core/animations/CoreAnimation.js';
 import { EventEmitter } from '../../common/EventEmitter.js';
@@ -54,8 +54,8 @@ export class MainOnlyNode extends EventEmitter implements INode {
   protected _children: MainOnlyNode[] = [];
   protected _src = '';
   protected _parent: MainOnlyNode | null = null;
-  protected _texture: TextureDesc | null = null;
-  protected _shader: ShaderDesc | null = null;
+  protected _texture: TextureRef | null = null;
+  protected _shader: ShaderRef | null = null;
 
   constructor(
     props: INodeWritableProps,
@@ -357,20 +357,26 @@ export class MainOnlyNode extends EventEmitter implements INode {
       this.texture = null;
       return;
     }
-    this.texture = this.rendererMain.makeTexture('ImageTexture', {
+    this.texture = this.rendererMain.createTexture('ImageTexture', {
       src: imageUrl,
     });
   }
 
   //#region Texture
-  get texture(): TextureDesc | null {
+  get texture(): TextureRef | null {
     return this._texture;
   }
 
-  set texture(texture: TextureDesc | null) {
+  set texture(texture: TextureRef | null) {
     if (this._texture === texture) {
       return;
     }
+    if (this._texture) {
+      this.rendererMain.textureTracker.decrementTextureRefCount(this._texture);
+    }
+    if (texture) {
+      this.rendererMain.textureTracker.incrementTextureRefCount(texture);
+    }
     this._texture = texture;
     if (texture) {
       this.coreNode.loadTexture(texture.txType, texture.props, texture.options);
@@ -388,11 +394,11 @@ export class MainOnlyNode extends EventEmitter implements INode {
   };
   //#endregion Texture
 
-  get shader(): ShaderDesc | null {
+  get shader(): ShaderRef | null {
     return this._shader;
   }
 
-  set shader(shader: ShaderDesc | null) {
+  set shader(shader: ShaderRef | null) {
     if (this._shader === shader) {
       return;
     }
@@ -405,6 +411,7 @@ export class MainOnlyNode extends EventEmitter implements INode {
   destroy(): void {
     this.emit('beforeDestroy', {});
     this.parent = null;
+    this.texture = null;
     this.emit('afterDestroy', {});
     this.removeAllListeners();
   }

package/src/render-drivers/threadx/ThreadXMainNode.ts

@@ -21,8 +21,8 @@ import type { IAnimationController } from '../../common/IAnimationController.js'
 import type { INode, INodeAnimatableProps } from '../../main-api/INode.js';
 import type {
   RendererMain,
-  ShaderDesc,
-  TextureDesc,
+  ShaderRef,
+  TextureRef,
 } from '../../main-api/RendererMain.js';
 import { assertTruthy } from '../../utils.js';
 import type { NodeStruct } from './NodeStruct.js';
@@ -34,8 +34,8 @@ export class ThreadXMainNode extends SharedNode implements INode {
   private nextAnimationId = 1;
   protected _parent: ThreadXMainNode | null = null;
   protected _children: ThreadXMainNode[] = [];
-  protected _texture: TextureDesc | null = null;
-  protected _shader: ShaderDesc | null = null;
+  protected _texture: TextureRef | null = null;
+  protected _shader: ShaderRef | null = null;
   private _src = '';
 
   /**
@@ -59,14 +59,20 @@ export class ThreadXMainNode extends SharedNode implements INode {
     super(sharedNodeStruct, extendedCurProps);
   }
 
-  get texture(): TextureDesc | null {
+  get texture(): TextureRef | null {
     return this._texture;
   }
 
-  set texture(texture: TextureDesc | null) {
+  set texture(texture: TextureRef | null) {
     if (this._texture === texture) {
       return;
     }
+    if (this._texture) {
+      this.rendererMain.textureTracker.decrementTextureRefCount(this._texture);
+    }
+    if (texture) {
+      this.rendererMain.textureTracker.incrementTextureRefCount(texture);
+    }
     this._texture = texture;
     if (texture) {
       this.emit('loadTexture', texture as unknown as Record<string, unknown>);
@@ -75,11 +81,11 @@ export class ThreadXMainNode extends SharedNode implements INode {
     }
   }
 
-  get shader(): ShaderDesc | null {
+  get shader(): ShaderRef | null {
     return this._shader;
   }
 
-  set shader(shader: ShaderDesc | null) {
+  set shader(shader: ShaderRef | null) {
     if (this._shader === shader) {
       return;
     }
@@ -113,7 +119,7 @@ export class ThreadXMainNode extends SharedNode implements INode {
       this.texture = null;
       return;
     }
-    this.texture = this.rendererMain.makeTexture('ImageTexture', {
+    this.texture = this.rendererMain.createTexture('ImageTexture', {
       src: imageUrl,
     });
   }
@@ -148,4 +154,9 @@ export class ThreadXMainNode extends SharedNode implements INode {
   get props() {
     return this.curProps;
   }
+
+  override destroy() {
+    super.destroy();
+    this.texture = null;
+  }
 }

package/src/render-drivers/threadx/worker/ThreadXRendererNode.ts

@@ -28,10 +28,7 @@ import { CoreAnimation } from '../../../core/animations/CoreAnimation.js';
 import { CoreAnimationController } from '../../../core/animations/CoreAnimationController.js';
 import type { Texture } from '../../../core/textures/Texture.js';
 import { CoreNode } from '../../../core/CoreNode.js';
-import type {
-  ShaderDesc,
-  TextureDesc,
-} from '../../../main-api/RendererMain.js';
+import type { ShaderRef, TextureRef } from '../../../main-api/RendererMain.js';
 import type { IAnimationSettings } from '../../../core/animations/CoreAnimation.js';
 import type { Dimensions } from '../../../common/CommonTypes.js';
 
@@ -112,19 +109,18 @@ export class ThreadXRendererNode extends SharedNode {
     });
     this.on(
       'loadTexture',
-      (target: ThreadXRendererNode, textureDesc: TextureDesc) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
+      (target: ThreadXRendererNode, textureDesc: TextureRef) => {
         this.coreNode.loadTexture(
           textureDesc.txType,
-          textureDesc.props as any,
+          textureDesc.props,
           textureDesc.options,
         );
       },
     );
     this.on(
       'loadShader',
-      (target: ThreadXRendererNode, shaderDesc: ShaderDesc) => {
-        this.coreNode.loadShader(shaderDesc.shType, shaderDesc.props as any);
+      (target: ThreadXRendererNode, shaderDesc: ShaderRef) => {
+        this.coreNode.loadShader(shaderDesc.shType, shaderDesc.props);
       },
     );
     this.on('unloadTexture', (target: ThreadXRendererNode) => {