@divinevoxel/vlox 0.0.73 → 0.0.74

package/Models/Defaults/CubeVoxelModels.js

@@ -1,7 +1,7 @@
 export const simpleCube = {
     id: "dve_simple_cube",
     relationsSchema: [],
-    shapeStateSchema: [],
+    stateSchema: [],
     arguments: {
         texture: {
             type: "texture",
@@ -11,8 +11,8 @@ export const simpleCube = {
             default: false,
         },
     },
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "*": [
             {
                 id: "cube",
@@ -38,28 +38,16 @@ export const simpleCube = {
 export const orientedCube = {
     id: "dve_oriented_cube",
     relationsSchema: [],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "placement",
             type: "string",
-            values: {
-                0: "down",
-                1: "up",
-                2: "north",
-                3: "south",
-                4: "east",
-                5: "west",
-            },
+            values: ["down", "up", "north", "south", "east", "west"],
         },
         {
             name: "direction",
             type: "string",
-            values: {
-                0: "north",
-                1: "south",
-                2: "east",
-                3: "west",
-            },
+            values: ["north", "south", "east", "west"],
         },
     ],
     arguments: {
@@ -82,8 +70,8 @@ export const orientedCube = {
             type: "texture",
         },
     },
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "placement=down,direction=north": [
             {
                 id: "cube",
@@ -553,18 +541,11 @@ export const orientedCube = {
 export const simpleHalfCube = {
     id: "dve_simple_half_cube",
     relationsSchema: [],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "placement",
             type: "string",
-            values: {
-                0: "down",
-                1: "up",
-                2: "north",
-                3: "south",
-                4: "east",
-                5: "west",
-            },
+            values: ["down", "up", "north", "south", "east", "west"],
         },
     ],
     arguments: {
@@ -575,8 +556,8 @@ export const simpleHalfCube = {
             type: "texture",
         },
     },
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "placement=down": [
             {
                 id: "half_cube",
@@ -724,15 +705,11 @@ export const pillarCube = {
             ],
         },
     ],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "direction",
             type: "string",
-            values: {
-                0: "down-up",
-                1: "south-north",
-                2: "west-east",
-            },
+            values: ["down-up", "south-north", "west-east"],
         },
     ],
     arguments: {
@@ -755,8 +732,8 @@ export const pillarCube = {
             type: "texture",
         },
     },
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "direction=down-up,same-down=false,same-up=false": [
             {
                 id: "cube",

package/Models/Defaults/LiquidVoxelModel.js

@@ -22,7 +22,7 @@ export const liquidGeometry = {
 export const liquidModel = {
     id: "dve_liquid",
     relationsSchema: [],
-    shapeStateSchema: [],
+    stateSchema: [],
     arguments: {
         stillTexture: {
             type: "texture",
@@ -31,8 +31,8 @@ export const liquidModel = {
             type: "texture",
         },
     },
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "*": [
             {
                 id: "liquid",

package/Models/Defaults/PanelVoxelModels.js

@@ -1,28 +1,16 @@
 export const simpleThinPannel = {
     id: "dve_simple_thin_panel",
     relationsSchema: [],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "placement",
             type: "string",
-            values: {
-                0: "down",
-                1: "up",
-                2: "north",
-                3: "south",
-                4: "east",
-                5: "west",
-            },
+            values: ["down", "up", "north", "south", "east", "west"],
         },
         {
             name: "direction",
             type: "string",
-            values: {
-                0: "north",
-                1: "south",
-                2: "east",
-                3: "west",
-            },
+            values: ["north", "south", "east", "west"],
         },
     ],
     arguments: {
@@ -37,9 +25,8 @@ export const simpleThinPannel = {
             type: "texture",
         },
     },
-    shapeStatesConditonalNodes: {},
-    //  shapeStatesOverrides: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "placement=down,direction=south": [
             {
                 id: "cube",
@@ -489,28 +476,16 @@ export const simpleThinPannel = {
 export const simpleCrossedPannel = {
     id: "dve_simple_crossed_panels",
     relationsSchema: [],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "placement",
             type: "string",
-            values: {
-                0: "down",
-                1: "up",
-                2: "north",
-                3: "south",
-                4: "east",
-                5: "west",
-            },
+            values: ["down", "up", "north", "south", "east", "west"],
         },
         {
             name: "direction",
             type: "string",
-            values: {
-                0: "north",
-                1: "south",
-                2: "east",
-                3: "west",
-            },
+            values: ["north", "south", "east", "west"],
         },
     ],
     arguments: {
@@ -526,9 +501,8 @@ export const simpleCrossedPannel = {
             default: false,
         },
     },
-    shapeStatesConditonalNodes: {},
-    //  shapeStatesOverrides: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "placement=down,direction=north": [
             {
                 id: "quad-1",

package/Models/Defaults/StairVoxelModel.js

@@ -1,36 +1,21 @@
 export const stair = {
     id: "dve_simple_stair",
     relationsSchema: [],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "placement",
             type: "string",
-            values: {
-                0: "down",
-                1: "up",
-                2: "north",
-                3: "south",
-                4: "east",
-                5: "west",
-            },
+            values: ["down", "up", "north", "south", "east", "west"],
         },
         {
             name: "direction",
             type: "string",
-            values: {
-                0: "south",
-                1: "north",
-                2: "east",
-                3: "west",
-            },
+            values: ["south", "north", "east", "west"],
         },
         {
             name: "connected",
             type: "string",
-            values: {
-                0: "false",
-                1: "true",
-            },
+            values: ["false", "true"],
         },
     ],
     arguments: {
@@ -38,8 +23,8 @@ export const stair = {
             type: "texture",
         },
     },
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "placement=up,direction=north,connected=false": [
             {
                 id: "base",

package/Models/Examples.js

@@ -42,19 +42,15 @@ export const chainModel = {
         },
     },
     relationsSchema: [],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "axis",
             type: "string",
-            values: {
-                0: "y",
-                1: "x",
-                2: "z",
-            },
+            values: ["y", "x", "z"],
         },
     ],
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "axis=y": [
             {
                 id: "main",
@@ -144,9 +140,9 @@ export const carpetModel = {
         },
     },
     relationsSchema: [],
-    shapeStateSchema: [],
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    stateSchema: [],
+    conditonalNodes: {},
+    stateNodes: {
         "*": [
             {
                 id: "main",
@@ -404,6 +400,7 @@ export const fenceNorthsouth = {
 };
 export const fence = {
     id: "dve_fence",
+    divisor: [16, 16, 16],
     relationsSchema: [
         {
             name: "same-east",
@@ -442,7 +439,7 @@ export const fence = {
             ],
         },
     ],
-    shapeStateSchema: [],
+    stateSchema: [],
     arguments: {
         southTex: {
             type: "texture",
@@ -463,7 +460,7 @@ export const fence = {
             type: "texture",
         },
     },
-    shapeStatesConditonalNodes: {
+    conditonalNodes: {
         "same-south=true": [
             {
                 id: "fence_connection_south",
@@ -523,7 +520,7 @@ export const fence = {
             },
         ],
     },
-    shapeStatesNodes: {
+    stateNodes: {
         "*": [
             {
                 id: "fence_post",
@@ -828,7 +825,7 @@ export const candlesModel = {
         },
     },
     relationsSchema: [],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "num_candles",
             type: "number",
@@ -837,10 +834,7 @@ export const candlesModel = {
         {
             name: "lit",
             type: "string",
-            values: {
-                0: "false",
-                1: "true",
-            },
+            values: ["false", "true"],
         },
     ],
     effects: [
@@ -881,8 +875,8 @@ export const candlesModel = {
             },
         },
     ],
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "num_candles=0,lit=false": [
             {
                 id: "candel_1",
@@ -1161,40 +1155,25 @@ export const leverModel = {
         },
     },
     relationsSchema: [],
-    shapeStateSchema: [
+    stateSchema: [
         {
             name: "placement",
             type: "string",
-            values: {
-                0: "down",
-                1: "up",
-                2: "north",
-                3: "south",
-                4: "east",
-                5: "west",
-            },
+            values: ["down", "up", "north", "south", "east", "west"],
         },
         {
             name: "direction",
             type: "string",
-            values: {
-                0: "north",
-                1: "south",
-                2: "east",
-                3: "west",
-            },
+            values: ["north", "south", "east", "west"],
         },
         {
             name: "state",
             type: "string",
-            values: {
-                0: "off",
-                1: "on",
-            },
+            values: ["off", "on"],
         },
     ],
-    shapeStatesConditonalNodes: {},
-    shapeStatesNodes: {
+    conditonalNodes: {},
+    stateNodes: {
         "placement=down,direction=north,state=off": [
             {
                 id: "lever_base",
@@ -1242,7 +1221,7 @@ export const leverModel = {
             {
                 id: "lever",
                 geometryId: "dve_lever_model",
-                position: [0, -.8, 3],
+                position: [0, -0.8, 3],
                 rotation: [45, 0, 0],
                 inputs: {
                     texture: "@leverTexture",
@@ -1260,7 +1239,7 @@ export const leverModel = {
             {
                 id: "lever",
                 geometryId: "dve_lever_model",
-                position: [0, -.8, -3],
+                position: [0, -0.8, -3],
                 rotation: [-45, 0, 0],
                 inputs: {
                     texture: "@leverTexture",

package/Models/Rules/Classes/VoxelRulesModel.d.ts

@@ -2,7 +2,7 @@ import { VoxelModelConstructorData, VoxelModelData } from "../../VoxelModel.type
 import { BuildStateData } from "../../../Voxels/Functions/BuildStateData";
 export declare class VoxelRulesModoel {
     data: VoxelModelData;
-    shapeStates: Map<string, string[]>;
+    states: Map<string, string[]>;
     conditionalNodes: Map<string, string[]>;
     stateData: ReturnType<typeof BuildStateData>;
     voxels: Map<string, VoxelModelConstructorData>;

package/Models/Rules/Classes/VoxelRulesModel.js

@@ -1,6 +1,6 @@
 export class VoxelRulesModoel {
     data;
-    shapeStates = new Map();
+    states = new Map();
     conditionalNodes = new Map();
     stateData;
     voxels = new Map();
@@ -9,10 +9,10 @@ export class VoxelRulesModoel {
         this.data = data;
     }
     registerShapeState(id, geomtryId) {
-        let stateArray = this.shapeStates.get(id);
+        let stateArray = this.states.get(id);
         if (!stateArray) {
             stateArray = [];
-            this.shapeStates.set(id, stateArray);
+            this.states.set(id, stateArray);
         }
         if (!stateArray.find((_) => _ == geomtryId))
             stateArray.push(geomtryId);

package/Models/Rules/Functions/BuildFinalInputs.d.ts

@@ -1,7 +1,7 @@
 import { VoxelFaceTransparentResultsIndex } from "../../Indexing/VoxelFaceTransparentResultsIndex";
 import { VoxelRulesModoel } from "../Classes/VoxelRulesModel";
 export declare function BuildFinalInputs(model: VoxelRulesModoel): {
-    shapeStateVoxelInputs: Record<string, any[]>;
+    stateVoxelInputs: Record<string, any[]>;
     transparentVoxelFaceIndexes: Record<string, VoxelFaceTransparentResultsIndex>;
     conditionalShapeStateVoxelInputs: Record<string, any[]>;
 };

package/Models/Rules/Functions/BuildFinalInputs.js

@@ -6,7 +6,7 @@ const isArgString = (data) => {
     return data[0] == "@";
 };
 export function BuildFinalInputs(model) {
-    const shapeStateVoxelInputs = {};
+    const stateVoxelInputs = {};
     const transparentVoxelFaceIndexes = {};
     const conditionalShapeStateVoxelInputs = {};
     for (const [voxelId, voxel] of model.voxels) {
@@ -20,10 +20,10 @@ export function BuildFinalInputs(model) {
             const modVoxelInput = voxel.inputs[modVoxelInputKey];
             const modIndex = voxelModData.modRecord[modVoxelInputKey];
             const baseStates = [];
-            for (const state in model.data.shapeStatesNodes) {
+            for (const state in model.data.stateNodes) {
                 const geoNodes = [];
-                const shapeStateNodes = model.data.shapeStatesNodes[state];
-                for (const node of shapeStateNodes) {
+                const stateNodes = model.data.stateNodes[state];
+                for (const node of stateNodes) {
                     const geo = VoxelModelRuleBuilderRegister.getGeomtryFromLink(node);
                     if (!geo)
                         throw new Error(`Geometry does not exist`);
@@ -39,24 +39,24 @@ export function BuildFinalInputs(model) {
                     }
                     geoNodes[model.stateData.geometryLinkPalette[node.id]] =
                         geo.inputs.cloneArgs();
-                    const byteIndex = model.stateData.relativeGeometryByteIndexMap[model.stateData.shapeStateRelativeGeometryMap[model.stateData.shapeStateRecord[state]][VoxelModelRuleBuilderRegister.geometryPalette.getNumberId(VoxelModelRuleBuilderRegister.getGeometryLinkId(node))]];
+                    const byteIndex = model.stateData.relativeGeometryByteIndexMap[model.stateData.stateRelativeGeometryMap[model.stateData.stateRecord[state]][VoxelModelRuleBuilderRegister.geometryPalette.getNumberId(VoxelModelRuleBuilderRegister.getGeometryLinkId(node))]];
                     if (geo.data.ogData.doNotBuildRules !== true) {
                         for (let i = 0; i < geo.inputs.faceTransparentIndex.length; i++) {
                             transparentIndex.setValue(modIndex, byteIndex, i, geo.inputs.faceTransparentIndex[i] ? 1 : 0);
                         }
                     }
                 }
-                baseStates[model.stateData.shapeStateRecord[state]] = geoNodes;
+                baseStates[model.stateData.stateRecord[state]] = geoNodes;
             }
-            shapeStateVoxelInputs[voxelId] ??= [];
-            shapeStateVoxelInputs[voxelId][voxelModData.modRecord[modVoxelInputKey]] =
+            stateVoxelInputs[voxelId] ??= [];
+            stateVoxelInputs[voxelId][voxelModData.modRecord[modVoxelInputKey]] =
                 baseStates;
             const condiotnalStates = [];
-            for (const state in model.data.shapeStatesConditonalNodes) {
+            for (const state in model.data.conditonalNodes) {
                 const geoNodes = [];
-                const shapeStateNodes = model.data.shapeStatesConditonalNodes[state];
-                for (let i = 0; i < shapeStateNodes.length; i++) {
-                    const node = shapeStateNodes[i];
+                const stateNodes = model.data.conditonalNodes[state];
+                for (let i = 0; i < stateNodes.length; i++) {
+                    const node = stateNodes[i];
                     const geo = VoxelModelRuleBuilderRegister.getGeomtryFromLink(node);
                     if (!geo)
                         throw new Error(`Geometry does not exist`);
@@ -86,7 +86,7 @@ export function BuildFinalInputs(model) {
         }
     }
     return {
-        shapeStateVoxelInputs,
+        stateVoxelInputs,
         transparentVoxelFaceIndexes,
         conditionalShapeStateVoxelInputs,
     };

package/Models/Rules/VoxelModelRuleBuilderRegister.js

@@ -111,8 +111,8 @@ export class VoxelModelRuleBuilderRegister {
             this.models.set(model.id, rulesModel);
             const divisor = model.divisor ? model.divisor : null;
             if (divisor) {
-                for (const stateId in model.shapeStatesNodes) {
-                    const nodes = model.shapeStatesNodes[stateId];
+                for (const stateId in model.stateNodes) {
+                    const nodes = model.stateNodes[stateId];
                     for (const node of nodes) {
                         const d = "divisor" in node ? node.divisor : divisor;
                         if (node.position) {
@@ -127,8 +127,8 @@ export class VoxelModelRuleBuilderRegister {
                         }
                     }
                 }
-                for (const stateId in model.shapeStatesConditonalNodes) {
-                    const nodes = model.shapeStatesConditonalNodes[stateId];
+                for (const stateId in model.conditonalNodes) {
+                    const nodes = model.conditonalNodes[stateId];
                     for (const node of nodes) {
                         const d = "divisor" in node ? node.divisor : divisor;
                         if (node.position) {
@@ -157,12 +157,12 @@ export class VoxelModelRuleBuilderRegister {
                     }
                 }
             }
-            for (const stateId in model.shapeStatesNodes) {
-                const nodes = model.shapeStatesNodes[stateId];
+            for (const stateId in model.stateNodes) {
+                const nodes = model.stateNodes[stateId];
                 addGeo(model, stateId, nodes).forEach((_) => rulesModel.registerShapeState(..._));
             }
-            for (const stateId in model.shapeStatesConditonalNodes) {
-                const nodes = model.shapeStatesConditonalNodes[stateId];
+            for (const stateId in model.conditonalNodes) {
+                const nodes = model.conditonalNodes[stateId];
                 addGeo(model, stateId, nodes).forEach((_) => rulesModel.registerCondiotnalNode(..._));
             }
         }

package/Models/VoxelModel.types.d.ts

@@ -123,9 +123,9 @@ export interface VoxelModelData {
     /**Divisor used all transforms of geometry nodes. */
     divisor?: Vec3Array;
     arguments: Record<string, VoxelGeometryTextureArgument | VoxelGeometryBoxUVArgument | VoxelGeometryVector3Argument | VoxelGeometryIntArgument | VoxelGeometryBooleanArgument | VoxelGeometryFloatArgument>;
-    shapeStateSchema: (VoxelStateStringSchemaData | VoxelStateNumberSchemaData)[];
+    stateSchema: (VoxelStateStringSchemaData | VoxelStateNumberSchemaData)[];
     effects?: VoxelEffectData[];
     relationsSchema: VoxelModelRelationsSchemaData[];
-    shapeStatesNodes: Record<string, VoxelGeometryLinkData[]>;
-    shapeStatesConditonalNodes: Record<string, VoxelGeometryLinkData[]>;
+    stateNodes: Record<string, VoxelGeometryLinkData[]>;
+    conditonalNodes: Record<string, VoxelGeometryLinkData[]>;
 }

package/Renderer/Classes/DVESectionMeshes.d.ts

@@ -1,7 +1,6 @@
-import { Vec3Array } from "@amodx/math";
-import { CompactMeshData } from "../../Mesher/Types/Mesher.types";
 import { SectionMesh } from "./SectionMesh";
+import { CompactedSectionVoxelMesh } from "../../Mesher/Geomtry/CompactedSectionVoxelMesh";
 export declare abstract class DVESectionMeshes {
-    abstract updateVertexData(section: SectionMesh, position: Vec3Array, data: CompactMeshData): SectionMesh;
+    abstract updateVertexData(section: SectionMesh, data: CompactedSectionVoxelMesh): SectionMesh;
     abstract returnMesh(mesh: any): void;
 }

package/Renderer/InitTasks.js

@@ -7,16 +7,8 @@ export default function RendererTasks(threads) {
     const tasks = new TaskTool(threads);
     Threads.registerTask("set-section", (data, origin) => {
         MeshManager.updateSection(data);
-        const tranfers = [];
-        if (data[1][0] == 0) {
-            const comp = data[1][1];
-            for (const mesh of comp) {
-                tranfers.push(mesh[1].buffer);
-                tranfers.push(mesh[2].buffer);
-            }
-        }
         if (!EngineSettings.settings.rendererSettings.cpuBound) {
-            origin.sendMessage([], tranfers);
+            origin.sendMessage([], [data]);
         }
     });
     Threads.registerTask("remove-sector", (data) => {

package/Renderer/MeshManager.d.ts

@@ -1,4 +1,4 @@
-import { SetSectionMeshTask } from "../Renderer/Renderer.types";
+import type { SetSectionMeshTask } from "../Mesher/Types/Mesher.types";
 import { LocationData } from "../Math/index.js";
 import { DVESectionMeshes } from "./Classes/DVESectionMeshes";
 export declare class MeshManager {