From 390fef9f9a7097af3d9170835d683ccc01afa5b1 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 23 May 2025 09:48:29 -0700 Subject: [PATCH] Fix isledecomp/isle merge (#150) * Fix isledecomp/isle merge * Use constant --- LEGO1/tgl/d3drm/impl.h | 2 +- LEGO1/tgl/d3drm/meshbuilder.cpp | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h index 3c72d818..eb941cb5 100644 --- a/LEGO1/tgl/d3drm/impl.h +++ b/LEGO1/tgl/d3drm/impl.h @@ -695,7 +695,7 @@ inline Result MeshSetTextureMappingMode(MeshImpl::MeshData* pMesh, TextureMappin return ResultVal(pMesh->groupMesh->SetGroupMapping(pMesh->groupIndex, D3DRMMAP_PERSPCORRECT)); } else { - return ResultVal(pMesh->groupMesh->SetGroupMapping(pMesh->groupIndex, 0)); + return ResultVal(pMesh->groupMesh->SetGroupMapping(pMesh->groupIndex, D3DRMMAP_NONE)); } } diff --git a/LEGO1/tgl/d3drm/meshbuilder.cpp b/LEGO1/tgl/d3drm/meshbuilder.cpp index 76a8de30..d7363fc8 100644 --- a/LEGO1/tgl/d3drm/meshbuilder.cpp +++ b/LEGO1/tgl/d3drm/meshbuilder.cpp @@ -45,16 +45,6 @@ Mesh* MeshBuilderImpl::CreateMesh( return pMeshImpl; } -inline Result MeshSetTextureMappingMode(MeshImpl::MeshData* pMesh, TextureMappingMode mode) -{ - if (mode == PerspectiveCorrect) { - return ResultVal(pMesh->groupMesh->SetGroupMapping(pMesh->groupIndex, D3DRMMAP_PERSPCORRECT)); - } - else { - return ResultVal(pMesh->groupMesh->SetGroupMapping(pMesh->groupIndex, D3DRMMAP_NONE)); - } -} - inline Result CreateMesh( IDirect3DRMMesh* pD3DRM, unsigned int faceCount,