Allow reaxising mesh

src/dusk/asset/loader/display/assetmeshloader.c

@@ -79,10 +79,53 @@ errorret_t assetMeshLoader(assetfile_t *file) {
         );
       }
 
-      // Convert Z-Up to Y-Up
-      float_t temp = verts[i * 3 + j].pos[1];
-      verts[i * 3 + j].pos[1] = verts[i * 3 + j].pos[2];
-      verts[i * 3 + j].pos[2] = temp;
+      switch(output->inputAxis) {
+        case MESH_INPUT_AXIS_Z_UP:
+          // Convert Z-Up to Y-Up
+          {
+            float_t temp = verts[i * 3 + j].pos[1];
+            verts[i * 3 + j].pos[1] = verts[i * 3 + j].pos[2];
+            verts[i * 3 + j].pos[2] = temp;
+          }
+          break;
+
+        case MESH_INPUT_AXIS_X_UP:
+          // Convert X-Up to Y-Up
+          {
+            float_t temp = verts[i * 3 + j].pos[0];
+            verts[i * 3 + j].pos[0] = verts[i * 3 + j].pos[1];
+            verts[i * 3 + j].pos[1] = temp;
+          }
+          break;
+
+        case MESH_INPUT_AXIS_Y_DOWN:
+          // Invert Y axis
+          verts[i * 3 + j].pos[1] = -verts[i * 3 + j].pos[1];
+          break;
+
+        case MESH_INPUT_AXIS_Z_DOWN:
+          // Convert Z-Up to Y-Up and invert Y axis
+          {
+            float_t temp = verts[i * 3 + j].pos[1];
+            verts[i * 3 + j].pos[1] = -verts[i * 3 + j].pos[2];
+            verts[i * 3 + j].pos[2] = temp;
+          }
+          break;
+
+        case MESH_INPUT_AXIS_X_DOWN:
+          // Convert X-Up to Y-Up and invert Y axis
+          {
+            float_t temp = verts[i * 3 + j].pos[0];
+            verts[i * 3 + j].pos[0] = verts[i * 3 + j].pos[1];
+            verts[i * 3 + j].pos[1] = -temp;
+          }
+          break;
+
+        case MESH_INPUT_AXIS_Y_UP:
+        default:
+          // No covnersion possible / Needed
+          break;
+      }
     }
   }
 
@@ -108,15 +151,32 @@ errorret_t assetMeshLoader(assetfile_t *file) {
   errorOk();
 }
 
+errorret_t assetMeshLoadToOutput(
+  const char_t *path,
+  assetmeshoutput_t *output
+) {
+  assertNotNull(path, "Path cannot be null");
+  assertNotNull(output, "Output cannot be null");
+  assertNotNull(output->outMesh, "Output mesh cannot be null");
+  assertNotNull(output->outVertices, "Output vertices cannot be null");
+  
+  return assetLoad(path, &assetMeshLoader, NULL, output);
+}
+
 errorret_t assetMeshLoad(
   const char_t *path,
   mesh_t *outMesh,
-  meshvertex_t **outVertices
+  meshvertex_t **outVertices,
+  const assetmeshinputaxis_t inputAxis
 ) {
   assertNotNull(path, "Path cannot be null");
   assertNotNull(outMesh, "Output mesh cannot be null");
   assertNotNull(outVertices, "Output vertices cannot be null");
   
-  assetmeshoutput_t output = { outMesh, outVertices };
-  return assetLoad(path, &assetMeshLoader, NULL, &output);
+  assetmeshoutput_t output = {
+    outMesh,
+    outVertices,
+    inputAxis
+  };
+  return assetMeshLoadToOutput(path, &output);
 }

src/dusk/asset/loader/display/assetmeshloader.h

@@ -10,9 +10,20 @@
 #include "display/mesh/mesh.h"
 #include "assert/assert.h"
 
+typedef enum {
+  MESH_INPUT_AXIS_Y_UP,// Default
+  MESH_INPUT_AXIS_Z_UP,
+  MESH_INPUT_AXIS_X_UP,
+
+  MESH_INPUT_AXIS_Y_DOWN,
+  MESH_INPUT_AXIS_Z_DOWN,
+  MESH_INPUT_AXIS_X_DOWN,
+} assetmeshinputaxis_t;
+
 typedef struct {
   mesh_t *outMesh;
   meshvertex_t **outVertices;
+  assetmeshinputaxis_t inputAxis;
 } assetmeshoutput_t;
 
 #pragma pack(push, 1)
@@ -37,10 +48,14 @@ errorret_t assetMeshLoader(assetfile_t *file);
  * Handler for mesh assets.
  * 
  * @param file Asset file to load the mesh from.
+ * @param outMesh Output mesh to load the data into.
+ * @param outVertices Output pointer to the vertex data, used for cleanup.
+ * @param inputAxis The axis orientation of the input mesh data.
  * @return Any error that occurs during loading.
  */
 errorret_t assetMeshLoad(
   const char_t *path,
   mesh_t *outMesh,
-  meshvertex_t **outVertices
+  meshvertex_t **outVertices,
+  const assetmeshinputaxis_t inputAxis
 );