move TextureStore to twopoint5d package

Author: spearwolf

packages/twopoint5d-elements-e2e/src/display-and-stage2d.ts

@@ -1,4 +1,5 @@
-import {Stage2DElement, TextureStore} from '@spearwolf/twopoint5d-elements';
+import {TextureStore} from '@spearwolf/twopoint5d';
+import {Stage2DElement} from '@spearwolf/twopoint5d-elements';
 import type {StageFirstFrameProps} from '@spearwolf/twopoint5d-elements/events.js';
 import '@spearwolf/twopoint5d-elements/two5-display.js';
 import '@spearwolf/twopoint5d-elements/two5-stage2d.js';

packages/twopoint5d-elements/src/components/DisplayElement.ts

@@ -1,10 +1,8 @@
 import {provide} from '@lit/context';
-import {Display, type DisplayParameters} from '@spearwolf/twopoint5d';
+import {Display, StageRenderer, type DisplayParameters, type IStageRenderer} from '@spearwolf/twopoint5d';
 import {css, html} from 'lit';
 import {displayContext} from '../context/display-context.js';
 import {stageRendererContext} from '../context/stage-renderer-context.js';
-import type {IStageRenderer} from '../twopoint5d/IStageRenderer.js';
-import {SimpleStageRenderer} from '../twopoint5d/SimpleStageRenderer.js';
 import {readBooleanAttribute} from '../utils/readBooleanAttribute.js';
 import {readStringAttribute} from '../utils/readStringAttribute.js';
 import {whenDefined} from '../utils/whenDefined.js';
