Version 1.0.3-alpha (#2)

* Refactor package structure and enhance dictionary array handling

- Updated GitHub python workflows
- Removed requirements.txt and setup.py, transitioning to pyproject.toml for package management.
- Modified MANIFEST.in to exclude requirements.txt.
- Added new properties and methods in Mesh class to support nested dictionary structures containing numpy arrays.
- Implemented recursive extraction and reconstruction of nested arrays in MeshUtils.
- Created comprehensive unit tests for dictionary fields containing arrays, ensuring correct encoding and decoding.
- Added TypeScript tests for dictionary arrays, verifying functionality and data integrity.

* Refactor mesh handling to support mixed polygon types and preserve non-array values in nested dictionaries

- Updated EncodedMesh and Mesh classes to include index_sizes for polygon size metadata.
- Introduced methods for polygon count and uniformity checks in MeshUtils.
- Enhanced encoding/decoding processes to handle mixed polygon structures (triangles and quads).
- Modified tests to validate the preservation of non-array values in nested dictionaries during encoding/decoding.
- Adjusted ArrayUtils to support both Float32Array and Uint32Array.
- Removed obsolete dictionary structure metadata handling from Mesh and MeshUtils.

* Refactor mesh handling to support nested directory structure for encoded arrays and update related metadata management

* Update Mesh class index_sizes validation and improve documentation for inferred sizes

* Added deterministic zip output

* Bump version to 1.0.3-alpha in pyproject.toml and package.json

Author: afshawnlotfi

.github/workflows/pypi-publish.yml

@@ -17,7 +17,7 @@ jobs:
         python -m pip install --upgrade pip
         cd python
         pip install build
-        pip install -r requirements.txt
+        pip install .
 
     - name: Build package
       run: cd python && python -m build --sdist

.github/workflows/python-test.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        cd python &&  pip install -r requirements.txt
+        cd python &&  pip install .
     - name: Test with unittest
       run: |
         cd python && python -m unittest discover tests

python/MANIFEST.in

@@ -1,3 +1,2 @@
 include README.md
-include requirements.txt
 include LICENSE

python/examples/mesh_example.ipynb

@@ -57,7 +57,20 @@
                 "    \n",
                 "    # Add non-array attributes\n",
                 "    material_name: str = Field(\"default\", description=\"Material name\")\n",
-                "    tags: List[str] = Field(default_factory=list, description=\"Tags for the mesh\")"
+                "    tags: List[str] = Field(default_factory=list, description=\"Tags for the mesh\")\n",
+                "\n",
+                "    # Dictionary containing nested dictionaries with arrays\n",
+                "    material_data: dict[str, dict[str, np.ndarray]] = Field(\n",
+                "        default_factory=dict,\n",
+                "        description=\"Nested dictionary structure with arrays\"\n",
+                "    )\n",
+                "\n",
+                "    material_colors: dict[str, str] = Field(\n",
+                "        default_factory=dict,\n",
+                "        description=\"Dictionary with non-array values\"\n",
+                "    )\n",
+                "    \n",
+                "    \n"
             ]
         },
         {
@@ -99,12 +112,12 @@
                 "\n",
                 "# Create indices for the cube\n",
                 "indices = np.array([\n",
-                "    0, 1, 2, 2, 3, 0,  # back face\n",
-                "    1, 5, 6, 6, 2, 1,  # right face\n",
-                "    5, 4, 7, 7, 6, 5,  # front face\n",
-                "    4, 0, 3, 3, 7, 4,  # left face\n",
-                "    3, 2, 6, 6, 7, 3,  # top face\n",
-                "    4, 5, 1, 1, 0, 4   # bottom face\n",
+                "    [0, 1, 2, 2, 3, 0],  # back face\n",
+                "    [1, 5, 6, 6, 2, 1],  # right face\n",
+                "    [5, 4, 7, 7, 6, 5],  # front face\n",
+                "    [4, 0, 3, 3, 7, 4],  # left face\n",
+                "    [3, 2, 6, 6, 7, 3],  # top face\n",
+                "    [4, 5, 1, 1, 0, 4]   # bottom face\n",
                 "], dtype=np.uint32)\n",
                 "\n",
                 "# Create texture coordinates (one for each vertex)\n",
@@ -138,7 +151,17 @@
                 "    texture_coords=texture_coords,\n",
                 "    normals=normals,\n",
                 "    material_name=\"cube_material\",\n",
-                "    tags=[\"cube\", \"example\"]\n",
+                "    tags=[\"cube\", \"example\"],\n",
+                "    material_data={\n",
+                "        \"cube_material\": {\n",
+                "            \"diffuse\": np.array([1.0, 0.5, 0.31], dtype=np.float32),\n",
+                "            \"specular\": np.array([0.5, 0.5, 0.5], dtype=np.float32),\n",
+                "            \"shininess\": np.array([32.0], dtype=np.float32)\n",
+                "        }\n",
+                "    },\n",
+                "    material_colors={\n",
+                "        \"cube_material\": \"#FF7F50\"\n",
+                "    }\n",
                 ")\n",
                 "\n",
                 "print(f\"Mesh created with {mesh.vertex_count} vertices and {mesh.index_count} indices\")\n",
@@ -213,8 +236,8 @@
                     "output_type": "stream",
                     "text": [
                         "Encoded mesh: 65 bytes for vertices, 41 bytes for indices\n",
-                        "Encoded arrays: ['texture_coords', 'normals']\n",
-                        "Saved mesh to textured_cube.zip, file size: 1543 bytes\n"
+                        "Encoded arrays: ['normals', 'material_data.cube_material.specular', 'texture_coords', 'material_data.cube_material.diffuse', 'material_data.cube_material.shininess', 'index_sizes']\n",
+                        "Saved mesh to textured_cube.zip, file size: 3447 bytes\n"
                     ]
                 }
             ],
