This commit is contained in:
Bill 2021-08-02 23:50:57 -04:00
parent 4be404e96d
commit 4d25b57bfc
39 changed files with 63 additions and 45 deletions

View File

@ -1,4 +1,4 @@
import { Point } from 'pixi.js'; import { Point } from '@pixi/math';
import { IVector3D } from '../../../room/utils/IVector3D'; import { IVector3D } from '../../../room/utils/IVector3D';
import { Vector3d } from '../../../room/utils/Vector3d'; import { Vector3d } from '../../../room/utils/Vector3d';
import { RoomFloorHole } from './RoomFloorHole'; import { RoomFloorHole } from './RoomFloorHole';

View File

@ -1,4 +1,4 @@
import { Point } from 'pixi.js'; import { Point } from '@pixi/math';
import { IVector3D } from '../../../room/utils/IVector3D'; import { IVector3D } from '../../../room/utils/IVector3D';
import { Vector3d } from '../../../room/utils/Vector3d'; import { Vector3d } from '../../../room/utils/Vector3d';

View File

@ -1,4 +1,4 @@
import { Point } from 'pixi.js'; import { Point } from '@pixi/math';
import { RoomObjectEvent } from '../../../../../room/events/RoomObjectEvent'; import { RoomObjectEvent } from '../../../../../room/events/RoomObjectEvent';
import { RoomObjectMouseEvent } from '../../../../../room/events/RoomObjectMouseEvent'; import { RoomObjectMouseEvent } from '../../../../../room/events/RoomObjectMouseEvent';
import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent'; import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';

View File

@ -1,4 +1,5 @@
import { BLEND_MODES, Resource, Texture } from 'pixi.js'; import { BLEND_MODES } from '@pixi/constants';
import { Resource, Texture } from '@pixi/core';
import { AdvancedMap } from '../../../../../core/utils/AdvancedMap'; import { AdvancedMap } from '../../../../../core/utils/AdvancedMap';
import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance'; import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance';
import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType'; import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType';

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { IAssetData } from '../../../../../core/asset/interfaces'; import { IAssetData } from '../../../../../core/asset/interfaces';
import { Disposable } from '../../../../../core/common/disposable/Disposable'; import { Disposable } from '../../../../../core/common/disposable/Disposable';
import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData'; import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData';

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite'; import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
import { Nitro } from '../../../../../Nitro'; import { Nitro } from '../../../../../Nitro';
import { AvatarVisualization } from '../AvatarVisualization'; import { AvatarVisualization } from '../AvatarVisualization';

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite'; import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
import { Nitro } from '../../../../../Nitro'; import { Nitro } from '../../../../../Nitro';
import { AvatarVisualization } from '../AvatarVisualization'; import { AvatarVisualization } from '../AvatarVisualization';

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite'; import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
import { AvatarVisualization } from '../AvatarVisualization'; import { AvatarVisualization } from '../AvatarVisualization';
import { IAvatarAddition } from './IAvatarAddition'; import { IAvatarAddition } from './IAvatarAddition';

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite'; import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
import { AvatarVisualization } from '../AvatarVisualization'; import { AvatarVisualization } from '../AvatarVisualization';
import { IAvatarAddition } from './IAvatarAddition'; import { IAvatarAddition } from './IAvatarAddition';

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite'; import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
import { AvatarVisualization } from '../AvatarVisualization'; import { AvatarVisualization } from '../AvatarVisualization';
import { IAvatarAddition } from './IAvatarAddition'; import { IAvatarAddition } from './IAvatarAddition';

View File