@@ -146,7 +144,7 @@ export class DisplayElement extends TwoPoint5DElement {
 
     this.display.on(this);
 
-    this.stageRenderer = new SimpleStageRenderer();
+    this.stageRenderer = new StageRenderer();
     this.stageRenderer.attach(this.display);
 
     this.display.start();

packages/twopoint5d-elements/src/components/Stage2DElement.ts

@@ -6,23 +6,17 @@ import {
   ParallaxProjection,
   Stage2D,
   type IProjection,
+  type IStageRenderer,
   type OrthographicProjectionSpecs,
   type ParallaxProjectionSpecs,
   type ProjectionPlaneDescription,
 } from '@spearwolf/twopoint5d';
+import {StageRenderFrame, type StageRenderFrameProps} from '@spearwolf/twopoint5d/events.js';
 import {css, html} from 'lit';
 import {property} from 'lit/decorators.js';
 import type {Scene} from 'three';
 import {stageRendererContext} from '../context/stage-renderer-context.js';
-import {
-  StageFirstFrame,
-  StageRenderFrame,
-  StageResize,
-  type StageFirstFrameProps,
-  type StageRenderFrameProps,
-  type StageResizeProps,
-} from '../events.js';
-import type {IStageRenderer} from '../twopoint5d/IStageRenderer.js';
+import {StageFirstFrame, StageResize, type StageFirstFrameProps, type StageResizeProps} from '../events.js';
 import {SignalMap} from '../utils/SignalMap.js';
 import {whenDefined} from '../utils/whenDefined.js';
 import {TwoPoint5DElement} from './TwoPoint5DElement.js';

packages/twopoint5d-elements/src/context/stage-renderer-context.ts

@@ -1,4 +1,4 @@
 import {createContext} from '@lit/context';
-import type {IStageRenderer} from '../twopoint5d/IStageRenderer.js';
+import type {IStageRenderer} from '@spearwolf/twopoint5d';
 
 export const stageRendererContext = createContext<IStageRenderer | undefined>(Symbol('stage-renderer'));

packages/twopoint5d-elements/src/events.ts

@@ -1,26 +1,5 @@
 import type {Stage2D} from '@spearwolf/twopoint5d';
-import type {WebGLRenderer} from 'three';
-import type {IStageRenderer, StageType} from './twopoint5d/IStageRenderer.js';
-
-/**
- * published by the SimpleStageRenderer
- */
-export const StageAdded = 'stageadded';
-
-export interface StageAddedProps {
-  stage: StageType;
-  renderer: IStageRenderer;
-}
-
-/**
- * published by the SimpleStageRenderer
- */
-export const StageRemoved = 'stageremoved';
-
-export interface StageRemovedProps {
-  stage: StageType;
-  renderer: IStageRenderer;
-}
+import type {StageRenderFrame, StageRenderFrameProps} from '@spearwolf/twopoint5d/events.js';
 
 /**
  * published by the <two5-stage2d> element as object event and customevent
@@ -40,20 +19,6 @@ export interface StageResizeEvent extends Event {
   detail?: StageResizeProps;
 }
 
-/**
- * published by the <two5-stage2d> element as object event and customevent
- */
-export const StageRenderFrame = 'stagerenderframe';
-
-export interface StageRenderFrameProps {
-  width: number;
-  height: number;
-  renderer: WebGLRenderer;
-  now: number;
-  deltaTime: number;
-  frameNo: number;
-}
-
 export interface StageRenderFrameEvent extends Event {
   detail?: StageRenderFrameProps;
 }

packages/twopoint5d-elements/src/index.ts

@@ -4,9 +4,6 @@ export * from './components/Stage2DElement.js';
 export * from './components/TwoPoint5DElement.js';
 export * from './context/display-context.js';
 export * from './context/stage-renderer-context.js';
-export type * from './twopoint5d/IStageRenderer.js';
-export * from './twopoint5d/SimpleStageRenderer.js';
-export * from './twopoint5d/TextureStore.js';
 export * from './utils/ConsoleLogger.js';
 export * from './utils/asBoolean.js';
 export * from './utils/readBooleanAttribute.js';

packages/twopoint5d/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spearwolf/twopoint5d",
   "description": "a library to create 2.5d realtime graphics and pixelart with three.js",
-  "version": "0.3.3",
+  "version": "0.4.0-dev",
   "author": {
     "name": "Wolfger Schramm",
     "email": "[email protected]",
@@ -14,6 +14,10 @@
     ".": {
       "types": "./dist/lib/index.d.ts",
       "import": "./dist/lib/index.js"
+    },
+    "./events.js": {
+      "types": "./dist/lib/events.d.ts",
+      "import": "./dist/lib/events.js"
     }
   },
   "main": "dist/lib/index.js",
@@ -30,6 +34,7 @@
   },
   "peerDependencies": {
     "@spearwolf/eventize": "^3.4.1",
+    "@spearwolf/signalize": "^0.9.0",
     "three": "^0.153"
   }
 }

packages/twopoint5d/src/events.ts

@@ -0,0 +1,33 @@
+import type {WebGLRenderer} from 'three';
+import type {IStageRenderer, StageType} from './stage/IStageRenderer.js';
+
+export const StageAdded = 'stageadded';
+
+export interface StageAddedProps {
+  stage: StageType;
+  renderer: IStageRenderer;
+}
+
+export const StageRemoved = 'stageremoved';
+
+export interface StageRemovedProps {
+  stage: StageType;
+  renderer: IStageRenderer;
+}
+
+export const StageRenderFrame = 'stagerenderframe';
+
+export interface StageRenderFrameProps {
+  width: number;
+  height: number;
+  renderer: WebGLRenderer;
+  now: number;
+  deltaTime: number;
+  frameNo: number;
+}
+
+export interface StageRenderFrameEvent extends Event {
+  detail?: StageRenderFrameProps;
+}
+
+export const UnsubscribeFromParent = 'unsubscribeFromParent';

packages/twopoint5d-elements/src/twopoint5d/IStageRenderer.ts renamed to packages/twopoint5d/src/stage/IStageRenderer.ts

@@ -1,5 +1,6 @@
-import type {Display, Stage2D} from '@spearwolf/twopoint5d';
 import type {WebGLRenderer} from 'three';
+import type {Display} from '../display/Display.js';
+import type {Stage2D} from './Stage2D.js';
 
 export type StageParentType = Display | IStageRenderer;
 export type StageType = Stage2D | IStageRenderer;

