From 8289e7a29f0763c6fd8fea45066b5a5bc8150e8a Mon Sep 17 00:00:00 2001 From: Valtteri Koskivuori Date: Sat, 18 Nov 2023 20:57:04 +0200 Subject: [PATCH] Tidy up sceneloader includes --- src/utils/loaders/sceneloader.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/utils/loaders/sceneloader.c b/src/utils/loaders/sceneloader.c index 8d68fc65..d05a5581 100644 --- a/src/utils/loaders/sceneloader.c +++ b/src/utils/loaders/sceneloader.c @@ -11,6 +11,8 @@ //FIXME: We should only need to include c-ray.h here! #include +#include +#include #include "../../datatypes/scene.h" #include "../../datatypes/vector.h" @@ -19,35 +21,24 @@ #include "../../datatypes/material.h" #include "../../datatypes/poly.h" #include "../../datatypes/transforms.h" -#include "../logging.h" -#include "../fileio.h" -#include "../string.h" -#include "../../vendored/cJSON.h" -#ifdef WINDOWS // Sigh... -#include -#else -#include -#endif -#include -#include -#include "../platform/capabilities.h" #include "../../datatypes/image/imagefile.h" +#include "../../vendored/cJSON.h" #include "../../renderer/renderer.h" -#include "textureloader.h" #include "../../renderer/instance.h" -#include "../../utils/timer.h" #include "../../utils/string.h" -#include "../../utils/platform/signal.h" #include "../../nodes/bsdfnode.h" #include "../../nodes/valuenode.h" #include "../../nodes/colornode.h" #include "../../nodes/shaders/emission.h" #include "../../nodes/textures/constant.h" #include "../../nodes/valuenode.h" +#include "../platform/capabilities.h" +#include "../logging.h" +#include "../fileio.h" +#include "../string.h" +#include "textureloader.h" #include "meshloader.h" -struct transform parseTransformComposite(const cJSON *transforms); - static struct transform parseTransform(const cJSON *data, char *targetName) { cJSON *type = cJSON_GetObjectItem(data, "type"); if (!cJSON_IsString(type)) {