@wayward/types 2.11.4-beta.dev.20220213.1 → 2.11.4-beta.dev.20220219.1

package/definitions/game/game/IGame.d.ts

@@ -259,5 +259,5 @@ export declare const TURN_DELAY_MAX: number;
 export declare const TURN_DELAY_DEFAULT: number;
 export declare const LIGHT_COLOR_DEFAULT: import("utilities/Color").IRGB;
 export declare const TOOLTIP_DELAY_DEFAULT = 170;
-export declare const ZOOM_LEVEL_MAX = 8;
+export declare const ZOOM_LEVEL_MAX = 16;
 export declare const ZOOM_LEVEL_MIN = 1;

package/definitions/game/renderer/Renderer.d.ts

@@ -39,7 +39,7 @@ export default class Renderer extends EventEmitter.Host<IRendererEvents> {
     delete(): Promise<void>;
     get fieldOfView(): import("./fieldOfView/FieldOfView").default;
     get notifier(): import("./notifier/Notifier").default;
-    get particle(): import("./particle/Particle").default;
+    get particle(): import("./particle/ParticleSystem").default;
     get isFadingIn(): boolean;
     get isUpdatingThumbnail(): boolean;
     start(): void;

package/definitions/game/renderer/RendererConstants.d.ts

@@ -17,3 +17,5 @@ export declare function getPixelOffset(pixels: number): number;
 export declare const fourPixelOffset: number;
 export declare const negativeFivePixelOffset: number;
 export declare const defaultFadeInTime = 2000;
+export declare const texCordsPerSprite = 6;
+export declare function createTexCordArray(capacity: number): Float32Array;

package/definitions/game/renderer/context/RendererContext.d.ts

@@ -11,6 +11,8 @@
 import type BaseRendererContext from "renderer/context/BaseRendererContext";
 import type { IRendererOrigin } from "renderer/context/RendererOrigin";
 import type Renderer from "renderer/Renderer";
+import SpriteBatch1 from "renderer/spriteBatch/SpriteBatch1";
+import SpriteBatch2 from "renderer/spriteBatch/SpriteBatch2";
 import type WebGlContext from "renderer/WebGlContext";
 export default class RendererContext {
     readonly renderer: Renderer;
@@ -18,5 +20,7 @@ export default class RendererContext {
     readonly gl: WebGL2RenderingContext;
     readonly webGlContext: WebGlContext;
     constructor(renderer: Renderer, baseRendererContext: BaseRendererContext);
+    get isWebGl2(): boolean;
     get origin(): IRendererOrigin;
+    createSpriteBatch(capacity: number, depthOffset?: number, yOffset?: number): SpriteBatch2 | SpriteBatch1;
 }

package/definitions/game/renderer/particle/IParticleRenderer.d.ts

@@ -0,0 +1,16 @@
+/*!
+ * Copyright 2011-2021 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
+ * https://github.com/WaywardGame/types/wiki
+ */
+import type { IProgramDescription } from "renderer/CompiledProgram";
+export interface IParticleRenderer {
+    render(x: number, y: number, count: number): void;
+    delete(): void;
+}
+export declare const particleRendererShaderProgramDescription: IProgramDescription;

package/definitions/game/renderer/particle/ParticleRenderer1.d.ts

@@ -0,0 +1,25 @@
+/*!
+ * Copyright 2011-2021 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
+ * https://github.com/WaywardGame/types/wiki
+ */
+import type RendererContext from "renderer/context/RendererContext";
+/**
+ * Particle renderer for webgl 1
+ */
+export declare class ParticleRenderer1 {
+    private readonly context;
+    private readonly positionSizeData;
+    private readonly colorData;
+    private readonly shaderProgram;
+    private readonly positionSizeBuffer;
+    private readonly colorBuffer;
+    constructor(context: RendererContext, maxParticles: number, positionSizeData: Float32Array, colorData: Uint8Array);
+    delete(): void;
+    render(x: number, y: number, count: number): boolean;
+}

package/definitions/game/renderer/particle/ParticleRenderer2.d.ts

@@ -0,0 +1,27 @@
+/*!
+ * Copyright 2011-2021 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
+ * https://github.com/WaywardGame/types/wiki
+ */
+import type RendererContext from "renderer/context/RendererContext";
+/**
+ * Particle renderer for webgl 2
+ */
+export declare class ParticleRenderer2 {
+    private readonly context;
+    private readonly dataArray;
+    private readonly colorArray;
+    private readonly shaderProgram;
+    private readonly texCordBuffer;
+    private readonly dataBuffer;
+    private readonly colorBuffer;
+    private readonly vertexArray;
+    constructor(context: RendererContext, maxParticles: number, dataArray: Float32Array, colorArray: Uint8Array);
+    delete(): void;
+    render(x: number, y: number, count: number): boolean;
+}

package/definitions/game/renderer/particle/{Particle.d.ts → ParticleSystem.d.ts}

@@ -13,21 +13,18 @@ import type RendererContext from "renderer/context/RendererContext";
 import type WebGlContext from "renderer/WebGlContext";
 import type WorldRenderer from "renderer/world/WorldRenderer";
 import type { IRGB } from "utilities/Color";
-export default class Particle {
+export default class ParticleSystem {
     private readonly context;
     private readonly worldRenderer;
-    private readonly shaderProgram;
-    private readonly capacity;
-    private readonly positionSizeBuffer;
-    private readonly colorBuffer;
+    private readonly maxParticles;
     private readonly particles;
     private readonly positionSizeData;
     private readonly colorData;
-    private readonly particleSize;
-    private readonly vertexArray;
+    private readonly dataPerParticle;
     private count;
     private lastUsedParticle;
     private nextUpdate;
+    private readonly renderer;
     static initializePrograms(webGlContext: WebGlContext): Promise<void>;
     constructor(context: RendererContext, worldRenderer: WorldRenderer, maxParticles?: number);
     delete(): void;

package/definitions/game/renderer/spriteBatch/ISpriteBatch.d.ts

@@ -9,5 +9,10 @@
  * https://github.com/WaywardGame/types/wiki
  */
 export default interface ISpriteBatch {
+    readonly capacity: number;
+    delete(): void;
+    begin(): void;
     add(tileX: number, tileY: number, spriteSize: number, sourceX: number, sourceY: number, sourceSize: number, offsetX?: number, offsetY?: number, red?: number, green?: number, blue?: number, alpha?: number): void;
+    end(): number;
+    render(x: number, y: number, tileScale: number, viewportWidth: number, viewportHeight: number): void;
 }

package/definitions/game/renderer/spriteBatch/SpriteBatch.d.ts

@@ -8,33 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type ISpriteBatch from "renderer/spriteBatch/ISpriteBatch";
-import type Vector2 from "utilities/math/Vector2";
-import type WebGlContext from "renderer/WebGlContext";
 import type RendererContext from "renderer/context/RendererContext";
-export default class SpriteBatch implements ISpriteBatch {
-    private readonly context;
-    readonly capacity: number;
-    private readonly depthOffset;
-    private readonly yOffset;
-    private readonly shaderProgram;
-    texSprites: WebGLTexture | undefined;
-    inverseSpriteTextureSize: Vector2 | undefined;
-    private count;
-    private readonly buffer;
-    private readonly colorBuffer;
-    private array;
-    private colorArray;
-    private begun;
-    private readonly vertexArray;
-    private _setup;
-    static initializePrograms(webGlContext: WebGlContext): Promise<void>;
-    constructor(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number);
-    setup(): void;
-    delete(): void;
-    clear(): void;
-    begin(): void;
-    add(tileX: number, tileY: number, spriteSize: number, sourceX: number, sourceY: number, sourceSize: number, offsetX?: number, offsetY?: number, red?: number, green?: number, blue?: number, alpha?: number): void;
-    end(): number;
-    render(x: number, y: number, tileScale: number, viewportWidth: number, viewportHeight: number): void;
-}
+import type ISpriteBatch from "renderer/spriteBatch/ISpriteBatch";
+export declare function createSpriteBatch(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number): ISpriteBatch;

package/definitions/game/renderer/spriteBatch/SpriteBatch1.d.ts

@@ -0,0 +1,42 @@
+/*!
+ * Copyright 2011-2021 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
+ * https://github.com/WaywardGame/types/wiki
+ */
+import type ISpriteBatch from "renderer/spriteBatch/ISpriteBatch";
+import type Vector2 from "utilities/math/Vector2";
+import type WebGlContext from "renderer/WebGlContext";
+import type RendererContext from "renderer/context/RendererContext";
+/**
+ * SpriteBatch for WebGl 1
+ */
+export default class SpriteBatch1 implements ISpriteBatch {
+    private readonly context;
+    readonly capacity: number;
+    private readonly depthOffset;
+    private readonly yOffset;
+    private readonly shaderProgram;
+    texSprites: WebGLTexture | undefined;
+    inverseSpriteTextureSize: Vector2 | undefined;
+    private count;
+    private readonly buffer;
+    private readonly colorBuffer;
+    private array;
+    private colorArray;
+    private begun;
+    private _setup;
+    static initializePrograms(webGlContext: WebGlContext): Promise<void>;
+    constructor(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number);
+    setup(): void;
+    delete(): void;
+    clear(): void;
+    begin(): void;
+    add(tileX: number, tileY: number, spriteSize: number, sourceX: number, sourceY: number, sourceSize: number, offsetX?: number, offsetY?: number, red?: number, green?: number, blue?: number, alpha?: number): void;
+    end(): number;
+    render(x: number, y: number, tileScale: number, viewportWidth: number, viewportHeight: number): void;
+}

package/definitions/game/renderer/spriteBatch/SpriteBatch2.d.ts

@@ -0,0 +1,48 @@
+/*!
+ * Copyright 2011-2021 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
+ * https://github.com/WaywardGame/types/wiki
+ */
+import type ISpriteBatch from "renderer/spriteBatch/ISpriteBatch";
+import type Vector2 from "utilities/math/Vector2";
+import type WebGlContext from "renderer/WebGlContext";
+import type RendererContext from "renderer/context/RendererContext";
+/**
+ * SpriteBatch for WebGl 2
+ */
+export default class SpriteBatch2 implements ISpriteBatch {
+    private readonly context;
+    readonly capacity: number;
+    private readonly depthOffset;
+    private readonly yOffset;
+    private readonly shaderProgram;
+    texSprites: WebGLTexture | undefined;
+    inverseSpriteTextureSize: Vector2 | undefined;
+    private spriteCount;
+    private readonly texCordBuffer;
+    private readonly dataBuffer;
+    private dataArray;
+    private readonly colorBuffer;
+    private colorArray;
+    private begun;
+    private readonly vertexArray;
+    private _setup;
+    static initializePrograms(webGlContext: WebGlContext): Promise<void>;
+    constructor(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number);
+    setup(): void;
+    delete(): void;
+    clear(): void;
+    begin(): void;
+    add(tileX: number, tileY: number, spriteSize: number, sourceX: number, sourceY: number, sourceSize: number, offsetX?: number, offsetY?: number, red?: number, green?: number, blue?: number, alpha?: number): void;
+    /**
+     * Binds sprites to be included in the next render
+     * @returns number of sprites being rendered
+     */
+    end(): number;
+    render(x: number, y: number, tileScale: number, viewportWidth: number, viewportHeight: number): void;
+}

package/definitions/game/renderer/world/WorldRenderer.d.ts

@@ -16,7 +16,6 @@ import { TerrainType } from "game/tile/ITerrain";
 import type { ITile } from "game/tile/ITerrain";
 import FieldOfView from "renderer/fieldOfView/FieldOfView";
 import Notifier from "renderer/notifier/Notifier";
-import Particle from "renderer/particle/Particle";
 import type RendererContext from "renderer/context/RendererContext";
 import type ISpriteBatch from "renderer/spriteBatch/ISpriteBatch";
 import Fence from "renderer/tile/adaptors/Fence";
@@ -29,6 +28,7 @@ import WorldLayerRenderer from "renderer/world/WorldLayerRenderer";
 import Vector2 from "utilities/math/Vector2";
 import type { TerrainTileInfo } from "renderer/tile/TerrainTileInfo";
 import type { IRendererOrigin } from "renderer/context/RendererOrigin";
+import ParticleSystem from "renderer/particle/ParticleSystem";
 export interface IWorldRendererEvents {
     /**
      * Called when calculating creatures in the viewport
@@ -108,7 +108,7 @@ export default class WorldRenderer extends EventEmitter.Host<IWorldRendererEvent
     private readonly worldShaderProgram;
     private readonly fogShaderProgram;
     readonly fieldOfView: FieldOfView;
-    readonly particle: Particle;
+    readonly particleSystem: ParticleSystem;
     readonly notifier: Notifier;
     layers: Record<number, WorldLayerRenderer>;
     tillAdaptor: ITileAdaptor;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@wayward/types",
 	"description": "TypeScript declarations for Wayward, used for modding.",
-	"version": "2.11.4-beta.dev.20220213.1",
+	"version": "2.11.4-beta.dev.20220219.1",
 	"license": "MIT",
 	"repository": {
 		"type": "git",