Merge branch 'fix/variable-cleanup' of https://git.krews.org/nitro/nitro-renderer into fix/variable-cleanup

This commit is contained in:
Dank074 2021-06-13 03:40:13 -05:00
commit 5754ff294a
3 changed files with 8 additions and 17 deletions

View File

@ -1,5 +1,5 @@
export * from './GraphicAsset';
export * from './GraphicAssetCollection';
//export * from './GraphicAssetCollection';
export * from './GraphicAssetPalette';
export * from './IGraphicAsset';
export * from './IGraphicAssetCollection';

View File

@ -549,11 +549,11 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas
{
if((index < 0) || (index >= this._spriteCount)) return null;
const sprite = this._display.getChildAt(index);
const sprite = (this._display.getChildAt(index) as ExtendedSprite);
if(!sprite) return null;
return sprite as ExtendedSprite;
return sprite;
}
protected getExtendedSpriteIdentifier(sprite: ExtendedSprite): string

View File

@ -1,4 +1,4 @@
import { BaseTexture, BLEND_MODES, Point, Renderer, RenderTexture, Sprite, Texture } from 'pixi.js';
import { BaseTexture, BLEND_MODES, Point, RenderTexture, Sprite, Texture } from 'pixi.js';
import { Nitro } from '../../../nitro/Nitro';
export class ExtendedSprite extends Sprite
@ -38,20 +38,11 @@ export class ExtendedSprite extends Sprite
return true;
}
public render(renderer: Renderer): void
public calculateVertices(): void
{
try
{
//@ts-ignore
if(!this._texture || !this._texture._uvs || !this._texture._uvs.uvsFloat32) return;
}
if(!this.texture.orig) return;
catch (err)
{
return;
}
super.render(renderer);
super.calculateVertices();
}
public setTexture(texture: Texture): void