From e637ad9d2a62fdcc2d4917de63defef5f8fb0591 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 4 Dec 2021 19:56:02 +0100 Subject: Support custom modules inclusion Allow to choose which modules are compiled with raylib, if some modules are excluded from compilation, required functionality is not available but smaller builds are possible. --- src/rmodels.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/rmodels.c') diff --git a/src/rmodels.c b/src/rmodels.c index c159350c..bbb46e4b 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -4,12 +4,14 @@ * * CONFIGURATION: * +* #define SUPPORT_MODULE_RMODELS +* rmodels module is included in the build +* * #define SUPPORT_FILEFORMAT_OBJ * #define SUPPORT_FILEFORMAT_MTL * #define SUPPORT_FILEFORMAT_IQM * #define SUPPORT_FILEFORMAT_GLTF * #define SUPPORT_FILEFORMAT_VOX -* * Selected desired fileformats to be supported for model data loading. * * #define SUPPORT_MESH_GENERATION @@ -45,6 +47,8 @@ #include "config.h" // Defines module configuration flags #endif +#if defined(SUPPORT_MODULE_RMODELS) + #include "utils.h" // Required for: TRACELOG(), LoadFileData(), LoadFileText(), SaveFileText() #include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 2.1, 3.3+ or ES2 #include "raymath.h" // Required for: Vector3, Quaternion and Matrix functionality @@ -918,7 +922,7 @@ Model LoadModel(const char *fileName) if (IsFileExtension(fileName, ".iqm")) model = LoadIQM(fileName); #endif #if defined(SUPPORT_FILEFORMAT_GLTF) - if (IsFileExtension(fileName, ".gltf;.glb")) model = LoadGLTF(fileName); + if (IsFileExtension(fileName, ".gltf") || IsFileExtension(fileName, ".glb")) model = LoadGLTF(fileName); #endif #if defined(SUPPORT_FILEFORMAT_VOX) if (IsFileExtension(fileName, ".vox")) model = LoadVOX(fileName); @@ -1704,7 +1708,6 @@ bool ExportMesh(Mesh mesh, const char *fileName) return success; } - // Load materials from model file Material *LoadMaterials(const char *fileName, int *materialCount) { @@ -5089,3 +5092,5 @@ static Model LoadVOX(const char *fileName) return model; } #endif + +#endif // SUPPORT_MODULE_RMODELS -- cgit v1.2.3