@divinevoxel/vlox 0.0.4 → 0.0.5

package/Models/Defaults/CubeVoxelModels.js

@@ -84,7 +84,7 @@ export const orientedCube = {
     },
     shapeStatesConditonalNodes: {},
     shapeStatesNodes: {
-        "placement=down,direction=south": [
+        "placement=down,direction=north": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -100,7 +100,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=down,direction=north": [
+        "placement=down,direction=south": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -109,10 +109,10 @@ export const orientedCube = {
                     "@upTexRotation": 180,
                     "@downTex": "@downTex",
                     "@downTexRotation": 180,
-                    "@northTex": "@southTex",
-                    "@southTex": "@northTex",
-                    "@eastTex": "@westTex",
-                    "@westTex": "@eastTex",
+                    "@northTex": "@northTex",
+                    "@southTex": "@southTex",
+                    "@eastTex": "@eastTex",
+                    "@westTex": "@westTex",
                 },
             },
         ],
@@ -148,7 +148,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=up,direction=south": [
+        "placement=up,direction=north": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -168,7 +168,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=up,direction=north": [
+        "placement=up,direction=south": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -228,7 +228,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=south,direction=south": [
+        "placement=south,direction=north": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -248,7 +248,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=south,direction=north": [
+        "placement=south,direction=south": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -313,14 +313,14 @@ export const orientedCube = {
                 id: "cube",
                 geometryId: "dve_cube",
                 inputs: {
-                    "@upTex": "@northTex",
+                    "@upTex": "@southTex",
                     "@northTex": "@downTex",
-                    "@northTexRotation": 0,
+                    "@northTexRotation": 180,
                     "@southTex": "@upTex",
-                    "@southTexRotation": 0,
-                    "@downTex": "@southTex",
-                    "@eastTex": "@eastTex",
-                    "@westTex": "@westTex",
+                    "@southTexRotation": 180,
+                    "@downTex": "@northTex",
+                    "@eastTex": "@westTex",
+                    "@westTex": "@eastTex",
                     "@upTexRotation": 180,
                     "@downTexRotation": 180,
                     "@eastTexRotation": 270,
@@ -333,14 +333,14 @@ export const orientedCube = {
                 id: "cube",
                 geometryId: "dve_cube",
                 inputs: {
-                    "@upTex": "@southTex",
+                    "@upTex": "@northTex",
                     "@northTex": "@downTex",
-                    "@northTexRotation": 180,
+                    "@northTexRotation": 0,
                     "@southTex": "@upTex",
-                    "@southTexRotation": 180,
-                    "@downTex": "@northTex",
-                    "@eastTex": "@westTex",
-                    "@westTex": "@eastTex",
+                    "@southTexRotation": 0,
+                    "@downTex": "@southTex",
+                    "@eastTex": "@eastTex",
+                    "@westTex": "@westTex",
                     "@upTexRotation": 180,
                     "@downTexRotation": 180,
                     "@eastTexRotation": 270,
@@ -388,7 +388,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=west,direction=south": [
+        "placement=west,direction=north": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -408,7 +408,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=west,direction=north": [
+        "placement=west,direction=south": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -468,7 +468,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=east,direction=south": [
+        "placement=east,direction=north": [
             {
                 id: "cube",
                 geometryId: "dve_cube",
@@ -488,7 +488,7 @@ export const orientedCube = {
                 },
             },
         ],
-        "placement=east,direction=north": [
+        "placement=east,direction=south": [
             {
                 id: "cube",
                 geometryId: "dve_cube",

package/Models/Defaults/PanelVoxelModels.js

@@ -529,7 +529,7 @@ export const simpleCrossedPannel = {
     shapeStatesConditonalNodes: {},
     //  shapeStatesOverrides: {},
     shapeStatesNodes: {
-        "placement=down,direction=south": [
+        "placement=down,direction=north": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
@@ -551,7 +551,7 @@ export const simpleCrossedPannel = {
                 },
             },
         ],
-        "placement=down,direction=north": [
+        "placement=down,direction=south": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
@@ -617,7 +617,7 @@ export const simpleCrossedPannel = {
                 },
             },
         ],
-        "placement=up,direction=south": [
+        "placement=up,direction=north": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
@@ -639,7 +639,7 @@ export const simpleCrossedPannel = {
                 },
             },
         ],
-        "placement=up,direction=north": [
+        "placement=up,direction=south": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
@@ -705,7 +705,7 @@ export const simpleCrossedPannel = {
                 },
             },
         ],
-        "placement=north,direction=south": [
+        "placement=north,direction=north": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
@@ -727,7 +727,7 @@ export const simpleCrossedPannel = {
                 },
             },
         ],
-        "placement=north,direction=north": [
+        "placement=north,direction=south": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
@@ -793,13 +793,13 @@ export const simpleCrossedPannel = {
                 },
             },
         ],
-        "placement=south,direction=south": [
+        "placement=south,direction=north": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 180,
+                    "@textureRotation": 0,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
@@ -809,19 +809,19 @@ export const simpleCrossedPannel = {
                 geometryId: "dve_diagonal_flat_panel_east_west",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 180,
+                    "@textureRotation": 0,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
             },
         ],
-        "placement=south,direction=north": [
+        "placement=south,direction=south": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 0,
+                    "@textureRotation": 180,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
@@ -831,7 +831,7 @@ export const simpleCrossedPannel = {
                 geometryId: "dve_diagonal_flat_panel_east_west",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 0,
+                    "@textureRotation": 180,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
@@ -881,13 +881,13 @@ export const simpleCrossedPannel = {
                 },
             },
         ],
-        "placement=east,direction=south": [
+        "placement=east,direction=north": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 180,
+                    "@textureRotation": 0,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
@@ -897,19 +897,19 @@ export const simpleCrossedPannel = {
                 geometryId: "dve_diagonal_flat_panel_east_west",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 180,
+                    "@textureRotation": 0,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
             },
         ],
-        "placement=east,direction=north": [
+        "placement=east,direction=south": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 0,
+                    "@textureRotation": 180,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
@@ -919,7 +919,7 @@ export const simpleCrossedPannel = {
                 geometryId: "dve_diagonal_flat_panel_east_west",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 0,
+                    "@textureRotation": 180,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
@@ -969,13 +969,13 @@ export const simpleCrossedPannel = {
                 },
             },
         ],
-        "placement=west,direction=south": [
+        "placement=west,direction=north": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 180,
+                    "@textureRotation": 0,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
@@ -985,19 +985,19 @@ export const simpleCrossedPannel = {
                 geometryId: "dve_diagonal_flat_panel_east_west",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 180,
+                    "@textureRotation": 0,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
             },
         ],
-        "placement=west,direction=north": [
+        "placement=west,direction=south": [
             {
                 id: "quad-1",
                 geometryId: "dve_diagonal_flat_panel_west_east",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 0,
+                    "@textureRotation": 180,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },
@@ -1007,7 +1007,7 @@ export const simpleCrossedPannel = {
                 geometryId: "dve_diagonal_flat_panel_east_west",
                 inputs: {
                     "@texture": "@texture",
-                    "@textureRotation": 0,
+                    "@textureRotation": 180,
                     "@transaprent": "@transparent",
                     "@doubleSided": "@doubleSided",
                 },

package/Models/Input/BoxVoxelGometryInputs.d.ts

@@ -1,11 +1,12 @@
-import { QuadUVData } from "@amodx/meshing/Geometry.types";
+import { QuadUVData } from "../../Mesher/Geomtry/Geometry.types";
 export type BoxFaceArags = [
     enabled: boolean,
     Fliped: boolean,
     texture: number,
     rotation: number,
     transparent: boolean,
-    uvs: QuadUVData
+    uvs: QuadUVData,
+    index: number
 ];
 declare enum ArgIndexes {
     Enabled = 0,
@@ -13,7 +14,8 @@ declare enum ArgIndexes {
     Texture = 2,
     Rotation = 3,
     Transparent = 4,
-    UVs = 5
+    UVs = 5,
+    Index = 6
 }
 export type BoxVoxelGometryArgs = BoxFaceArags[];
 export declare class BoxVoxelGometryInputs {

package/Models/Input/BoxVoxelGometryInputs.js

@@ -1,4 +1,3 @@
-import { VoxelFacesArray } from "../../Math";
 var ArgIndexes;
 (function (ArgIndexes) {
     ArgIndexes[ArgIndexes["Enabled"] = 0] = "Enabled";
@@ -7,8 +6,9 @@ var ArgIndexes;
     ArgIndexes[ArgIndexes["Rotation"] = 3] = "Rotation";
     ArgIndexes[ArgIndexes["Transparent"] = 4] = "Transparent";
     ArgIndexes[ArgIndexes["UVs"] = 5] = "UVs";
+    ArgIndexes[ArgIndexes["Index"] = 6] = "Index";
 })(ArgIndexes || (ArgIndexes = {}));
-const getArgs = () => {
+const getArgs = (face) => {
     const args = [];
     args[ArgIndexes.Enabled] = true;
     args[ArgIndexes.Fliped] = false;
@@ -21,15 +21,15 @@ const getArgs = () => {
         [0, 0],
         [1, 0],
     ];
+    args[ArgIndexes.Index] = face;
     return args;
 };
 export class BoxVoxelGometryInputs {
     static ArgIndexes = ArgIndexes;
     static CreateArgs() {
         const base = [];
-        for (let i = 0; i < VoxelFacesArray.length; i++) {
-            const face = VoxelFacesArray[i];
-            base[face] = getArgs();
+        for (let face = 0; face < 6; face++) {
+            base[face] = getArgs(face);
         }
         return base;
     }

package/Models/Input/QuadVoxelGometryInputs.d.ts

@@ -1,4 +1,4 @@
-import { QuadUVData } from "@amodx/meshing/Geometry.types";
+import { QuadUVData } from "../../Mesher/Geomtry/Geometry.types";
 export type QuadVoxelGometryArgs = [
     enabled: boolean,
     fliped: boolean,

package/Models/Rules/Classes/OcclusionFace.js

@@ -1,5 +1,5 @@
 import { Vector3Like } from "@amodx/math";
-import { Quad } from "@amodx/meshing/Primitives/Quad";
+import { Quad } from "../../../Mesher/Geomtry/Primitives/Quad";
 export class OcclusionFace {
     parentId;
     nodeId;

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

@@ -1,15 +1,15 @@
 import { OcclusionFaceContainer } from "./OcclusionFace";
 import { BuildGeomtryInputs } from "../Functions/BuildGeomtryInputs";
 import { BuildStateData } from "../../../Voxels/Functions/BuildStateData";
-import { PrcoessedVoxelGeometryData } from "../../../Voxels/VoxelSyncData";
+import { CompiledVoxelGeometryData } from "../../../Voxels/Types/VoxelModelCompiledData.types";
 export declare class VoxelRuleGeometry {
     id: string;
-    data: PrcoessedVoxelGeometryData;
+    data: CompiledVoxelGeometryData;
     occlusionPlane: OcclusionFaceContainer;
     inputs: ReturnType<typeof BuildGeomtryInputs>;
     faceCount: number;
     vertexCount: number;
     state: ReturnType<typeof BuildStateData>;
-    constructor(id: string, data: PrcoessedVoxelGeometryData, occlusionPlane?: OcclusionFaceContainer, inputs?: ReturnType<typeof BuildGeomtryInputs>);
+    constructor(id: string, data: CompiledVoxelGeometryData, occlusionPlane?: OcclusionFaceContainer, inputs?: ReturnType<typeof BuildGeomtryInputs>);
     clone(): VoxelRuleGeometry;
 }

package/Models/Rules/Functions/BuildGeomtryInputs.js

@@ -1,6 +1,5 @@
-import { Observable } from "@amodx/core/Observers";
 import { BoxVoxelGometryInputs } from "../../Input/BoxVoxelGometryInputs";
-import { VoxelFaceNameArray, VoxelFaceNameRecord } from "../../../Math";
+import { VoxelFaceNameArray } from "../../../Math";
 import { TextureManager } from "../../../Textures/TextureManager";
 import { Matrix2x2Like, AMath } from "@amodx/math";
 import { QuadVoxelGometryInputs } from "../../Input/QuadVoxelGometryInputs";
@@ -63,13 +62,13 @@ const mapQuadUvs = (uvs, rotation = 0, transform) => {
 };
 export function BuildGeomtryInputs(geomtry) {
     const inputObservers = new Map();
-    const getInputObserver = (id) => {
+    const onInput = (id, subscribe) => {
         let obs = inputObservers.get(id);
         if (!obs) {
-            obs = new Observable();
+            obs = [];
             inputObservers.set(id, obs);
         }
-        return obs;
+        return obs.push(subscribe);
     };
     let faceTransparentIndex = [];
     let faceCount = 0;
@@ -84,9 +83,8 @@ export function BuildGeomtryInputs(geomtry) {
                 const value = node.inputs[input];
                 if (isArgString(value)) {
                     args[argsIndex][input] = null;
-                    getInputObserver(value).subscribe((value) => {
+                    onInput(value, (value) => {
                         args[argsIndex][input] = value;
-                        console.warn("set the value", value, args[argsIndex][input]);
                     });
                 }
                 else {
@@ -95,69 +93,76 @@ export function BuildGeomtryInputs(geomtry) {
             }
         }
         if (node.type == "box") {
-            const newArgs = BoxVoxelGometryInputs.CreateArgs();
-            args.push(newArgs);
+            args.push(BoxVoxelGometryInputs.CreateArgs());
             const argsIndex = args.length - 1;
-            for (const face of VoxelFaceNameArray) {
+            for (let face = 0; face < 6; face++) {
                 const relativeFaceCount = faceCount;
-                const faceIndex = VoxelFaceNameRecord[face];
-                const faceData = node.faces[face];
+                const faceName = VoxelFaceNameArray[face];
+                const faceData = node.faces[faceName];
                 let defaultUvs = [0, 0, 1, 1];
                 if (isArgString(faceData.enabled)) {
-                    getInputObserver(String(faceData.enabled)).subscribe((value) => (args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Enabled] = value));
+                    onInput(String(faceData.enabled), (value) => (args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Enabled] =
+                        value));
                 }
                 if (isArgString(faceData.flip)) {
-                    getInputObserver(String(faceData.flip)).subscribe((value) => (args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Fliped] = value));
+                    onInput(String(faceData.flip), (value) => (args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Fliped] =
+                        value));
                 }
                 if (isArgString(faceData.transparent)) {
-                    getInputObserver(String(faceData.transparent)).subscribe((value) => {
-                        args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Transparent] = value;
-                        faceTransparentIndex[relativeFaceCount + faceIndex] =
-                            Boolean(value);
+                    onInput(String(faceData.transparent), (value) => {
+                        args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Transparent] = value;
+                        faceTransparentIndex[relativeFaceCount + face] = Boolean(value);
                     });
                 }
                 else {
-                    args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Transparent] = Boolean(faceData.transparent);
-                    faceTransparentIndex[relativeFaceCount + faceIndex] = Boolean(faceData.transparent);
+                    args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Transparent] =
+                        Boolean(faceData.transparent);
+                    faceTransparentIndex[relativeFaceCount + face] = Boolean(faceData.transparent);
                 }
                 if (isArgString(faceData.rotation)) {
-                    getInputObserver(String(faceData.rotation)).subscribe((value) => {
-                        args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Rotation] = value;
-                        args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.UVs] = mapQuadUvs(defaultUvs, value, tranform);
+                    onInput(String(faceData.rotation), (value) => {
+                        args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Rotation] =
+                            value;
+                        args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.UVs] =
+                            mapQuadUvs(defaultUvs, value, tranform);
                     });
                 }
                 else {
                     faceData.rotation &&
-                        (args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Rotation] = faceData.rotation);
+                        (args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Rotation] =
+                            faceData.rotation);
                 }
                 if (isArgString(faceData.uv)) {
                     const defaultInput = geomtry.data.ogData.arguments[faceData.uv.substring(1)];
                     if (defaultInput.type == "box-uv" && defaultInput.default) {
-                        args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.UVs] = mapQuadUvs(defaultInput.default, args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Rotation], tranform);
+                        args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.UVs] =
+                            mapQuadUvs(defaultInput.default, args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Rotation], tranform);
                         defaultUvs = defaultInput.default;
                     }
-                    getInputObserver(String(faceData.uv)).subscribe((value) => {
-                        args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.UVs] = mapQuadUvs(value, args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Rotation], tranform);
+                    onInput(String(faceData.uv), (value) => {
+                        args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.UVs] =
+                            mapQuadUvs(value, args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Rotation], tranform);
                     });
                 }
                 else {
-                    args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.UVs] = mapQuadUvs(faceData.uv, args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Rotation], tranform);
+                    args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.UVs] =
+                        mapQuadUvs(faceData.uv, args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Rotation], tranform);
                     defaultUvs = faceData.uv;
                 }
                 if (isArgString(faceData.texture)) {
-                    getInputObserver(String(faceData.texture)).subscribe((value) => (args[argsIndex][VoxelFaceNameRecord[face]][BoxVoxelGometryInputs.ArgIndexes.Texture] = value));
+                    onInput(String(faceData.texture), (value) => (args[argsIndex][face][BoxVoxelGometryInputs.ArgIndexes.Texture] =
+                        value));
                 }
             }
             faceCount += 6;
         }
         if (node.type == "quad") {
-            const newArgs = QuadVoxelGometryInputs.CreateArgs();
-            args.push(newArgs);
+            args.push(QuadVoxelGometryInputs.CreateArgs());
             const argsIndex = args.length - 1;
             const relativeFaceCount = faceCount;
             let defaultUvs = [0, 0, 1, 1];
             if (isArgString(node.transparent)) {
-                getInputObserver(String(node.transparent)).subscribe((value) => {
+                onInput(String(node.transparent), (value) => {
                     args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.Transparent] =
                         value;
                     faceTransparentIndex[relativeFaceCount] = Boolean(value);
@@ -169,7 +174,7 @@ export function BuildGeomtryInputs(geomtry) {
                 faceTransparentIndex[relativeFaceCount] = Boolean(node.transparent);
             }
             if (isArgString(node.doubleSided)) {
-                getInputObserver(String(node.doubleSided)).subscribe((value) => {
+                onInput(String(node.doubleSided), (value) => {
                     args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.DoubleSided] =
                         value;
                 });
@@ -179,7 +184,7 @@ export function BuildGeomtryInputs(geomtry) {
                     Boolean(node.doubleSided);
             }
             if (isArgString(node.textureRotation)) {
-                getInputObserver(String(node.textureRotation)).subscribe((value) => {
+                onInput(String(node.textureRotation), (value) => {
                     args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.Rotation] = value;
                     args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.UVs] = mapQuadUvs(defaultUvs, value, tranform);
                 });
@@ -195,7 +200,7 @@ export function BuildGeomtryInputs(geomtry) {
                     args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.UVs] = mapQuadUvs(defaultInput.default, args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.Rotation], tranform);
                     defaultUvs = defaultInput.default;
                 }
-                getInputObserver(String(node.uv)).subscribe((value) => {
+                onInput(String(node.uv), (value) => {
                     args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.UVs] = mapQuadUvs(value, args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.Rotation], tranform);
                 });
             }
@@ -204,7 +209,7 @@ export function BuildGeomtryInputs(geomtry) {
                 defaultUvs = node.uv;
             }
             if (isArgString(node.texture)) {
-                getInputObserver(String(node.texture)).subscribe((value) => (args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.Texture] = value));
+                onInput(String(node.texture), (value) => (args[argsIndex][QuadVoxelGometryInputs.ArgIndexes.Texture] = value));
             }
             faceCount++;
         }
@@ -233,7 +238,9 @@ export function BuildGeomtryInputs(geomtry) {
                 if (data.type == "texture") {
                     value = TextureManager.getTextureIndex(value);
                 }
-                obs.notify(value);
+                for (const func of obs) {
+                    func(value);
+                }
             },
         });
     }

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

