@divinevoxel/vlox 0.0.75 → 0.0.76

package/Voxels/Types/PaintVoxelData.js

@@ -1,19 +1,25 @@
 import { VoxelPalettesRegister } from "../Data/VoxelPalettesRegister";
 import { VoxelLevelReader } from "../Cursor/VoxelLevelReader";
+import { SchemaRegister } from "../../Voxels/State/SchemaRegister";
 export class PaintVoxelData {
     id;
     name;
-    mod;
     state;
+    stateString;
+    mod;
+    modString;
     level;
     levelState;
     secondaryVoxelId;
     secondaryName;
     secondaryMod;
+    secondaryModString;
     secondaryState;
+    secondaryStateString;
     static Create(data = {}) {
-        return new PaintVoxelData(data.id, data.name, data.mod, data.state, data.level, data.levelState, data.secondaryVoxelId, data.secondaryName, data.secondaryMod, data.secondaryState);
+        return new PaintVoxelData(data.id, data.name, data.state, data.stateString, data.mod, data.modString, data.level, data.levelState, data.secondaryVoxelId, data.secondaryName, data.secondaryMod, data.secondaryModString, data.secondaryState, data.secondaryModString);
     }
+    /**Transforms numeric voxel data into a PaintVoxelData object */
     static FromRaw(data, paintData = PaintVoxelData.Create()) {
         const [trueVoxelId, state, mod] = VoxelPalettesRegister.voxels[data[0]];
         paintData.id = VoxelPalettesRegister.voxelIds.getStringId(trueVoxelId);
@@ -34,23 +40,48 @@ export class PaintVoxelData {
         paintData.levelState = VoxelLevelReader.getLevel(data[2]);
         return paintData;
     }
+    /**Transforms the voxel data into numeric voxel data */
     static ToRaw(data, light = 0) {
         let stringId = data.id
             ? data.id
             : data.name
                 ? VoxelPalettesRegister.voxelNametoIdMap.get(data.name)
                 : "dve_air";
-        let secondaryStringId = data.id
-            ? data.id
-            : data.name
-                ? VoxelPalettesRegister.voxelNametoIdMap.get(data.name)
+        let secondaryStringId = data.secondaryName
+            ? data.secondaryVoxelId
+            : data.secondaryName
+                ? VoxelPalettesRegister.voxelNametoIdMap.get(data.secondaryName)
                 : "dve_air";
-        const id = (stringId !== "dve_air" &&
-            VoxelPalettesRegister.getVoxelIdFromString(stringId, data.state || 0, data.mod || 0)) ||
-            0;
-        const secondaryId = (secondaryStringId !== "dve_air" &&
-            VoxelPalettesRegister.getVoxelIdFromString(secondaryStringId, data.secondaryState || 0, data.secondaryMod || 0)) ||
-            0;
+        let state = data.state || 0;
+        let mod = data.mod || 0;
+        let secondaryState = data.secondaryState || 0;
+        let secondaryMod = data.secondaryMod || 0;
+        if (SchemaRegister.hasVoxelSchema(stringId)) {
+            const schema = SchemaRegister.getVoxelSchemas(stringId);
+            if (data.stateString && data.stateString !== "") {
+                state = schema.state.readString(data.stateString);
+            }
+            if (data.modString && data.modString !== "") {
+                mod = schema.mod.readString(data.modString);
+            }
+        }
+        if (secondaryStringId && SchemaRegister.hasVoxelSchema(secondaryStringId)) {
+            const schema = SchemaRegister.getVoxelSchemas(secondaryStringId);
+            if (data.secondaryStateString && data.secondaryStateString !== "") {
+                secondaryState = schema.state.readString(data.secondaryStateString);
+            }
+            if (data.secondaryModString && data.secondaryModString !== "") {
+                secondaryMod = schema.mod.readString(data.secondaryModString);
+            }
+        }
+        const id = stringId !== "dve_air"
+            ? VoxelPalettesRegister.getVoxelIdFromString(stringId, state || 0, mod || 0)
+            : 0;
+        const secondaryId = secondaryStringId !== "dve_air"
+            ? secondaryStringId
+                ? VoxelPalettesRegister.getVoxelIdFromString(secondaryStringId, secondaryState || 0, secondaryMod || 0)
+                : 0
+            : 0;
         let levleData = 0;
         if (data.level !== undefined)
             levleData = VoxelLevelReader.setLevel(levleData, data.level);
@@ -58,16 +89,71 @@ export class PaintVoxelData {
             levleData = VoxelLevelReader.setLevelState(levleData, data.levelState);
         return [id, light, levleData, secondaryId];
     }
-    constructor(id = "dve_air", name = "", mod = 0, state = 0, level = 0, levelState = 0, secondaryVoxelId = "dve_air", secondaryName = "", secondaryMod = 0, secondaryState = 0) {
+    /**Restores the data to the default state of being dve_air */
+    static Clear(data) {
+        data.id = "dve_air";
+        data.name = "";
+        data.state = 0;
+        data.stateString = "";
+        data.mod = 0;
+        data.modString = "";
+        data.level = 0;
+        data.levelState = 0;
+        data.secondaryVoxelId = "dve_air";
+        data.secondaryName = "";
+        data.secondaryMod = 0;
+        data.secondaryModString = "";
+        data.secondaryState = 0;
+        data.secondaryStateString = "";
+        return data;
+    }
+    /**Clears the target data and then copies properties from source to target. */
+    static Set(target, source) {
+        PaintVoxelData.Clear(target);
+        if (source.id !== undefined)
+            target.id = source.id;
+        if (source.name !== undefined)
+            target.name = source.name;
+        if (source.state !== undefined)
+            target.state = source.state;
+        if (source.stateString !== undefined)
+            target.stateString = source.stateString;
+        if (source.mod !== undefined)
+            target.mod = source.mod;
+        if (source.modString !== undefined)
+            target.modString = source.modString;
+        if (source.level !== undefined)
+            target.level = source.level;
+        if (source.levelState !== undefined)
+            target.levelState = source.levelState;
+        if (source.secondaryVoxelId !== undefined)
+            target.secondaryVoxelId = source.secondaryVoxelId;
+        if (source.secondaryName !== undefined)
+            target.secondaryName = source.secondaryName;
+        if (source.secondaryMod !== undefined)
+            target.secondaryMod = source.secondaryMod;
+        if (source.secondaryModString !== undefined)
+            target.secondaryModString = source.secondaryModString;
+        if (source.secondaryState !== undefined)
+            target.secondaryState = source.secondaryState;
+        if (source.secondaryStateString !== undefined)
+            target.secondaryStateString = source.secondaryStateString;
+        return target;
+    }
+    constructor(id = "dve_air", name = "", state = 0, stateString = "", mod = 0, modString = "", level = 0, levelState = 0, secondaryVoxelId = "dve_air", secondaryName = "", secondaryMod = 0, secondaryModString = "", secondaryState = 0, secondaryStateString = "") {
         this.id = id;
         this.name = name;
-        this.mod = mod;
         this.state = state;
+        this.stateString = stateString;
+        this.mod = mod;
+        this.modString = modString;
         this.level = level;
         this.levelState = levelState;
         this.secondaryVoxelId = secondaryVoxelId;
         this.secondaryName = secondaryName;
         this.secondaryMod = secondaryMod;
+        this.secondaryModString = secondaryModString;
         this.secondaryState = secondaryState;
+        this.secondaryStateString = secondaryStateString;
     }
 }

package/World/Archive/Functions/Shared/LightSegments.d.ts

@@ -2,4 +2,4 @@ import { ArchivedLightSegments } from "../../Types/Archive.types";
 export declare const lightSegments: ArchivedLightSegments[];
 export declare const lightSemgnetGet: Record<ArchivedLightSegments, (value: number) => number>;
 export declare const lightSemgnetSet: Record<ArchivedLightSegments, (value: number, source: number) => number>;
-export declare function getLightBuffer(light: ArchivedLightSegments, buffer: Uint16Array): Uint8Array;
+export declare function getLightBuffer(light: ArchivedLightSegments, buffer: Uint16Array): Uint8Array<ArrayBuffer>;

package/World/Sector/Sector.d.ts

@@ -16,7 +16,7 @@ export declare class Sector {
     static TimeStampIds: typeof import("./SectorState.js").SectorStateDefaultTimeStamps;
     static GetHeaderSize(): number;
     static GetBufferSize(): number;
-    static CreateNewBuffer(): ArrayBuffer;
+    static CreateNewBuffer(): ArrayBuffer | SharedArrayBuffer;
     sections: Section[];
     bufferView: Uint8Array;
     position: Vec3Array;

package/WorldSimulation/Dimensions/SimulationSector.d.ts

@@ -15,7 +15,7 @@ export declare class SimulationSector {
     _rendered: boolean;
     _genAllDone: boolean;
     /**An array of the last tick each section was built at */
-    _displayTicks: Uint32Array;
+    _displayTicks: Uint32Array<ArrayBuffer>;
     tickQueue: TickQueue;
     neighbors: SimulationSector[];
     fullNeighbors: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divinevoxel/vlox",
-  "version": "0.0.75",
+  "version": "0.0.76",
   "description": "Vlox a block style voxel engine.",
   "main": "index.js",
   "types": "index.d.ts",