From ca2d3cc9b1e7e881239e6b2fe9857751120d6065 Mon Sep 17 00:00:00 2001 From: nek0 Date: Mon, 15 May 2023 06:45:12 +0200 Subject: [PATCH] move meshes --- assets/{ => models}/cat_mask_cyberpunk.obj | 0 src/Mesh.hs | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) rename assets/{ => models}/cat_mask_cyberpunk.obj (100%) diff --git a/assets/cat_mask_cyberpunk.obj b/assets/models/cat_mask_cyberpunk.obj similarity index 100% rename from assets/cat_mask_cyberpunk.obj rename to assets/models/cat_mask_cyberpunk.obj diff --git a/src/Mesh.hs b/src/Mesh.hs index 1a30d70..680f4db 100644 --- a/src/Mesh.hs +++ b/src/Mesh.hs @@ -43,7 +43,12 @@ loadMeshes allocator uploadContext queue device = do ] triMesh <- uploadMesh triangle allocator uploadContext queue device - maskMesh <- loadFromObj "./assets/cat_mask_cyberpunk.obj" allocator uploadContext queue device + maskMesh <- loadFromObj + "./assets/models/cat_mask_cyberpunk.obj" + allocator + uploadContext + queue + device meshLib <- asks meshLibrary