mirror of
https://github.com/billsonnn/nitro-renderer.git
synced 2025-02-19 19:22:36 +01:00
Update assets api
This commit is contained in:
parent
d918e0c587
commit
d8fca7188f
@ -1,9 +1,9 @@
|
||||
|
||||
import { Resource, Texture } from '@pixi/core';
|
||||
import { Spritesheet } from '@pixi/spritesheet';
|
||||
import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset';
|
||||
import { IGraphicAssetCollection } from '../../room/object/visualization/utils/IGraphicAssetCollection';
|
||||
import { IAssetData } from './interfaces';
|
||||
import { IAssetData } from './IAssetData';
|
||||
import { IGraphicAsset } from './IGraphicAsset';
|
||||
import { IGraphicAssetCollection } from './IGraphicAssetCollection';
|
||||
|
||||
export interface IAssetManager
|
||||
{
|
@ -1,7 +1,7 @@
|
||||
import { BaseTexture, Resource, Texture } from '@pixi/core';
|
||||
import { IAssetData } from '../../../../core/asset/interfaces';
|
||||
import { GraphicAssetPalette } from './GraphicAssetPalette';
|
||||
import { IAssetData } from './IAssetData';
|
||||
import { IGraphicAsset } from './IGraphicAsset';
|
||||
import { IGraphicAssetPalette } from './IGraphicAssetPalette';
|
||||
|
||||
export interface IGraphicAssetCollection
|
||||
{
|
||||
@ -14,7 +14,7 @@ export interface IGraphicAssetCollection
|
||||
getTexture(name: string): Texture<Resource>;
|
||||
getPaletteNames(): string[];
|
||||
getPaletteColors(paletteName: string): number[];
|
||||
getPalette(name: string): GraphicAssetPalette;
|
||||
getPalette(name: string): IGraphicAssetPalette;
|
||||
addAsset(name: string, texture: Texture<Resource>, override: boolean, x?: number, y?: number, flipH?: boolean, flipV?: boolean): boolean;
|
||||
disposeAsset(name: string): void;
|
||||
referenceCount: number;
|
9
src/api/asset/IGraphicAssetPalette.ts
Normal file
9
src/api/asset/IGraphicAssetPalette.ts
Normal file
@ -0,0 +1,9 @@
|
||||
import { Resource, Texture } from '@pixi/core';
|
||||
|
||||
export interface IGraphicAssetPalette
|
||||
{
|
||||
dispose: () => void;
|
||||
applyPalette(texture: Texture<Resource>): Texture<Resource>;
|
||||
primaryColor: number;
|
||||
secondaryColor: number;
|
||||
}
|
18
src/api/asset/index.ts
Normal file
18
src/api/asset/index.ts
Normal file
@ -0,0 +1,18 @@
|
||||
export * from './animation';
|
||||
export * from './IAsset';
|
||||
export * from './IAssetAlias';
|
||||
export * from './IAssetData';
|
||||
export * from './IAssetManager';
|
||||
export * from './IAssetPalette';
|
||||
export * from './IGraphicAsset';
|
||||
export * from './IGraphicAssetCollection';
|
||||
export * from './IGraphicAssetPalette';
|
||||
export * from './logic';
|
||||
export * from './logic/model';
|
||||
export * from './logic/particlesystem';
|
||||
export * from './spritesheet';
|
||||
export * from './visualization';
|
||||
export * from './visualization/animation';
|
||||
export * from './visualization/color';
|
||||
export * from './visualization/gestures';
|
||||
export * from './visualization/postures';
|
11
src/api/index.ts
Normal file
11
src/api/index.ts
Normal file
@ -0,0 +1,11 @@
|
||||
export * from './asset';
|
||||
export * from './asset/animation';
|
||||
export * from './asset/logic';
|
||||
export * from './asset/logic/model';
|
||||
export * from './asset/logic/particlesystem';
|
||||
export * from './asset/spritesheet';
|
||||
export * from './asset/visualization';
|
||||
export * from './asset/visualization/animation';
|
||||
export * from './asset/visualization/color';
|
||||
export * from './asset/visualization/gestures';
|
||||
export * from './asset/visualization/postures';
|
@ -1,4 +1,4 @@
|
||||
import { IAssetManager } from './asset/IAssetManager';
|
||||
import { IAssetManager } from '../api';
|
||||
import { IDisposable } from './common/disposable/IDisposable';
|
||||
import { ICommunicationManager } from './communication/ICommunicationManager';
|
||||
import { IConfigurationManager } from './configuration/IConfigurationManager';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { IAssetManager } from '../api';
|
||||
import { AssetManager } from './asset/AssetManager';
|
||||
import { IAssetManager } from './asset/IAssetManager';
|
||||
import { Disposable } from './common/disposable/Disposable';
|
||||
import { CommunicationManager } from './communication/CommunicationManager';
|
||||
import { ICommunicationManager } from './communication/ICommunicationManager';
|
||||
|
@ -1,15 +1,12 @@
|
||||
import { BaseTexture, Resource, Texture } from '@pixi/core';
|
||||
import { Loader, LoaderResource } from '@pixi/loaders';
|
||||
import { Spritesheet } from '@pixi/spritesheet';
|
||||
import { IGraphicAsset } from '../../room/object/visualization/utils';
|
||||
import { IAssetData, IAssetManager, IGraphicAsset, IGraphicAssetCollection } from '../../api';
|
||||
import { GraphicAssetCollection } from '../../room/object/visualization/utils/GraphicAssetCollection';
|
||||
import { IGraphicAssetCollection } from '../../room/object/visualization/utils/IGraphicAssetCollection';
|
||||
import { Disposable } from '../common/disposable/Disposable';
|
||||
import { INitroLogger } from '../common/logger/INitroLogger';
|
||||
import { NitroLogger } from '../common/logger/NitroLogger';
|
||||
import { ArrayBufferToBase64 } from '../utils';
|
||||
import { IAssetManager } from './IAssetManager';
|
||||
import { IAssetData } from './interfaces';
|
||||
import { NitroBundle } from './NitroBundle';
|
||||
|
||||
export class AssetManager extends Disposable implements IAssetManager
|
||||
|
@ -1,4 +1,2 @@
|
||||
export * from './AssetManager';
|
||||
export * from './IAssetManager';
|
||||
export * from './interfaces';
|
||||
export * from './NitroBundle';
|
||||
|
@ -1,8 +0,0 @@
|
||||
export * from './animation';
|
||||
export * from './IAsset';
|
||||
export * from './IAssetAlias';
|
||||
export * from './IAssetData';
|
||||
export * from './IAssetPalette';
|
||||
export * from './logic';
|
||||
export * from './spritesheet';
|
||||
export * from './visualization';
|
@ -1,3 +1,4 @@
|
||||
export * from './api';
|
||||
export * from './core';
|
||||
export * from './nitro';
|
||||
export * from './room';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetManager } from '../../core/asset/IAssetManager';
|
||||
import { IAssetManager } from '../../api';
|
||||
import { EventDispatcher } from '../../core/events/EventDispatcher';
|
||||
import { AvatarRenderLibraryEvent } from './events/AvatarRenderLibraryEvent';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetManager } from '../../core/asset/IAssetManager';
|
||||
import { IAssetManager } from '../../api';
|
||||
import { EventDispatcher } from '../../core/events/EventDispatcher';
|
||||
import { NitroEvent } from '../../core/events/NitroEvent';
|
||||
import { Nitro } from '../Nitro';
|
||||
|
@ -3,10 +3,10 @@ import { Container } from '@pixi/display';
|
||||
import { ColorMatrixFilter } from '@pixi/filter-color-matrix';
|
||||
import { Rectangle } from '@pixi/math';
|
||||
import { Sprite } from '@pixi/sprite';
|
||||
import { IGraphicAsset } from '../../api';
|
||||
import { NitroContainer, NitroSprite } from '../../core';
|
||||
import { AdvancedMap } from '../../core/utils/AdvancedMap';
|
||||
import { PaletteMapFilter } from '../../core/utils/PaletteMapFilter';
|
||||
import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset';
|
||||
import { TextureUtils } from '../../room/utils/TextureUtils';
|
||||
import { Nitro } from '../Nitro';
|
||||
import { ActiveActionData } from './actions/ActiveActionData';
|
||||
|
@ -1,7 +1,6 @@
|
||||
import { IAssetManager } from '../../core/asset/IAssetManager';
|
||||
import { IAssetManager, IGraphicAsset } from '../../api';
|
||||
import { NitroManager } from '../../core/common/NitroManager';
|
||||
import { NitroEvent } from '../../core/events/NitroEvent';
|
||||
import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset';
|
||||
import { Nitro } from '../Nitro';
|
||||
import { FigureDataContainer } from '../utils/FigureDataContainer';
|
||||
import { AssetAliasCollection } from './alias/AssetAliasCollection';
|
||||
|
@ -1,6 +1,5 @@
|
||||
import { Point } from '@pixi/math';
|
||||
import { IAssetManager } from '../../core/asset/IAssetManager';
|
||||
import { IAssetAnimation } from '../../core/asset/interfaces';
|
||||
import { IAssetAnimation, IAssetManager } from '../../api';
|
||||
import { EventDispatcher } from '../../core/events/EventDispatcher';
|
||||
import { ActionDefinition } from './actions/ActionDefinition';
|
||||
import { AvatarActionManager } from './actions/AvatarActionManager';
|
||||
|
@ -1,5 +1,4 @@
|
||||
import { IAssetManager } from '../../core/asset/IAssetManager';
|
||||
import { IAssetAnimation } from '../../core/asset/interfaces';
|
||||
import { IAssetAnimation, IAssetManager } from '../../api';
|
||||
import { EventDispatcher } from '../../core/events/EventDispatcher';
|
||||
import { AvatarRenderEffectLibraryEvent } from './events/AvatarRenderEffectLibraryEvent';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetManager } from '../../core/asset/IAssetManager';
|
||||
import { IAssetManager } from '../../api';
|
||||
import { EventDispatcher } from '../../core/events/EventDispatcher';
|
||||
import { NitroEvent } from '../../core/events/NitroEvent';
|
||||
import { Nitro } from '../Nitro';
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { RenderTexture } from '@pixi/core';
|
||||
import { Sprite } from '@pixi/sprite';
|
||||
import { IGraphicAsset } from '../../api';
|
||||
import { IDisposable } from '../../core/common/disposable/IDisposable';
|
||||
import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset';
|
||||
import { IAnimationLayerData } from './animation/IAnimationLayerData';
|
||||
import { IAvatarDataContainer } from './animation/IAvatarDataContainer';
|
||||
import { ISpriteDataContainer } from './animation/ISpriteDataContainer';
|
||||
|
@ -1,6 +1,5 @@
|
||||
import { IAssetManager } from '../../core/asset/IAssetManager';
|
||||
import { IAssetManager, IGraphicAsset } from '../../api';
|
||||
import { INitroManager } from '../../core/common/INitroManager';
|
||||
import { IGraphicAsset } from '../../room/object/visualization/utils/IGraphicAsset';
|
||||
import { AvatarAssetDownloadManager } from './AvatarAssetDownloadManager';
|
||||
import { AvatarStructure } from './AvatarStructure';
|
||||
import { IAvatarEffectListener } from './IAvatarEffectListener';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetManager } from '../../../core/asset/IAssetManager';
|
||||
import { IAssetManager } from '../../../api';
|
||||
import { ActionDefinition } from './ActionDefinition';
|
||||
import { IActiveActionData } from './IActiveActionData';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetAlias } from '../../../core/asset/interfaces';
|
||||
import { IAssetAlias } from '../../../api';
|
||||
|
||||
export class AssetAlias
|
||||
{
|
||||
|
@ -1,5 +1,4 @@
|
||||
import { IAssetManager } from '../../../core/asset/IAssetManager';
|
||||
import { IGraphicAsset } from '../../../room/object/visualization/utils/IGraphicAsset';
|
||||
import { IAssetManager, IGraphicAsset } from '../../../api';
|
||||
import { AvatarRenderManager } from '../AvatarRenderManager';
|
||||
import { AssetAlias } from './AssetAlias';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetAnimationAdd } from '../../../core/asset/interfaces';
|
||||
import { IAssetAnimationAdd } from '../../../api';
|
||||
|
||||
export class AddDataContainer
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetAnimation, IAssetAnimationFrame } from '../../../core/asset/interfaces';
|
||||
import { IAssetAnimation, IAssetAnimationFrame } from '../../../api';
|
||||
import { AvatarStructure } from '../AvatarStructure';
|
||||
import { AddDataContainer } from './AddDataContainer';
|
||||
import { AvatarAnimationLayerData } from './AvatarAnimationLayerData';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetAnimation } from '../../../core/asset/interfaces';
|
||||
import { IAssetAnimation } from '../../../api';
|
||||
import { AvatarStructure } from '../AvatarStructure';
|
||||
import { Animation } from './Animation';
|
||||
import { IAnimation } from './IAnimation';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetAnimationFramePart } from '../../../core/asset/interfaces/animation/IAssetAnimationFramePart';
|
||||
import { IAssetAnimationFramePart } from '../../../api';
|
||||
import { ActiveActionData } from '../actions/ActiveActionData';
|
||||
import { IActionDefinition } from '../actions/IActionDefinition';
|
||||
import { IActiveActionData } from '../actions/IActiveActionData';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { AdjustmentFilter } from '@pixi/filter-adjustment';
|
||||
import { IAssetAnimationAvatar } from '../../../core/asset/interfaces';
|
||||
import { IAssetAnimationAvatar } from '../../../api';
|
||||
import { IAvatarDataContainer } from './IAvatarDataContainer';
|
||||
|
||||
export class AvatarDataContainer implements IAvatarDataContainer
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetAnimationDirection } from '../../../core/asset/interfaces';
|
||||
import { IAssetAnimationDirection } from '../../../api';
|
||||
|
||||
export class DirectionDataContainer
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetAnimationSprite } from '../../../core/asset/interfaces';
|
||||
import { IAssetAnimationSprite } from '../../../api';
|
||||
import { IAnimation } from './IAnimation';
|
||||
import { ISpriteDataContainer } from './ISpriteDataContainer';
|
||||
|
||||
|
@ -60,6 +60,8 @@ export class RoomCameraWidgetManager implements IRoomCameraWidgetManager
|
||||
|
||||
container.addChild(sprite);
|
||||
|
||||
if (isZoomed) sprite.scale.set(2);
|
||||
|
||||
for (const selectedEffect of selectedEffects)
|
||||
{
|
||||
const effect = selectedEffect.effect;
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { BaseTexture, Resource, Texture } from '@pixi/core';
|
||||
import { Loader, LoaderResource } from '@pixi/loaders';
|
||||
import { Spritesheet } from '@pixi/spritesheet';
|
||||
import { IAssetData } from '../../core/asset/interfaces';
|
||||
import { IAssetData, IGraphicAssetCollection } from '../../api';
|
||||
import { NitroBundle } from '../../core/asset/NitroBundle';
|
||||
import { INitroLogger } from '../../core/common/logger/INitroLogger';
|
||||
import { NitroLogger } from '../../core/common/logger/NitroLogger';
|
||||
@ -11,7 +11,6 @@ import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent
|
||||
import { IRoomObject } from '../../room/object/IRoomObject';
|
||||
import { GraphicAssetCollection } from '../../room/object/visualization/utils/GraphicAssetCollection';
|
||||
import { GraphicAssetGifCollection } from '../../room/object/visualization/utils/GraphicAssetGifCollection';
|
||||
import { IGraphicAssetCollection } from '../../room/object/visualization/utils/IGraphicAssetCollection';
|
||||
import { Nitro } from '../Nitro';
|
||||
import { FurnitureType } from '../session/furniture/FurnitureType';
|
||||
import { IFurnitureData } from '../session/furniture/IFurnitureData';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../api';
|
||||
import { NitroLogger } from '../../../core/common/logger/NitroLogger';
|
||||
import { IRoomObjectGraphicVisualization } from '../../../room/object/visualization/IRoomObjectGraphicVisualization';
|
||||
import { IObjectVisualizationData } from '../../../room/object/visualization/IRoomObjectVisualizationData';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomToObjectOwnAvatarMoveEvent } from '../../../events/RoomToObjectOwnAvatarMoveEvent';
|
||||
import { RoomObjectVariable } from '../../RoomObjectVariable';
|
||||
import { FurnitureLogic } from './FurnitureLogic';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomObjectUpdateMessage } from '../../../../../room';
|
||||
import { RoomObjectWidgetRequestEvent } from '../../../events';
|
||||
import { ObjectDataUpdateMessage } from '../../../messages';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent';
|
||||
import { RoomObjectVariable } from '../../RoomObjectVariable';
|
||||
import { FurnitureLogic } from './FurnitureLogic';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent';
|
||||
import { RoomObjectVariable } from '../../RoomObjectVariable';
|
||||
import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
|
||||
import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
|
||||
import { MouseEventType } from '../../../../ui/MouseEventType';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent';
|
||||
import { RoomObjectVariable } from '../../RoomObjectVariable';
|
||||
import { FurnitureLogic } from './FurnitureLogic';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomObjectWidgetRequestEvent } from '../../../events';
|
||||
import { RoomObjectVariable } from '../../RoomObjectVariable';
|
||||
import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData, IParticleSystem } from '../../../../../core';
|
||||
import { IAssetData, IParticleSystem } from '../../../../../api';
|
||||
import { RoomObjectEvent } from '../../../../../room/events/RoomObjectEvent';
|
||||
import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
|
||||
import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage';
|
||||
import { ContextMenuEnum } from '../../../../ui';
|
||||
import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
|
||||
import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
|
||||
import { MouseEventType } from '../../../../ui/MouseEventType';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomObjectMouseEvent } from '../../../../../room/events/RoomObjectMouseEvent';
|
||||
import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
|
||||
import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { RoomObjectVariable } from '../../RoomObjectVariable';
|
||||
import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData, IAssetLogicPlanetSystem } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData, IAssetLogicPlanetSystem } from '../../../../../api';
|
||||
import { RoomObjectVariable } from '../../RoomObjectVariable';
|
||||
import { FurnitureLogic } from './FurnitureLogic';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { IAssetData, IParticleSystem } from '../../../../../core/asset/interfaces';
|
||||
import { IAssetData, IParticleSystem } from '../../../../../api';
|
||||
import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
|
||||
import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage';
|
||||
import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { BaseTexture, Texture } from '@pixi/core';
|
||||
import { decompressFrames, parseGIF } from 'gifuct-js';
|
||||
import { IAssetData } from '../../../../../core';
|
||||
import { IAssetData } from '../../../../../api';
|
||||
import { IRoomGeometry, RoomSpriteMouseEvent } from '../../../../../room';
|
||||
import { RoomObjectUpdateMessage } from '../../../../../room/messages/RoomObjectUpdateMessage';
|
||||
import { Nitro } from '../../../../Nitro';
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user