@divinevoxel/vlox 0.0.71 → 0.0.73

package/Voxels/State/Schema/StateSchema.d.ts

@@ -1,7 +1,7 @@
 import { ShapeStateRelationsNode } from "./ShapeStateRelationsNode";
 import { BinarySchemaNode } from "./BinarySchemaNode";
 import { VoxelModelStateSchemaData } from "../State.types";
-import { DataCursorInterface } from "../../../Data/Cursor/DataCursor.interface";
+import { DataCursorInterface } from "../../Cursor/DataCursor.interface";
 import { Vector3Like } from "@amodx/math";
 import { VoxelCursorInterface } from "../../Cursor/VoxelCursor.interface";
 export declare class StateSchema {

package/Voxels/Types/Voxel.types.d.ts

@@ -1,5 +1,22 @@
 import { TextureId } from "../../Textures/index";
 import { VoxelModelConstructorData } from "../../Models/VoxelModel.types";
+import { VoxelTags } from "../Data/VoxelTag.types";
+export interface VoxelDataArrays {
+    /**The runtime numeric voxel ids */
+    ids: Uint16Array;
+    /**The light data for voxels stored as 4 nibbles. 0 -> sun light 1 -> red light 2 -> green light 3 -> blue light */
+    light: Uint16Array;
+    /**The levels of the voxel. Used mainly for waterflow now. */
+    level: Uint8Array;
+    /**The state of the voxel. Used mainly be the voxel model system to get the model shape. */
+    state: Uint16Array;
+    /**The mod state of the voxel. Used mainly by the voxel model system to change model inputs. */
+    mod: Uint16Array;
+    /**The secondary state of the voxel. Can be set to a voxel id to make things like water logged voxels.
+     * But the main voxel itself must not use state or mod because the secondary voxel will use the same state and mod.
+     */
+    secondary: Uint16Array;
+}
 export type VoxelNamedStateData = {
     id: string;
     name?: string;
@@ -19,11 +36,13 @@ export type VoxelNamedStateData = {
 };
 export declare class PaintVoxelData {
     id: string;
+    name: string;
     mod: number;
     state: number;
     level: number;
     levelState: number;
     secondaryVoxelId: string;
+    secondaryVoxeName: string;
     static Create(data: Partial<PaintVoxelData>): PaintVoxelData;
     private constructor();
 }
@@ -44,49 +63,8 @@ export type RawVoxelData = [
     /**The secondary id of the voxel */
     secondary: number
 ];
-export declare enum VoxelStructIds {
-    substance = "dve_substance",
-    renderedMaterial = "dve_rendered_material",
-    voxelMaterial = "dve_voxel_material",
-    hardness = "dve_hardness",
-    colliderID = "dve_collider_id",
-    checkCollisions = "dve_check_collisions",
-    isLightSource = "dve_is_light_source",
-    noAO = "dve_no_ao",
-    isTransparent = "dve_is_transparent",
-    lightValue = "dve_light_value",
-    isRich = "dve_is_rich",
-    canHaveSecondary = "dve_can_have_secondary"
-}
-interface VoxelProperties {
+interface VoxelProperties extends Partial<VoxelTags> {
     [key: string]: any;
-    /** The material used to render the voxel. Used by the engine to assign meshes to the proper material. */
-    [VoxelStructIds.renderedMaterial]?: string;
-    /** A description of the material used for the voxel. Not used by the engine directly. */
-    [VoxelStructIds.voxelMaterial]?: string;
-    /** Specifies the substance of the voxel.
-     * The voxel will inherit properties from the substance and change how it acts in the world.
-     * Properties include being solid or liquid.
-     * */
-    [VoxelStructIds.substance]?: string;
-    /** Indicates whether the voxel is a light source. */
-    [VoxelStructIds.isLightSource]?: boolean;
-    /** Indicates if the voxel lets light through */
-    [VoxelStructIds.isTransparent]?: boolean;
-    /** Disables ambient occlusion for this voxel if set to true. */
-    [VoxelStructIds.noAO]?: boolean;
-    /** Defines the light value emitted by the voxel (r, g, z). */
-    [VoxelStructIds.lightValue]?: [r: number, g: number, z: number];
-    /** The collider ID for the voxel, used for collision detection. */
-    [VoxelStructIds.colliderID]?: string;
-    /** Specifies if the voxel participates in collision checks. */
-    [VoxelStructIds.checkCollisions]?: boolean;
-    /** Indicates if the voxel can have a secondary voxel. */
-    [VoxelStructIds.canHaveSecondary]?: boolean;
-    /** The hardness level of the voxel, affecting how it is broken or interacted with. */
-    [VoxelStructIds.hardness]?: number;
-    /** Marks the voxel as "rich" for specialized interactions or rendering. */
-    [VoxelStructIds.isRich]?: boolean;
     /** Named states associated with the voxel. */
     dve_named_states?: VoxelNamedStateData[];
     /** Model data used to construct the voxel's appearance. */

package/Voxels/Types/Voxel.types.js

@@ -1,34 +1,23 @@
 export class PaintVoxelData {
     id;
+    name;
     mod;
     state;
     level;
     levelState;
     secondaryVoxelId;
+    secondaryVoxeName;
     static Create(data) {
-        return new PaintVoxelData(data.id, data.mod, data.state, data.level, data.levelState, data.secondaryVoxelId);
+        return new PaintVoxelData(data.id, data.name, data.mod, data.state, data.level, data.levelState, data.secondaryVoxelId, data.secondaryVoxeName);
     }
-    constructor(id = "dve_air", mod = 0, state = 0, level = 0, levelState = 0, secondaryVoxelId = "dve_air") {
+    constructor(id = "dve_air", name = "", mod = 0, state = 0, level = 0, levelState = 0, secondaryVoxelId = "dve_air", secondaryVoxeName = "") {
         this.id = id;
+        this.name = name;
         this.mod = mod;
         this.state = state;
         this.level = level;
         this.levelState = levelState;
         this.secondaryVoxelId = secondaryVoxelId;
+        this.secondaryVoxeName = secondaryVoxeName;
     }
 }
-export var VoxelStructIds;
-(function (VoxelStructIds) {
-    VoxelStructIds["substance"] = "dve_substance";
-    VoxelStructIds["renderedMaterial"] = "dve_rendered_material";
-    VoxelStructIds["voxelMaterial"] = "dve_voxel_material";
-    VoxelStructIds["hardness"] = "dve_hardness";
-    VoxelStructIds["colliderID"] = "dve_collider_id";
-    VoxelStructIds["checkCollisions"] = "dve_check_collisions";
-    VoxelStructIds["isLightSource"] = "dve_is_light_source";
-    VoxelStructIds["noAO"] = "dve_no_ao";
-    VoxelStructIds["isTransparent"] = "dve_is_transparent";
-    VoxelStructIds["lightValue"] = "dve_light_value";
-    VoxelStructIds["isRich"] = "dve_is_rich";
-    VoxelStructIds["canHaveSecondary"] = "dve_can_have_secondary";
-})(VoxelStructIds || (VoxelStructIds = {}));

package/Voxels/Types/VoxelModelCompiledData.types.d.ts

@@ -5,29 +5,26 @@ import { VoxelFaceTransparentResultsIndexData } from "../../Models/Indexing/Voxe
 import { VoxelModelStateSchemaData, StateLogicStatement } from "../State/State.types";
 import { VoxelGeometryData, VoxelGeometryNodes } from "../../Models/VoxelModel.types";
 import { VoxelEffectSyncData } from "../Effects/VoxelEffects.types";
-import { VoxelTagStatesData } from "../State/VoxelTagStates";
-import { BinaryStructData } from "@amodx/binary";
-export type CompiledVoxelData = {
-    models: FinalCompiledVoxelModelData;
+import { VoxelTagStatesData } from "../Data/VoxelTagStates";
+import { VoxelSubstanceTags, VoxelTags } from "../Data/VoxelTag.types";
+export type CompiledVoxelTagAndPaletteData = {
     data: {
-        struct: BinaryStructData;
-        index: Uint16Array;
+        tags: VoxelTags[];
         palette: string[];
-        nameToIdMap: Record<string, string>;
-        idToNameMap: Record<string, string>;
-        stringMaps: Record<string, string[]>;
-        objectMaps: Record<string, any[]>;
+        nameToIdMap: [string, string][];
+        idToNameMap: [string, string][];
     };
     substances: {
-        struct: BinaryStructData;
+        tags: VoxelSubstanceTags[];
         palette: string[];
-        stringMaps: Record<string, string[]>;
-        objectMaps: Record<string, any[]>;
     };
     materials: {
         palette: string[];
     };
 };
+export type CompiledVoxelData = {
+    models: FinalCompiledVoxelModelData;
+} & CompiledVoxelTagAndPaletteData;
 export interface CompiledVoxelGeometryNodes {
     node: VoxelGeometryNodes;
     tranform: VoxelGeometryTransform;
@@ -77,6 +74,7 @@ export interface CompiledVoxelModelData {
 }
 export interface CompiledVoxelModelInputData {
     id: string;
+    materialId: string;
     modelId: string;
     transparentFaceIndex: VoxelFaceTransparentResultsIndexData;
     modSchema: VoxelModelStateSchemaData[];

package/Voxels/Types/VoxelSubstances.types.d.ts

@@ -1,19 +1,6 @@
-export declare enum SubstanceStructIds {
-    parent = "dve_parent_substance",
-    isSolid = "dve_is_solid",
-    isTransparent = "dve_is_transparent",
-    isLiquid = "dve_is_liquid",
-    flowRate = "dve_flow_rate",
-    isWindAffected = "dve_is_wind_affected"
-}
-export interface VoxelSubstanceDataProperties {
+import { VoxelSubstanceTags } from "../Data/VoxelTag.types";
+export interface VoxelSubstanceDataProperties extends Partial<VoxelSubstanceTags> {
     [key: string]: any;
-    [SubstanceStructIds.parent]?: string;
-    [SubstanceStructIds.isTransparent]?: boolean;
-    [SubstanceStructIds.isSolid]?: boolean;
-    [SubstanceStructIds.isLiquid]?: boolean;
-    [SubstanceStructIds.flowRate]?: number;
-    [SubstanceStructIds.isWindAffected]?: boolean;
 }
 export type VoxelSubstanceData = {
     id: string;

package/Voxels/Types/VoxelSubstances.types.js

@@ -1,9 +1 @@
-export var SubstanceStructIds;
-(function (SubstanceStructIds) {
-    SubstanceStructIds["parent"] = "dve_parent_substance";
-    SubstanceStructIds["isSolid"] = "dve_is_solid";
-    SubstanceStructIds["isTransparent"] = "dve_is_transparent";
-    SubstanceStructIds["isLiquid"] = "dve_is_liquid";
-    SubstanceStructIds["flowRate"] = "dve_flow_rate";
-    SubstanceStructIds["isWindAffected"] = "dve_is_wind_affected";
-})(SubstanceStructIds || (SubstanceStructIds = {}));
+export {};

package/World/Archive/Archive.types.d.ts

@@ -1,45 +1,46 @@
 import { Vec3Array } from "@amodx/math";
 import { LocationData } from "../../Math";
+import { BinaryBufferData } from "../../Util/Binary/BinaryBuffer";
+export type ArchivedLightSegments = "sun" | "red" | "green" | "blue";
 /**
  * Interface for an archived sector.
  */
 export interface ArchivedSectorData {
-    /** The version of vlox the data was stored in. */
+    /** A user provided version of the data. */
     version: string;
+    /** The version of vlox the data was stored in. */
+    vloxVersion: string;
     /** The location of the sector in the world. */
     location: LocationData;
-    /** Record of the sector's state, storing dynamic or user-defined data. */
-    sectorState: Record<string, any>;
+    /** Record of the sector's bit flags.  */
+    flags: Record<string, boolean>;
+    /** Record of the sector's timestamps. */
+    timestamps: Record<string, number>;
     /** The palette data used within the sector. */
     palettes: ArchivedSectorPaletteData;
     /** Placeholder for future buffer data. */
     buffers: ArchivedSectorBuffersData;
-    /** Keys associated with section states and other objects. */
-    keys: ArchivedSectorKeysData;
+    duplicates: ArchivedSectorDuplicteData;
     /** Array of archived section data within the sector. */
-    sections: ArchivedSectionData[];
+    sections: (ArchivedSectionData | string)[];
+}
+export interface ArchivedSectorDuplicteData {
+    sections?: Record<string, ArchivedSectionData>;
 }
 /**
  * Interface for the palettes of an archived sector.
  */
 export interface ArchivedSectorPaletteData {
     id: string[];
-    secondaryId?: string[];
-    level?: Uint8Array;
-    stateMap: Record<number, any[]>;
-    modMap: Record<number, any[]>;
+    secondaryId: string[];
     state: Uint16Array;
+    stateMap: Record<number, any[]>;
     mod: Uint16Array;
-    light?: Uint16Array;
+    modMap: Record<number, any[]>;
+    level?: Uint8Array;
+    light: Partial<Record<ArchivedLightSegments, Uint8Array>>;
     secondaryState?: Uint16Array;
 }
-/**
- * Interface for the keys of an archived sector.
- */
-export interface ArchivedSectorKeysData {
-    /** Array of strings that are the keys for the section state struct.  */
-    sectionState: string[];
-}
 /**
  * Placeholder interface for future buffer data in a sector.
  */
@@ -49,10 +50,10 @@ export interface ArchivedSectorBuffersData {
  * Interface for an archived section.
  */
 export interface ArchivedSectionData {
-    /** Array representing the section's state, holding dynamic or user-defined data. */
-    state: any[];
+    /** Record of the sections's bit flags.  */
+    flags?: Record<string, boolean>;
     /** Palette data used within the section. */
-    palettes: ArchivedSectionPaletteData;
+    palettes?: ArchivedSectionPaletteData;
     /** Buffer data for the section, holding voxel type identifiers, light data, state, and secondary state. */
     buffers: ArchivedSectionBuffers;
 }
@@ -61,7 +62,7 @@ export interface ArchivedSectionData {
  */
 export interface ArchivedSectionPaletteData {
     id?: Uint16Array;
-    light?: Uint16Array;
+    light?: Partial<Record<ArchivedLightSegments, Uint8Array>>;
     level?: Uint8Array;
     secondaryId?: Uint16Array;
     state?: Uint16Array;
@@ -72,12 +73,15 @@ export interface ArchivedSectionPaletteData {
  * Interface representing the buffer data for a section.
  */
 export interface ArchivedSectionBuffers {
-    id: Uint16Array | Uint8Array | number;
-    light: Uint16Array | Uint8Array | number;
-    level: Uint8Array | number;
-    state: Uint16Array | Uint8Array | number;
-    mod: Uint16Array | Uint8Array | number;
-    secondary: Uint16Array | Uint8Array | number;
+    buried?: Uint8Array | number;
+    voxelMap?: Uint8Array | number;
+    dirtyMap?: Uint8Array | number;
+    id?: BinaryBufferData | number;
+    light?: Partial<Record<ArchivedLightSegments, BinaryBufferData | number>>;
+    level?: BinaryBufferData | number;
+    state?: BinaryBufferData | number;
+    mod?: BinaryBufferData | number;
+    secondary?: BinaryBufferData | number;
 }
 /**
  * Interface for an archived area.
@@ -133,14 +137,14 @@ export interface ArchivedAreaKeysData {
  */
 export interface ArchivedAreaSectorPaletteData {
     id: string[];
-    light?: Uint16Array;
-    level?: Uint8Array;
-    state?: Uint16Array;
-    mod?: Uint16Array;
+    light: Uint16Array;
+    level: Uint8Array;
+    state: Uint16Array;
+    mod: Uint16Array;
     stateMap: Record<number, any[]>;
     modMap: Record<number, any[]>;
-    secondaryId?: string[];
-    secondaryState?: Uint16Array;
+    secondaryId: string[];
+    secondaryState: Uint16Array;
 }
 /**
  * Interface representing the archived data for a sector within an area.

package/World/Archive/Functions/ArchiveArea.js

@@ -1,19 +1,5 @@
 import { BinaryObject } from "@amodx/binary";
-import { Sector } from "../../../World/index";
-const charset = "0123456789ABCDEF";
-function uint16To4CharString(value) {
-    if (value < 0 || value > 0xffff) {
-        throw new RangeError("Value must be a 16-bit unsigned integer.");
-    }
-    const chars = [];
-    for (let i = 0; i < 4; i++) {
-        const charCode = (value >> (i * 4)) & 0x0f;
-        chars.unshift(charset[charCode]);
-    }
-    const result = chars.join("").replace(/^0+(?!$)/, "");
-    return result;
-}
-let sectorStructInstance;
+import { uint16To4CharString } from "./Shared";
 const processPalettes = (archiveData) => {
     const allRegistered = new Set();
     for (const sector of archiveData.sectors) {
@@ -107,7 +93,7 @@ const buildSectorState = (archiveData) => {
     const maped = new Map();
     const binaryObjects = new Map();
     let count = 0;
-    const sectorStateKeys = sectorStructInstance.getKeys();
+    const sectorStateKeys = [];
     const created = new Map();
     const processSectorState = (sector, sectorStateMap) => {
         if (typeof sector.sectorState == "string")
@@ -227,8 +213,7 @@ function SectorToArchivedAreaSector(sector) {
     palettes.id = sector.palettes.id;
     if (sector.palettes.secondaryId)
         palettes.secondaryId = sector.palettes.secondaryId;
-    if (sector.palettes.light)
-        palettes.light = sector.palettes.light;
+    // if (sector.palettes.light) palettes.light = sector.palettes.light;
     if (sector.palettes.secondaryState)
         palettes.secondaryState = sector.palettes.secondaryState;
     if (sector.palettes.state)
@@ -239,16 +224,14 @@ function SectorToArchivedAreaSector(sector) {
     sector.palettes.modMap = sector.palettes.modMap;
     return {
         position: [sector.location[1], sector.location[2], sector.location[3]],
-        sectorState: sector.sectorState,
+        sectorState: sector.flags,
         buffers: sector.buffers,
         palettes,
         sections: sector.sections,
     };
 }
 export default function CreateArchiveArea(archiveData) {
-    if (!sectorStructInstance)
-        sectorStructInstance = Sector.StateStruct.instantiate();
-    const sectorStateKeys = sectorStructInstance.getKeys();
+    const sectorStateKeys = [];
     const sectors = [];
     for (const sector of archiveData.sectors) {
         sectors.push(SectorToArchivedAreaSector(sector));
@@ -258,7 +241,8 @@ export default function CreateArchiveArea(archiveData) {
         version: "",
         keys: {
             sectorState: sectorStateKeys,
-            sectionState: archiveData.sectors[0].keys.sectionState,
+            sectionState: []
+            //   sectionState: archiveData.sectors[0].keys.sectionState,
         },
         maps: {
             sectorState: buildSectorState(archiveData),
@@ -289,10 +273,11 @@ export function CreateSectorFromArea(area, sector) {
         id[i] = area.maps.id[i];
     }
     palettes.id = id;
-    palettes.light =
+    /*   palettes.light =
         typeof sector.palettes.light == "string"
-            ? area.maps.lightPalette[sector.palettes.light]
-            : sector.palettes.light;
+          ? area.maps.lightPalette[sector.palettes.light]
+          : sector.palettes.light;
+     */
     palettes.level =
         typeof sector.palettes.level == "string"
             ? area.maps.levelPalette[sector.palettes.level]
@@ -333,11 +318,14 @@ export function CreateSectorFromArea(area, sector) {
     }
     return {
         version: area.version,
+        vloxVersion: area.version,
         location: [area.dimension, ...sector.position],
-        sectorState,
-        keys: {
-            sectionState: area.keys.sectionState,
-        },
+        flags: sectorState,
+        timestamps: {},
+        /*     keys: {
+              sectionState: area.keys.sectionState,
+            }, */
+        duplicates: {},
         palettes,
         buffers: sector.buffers,
         sections,