@@ -1,4 +1,4 @@
 import { OcclusionFaceContainer } from "../Classes/OcclusionFace";
 import { VoxelRuleGeometry } from "../Classes/VoxelRulesGeometry";
-import { PrcoessedVoxelGeometryNodes } from "../../../Voxels/VoxelSyncData";
-export declare function GetOcclusionFaces(parentId: string, geometry: VoxelRuleGeometry, data: PrcoessedVoxelGeometryNodes[]): OcclusionFaceContainer;
+import { CompiledVoxelGeometryNodes } from "../../../Voxels/Types/VoxelModelCompiledData.types";
+export declare function GetOcclusionFaces(parentId: string, geometry: VoxelRuleGeometry, data: CompiledVoxelGeometryNodes[]): OcclusionFaceContainer;

package/Models/Rules/Functions/GetOcclusionFaces.js

@@ -2,7 +2,7 @@ import { Vector3Like } from "@amodx/math";
 import { OcclusionFlatQuadFace, OcclusionFaceContainer, OcclusionQuadFace, } from "../Classes/OcclusionFace";
 import { VoxelFaces } from "../../../Math";
 import { TransformBox, TransformQuad } from "../../Shared/Transform";
-import { Quad } from "@amodx/meshing/Primitives/Quad";
+import { Quad } from "../../../Mesher/Geomtry/Primitives/Quad";
 export function GetOcclusionFaces(parentId, geometry, data) {
     const faceContainer = new OcclusionFaceContainer();
     let vertexCount = 0;

package/Models/Shared/Transform.d.ts

@@ -1,4 +1,4 @@
-import { Quad } from "@amodx/meshing/Primitives/Quad";
-import { VoxelGeometryTransform } from "../../Voxels/VoxelSyncData";
+import { Quad } from "../../Mesher/Geomtry/Primitives/Quad";
+import { VoxelGeometryTransform } from "../../Voxels/Types/VoxelModelCompiledData.types";
 export declare function TransformQuad(quad: Quad, transform: VoxelGeometryTransform): Quad;
 export declare function TransformBox(quads: [Quad, Quad, Quad, Quad, Quad, Quad], transform: VoxelGeometryTransform): [Quad, Quad, Quad, Quad, Quad, Quad];