@@ -248,36 +271,29 @@
                     "name": "stdout",
                     "output_type": "stream",
                     "text": [
-                        "[0 1 2 2 3 0 1 5 6 6 2 1 5 4 7 7 6 5 4 0 3 3 7 4 3 2 6 6 7 3 4 5 1 1 0 4]\n",
                         "Loaded mesh: 8 vertices, 36 indices\n",
                         "Material name: cube_material\n",
                         "Tags: ['cube', 'example']\n",
                         "\n",
                         "Texture coordinates shape: (8, 2)\n",
-                        "Normals shape: (8, 3)\n"
+                        "Normals shape: (8, 3)\n",
+                        "Material data: {'cube_material': {'specular': array([0.5, 0.5, 0.5], dtype=float32), 'diffuse': array([1.  , 0.5 , 0.31], dtype=float32), 'shininess': array([32.], dtype=float32)}}\n",
+                        "Material colors: {'cube_material': '#FF7F50'}\n"
                     ]
                 }
             ],
             "source": [
                 "# Load the mesh from the zip file\n",
                 "loaded_mesh = MeshUtils.load_from_zip(TexturedMesh, zip_path)\n",
-                "print(loaded_mesh.indices)\n",
                 "print(f\"Loaded mesh: {loaded_mesh.vertex_count} vertices, {loaded_mesh.index_count} indices\")\n",
                 "print(f\"Material name: {loaded_mesh.material_name}\")\n",
                 "print(f\"Tags: {loaded_mesh.tags}\")\n",
                 "\n",
                 "# Verify that the texture coordinates and normals were loaded correctly\n",
                 "print(f\"\\nTexture coordinates shape: {loaded_mesh.texture_coords.shape}\")\n",
                 "print(f\"Normals shape: {loaded_mesh.normals.shape}\")\n",
-                "\n",
-                "\n",
-                "\n",
-                "# Python (Main)\n",
-                "# 209 0 4 4 0 4 10 4 2 16 0 14 12 8 10 2 8 2 12 2 8 18 0 20 2 6 16 10 8 6 12 6 8 14 16 6 4 0 0 0 0\n",
-                "\n",
-                "# JSZip\n",
-                "# 209 0 4 4 0 4 10 4 16 4 0 14 2 16 2 12 0 2 2 2 14 12 0 16 10 2 2 16 0 4 14 4 4 14 0 2 16 0 0 0 0\n",
-                "\n"
+                "print(f\"Material data: {loaded_mesh.material_data}\")\n",
+                "print(f\"Material colors: {loaded_mesh.material_colors}\")\n"
             ]
         },
         {
@@ -431,7 +447,7 @@
             "name": "python",
             "nbconvert_exporter": "python",
             "pygments_lexer": "ipython3",
-            "version": "3.12.8"
+            "version": "3.12.11"
         }
     },
     "nbformat": 4,