From bfcc7b3286906020afaab6d0d2e5bb4a22b7d175 Mon Sep 17 00:00:00 2001 From: Alexander Gauggel <agauggel@uni-koblenz.de> Date: Sun, 20 Jun 2021 10:41:16 +0200 Subject: [PATCH] [#82] Add asset loader tangent attribute --- modules/asset_loader/include/vkcv/asset/asset_loader.hpp | 3 ++- modules/asset_loader/src/vkcv/asset/asset_loader.cpp | 5 ++++- 2 files changed, 6 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 4107d57e..f0e505e1 100644 --- a/modules/asset_loader/include/vkcv/asset/asset_loader.hpp +++ b/modules/asset_loader/include/vkcv/asset/asset_loader.hpp @@ -114,7 +114,8 @@ enum class PrimitiveType : uint32_t { POSITION = 1, NORMAL = 2, TEXCOORD_0 = 3, - TEXCOORD_1 = 4 + TEXCOORD_1 = 4, + TANGENT = 5 }; /** These integer values are used the same way in OpenGL, Vulkan and glTF. This diff --git a/modules/asset_loader/src/vkcv/asset/asset_loader.cpp b/modules/asset_loader/src/vkcv/asset/asset_loader.cpp index 97fd3951..a14e9eb6 100644 --- a/modules/asset_loader/src/vkcv/asset/asset_loader.cpp +++ b/modules/asset_loader/src/vkcv/asset/asset_loader.cpp @@ -177,8 +177,11 @@ int loadScene(const std::string &path, Scene &scene){ attribute.type = PrimitiveType::NORMAL; } else if (attrib.first == "TEXCOORD_0") { attribute.type = PrimitiveType::TEXCOORD_0; - } else if (attrib.first == "TEXCOORD_1") { + } + else if (attrib.first == "TEXCOORD_1") { attribute.type = PrimitiveType::TEXCOORD_1; + } else if (attrib.first == "TANGENT") { + attribute.type = PrimitiveType::TANGENT; } else { return 0; } -- GitLab