packages/twopoint5d-elements/src/twopoint5d/SimpleStageRenderer.ts renamed to packages/twopoint5d/src/stage/StageRenderer.ts

@@ -1,28 +1,27 @@
 import {eventize, type Eventize} from '@spearwolf/eventize';
-import {Display, Stage2D} from '@spearwolf/twopoint5d';
 import type {WebGLRenderer} from 'three';
+import {Display} from '../display/Display.js';
 import {
   StageAdded,
   StageRemoved,
   StageRenderFrame,
+  UnsubscribeFromParent,
   type StageAddedProps,
   type StageRemovedProps,
   type StageRenderFrameProps,
 } from '../events.js';
 import type {IStageRenderer, StageParentType, StageType} from './IStageRenderer.js';
+import {Stage2D} from './Stage2D.js';
 
-export interface SimpleStageRenderer extends Eventize {}
+export interface StageRenderer extends Eventize {}
 
 interface StageItem {
   stage: StageType;
   width: number;
   height: number;
 }
 
-const UnsubscribeFromParent = 'unsubscribeFromParent';
-
-// TODO rename to StageRenderer
-export class SimpleStageRenderer implements IStageRenderer {
+export class StageRenderer implements IStageRenderer {
   #parent?: StageParentType;
 
   width: number = 0;

packages/twopoint5d/src/stage/public-api.ts

@@ -1,7 +1,9 @@
 export * from './Canvas2DStage.js';
 export type * from './IProjection.js';
+export type * from './IStageRenderer.js';
 export * from './OrthographicProjection.js';
 export * from './ParallaxProjection.js';
 export * from './ProjectionPlane.js';
 export * from './Stage2D.js';
+export * from './StageRenderer.js';
 export * from './fitIntoRectangle.js';

packages/twopoint5d-elements/src/twopoint5d/TextureResource.ts renamed to packages/twopoint5d/src/texture/TextureResource.ts

@@ -1,14 +1,10 @@
 import {eventize, type Eventize} from '@spearwolf/eventize';
 import {batch, createEffect, createSignal, value, type SignalFuncs, type SignalReader} from '@spearwolf/signalize';
-import {
-  TextureCoords,
-  TextureFactory,
-  TileSet,
-  type TextureAtlas,
-  type TextureOptionClasses,
-  type TileSetOptions,
-} from '@spearwolf/twopoint5d';
 import {ImageLoader, type Texture, type WebGLRenderer} from 'three';
+import type {TextureAtlas} from './TextureAtlas.js';
+import {TextureCoords} from './TextureCoords.js';
+import {TextureFactory, type TextureOptionClasses} from './TextureFactory.js';
+import {TileSet, type TileSetOptions} from './TileSet.js';
 
 export type TextureResourceType = 'image' | 'atlas' | 'tileset';
 export type TextureResourceSubType = 'imageCoords' | 'atlas' | 'tileSet' | 'texture';

packages/twopoint5d-elements/src/twopoint5d/TextureStore.ts renamed to packages/twopoint5d/src/texture/TextureStore.ts

@@ -1,8 +1,9 @@
 import {eventize, type Eventize} from '@spearwolf/eventize';
 import {batch, createSignal, value, type SignalReader} from '@spearwolf/signalize';
-import {type TextureOptionClasses, type TileSetOptions} from '@spearwolf/twopoint5d';
 import type {WebGLRenderer} from 'three';
+import type {TextureOptionClasses} from './TextureFactory.js';
 import {TextureResource, type TextureResourceSubType} from './TextureResource.js';
+import type {TileSetOptions} from './TileSet.js';
 
 export interface TextureStoreItem {
   imageUrl?: string;

packages/twopoint5d/src/texture/public-api.ts

@@ -6,6 +6,8 @@ export * from './TextureCoords.js';
 export * from './TextureFactory.js';
 export * from './TextureImageLoader.js';
 export * from './TexturePackerJson.js';
+export * from './TextureResource.js';
+export * from './TextureStore.js';
 export * from './TileSet.js';
 export * from './TileSetLoader.js';
 export type * from './types.js';