From d9b6b7480f5cd1c29bc922a0790d23fcd2532901 Mon Sep 17 00:00:00 2001
From: Trevor Hollmann <thollmann@uni-koblenz.de>
Date: Tue, 22 Jun 2021 08:19:08 +0200
Subject: [PATCH] [#79] Get rid of obsolete cerr print.
---
.../include/vkcv/asset/asset_loader.hpp | 4 ++--
.../asset_loader/src/vkcv/asset/asset_loader.cpp | 16 +++++++++-------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/modules/asset_loader/include/vkcv/asset/asset_loader.hpp b/modules/asset_loader/include/vkcv/asset/asset_loader.hpp
index ed264362..b8b043a1 100644
--- a/modules/asset_loader/include/vkcv/asset/asset_loader.hpp
+++ b/modules/asset_loader/include/vkcv/asset/asset_loader.hpp
@@ -189,8 +189,8 @@ typedef struct {
uint32_t offset; // offset in bytes
uint32_t length; // length of ... in bytes
uint32_t stride; // stride in bytes
- ComponentType componentType; // eg. 5126 for float
- uint8_t componentCount; // eg. 3 for vec3
+ ComponentType componentType; // eg. 5126 for float
+ uint8_t componentCount; // eg. 3 for vec3
} VertexAttribute;
/** This struct represents one (possibly the only) part of a mesh. There is
diff --git a/modules/asset_loader/src/vkcv/asset/asset_loader.cpp b/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
index 9de88260..1c0ac5d2 100644
--- a/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
+++ b/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
@@ -50,13 +50,17 @@ void print_what (const std::exception& e, const std::string &path) {
}
}
-/** Translate the component type used in the index accessor of fx-gltf to our
+/**
+ * Translate the component type used in the index accessor of fx-gltf to our
* enum for index type. The reason we have defined an incompatible enum that
* needs translation is that only a subset of component types is valid for
- * indices and we want to catch these incompatibilities here. */
-enum IndexType getIndexType(const enum fx::gltf::Accessor::ComponentType &t)
+ * indices and we want to catch these incompatibilities here.
+ * @param t The component type
+ * @return enum representation
+ */
+enum IndexType getIndexType(const enum fx::gltf::Accessor::ComponentType &type)
{
- switch (t) {
+ switch (type) {
case fx::gltf::Accessor::ComponentType::UnsignedByte:
return IndexType::UINT8;
case fx::gltf::Accessor::ComponentType::UnsignedShort:
@@ -64,8 +68,6 @@ enum IndexType getIndexType(const enum fx::gltf::Accessor::ComponentType &t)
case fx::gltf::Accessor::ComponentType::UnsignedInt:
return IndexType::UINT32;
default:
- std::cerr << "ERROR: Index type not supported: " <<
- static_cast<uint16_t>(t) << std::endl;
return IndexType::UNDEFINED;
}
}
@@ -272,7 +274,7 @@ int loadScene(const std::string &path, Scene &scene){
indexType = getIndexType(indexAccessor.componentType);
if (indexType == IndexType::UNDEFINED){
- vkcv_log(LogLevel::ERROR, "Index Type undefined.");
+ vkcv_log(LogLevel::ERROR, "Index Type undefined or not supported.");
return ASSET_ERROR;
}
}
--
GitLab