@ -1,4 +1,4 @@
import { BLEND_MODES } from 'pixi.js'; import { BLEND_MODES } from '@pixi/constants';
export class LayerData export class LayerData
{ {

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { Nitro } from '../../../../Nitro'; import { Nitro } from '../../../../Nitro';
import { RoomObjectVariable } from '../../RoomObjectVariable'; import { RoomObjectVariable } from '../../RoomObjectVariable';
import { FurnitureVisualization } from './FurnitureVisualization'; import { FurnitureVisualization } from './FurnitureVisualization';

View File

@ -1,4 +1,5 @@
import { SCALE_MODES, Texture } from 'pixi.js'; import { SCALE_MODES } from '@pixi/constants';
import { Texture } from '@pixi/core';
import { FurnitureThumbnailVisualization } from './FurnitureThumbnailVisualization'; import { FurnitureThumbnailVisualization } from './FurnitureThumbnailVisualization';
export class FurnitureDynamicThumbnailVisualization extends FurnitureThumbnailVisualization export class FurnitureDynamicThumbnailVisualization extends FurnitureThumbnailVisualization

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { DirectionalOffsetData } from '../data/DirectionalOffsetData'; import { DirectionalOffsetData } from '../data/DirectionalOffsetData';
import { FurnitureBrandedImageVisualization } from './FurnitureBrandedImageVisualization'; import { FurnitureBrandedImageVisualization } from './FurnitureBrandedImageVisualization';

View File

@ -1,4 +1,6 @@
import { Matrix, Rectangle, Resource, Sprite, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { Matrix, Rectangle } from '@pixi/math';
import { NitroSprite } from '../../../../../core';
import { IGraphicAsset } from '../../../../../room/object/visualization/utils/IGraphicAsset'; import { IGraphicAsset } from '../../../../../room/object/visualization/utils/IGraphicAsset';
import { TextureUtils } from '../../../../../room/utils/TextureUtils'; import { TextureUtils } from '../../../../../room/utils/TextureUtils';
import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization'; import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization';
@ -122,7 +124,7 @@ export class FurnitureThumbnailVisualization extends FurnitureAnimatedVisualizat
matrix.ty = 0; matrix.ty = 0;
} }
const sprite = Sprite.from(texture); const sprite = new NitroSprite(texture);
sprite.transform.setFromMatrix(matrix); sprite.transform.setFromMatrix(matrix);

View File

@ -1,7 +1,7 @@
import { RenderTexture, Resource, Texture } from '@pixi/core'; import { RenderTexture, Resource, Texture } from '@pixi/core';
import { Container } from '@pixi/display';
import { Sprite } from '@pixi/sprite'; import { Sprite } from '@pixi/sprite';
import { Text } from '@pixi/text'; import { Text } from '@pixi/text';
import { NitroContainer, NitroSprite } from '../../../../../core';
import { TextureUtils } from '../../../../../room'; import { TextureUtils } from '../../../../../room';
import { Nitro } from '../../../../Nitro'; import { Nitro } from '../../../../Nitro';
@ -14,7 +14,7 @@ export class ExperienceData
constructor(texture: Texture<Resource>) constructor(texture: Texture<Resource>)
{ {
this._sprite = new Sprite(texture); this._sprite = new NitroSprite(texture);
this._texture = null; this._texture = null;
this._amount = -1; this._amount = -1;
this._alpha = 0; this._alpha = 0;
@ -24,7 +24,7 @@ export class ExperienceData
{ {
if(!this._sprite || (this._amount === amount)) return null; if(!this._sprite || (this._amount === amount)) return null;
const container = new Container(); const container = new NitroContainer();
container.addChild(this._sprite); container.addChild(this._sprite);

View File

@ -1,4 +1,4 @@
import { Point } from 'pixi.js'; import { Point } from '@pixi/math';
import { IPlaneDrawingData } from '../../../../../room/object/visualization/IPlaneDrawingData'; import { IPlaneDrawingData } from '../../../../../room/object/visualization/IPlaneDrawingData';
export class PlaneDrawingData implements IPlaneDrawingData export class PlaneDrawingData implements IPlaneDrawingData

View File

@ -1,4 +1,6 @@
import { Graphics, Matrix, Point, Rectangle, RenderTexture, Resource, Texture } from 'pixi.js'; import { RenderTexture, Resource, Texture } from '@pixi/core';
import { Graphics } from '@pixi/graphics';
import { Matrix, Point, Rectangle } from '@pixi/math';
import { IRoomPlane } from '../../../../../room/object/visualization/IRoomPlane'; import { IRoomPlane } from '../../../../../room/object/visualization/IRoomPlane';
import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry'; import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
import { IVector3D } from '../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../room/utils/IVector3D';

View File

@ -1,4 +1,5 @@
import { Rectangle, RenderTexture, Resource, Texture } from 'pixi.js'; import { RenderTexture, Resource, Texture } from '@pixi/core';
import { Rectangle } from '@pixi/math';
import { AdvancedMap } from '../../../../../core/utils/AdvancedMap'; import { AdvancedMap } from '../../../../../core/utils/AdvancedMap';
import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance'; import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance';
import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType'; import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType';

View File

@ -1,4 +1,5 @@
import { Graphics, Matrix, Point } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { Matrix, Point } from '@pixi/math';
import { IGraphicAssetCollection } from '../../../../../../room/object/visualization/utils/IGraphicAssetCollection'; import { IGraphicAssetCollection } from '../../../../../../room/object/visualization/utils/IGraphicAssetCollection';
import { IVector3D } from '../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../room/utils/IVector3D';
import { PlaneMask } from './PlaneMask'; import { PlaneMask } from './PlaneMask';

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../room/utils/IVector3D';
import { PlaneBitmapData } from '../utils/PlaneBitmapData'; import { PlaneBitmapData } from '../utils/PlaneBitmapData';
import { PlaneVisualizationLayer } from './basic/PlaneVisualizationLayer'; import { PlaneVisualizationLayer } from './basic/PlaneVisualizationLayer';

View File

@ -1,4 +1,4 @@
import { Point } from 'pixi.js'; import { Point } from '@pixi/math';
import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset'; import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset';
export class AnimationItem export class AnimationItem

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { Vector3d } from '../../../../../../../room/utils/Vector3d'; import { Vector3d } from '../../../../../../../room/utils/Vector3d';
import { Plane } from '../basic/Plane'; import { Plane } from '../basic/Plane';

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { Nitro } from '../../../../../../Nitro'; import { Nitro } from '../../../../../../Nitro';
import { PlaneBitmapData } from '../../utils/PlaneBitmapData'; import { PlaneBitmapData } from '../../utils/PlaneBitmapData';

View File

@ -1,4 +1,5 @@
import { Graphics, Matrix } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { Matrix } from '@pixi/math';
import { IDisposable } from '../../../../../../../core/common/disposable/IDisposable'; import { IDisposable } from '../../../../../../../core/common/disposable/IDisposable';
import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection'; import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { Vector3d } from '../../../../../../../room/utils/Vector3d'; import { Vector3d } from '../../../../../../../room/utils/Vector3d';
import { Plane } from './Plane'; import { Plane } from './Plane';

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { PlaneBitmapData } from '../../utils/PlaneBitmapData'; import { PlaneBitmapData } from '../../utils/PlaneBitmapData';
import { FloorPlane } from './FloorPlane'; import { FloorPlane } from './FloorPlane';

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { PlaneMaterialCellMatrix } from './PlaneMaterialCellMatrix'; import { PlaneMaterialCellMatrix } from './PlaneMaterialCellMatrix';

View File

@ -1,4 +1,8 @@
import { Graphics, Point, Sprite, TilingSprite } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { Point } from '@pixi/math';
import { Sprite } from '@pixi/sprite';
import { TilingSprite } from '@pixi/sprite-tiling';
import { NitroSprite } from '../../../../../../../core';
import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset'; import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { PlaneTexture } from './PlaneTexture'; import { PlaneTexture } from './PlaneTexture';
@ -140,7 +144,7 @@ export class PlaneMaterialCell
} }
else else
{ {
bitmap = new Sprite(texture); bitmap = new NitroSprite(texture);
} }
if(bitmap) if(bitmap)

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { Vector3d } from '../../../../../../../room/utils/Vector3d'; import { Vector3d } from '../../../../../../../room/utils/Vector3d';
import { PlaneMaterialCell } from './PlaneMaterialCell'; import { PlaneMaterialCell } from './PlaneMaterialCell';

View File

@ -1,4 +1,5 @@
import { Graphics, Point, Rectangle } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { Point, Rectangle } from '@pixi/math';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { TextureUtils } from '../../../../../../../room/utils/TextureUtils'; import { TextureUtils } from '../../../../../../../room/utils/TextureUtils';
import { Vector3d } from '../../../../../../../room/utils/Vector3d'; import { Vector3d } from '../../../../../../../room/utils/Vector3d';

View File

@ -1,4 +1,6 @@
import { Graphics, Point, Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { Graphics } from '@pixi/graphics';
import { Point } from '@pixi/math';
import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset'; import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset';
import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection'; import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection';
import { IRoomGeometry } from '../../../../../../../room/utils/IRoomGeometry'; import { IRoomGeometry } from '../../../../../../../room/utils/IRoomGeometry';

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { PlaneTextureBitmap } from './PlaneTextureBitmap'; import { PlaneTextureBitmap } from './PlaneTextureBitmap';

View File

@ -1,4 +1,4 @@
import { Resource, Texture } from 'pixi.js'; import { Resource, Texture } from '@pixi/core';
export class PlaneTextureBitmap export class PlaneTextureBitmap
{ {

View File

@ -1,4 +1,5 @@
import { Graphics, Rectangle } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { Rectangle } from '@pixi/math';
import { IDisposable } from '../../../../../../../core/common/disposable/IDisposable'; import { IDisposable } from '../../../../../../../core/common/disposable/IDisposable';
import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection'; import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection';
import { IRoomGeometry } from '../../../../../../../room/utils/IRoomGeometry'; import { IRoomGeometry } from '../../../../../../../room/utils/IRoomGeometry';

View File

@ -1,4 +1,5 @@
import { Graphics, Rectangle } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { Rectangle } from '@pixi/math';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { TextureUtils } from '../../../../../../../room/utils/TextureUtils'; import { TextureUtils } from '../../../../../../../room/utils/TextureUtils';
import { RoomVisualization } from '../../RoomVisualization'; import { RoomVisualization } from '../../RoomVisualization';

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { Vector3d } from '../../../../../../../room/utils/Vector3d'; import { Vector3d } from '../../../../../../../room/utils/Vector3d';
import { Plane } from './Plane'; import { Plane } from './Plane';

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
import { IVector3D } from '../../../../../../../room/utils/IVector3D'; import { IVector3D } from '../../../../../../../room/utils/IVector3D';
import { PlaneBitmapData } from '../../utils/PlaneBitmapData'; import { PlaneBitmapData } from '../../utils/PlaneBitmapData';
import { PlaneRasterizer } from './PlaneRasterizer'; import { PlaneRasterizer } from './PlaneRasterizer';

View File

@ -1,4 +1,4 @@
import { Graphics } from 'pixi.js'; import { Graphics } from '@pixi/graphics';
export class PlaneBitmapData export class PlaneBitmapData
{ {