From c9ec1ea7b6f5d2c5744dd3cd1b24e03457744047 Mon Sep 17 00:00:00 2001 From: "Arthur Brainville (Ybalrid)" Date: Sun, 18 Feb 2018 21:01:59 +0100 Subject: [PATCH] Add a gltf_filename feild to the renderconfig struct This is to get the filename that will be given to the gltf-loader Signed-off by: Arthur Brainville (Ybalrid) --- examples/raytrace/render-config.cc | 6 ++++++ examples/raytrace/render-config.h | 1 + 2 files changed, 7 insertions(+) diff --git a/examples/raytrace/render-config.cc b/examples/raytrace/render-config.cc index b2e8e5f..7baa0e2 100644 --- a/examples/raytrace/render-config.cc +++ b/examples/raytrace/render-config.cc @@ -35,6 +35,12 @@ bool LoadRenderConfig(example::RenderConfig* config, const char* filename) { } } + if (o.find("gltf_filename") != o.end()) { + if (o["gltf_filename"].is()) { + config->gltf_filename = o["gltf_filename"].get(); + } + } + if (o.find("eson_filename") != o.end()) { if (o["eson_filename"].is()) { config->eson_filename = o["eson_filename"].get(); diff --git a/examples/raytrace/render-config.h b/examples/raytrace/render-config.h index fed4c0b..c3ffe4e 100644 --- a/examples/raytrace/render-config.h +++ b/examples/raytrace/render-config.h @@ -29,6 +29,7 @@ typedef struct { // Scene input info std::string obj_filename; + std::string gltf_filename; std::string eson_filename; float scene_scale;