From 564ac394e7535b771d301cd241fd0ee3459792ba Mon Sep 17 00:00:00 2001
From: Trevor Hollmann <thollmann@uni-koblenz.de>
Date: Mon, 12 Jul 2021 12:14:49 +0200
Subject: [PATCH] [#79] Change order of function arguments for loadMesh.
For consistency the output arguments should always be the last
arguments of a function.
---
modules/asset_loader/include/vkcv/asset/asset_loader.hpp | 2 +-
modules/asset_loader/src/vkcv/asset/asset_loader.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/asset_loader/include/vkcv/asset/asset_loader.hpp b/modules/asset_loader/include/vkcv/asset/asset_loader.hpp
index c194dcfb..7adf6466 100644
--- a/modules/asset_loader/include/vkcv/asset/asset_loader.hpp
+++ b/modules/asset_loader/include/vkcv/asset/asset_loader.hpp
@@ -234,7 +234,7 @@ int probeScene(const std::filesystem::path &path, Scene &scene);
/**
* TODO document
*/
-int loadMesh(const std::filesystem::path &path, Scene &scene, const std::string &name);
+int loadMesh(const std::filesystem::path &path, const std::string &name, Scene &scene);
struct TextureData {
diff --git a/modules/asset_loader/src/vkcv/asset/asset_loader.cpp b/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
index bffde8f0..45810278 100644
--- a/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
+++ b/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
@@ -748,7 +748,7 @@ int probeScene(const std::filesystem::path& path, Scene& scene) {
}
-int loadMesh(const std::filesystem::path &path, Scene &scene, const std::string &name) {
+int loadMesh(const std::filesystem::path &path, const std::string &name, Scene &scene) {
fx::gltf::Document sceneObjects;
try {
--
GitLab